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

_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 <i>three</i> complete days after the calculated molad<span class="footnote"><span style="unicode-bidi: plaintext;">משנה ברורה תכ"ו:כ'</span></span>, it is preferable (if possible, and wouldn't lead you to lose out on the Beracha<span class="footnote">Ḥazon Ovadya (Ḥannuka page 363). See, Kaf HaChaim (426 62) & Ohr LeTzion (vol. 3 chapter 4 law 6) who disagree with this leniency.</span>) to wait <i>seven</i> days instead, as per our Sepharadic tradition.<span class="footnote">שו"ע (או"ח) תכו:ד</span>
-
-The latest time to recite Birkat HaLevana is when the moon is full (עד שתתמלא פגימתה)<span class="footnote"><span style="unicode-bidi: plaintext;">סנהדרין בבלי מא:</span></span>. Although we are stringent and determine that from the midpoint between the current month's molad to the next month's molad<span class="footnote">שו"ע או"ח סימן תכ"ו:ג' בהגאות רמ"א<br>Since there is a questions of ברכה לבטלה, Sepharadic authorities have also shown support for this opinion (<span style="unicode-bidi: plaintext;">ראה רב פעלים ב' סימן לח, כף החיים תכו:נ & נג, אור לציון ג' פרק ד' הלכה ו'</span>)</span>, one could theoretically do it until Dawn of the 15th day<span class="footnote">Ḥ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.</span>
+The Halachic range for when one can recite ברכת הלבנה is from the moon's renewal until it is full (חידושה<span class="footnote">ברכות ירושלמי ט:ב</span> עד שתתמלה פגימתה<span class="footnote"><span style="unicode-bidi: plaintext;">סנהדרין בבלי מא:</span></span>). The practical letter-of-the-law interpretation is from the third day following the molad<span class="footnote"><span style="unicode-bidi: plaintext;">משנה ברורה תכ"ו:כ'</span></span> until sunrise of the 15<sup>th</sup> day.<span class="footnote">The conditions of having הנאה from the moon are not impossible to fulfill from Dawn on the 15<sup>th</sup>, leaving one with the ability to do it if they had not done it prior. ע"ע חז"ע חנוכה אמוד שכה</span> Nevertheless, the Sepharadic tradition<span class="footnote">שו"ע (או"ח) תכו:ד</span> is to wait until the _seventh_ day from the molad to start, as long as one would not lose out on the blessing.<span class="footnote">Ḥazon Ovadya (Ḥannuka page 363). See, Kaf HaChaim (426 62) & Ohr LeTzion (vol. 3 chapter 4 law 6) who disagree with this leniency.</span> 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.<span class="footnote">שו"ע או"ח סימן תכ"ו:ג' בהגאות רמ"א<br><span style="unicode-bidi: plaintext;">ראה רב פעלים ב' סימן לח, כף החיים תכו:נ & נג, אור לציון ג' פרק ד' הלכה ו'</span></span> 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 15<sup>th</sup> day for the later end time.<span class="footnote">Ḥ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.</span>
 
 ###### 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,<span class="footnote">רמ”א על יורה דעה קט”ז:ה</span> for it is a time of spiritual danger.<span class="footnote">פרי חדש על ש”ע או”ח סוף סימן תכ”ח מזהיר על חשש המוות. יש גם תעם לפי פשת: לעורר אותנו בתשובה (תשובות הגאונים (מוסאפיה) סי’ י”ד)</span> 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)<span class="footnote">הליכות אולם ז' דף קפג, נהר מצרים, דף עז ע”ב, ר’ אלינו חזון בספר נוה שלום סימן קט”ז אות ה. יש הרבה מנהגים על זה, החל חצי שעה שהם ט"ו דקות לפניו ולאחריו (חיד”א, שו”ת יוסף אומץ סימן מ”ב) או שש שעות (מנהגי מהרי”ל בליקוטים של סימן נו), שהם שלושה שעות לפניו ולאחוריו. המנהג המפורסם שלא שוטים מים שעה ומחצה לפניו ולאחריו</span>
 
 {:.fakeListItem}
-Once every 28 years, we recite a special blessing thanking God for creating the sun when it returns to the same time<span class="footnote">6:39/7:00 IST.</span> and place that it occupied when it was created. This is done on the morning after Israel's<span class="footnote">(even if a timezone would dictate earlier/later)</span> Tekufath Nisan, where everyone prays by sunrise to recite the Beracha as soon as they can.<span class="footnote">Ḥazon Ovadia Berakhot pg. 479. Those who could not do it by then should still try to do it by the third hour</span>
+Once every 28 years, we recite a special blessing thanking God for creating the sun when it returns to the same time<span class="footnote">This is at 18:00, which translates into 5:39 PM IST.</span> and place that it occupied when it was created. This is done on the morning after Israel's<span class="footnote">(even if a timezone would dictate earlier/later)</span> Tekufath Nisan, where everyone prays by sunrise to recite the blessing as soon as they can.<span class="footnote">Ḥazon Ovadia Berakhot pg. 479. Those who could not do it by then should still try to do it by the third hour</span>
 
 ----
 
 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<span class="footnote">שמואל (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.</span> 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<span class="footnote">שמואל (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.</span> 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.<span class="footnote"><span style="unicode-bidi: plaintext;">משנה תורה, הלכות קידוש החדש ט':ד'</span></span> 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 to<span class="footnote">Rav Aharon Boron in תנובות שדה</span>) or sticking to the IST-based times (as the Ohr Hachaim calendar subscribes to<span class="footnote">Rav Tucazinsky</span>). 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.<span class="footnote">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).</span>

assets/js/features/print-export.js

@@ -27,10 +27,27 @@ const glArgs = Object.values(settings.location).map(numberFunc => 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
 	})
 }