From 76d6cd2da03699f105165ee4f69656261262872e Mon Sep 17 00:00:00 2001 From: NightScript <18664762+NightScript370@users.noreply.github.com> Date: Sun, 8 Dec 2024 17:09:33 -0500 Subject: [PATCH] Print touch-ups 1. Rewrite Birkat Halevana paragraph to introduce Talmudic precedent 2. Merge NoRT & RT 3. Remove Tzet Lehumra when using Ohr Hachaim or have the new mergeTzet parameter 4. Tisha Beav on Sunday needs an havdala, so add a new icon representing which type of havdala 5. Fix elevation display on OH mode --- _data/print/printOutNoRT.yml | 104 ------ _includes/printcal/misc.md | 8 +- assets/images/icons8-wine-bar-64.png | Bin 0 -> 763 bytes assets/js/features/print-export.js | 24 +- assets/js/features/print-web-worker.js | 124 ++++--- pages/print/full.html | 53 ++- pages/print/nort.html | 467 ------------------------- 7 files changed, 147 insertions(+), 633 deletions(-) delete mode 100644 _data/print/printOutNoRT.yml create mode 100644 assets/images/icons8-wine-bar-64.png delete mode 100644 pages/print/nort.html diff --git a/_data/print/printOutNoRT.yml b/_data/print/printOutNoRT.yml deleted file mode 100644 index c7489cb..0000000 --- a/_data/print/printOutNoRT.yml +++ /dev/null @@ -1,104 +0,0 @@ ---- -- timeGetter: getAlotHashachar - names: - hb: עלות - et: Aloth - en: Dawn -- timeGetter: getMisheyakir - names: - hb: מישיקיר - et: Misheyakir - en: Misheyakir -- timeGetter: getNetz - names: - hb: הנץ - et: HaNetz - en: Sunrise -- shitot: - - names: - hb: מג'א - en: MG'A - et: MG'A - timeGetter: getSofZmanShmaMGA - id: mga - - names: - hb: גר'א - en: GR'A - et: GR'A - timeGetter: getSofZmanShmaGRA - id: gra - names: - hb: סוף זמן שמע - et: Sof Zman Shema - en: Latest Shema -- timeGetter: getSofZmanBrachothShma - names: - hb: סוף זמן ברכות שמע - et: Sof Shach. - en: Latest Shach. -- timeGetter: getHatzoth - names: - hb: חצות - et: Ḥatsoth - en: Midday -- shitot: - - names: - hb: גדולה - en: Early - et: Early - timeGetter: getMinhaGedolah - id: gedolah - - names: - hb: קטנה - en: Pref. - et: Pref. - timeGetter: getMinchaKetana - id: ketanah - names: - hb: זמן מנחה - et: Zman Minḥa - en: Minḥa Times -- shitot: - - names: - hb: ה"ב - en: H"B - et: H"B - timeGetter: getPlagHaminhaHalachaBrurah - id: hb - - names: - hb: י"י - en: Y"Y - et: Y"Y - timeGetter: getPlagHaminhaYalkutYosef - id: yy - names: - hb: פלג המנחה - et: Plag HaMinḥa - en: Plag HaMinḥa -- timeGetter: getShkiya - names: - hb: שקיעה - et: Sheqi'a - en: Sunset -- shitot: - - names: - hb: שיטת מרן - en: Reg. - et: Reg. - timeGetter: getTzait - id: regular - - names: - hb: לחומרה - et: Ḥumra - en: Strict - timeGetter: getTzaitLechumra - id: humra - names: - hb: צאת הכוכבים - et: Tzet Hakokhavim - en: Nightfall -- timeGetter: candleLightingRT - names: - hb: נרות וצאת מלכה - et: Candles & Tzet Melakha - en: Candles & Tzet Melakha \ No newline at end of file diff --git a/_includes/printcal/misc.md b/_includes/printcal/misc.md index a381cb1..5a2a3a4 100644 --- a/_includes/printcal/misc.md +++ b/_includes/printcal/misc.md @@ -14,9 +14,7 @@ The practice of Ashkenazic communities (as well as some Sepharadic ones) is to a --- -Although the earliest time to recite ברכת הלבנה is three complete days after the calculated moladמשנה ברורה תכ"ו:כ', it is preferable (if possible, and wouldn't lead you to lose out on the BerachaḤazon Ovadya (Ḥannuka page 363). See, Kaf HaChaim (426 62) & Ohr LeTzion (vol. 3 chapter 4 law 6) who disagree with this leniency.) to wait seven days instead, as per our Sepharadic tradition.שו"ע (או"ח) תכו:ד - -The latest time to recite Birkat HaLevana is when the moon is full (עד שתתמלא פגימתה)סנהדרין בבלי מא:. Although we are stringent and determine that from the midpoint between the current month's molad to the next month's moladשו"ע או"ח סימן תכ"ו:ג' בהגאות רמ"א
Since there is a questions of ברכה לבטלה, Sepharadic authorities have also shown support for this opinion (ראה רב פעלים ב' סימן לח, כף החיים תכו:נ & נג, אור לציון ג' פרק ד' הלכה ו'), one could theoretically do it until Dawn of the 15th dayḤazon Ovadya (Ḥannuka page 349). It is important to note that here we would certainly go based on each locations respective time since this measure is not fixated on the molad rather on the date itself. +The Halachic range for when one can recite ברכת הלבנה is from the moon's renewal until it is full (חידושהברכות ירושלמי ט:ב עד שתתמלה פגימתהסנהדרין בבלי מא:). The practical letter-of-the-law interpretation is from the third day following the moladמשנה ברורה תכ"ו:כ' until sunrise of the 15th day.The conditions of having הנאה from the moon are not impossible to fulfill from Dawn on the 15th, leaving one with the ability to do it if they had not done it prior. ע"ע חז"ע חנוכה אמוד שכה Nevertheless, the Sepharadic traditionשו"ע (או"ח) תכו:ד is to wait until the _seventh_ day from the molad to start, as long as one would not lose out on the blessing.Ḥazon Ovadya (Ḥannuka page 363). See, Kaf HaChaim (426 62) & Ohr LeTzion (vol. 3 chapter 4 law 6) who disagree with this leniency. Since there is a question of ברכה לבטלה, other Sepharadic authorities have been stringent to determine the moon's fullness using the midpoint between the current month's molad to the next month's molad.שו"ע או"ח סימן תכ"ו:ג' בהגאות רמ"א
ראה רב פעלים ב' סימן לח, כף החיים תכו:נ & נג, אור לציון ג' פרק ד' הלכה ו' We list only these strict times, yet those looking for the earlier times should subtract 4 days from our listed time to start saying ברכת הלבנה, and use the Dawn entry on the 15th day for the later end time.Ḥazon Ovadya (Ḥannuka page 349). It is important to note that here we would certainly go based on each locations respective time since this measure is not fixated on the molad rather on the date itself. ###### Tekufa @@ -29,14 +27,14 @@ Outside ארץ ישראל, we switch the text of תפילת שמונה עשרי There is a Kabbalistic warning to not drink plain water at the moment the Tekufah begins,רמ”א על יורה דעה קט”ז:ה for it is a time of spiritual danger.פרי חדש על ש”ע או”ח סוף סימן תכ”ח מזהיר על חשש המוות. יש גם תעם לפי פשת: לעורר אותנו בתשובה (תשובות הגאונים (מוסאפיה) סי’ י”ד) We customarily developed a "time-buffer" for before and after this time, totaling in an hour where one would observe this restriction (30 minutes before and after)הליכות אולם ז' דף קפג, נהר מצרים, דף עז ע”ב, ר’ אלינו חזון בספר נוה שלום סימן קט”ז אות ה. יש הרבה מנהגים על זה, החל חצי שעה שהם ט"ו דקות לפניו ולאחריו (חיד”א, שו”ת יוסף אומץ סימן מ”ב) או שש שעות (מנהגי מהרי”ל בליקוטים של סימן נו), שהם שלושה שעות לפניו ולאחוריו. המנהג המפורסם שלא שוטים מים שעה ומחצה לפניו ולאחריו {:.fakeListItem} -Once every 28 years, we recite a special blessing thanking God for creating the sun when it returns to the same time6:39/7:00 IST. and place that it occupied when it was created. This is done on the morning after Israel's(even if a timezone would dictate earlier/later) Tekufath Nisan, where everyone prays by sunrise to recite the Beracha as soon as they can.Ḥazon Ovadia Berakhot pg. 479. Those who could not do it by then should still try to do it by the third hour +Once every 28 years, we recite a special blessing thanking God for creating the sun when it returns to the same timeThis is at 18:00, which translates into 5:39 PM IST. and place that it occupied when it was created. This is done on the morning after Israel's(even if a timezone would dictate earlier/later) Tekufath Nisan, where everyone prays by sunrise to recite the blessing as soon as they can.Ḥazon Ovadia Berakhot pg. 479. Those who could not do it by then should still try to do it by the third hour ---- Finding out which days mark the start of a season is as easy as knowing when one of them is and just adding/subtracting the length of a season. {:.fakeListItem} -The length of a season is determined by taking the length of the year divided by four. Since we holdשמואל (Bavli Eruvin, 56a). As the Ḥazon Ish (OC Siman 138, se'if katan 4) explains, things that each person should calculate for themselves use rounded values, like for the diameter of a Sukkah. that a year is 365.25 days, dividing that into four gives us a season’s length of 91 days, 7 hours and 30 minutes. +The length of a season is determined by taking the length of the year divided by four. Since we holdשמואל (Bavli Eruvin, 56a). As the Ḥazon Ish (O"Ḥ Siman 138, se'if katan 4) explains, things that each person should calculate for themselves use rounded values, like for the diameter of a Sukkah. that a year is 365.25 days, dividing that into four gives us a season’s length of 91 days, 7 hours and 30 minutes. {:.fakeListItem} The first season (as indicated by when we say ברכת החמה) is for the month of Nisan, which is used as our reference point.משנה תורה, הלכות קידוש החדש ט':ד' When translating these clock-times (6:00 AM, 12:00, 18:00 & 24:00) into timezone-based times, there is a dispute whether these are using Har Habayit's timezone offset of -21 minutes (as the Amudeh Hora'ah calendar subscribes toRav Aharon Boron in תנובות שדה) or sticking to the IST-based times (as the Ohr Hachaim calendar subscribes toRav Tucazinsky). The only area where this actually makes a difference is the water-warning, yet it's possible to accomodate both by starting the fast using R' Boron's time and ending using R' Tucazinsky's time.This only affects the 30 minute shita Maran zt"l followed. Communities looking to maintain their pre-existing custom of waiting longer can stick to whatever is easier on the community, since a half-hour both prior and following has long passed according to both R' Baron and R' Tucazinsky (as well as how the basic passage of time works). \ No newline at end of file diff --git a/assets/images/icons8-wine-bar-64.png b/assets/images/icons8-wine-bar-64.png new file mode 100644 index 0000000000000000000000000000000000000000..4bf3f855ce1062b456230bcf5254030b65b0d861 GIT binary patch literal 763 zcmVKT801he>k21AI#%qEDAp)o< z6MdQ5UgH4Hgb3iCGT{c@;G}T?cS8j5QkhthsogXVz%9ki`KV0H&C~{s1NaakfS<}l zdy{Z{H|NEi?@a>uVH|*)7R`CDOmt>yRpS8Mg3O#DWnx*TrZ-5w+p`b>JX9w3WooaC z19%W3fYZu^d);8bIDk_j0@&5$GCXe_!1fRU%mZr5$a1OeHynIbeF2+tTba2g?|0>d zqq7&3q?we=M8ve5FGSb=0FUKwk%R9S&8TRXg9+dF{e56Mkx`DQ z1s{q$mERy+j!m*J_@C`@Rc@)E^L$av26o77q0bTY%u$iGz5C3hqzibRGx%ZIUzCEw zIRPA^MD*kYu$U6jkrP0)bGt8e0HtF*1weVPfX zp7!whRM$G7SDqlL|HB@jF8|vrpLKn-^B92ZJCR5v5{U$b@D~PR@RJzcS3v*(002ovPDHLkV1jC numberFunc()) const geoLocation = new GeoLocation(...glArgs); const useOhrHachaim = (geoLocation.getLocationName() || "").toLowerCase().includes('israel') || settings.calendarToggle.hourCalculators() == "seasonal" -const listAllShitot = Array.from(document.querySelectorAll('[data-zyData]')).map(elem => elem.getAttribute('data-zyData')) /** @type {HTMLElement} */ // @ts-ignore const baseTable = document.getElementsByClassName('tableGrid')[0]; + +if (useOhrHachaim || printParam.has('mergeTzet')) { + const humraTzet = baseTable.querySelector('[data-zyData="getTzaitLechumra"]'); + if (humraTzet) { + /** @type {HTMLElement} */ + // @ts-ignore + const headerTzet = humraTzet.previousElementSibling.previousElementSibling; + headerTzet.removeAttribute('data-zyHeaderContainer'); + headerTzet.setAttribute('data-zyData', 'getTzait'); + headerTzet.style.removeProperty('grid-column-end'); + headerTzet.style.gridRow = '1 / span 2'; + + humraTzet.previousElementSibling.remove(); + humraTzet.remove(); + } +} + +const listAllShitot = Array.from(baseTable.querySelectorAll('[data-zyData]')).map(elem => elem.getAttribute('data-zyData')) baseTable.style.gridTemplateColumns = Array.from(document.getElementsByClassName('tableHeader')) .filter(elem => !elem.hasAttribute('data-zyHeaderContainer')) .map((/** @type {HTMLElement} */elem) => { @@ -60,7 +77,7 @@ if (typeof localStorage !== "undefined" && localStorage.getItem('ctNetz') && isV const footer = document.getElementsByClassName("zyCalFooter")[0]; footer.querySelector("[data-geoCoordinates]") .appendChild(document.createTextNode(`(${geoLocation.getLatitude()}, ${geoLocation.getLongitude()}${ - useOhrHachaim ? ", ↑" + geoLocation.getElevation : "" + useOhrHachaim ? ", ↑" + geoLocation.getElevation().toString() : "" })`)); footer.querySelector("[data-calendar]") .appendChild(document.createTextNode( @@ -114,7 +131,8 @@ for (let mIndex = plainDateForLoop.month; mIndex <= monthsForCal; (printParam.ha allShitot: listAllShitot, month: mIndex, candleTime: settings.customTimes.candleLighting(), - shabbatOnly: printParam.has('shabbatOnly') + shabbatOnly: printParam.has('shabbatOnly'), + mergeTzet: printParam.has('mergeTzet') || useOhrHachaim }) } diff --git a/assets/js/features/print-web-worker.js b/assets/js/features/print-web-worker.js index a9f2871..f67ad13 100644 --- a/assets/js/features/print-web-worker.js +++ b/assets/js/features/print-web-worker.js @@ -30,6 +30,7 @@ const hNum = new HebrewNumberFormatter(); candleTime: number; shabbatOnly: boolean; oneYear: boolean; + mergeTzet: boolean; }} singlePageParams */ // "date" of param will have to be in the iso8601 calendar @@ -61,6 +62,7 @@ async function messageHandler (x) { const havdalahIcon = await (await fetch('/assets/images/havdalah.svg')).text(); const candleIcon = ''; + const wineIcon = '' let plainDate = Temporal.PlainDate.from(x.data.date) const jCal = new WebsiteLimudCalendar(); @@ -350,7 +352,7 @@ async function messageHandler (x) { div.appendChild(rHelem); div.style.fontWeight = "bold"; } - + if (jCal.tomorrow().getDayOfChanukah() !== -1) { const hanTitleElem = flexWorkAround.cloneNode(true); hanTitleElem.appendChild(document.createTextNode({ @@ -359,7 +361,7 @@ async function messageHandler (x) { "en-et": (jCal.getDayOfChanukah() == -1 ? "Erev " : "") + "Ḥanukah" }[x.data.lang])); div.appendChild(hanTitleElem); - + const hanNightElem = flexWorkAround.cloneNode(true); // @ts-ignore hanNightElem.classList.add("omerText"); @@ -370,7 +372,7 @@ async function messageHandler (x) { "en-et": getOrdinal(jCal.tomorrow().getDayOfChanukah(), true) + " night" }[x.data.lang] + ")"; div.appendChild(hanNightElem); - + div.style.fontWeight = "bold"; } else if (jCal.getDayOfChanukah() == 8) { const hanTitleElem = flexWorkAround.cloneNode(true); @@ -381,7 +383,7 @@ async function messageHandler (x) { }[x.data.lang])); div.appendChild(hanTitleElem); } - + if (jCal.isBirkasHachamah()) { const rHelem = flexWorkAround.cloneNode(true); rHelem.appendChild(document.createTextNode({ @@ -389,22 +391,22 @@ async function messageHandler (x) { "en-et": "Birkath Haḥama", 'en': "Blessing of the Sun" }[x.data.lang])); - + div.appendChild(rHelem); div.style.fontWeight = "bold"; } - + if (jCal.getYomTovIndex() in yomTovObj) { const yomTovElem = flexWorkAround.cloneNode(true); yomTovElem.appendChild(document.createTextNode(yomTovObj[jCal.getYomTovIndex()][x.data.lang])) div.appendChild(yomTovElem); - + div.style.fontWeight = "bold"; } - + if (jCal.isTaanis()) { const taanitElem = flexWorkAround.cloneNode(true); - + switch (jCal.getYomTovIndex()) { case WebsiteLimudCalendar.FAST_OF_ESTHER: taanitElem.appendChild(document.createTextNode({ @@ -434,7 +436,7 @@ async function messageHandler (x) { 'en': "Fast" }[x.data.lang])); } - + div.appendChild(taanitElem); div.style.fontWeight = "bold"; } @@ -477,7 +479,7 @@ async function messageHandler (x) { if (shita !== 'datePri') div.appendChild(secondaryDate); - + if (jCal.isRoshChodesh() || jCal.getYomTovIndex() in yomTovObj || jCal.isBirkasHachamah()) div.style.fontWeight = "bold"; @@ -489,14 +491,20 @@ async function messageHandler (x) { renderZmanInDiv(zmanCalc.getCandleLighting(), {dtF: defaulTF, icon: candleIcon, hideAMPM: true}); else if (jCal.getDayOfWeek() === 7) renderZmanInDiv(zmanCalc.getTzaitShabbath(), {dtF: defaulTF, icon: candleIcon, hideAMPM: true}); + else if (x.data.mergeTzet && !(zmanCalc instanceof OhrHachaimZmanim)) + renderZmanInDiv(zmanCalc.getTzaitLechumra(), {dtF: defaulTF, icon: candleIcon, hideAMPM: true}); else return false; } - + + if (x.data.allShitot.includes('getTzaitLechumra') && jCal.isTaanis() && jCal.getJewishMonth() == WebsiteLimudCalendar.AV && jCal.getDayOfWeek() == KosherZmanim.Calendar.SUNDAY) + return false; + if (!jCal.hasCandleLighting() && jCal.isAssurBemelacha()) { renderZmanInDiv(zmanCalc.getTzaitShabbath(), {dtF: defaulTF, icon: havdalahIcon, hideAMPM: true}); - - if (jCal.tomorrow().getDayOfOmer() !== -1) { + + if (x.data.mergeTzet && jCal.tomorrow().getDayOfOmer() !== -1) { + omerSpan.style.marginTop = '.1rem'; div.appendChild(omerSpan); } @@ -506,21 +514,33 @@ async function messageHandler (x) { "en-et": 'R"T:', 'en': 'R"T:' }[x.data.lang], hideAMPM: true}); - // @ts-ignore - div.lastElementChild.style.marginTop = '.1rem'; - div.lastElementChild.classList.add("omerText"); + if (x.data.mergeTzet && jCal.tomorrow().getDayOfOmer() !== -1) { + const attachedRT = document.createElement("span"); + attachedRT.classList.add("omerText"); + attachedRT.innerHTML = "/" + div.lastElementChild.innerHTML; + div.lastElementChild.remove(); + div.firstElementChild.appendChild(attachedRT); + } else { + // @ts-ignore + div.lastElementChild.style.marginTop = '.1rem'; + div.lastElementChild.classList.add("omerText"); + } } } - + break; case 'getTzait': - if (!jCal.isAssurBemelacha()) { - renderZmanInDiv(zmanCalc.getTzait()) - + if (jCal.hasCandleLighting() || !jCal.isAssurBemelacha()) { + const potForCandle = zmanCalc instanceof OhrHachaimZmanim && jCal.hasCandleLighting() && jCal.getDayOfWeek() !== 6 && jCal.isAssurBemelacha() && jCal.getDayOfWeek() !== 7; + renderZmanInDiv(zmanCalc.getTzait(), potForCandle ? {dtF: defaulTF, icon: candleIcon, hideAMPM: true} : undefined) + if (potForCandle) { + div.style.gridColumnEnd = "span 2"; + } + if (jCal.tomorrow().getDayOfOmer() !== -1) { div.appendChild(omerSpan); } - + if (jCal.tomorrow().getDayOfChanukah() !== -1 && jCal.getDayOfWeek() !== 6) { renderZmanInDiv(zmanCalc.getTzait().add({ minutes: 30 }), {dtF: defaulTF, icon: { 'hb': "תדליק לפני", @@ -529,31 +549,39 @@ async function messageHandler (x) { }[x.data.lang], hideAMPM: true}) div.lastElementChild.classList.add("omerText"); } + + if (x.data.mergeTzet && jCal.isTaanis() && !jCal.isYomKippur()) { + renderZmanInDiv(zmanCalc.getTzaitLechumra(), {dtF: defaulTF, icon: { + 'hb': "צאת הצום", + "en-et": "Fast Ends", + 'en': "Fast Ends" + }[x.data.lang], hideAMPM: true}) + div.lastElementChild.classList.add("omerText"); + div.lastElementChild.style.fontWeight = "bold"; + } } break; case 'getTzaitLechumra': - let appear = false; + // Only on Amudeh Hora'ah const potForCandle = jCal.hasCandleLighting() && jCal.getDayOfWeek() !== 6 && jCal.isAssurBemelacha() && jCal.getDayOfWeek() !== 7; - if (zmanCalc instanceof OhrHachaimZmanim) { - if (jCal.isTaanis() && !jCal.isYomKippur()) { - appear = true; - renderZmanInDiv(zmanCalc.getTzait().add({ minutes: 20 }), potForCandle ? {dtF: defaulTF, icon: candleIcon, hideAMPM: true} : undefined) - div.style.fontWeight = "bold"; - } - } else { - appear = true; - renderZmanInDiv(zmanCalc.getTzaitLechumra(), potForCandle ? {dtF: defaulTF, icon: candleIcon, hideAMPM: true} : undefined) - - if (jCal.isTaanis() && !jCal.isYomKippur()) { - div.style.fontWeight = "bold"; - } + const havdalahOnWine = jCal.isTaanis() && jCal.getJewishMonth() == WebsiteLimudCalendar.AV && jCal.getDayOfWeek() == KosherZmanim.Calendar.SUNDAY; + + const iconParams = + potForCandle ? {dtF: defaulTF, icon: candleIcon, hideAMPM: true} : + havdalahOnWine ? {dtF: defaulTF, icon: wineIcon, hideAMPM: true} : + undefined; + + renderZmanInDiv(zmanCalc.getTzaitLechumra(), iconParams) + if (jCal.isTaanis() && !jCal.isYomKippur()) { + div.style.fontWeight = "bold"; } - - if (appear && potForCandle) { + + if (potForCandle || havdalahOnWine) { div.style.gridColumnEnd = "span 2"; - if (jCal.tomorrow().getDayOfOmer() !== -1) { - div.appendChild(omerSpan); - } + } + + if (jCal.tomorrow().getDayOfOmer() !== -1 && !(jCal.hasCandleLighting() || !jCal.isAssurBemelacha())) { + div.appendChild(omerSpan); } break; @@ -614,9 +642,9 @@ async function messageHandler (x) { renderZmanInDiv(zmanCalc.getHatzoth()); if (jCal.isYomKippur()) { renderZmanInDiv(zmanCalc.getNetz().add(zmanCalc.fixedToSeasonal(Temporal.Duration.from({ hours: 7 }))), {dtF: defaulTF, icon: '(' + { - 'hb': "(תסיים מוסף לפני ", - "en-et": "(Finish Musaf before ", - 'en': "(Finish Musaf before " + 'hb': "תסיים מוסף לפני ", + "en-et": "Finish Musaf before ", + 'en': "Finish Musaf before " }[x.data.lang], appendText: ")", hideAMPM: true}); div.lastElementChild.classList.add("omerText"); } @@ -641,11 +669,11 @@ async function messageHandler (x) { ) )); if (!x.data.oneYear) { - dateSel.appendChild(document.createTextNode(` (${ + dateSel.appendChild(document.createTextNode(' ' + x.data.lang == 'hb' - ? hNum.formatHebrewNumber(jCal.getJewishYear()) - : plainDate.withCalendar(x.data.calendar).year - })`)); + ? ` (${hNum.formatHebrewNumber(jCal.getJewishYear())})` + : " '" + plainDate.withCalendar(x.data.calendar).year.toString().slice(-2) + )); } } diff --git a/pages/print/full.html b/pages/print/full.html index 36d5a9b..a2bf12d 100644 --- a/pages/print/full.html +++ b/pages/print/full.html @@ -4,10 +4,11 @@ layout: nothing --- +{% capture differences %}{% include printcal/differences.md %}{% endcapture %} {% capture dayExpl %}{% include printcal/explanation-day.md %}{% endcapture %} {% capture nightRTExpl %}{% include printcal/explanation-night-rt.md %}{% endcapture %} +{% capture nightNORTExpl %}{% include printcal/explanation-night-nort.md %}{% endcapture %} {% capture miscExpl %}{% include printcal/misc.md %}{% endcapture %} -{% capture differences %}{% include printcal/differences.md %}{% endcapture %} {% capture fullHebExpl %}{% include printcal/explanation-hb.rtl.md %}{% endcapture %} @@ -26,7 +27,6 @@

This site requires JavaScript to function

width: 100%; display: grid; text-align: center; - font-size: .65em; line-height: 1.1; page-break-before: always; } @@ -216,7 +216,8 @@

This site requires JavaScript to function

font-size: .85em; } - .flexElemWorkaround svg { + .flexElemWorkaround svg, + .flexElemWorkaround img { height: 1em; width: 1em; vertical-align: bottom; @@ -423,9 +424,17 @@

Calendar Explanation

In this section of the calendar, we aim to explain every Halachic time in brief for both calculation and concept. One looking to read more on each time should read the descriptions for each on our website, royzmanim.com, where we give Talmudic based sources in addition to all the later Poskim we already bring in this document.

Zemaneh Hayom Explanations
- {{ dayExpl | markdownify }}{{ nightRTExpl | markdownify }} - {{ dayExpl | markdownify }}{{ nightRTExpl | markdownify }} - {{ fullHebExpl | markdownify }} +
+ {{ dayExpl | markdownify }} +
{{ nightRTExpl | markdownify }}
+
{{ nightNORTExpl | markdownify }}
+
+
+ {{ dayExpl | markdownify }} +
{{ nightRTExpl | markdownify }}
+
{{ nightNORTExpl | markdownify }}
+
+
{{ fullHebExpl | markdownify }}
Misc. Zemanim Explanations
{{ miscExpl | markdownify }}
@@ -458,4 +467,36 @@
Misc. + + \ No newline at end of file diff --git a/pages/print/nort.html b/pages/print/nort.html deleted file mode 100644 index 2e6194e..0000000 --- a/pages/print/nort.html +++ /dev/null @@ -1,467 +0,0 @@ ---- -title: No-RT Calendar -permalink: /print/nort -layout: nothing ---- - -{% capture dayExpl %}{% include printcal/explanation-day.md %}{% endcapture %} -{% capture nightNORTExpl %}{% include printcal/explanation-night-nort.md %}{% endcapture %} -{% capture miscExpl %}{% include printcal/misc.md %}{% endcapture %} -{% capture differences %}{% include printcal/differences.md %}{% endcapture %} - -{% capture fullHebExpl %}{% include printcal/explanation-hb.rtl.md %}{% endcapture %} - - - - - - - - - - -
-
- -

- Halachic times according to Sepharadic tradition
- Inspired from the Ohr Hachaim calendar by Maran Ovadia Yosef zt"l -

-
- -
- זמנים של - For: - For: -
-
-

- Summaries and formatting by Maor Na'im & Elyahu Jacobi
- Formulas and approbations by R' Leeor Dahan & R' Meir Gavriel Elbaz -

- ROYZMANIM.COM -
-
- -
-

Differences Explanation

-

This piece will only go through conclusions that we hold differently from other mainstream calendars; descriptions on individual Zemanim (as well as sources) can instead be found in the back of this calendar.

- -
{{ differences | markdownify }}
-

Although there are more shitot out there that our calendar does not follow (such as 90/96 minutes for dawn, using the beginning of an hour rather than the end for Shema), listing every shita we don't hold like would be confusing when one can learn the sugya as we outline and see what we would hold (to then infer what we wouldn't).

-
- -
-
-
- זמנים של - For: - For: -
-
-
- לוח - Current Calendar: - Current Calendar: -
-
- Current Timezone: -
-
-
-

זמני
יוסף

- - -
Gen.:
-
-
-
- -
-
-
-
- {% for item in site.data.print.printOutNoRT %} - {% if item.shitot %} -
- {{ item.names.hb }} - {{ item.names.et }} - {{ item.names.en }} -
- {% for shita in item.shitot %} -
- {{ shita.names.hb }} - {{ shita.names.et }} - {{ shita.names.en }} -
- {% endfor %} - {% else %} -
- {{ item.names.hb }} - {{ item.names.et }} - {{ item.names.en }} -
- {% endif %} - {% endfor %} -
-
- - - -
-
-
-
-

Calendar Explanation

-

In this section of the calendar, we aim to explain every Halachic time in brief for both calculation and concept. One looking to read more on each time should read the descriptions for each on our website, royzmanim.com, where we give Talmudic based sources in addition to all the later Poskim we already bring in this document.

-
Zemaneh Hayom Explanations
-
- {{ dayExpl | markdownify }}{{ nightNORTExpl | markdownify }} - {{ dayExpl | markdownify }}{{ nightNORTExpl | markdownify }} - {{ fullHebExpl | markdownify }} -
-
Misc. Zemanim Explanations
-
{{ miscExpl | markdownify }}
- -
-
-
-
- - - \ No newline at end of file