@hebcal/core 4.4.1 → 4.5.0

package/README.md

@@ -68,7 +68,17 @@ holidays. <code>@hebcal/core</code> supports four locales by default</p>
 <dd><p>Daily Hebrew date (&quot;11th of Sivan, 5780&quot;)</p>
 </dd>
 <dt><a href="#Zmanim">Zmanim</a></dt>
-<dd><p>Class representing halachic times</p>
+<dd><p>Calculate halachic times (zmanim / זְמַנִּים) for a given day and location.
+Calculations are available for tzeit / tzais (nightfall),
+shkiah (sunset) and more.</p>
+<p>Zmanim are estimated using an algorithm published by the US National Oceanic
+and Atmospheric Administration. The NOAA solar calculator is based on equations
+from <em>Astronomical Algorithms</em> by Jean Meeus.</p>
+<p>The sunrise and sunset results are theoretically accurate to within a minute for
+locations between +/- 72° latitude, and within 10 minutes outside of those latitudes.
+However, due to variations in atmospheric composition, temperature, pressure and
+conditions, observed values may vary from calculations.
+<a href="https://gml.noaa.gov/grad/solcalc/calcdetails.html">https://gml.noaa.gov/grad/solcalc/calcdetails.html</a></p>
 </dd>
 <dt><a href="#Location">Location</a></dt>
 <dd><p>Class representing Location</p>
@@ -1083,7 +1093,19 @@ Helper function to render a Hebrew date
 <a name="Zmanim"></a>
 
 ## Zmanim
-Class representing halachic times
+Calculate halachic times (zmanim / זְמַנִּים) for a given day and location.
+Calculations are available for tzeit / tzais (nightfall),
+shkiah (sunset) and more.
+
+Zmanim are estimated using an algorithm published by the US National Oceanic
+and Atmospheric Administration. The NOAA solar calculator is based on equations
+from _Astronomical Algorithms_ by Jean Meeus.
+
+The sunrise and sunset results are theoretically accurate to within a minute for
+locations between +/- 72° latitude, and within 10 minutes outside of those latitudes.
+However, due to variations in atmospheric composition, temperature, pressure and
+conditions, observed values may vary from calculations.
+https://gml.noaa.gov/grad/solcalc/calcdetails.html
 
 **Kind**: global class  
 
@@ -1091,6 +1113,7 @@ Class representing halachic times
     * [new Zmanim(date, latitude, longitude)](#new_Zmanim_new)
     * _instance_
         * ~~[.suntime()](#Zmanim+suntime) ⇒ [<code>ZmanimTimesResult</code>](#ZmanimTimesResult)~~
+        * [.timeAtAngle(angle, rising)](#Zmanim+timeAtAngle) ⇒ <code>Date</code>
         * [.sunrise()](#Zmanim+sunrise) ⇒ <code>Date</code>
         * [.sunset()](#Zmanim+sunset) ⇒ <code>Date</code>
         * [.dawn()](#Zmanim+dawn) ⇒ <code>Date</code>
@@ -1138,12 +1161,35 @@ Initialize a Zmanim instance.
 | latitude | <code>number</code> |  |
 | longitude | <code>number</code> |  |
 
+**Example**  
+```js
+const {Zmanim} = require('@hebcal/core');
+const latitude = 41.822232;
+const longitude = -71.448292;
+const friday = new Date(2023, 8, 8);
+const zmanim = new Zmanim(friday, latitude, longitude);
+const candleLighting = zmanim.sunsetOffset(-18, true);
+const timeStr = Zmanim.formatISOWithTimeZone('America/New_York', candleLighting);
+```
 <a name="Zmanim+suntime"></a>
 
 ### ~~zmanim.suntime() ⇒ [<code>ZmanimTimesResult</code>](#ZmanimTimesResult)~~
 ***Deprecated***
 
 **Kind**: instance method of [<code>Zmanim</code>](#Zmanim)  
+<a name="Zmanim+timeAtAngle"></a>
+
+### zmanim.timeAtAngle(angle, rising) ⇒ <code>Date</code>
+Convenience function to get the time when sun is above or below the horizon
+for a certain angle (in degrees).
+
+**Kind**: instance method of [<code>Zmanim</code>](#Zmanim)  
+
+| Param | Type |
+| --- | --- |
+| angle | <code>number</code> | 
+| rising | <code>boolean</code> | 
+
 <a name="Zmanim+sunrise"></a>
 
 ### zmanim.sunrise() ⇒ <code>Date</code>
@@ -1276,7 +1322,7 @@ Plag haMincha; Sunrise plus 10.75 halachic hours
 
 | Param | Type | Default | Description |
 | --- | --- | --- | --- |
-| [angle] | <code>number</code> | <code>8.5</code> | optional time for solar depression.   Default is 8.5 degrees for 3 small stars, use 7.083 degress for 3 medium-sized stars. |
+| [angle] | <code>number</code> | <code>8.5</code> | optional time for solar depression.   Default is 8.5 degrees for 3 small stars, use 7.083 degrees for 3 medium-sized stars. |
 
 <a name="Zmanim+neitzHaChama"></a>
 
@@ -1339,7 +1385,7 @@ Returns an array with tzeit Date object and a 24-hour string formatted time.
 
 | Param | Type | Description |
 | --- | --- | --- |
-| angle | <code>number</code> | degrees for solar depression.   Default is 8.5 degrees for 3 small stars, use 7.083 degress for 3 medium-sized stars. |
+| angle | <code>number</code> | degrees for solar depression.   Default is 8.5 degrees for 3 small stars, use 7.083 degrees for 3 medium-sized stars. |
 | timeFormat | <code>Intl.DateTimeFormat</code> |  |
 
 <a name="Zmanim.formatTime"></a>
@@ -2035,26 +2081,12 @@ Represents a built-in holiday like Pesach, Purim or Tu BiShvat
 **Kind**: global class  
 
 * [HolidayEvent](#HolidayEvent)
-    * [new HolidayEvent(date, desc, [mask], [attrs])](#new_HolidayEvent_new)
     * [.basename()](#HolidayEvent+basename) ⇒ <code>string</code>
     * [.url()](#HolidayEvent+url) ⇒ <code>string</code>
     * [.urlDateSuffix()](#HolidayEvent+urlDateSuffix) ⇒ <code>string</code>
     * [.getEmoji()](#HolidayEvent+getEmoji) ⇒ <code>string</code>
     * [.getCategories()](#HolidayEvent+getCategories) ⇒ <code>Array.&lt;string&gt;</code>
 
-<a name="new_HolidayEvent_new"></a>
-
-### new HolidayEvent(date, desc, [mask], [attrs])
-Constructs Holiday event
-
-
-| Param | Type | Default | Description |
-| --- | --- | --- | --- |
-| date | [<code>HDate</code>](#HDate) |  | Hebrew date event occurs |
-| desc | <code>string</code> |  | Description (not translated) |
-| [mask] | <code>number</code> | <code>0</code> | optional holiday flags |
-| [attrs] | <code>Object</code> | <code>{}</code> |  |
-
 <a name="HolidayEvent+basename"></a>
 
 ### holidayEvent.basename() ⇒ <code>string</code>
@@ -2125,23 +2157,6 @@ Because Asara B'Tevet often occurs twice in the same Gregorian year,
 we subclass HolidayEvent to override the `url()` method.
 
 **Kind**: global class  
-
-* [AsaraBTevetEvent](#AsaraBTevetEvent)
-    * [new AsaraBTevetEvent(date, desc, [mask])](#new_AsaraBTevetEvent_new)
-    * [.urlDateSuffix()](#AsaraBTevetEvent+urlDateSuffix) ⇒ <code>string</code>
-
-<a name="new_AsaraBTevetEvent_new"></a>
-
-### new AsaraBTevetEvent(date, desc, [mask])
-Constructs AsaraBTevetEvent
-
-
-| Param | Type | Default | Description |
-| --- | --- | --- | --- |
-| date | [<code>HDate</code>](#HDate) |  | Hebrew date event occurs |
-| desc | <code>string</code> |  | Description (not translated) |
-| [mask] | <code>number</code> | <code>0</code> | optional holiday flags |
-
 <a name="AsaraBTevetEvent+urlDateSuffix"></a>
 
 ### asaraBTevetEvent.urlDateSuffix() ⇒ <code>string</code>
@@ -2282,7 +2297,9 @@ Additional non-default event types can be specified:
 * Molad announcement on Saturday before Rosh Chodesh (`options.molad`)
 * Yom Kippur Katan (`options.yomKippurKatan`)
 
-Daily Study of texts:
+Daily Study of texts are supported by the
+[@hebcal/learning](https://github.com/hebcal/hebcal-learning) package,
+for example:
 * Babylonian Talmud Daf Yomi (`options.dailyLearning.dafYomi`)
 * Jerusalem Talmud (Yerushalmi) Yomi (`options.dailyLearning.yerushalmi`)
 * Mishna Yomi (`options.dailyLearning.mishnaYomi`)
@@ -2305,10 +2322,10 @@ option (Tzeit Hakochavim) is calculated when the sun is 8.5° below the horizon.
 These defaults can be changed using these options:
 * `options.candleLightingMins` - minutes before sundown to light candles
 * `options.havdalahMins` - minutes after sundown for Havdalah (typical values are 42, 50, or 72).
-   Havdalah times are supressed when `options.havdalahMins=0`.
+   Havdalah times are suppressed when `options.havdalahMins=0`.
 * `options.havdalahDeg` - degrees for solar depression for Havdalah.
-   Default is 8.5 degrees for 3 small stars. Use 7.083 degress for 3 medium-sized stars.
-   Havdalah times are supressed when `options.havdalahDeg=0`.
+   Default is 8.5 degrees for 3 small stars. Use 7.083 degrees for 3 medium-sized stars.
+   Havdalah times are suppressed when `options.havdalahDeg=0`.
 
 If both `options.candlelighting=true` and `options.location` is specified,
 Chanukah candle-lighting times and minor fast start/end times will also be generated.
@@ -2818,8 +2835,9 @@ Options to configure which events are returned
 | end | <code>Date</code> \| [<code>HDate</code>](#HDate) \| <code>number</code> | use specific end date (requires start date) |
 | candlelighting | <code>boolean</code> | calculate candle-lighting and havdalah times |
 | candleLightingMins | <code>number</code> | minutes before sundown to light candles (default 18) |
-| havdalahMins | <code>number</code> | minutes after sundown for Havdalah (typical values are 42, 50, or 72).      If `undefined` (the default), calculate Havdalah according to Tzeit Hakochavim -      Nightfall (the point when 3 small stars are observable in the night time sky with      the naked eye). If `0`, Havdalah times are supressed. |
-| havdalahDeg | <code>number</code> | degrees for solar depression for Havdalah.      Default is 8.5 degrees for 3 small stars. use 7.083 degress for 3 medium-sized stars.      If `0`, Havdalah times are supressed. |
+| havdalahMins | <code>number</code> | minutes after sundown for Havdalah (typical values are 42, 50, or 72).      If `undefined` (the default), calculate Havdalah according to Tzeit Hakochavim -      Nightfall (the point when 3 small stars are observable in the night time sky with      the naked eye). If `0`, Havdalah times are suppressed. |
+| havdalahDeg | <code>number</code> | degrees for solar depression for Havdalah.      Default is 8.5 degrees for 3 small stars. use 7.083 degrees for 3 medium-sized stars      (observed by Dr. Baruch (Berthold) Cohn in his luach published in France in 1899).      If `0`, Havdalah times are suppressed. |
+| fastEndDeg | <code>number</code> | degrees for solar depression for end of fast days.      Default is 7.083 degrees for 3 medium-sized stars. Other commonly-used values include      6.45 degrees, as calculated by Rabbi Yechiel Michel Tucazinsky. |
 | sedrot | <code>boolean</code> | calculate parashah hashavua on Saturdays |
 | il | <code>boolean</code> | Israeli holiday and sedra schedule |
 | noMinorFast | <code>boolean</code> | suppress minor fasts |

package/dist/bundle.js

@@ -1,4 +1,4 @@
-/*! @hebcal/core v4.4.1 */
+/*! @hebcal/core v4.5.0 */
 var hebcal = (function (exports) {
 'use strict';
 
@@ -1579,6 +1579,7 @@ class HDate {
           case 'h':
             return months.SHVAT;
         }
+        break;
       case 't':
         switch (c[1]) {
           case 'a':
@@ -2406,7 +2407,30 @@ function pad2(number) {
  * @property {Date} tzeit
 */
 
-/** Class representing halachic times */
+/**
+ * Calculate halachic times (zmanim / זְמַנִּים) for a given day and location.
+ * Calculations are available for tzeit / tzais (nightfall),
+ * shkiah (sunset) and more.
+ *
+ * Zmanim are estimated using an algorithm published by the US National Oceanic
+ * and Atmospheric Administration. The NOAA solar calculator is based on equations
+ * from _Astronomical Algorithms_ by Jean Meeus.
+ *
+ * The sunrise and sunset results are theoretically accurate to within a minute for
+ * locations between +/- 72° latitude, and within 10 minutes outside of those latitudes.
+ * However, due to variations in atmospheric composition, temperature, pressure and
+ * conditions, observed values may vary from calculations.
+ * https://gml.noaa.gov/grad/solcalc/calcdetails.html
+ *
+ * @example
+ * const {Zmanim} = require('@hebcal/core');
+ * const latitude = 41.822232;
+ * const longitude = -71.448292;
+ * const friday = new Date(2023, 8, 8);
+ * const zmanim = new Zmanim(friday, latitude, longitude);
+ * const candleLighting = zmanim.sunsetOffset(-18, true);
+ * const timeStr = Zmanim.formatISOWithTimeZone('America/New_York', candleLighting);
+ */
 class Zmanim {
   /**
      * Initialize a Zmanim instance.
@@ -2456,6 +2480,16 @@ class Zmanim {
       tzeit: this.tzeit()
     };
   }
+  /**
+   * Convenience function to get the time when sun is above or below the horizon
+   * for a certain angle (in degrees).
+   * @param {number} angle
+   * @param {boolean} rising
+   * @return {Date}
+   */
+  timeAtAngle(angle, rising) {
+    return this.sun.timeAtAngle(angle, rising);
+  }
   /**
    * Upper edge of the Sun appears over the eastern horizon in the morning (0.833° above horizon)
    * @return {Date}
@@ -2612,7 +2646,7 @@ class Zmanim {
   }
   /**
    * @param {number} [angle=8.5] optional time for solar depression.
-   *   Default is 8.5 degrees for 3 small stars, use 7.083 degress for 3 medium-sized stars.
+   *   Default is 8.5 degrees for 3 small stars, use 7.083 degrees for 3 medium-sized stars.
    * @return {Date}
    */
   tzeit() {
@@ -2762,7 +2796,7 @@ class Zmanim {
    * Returns an array with tzeit Date object and a 24-hour string formatted time.
    * @deprecated
    * @param {number} angle degrees for solar depression.
-   *   Default is 8.5 degrees for 3 small stars, use 7.083 degress for 3 medium-sized stars.
+   *   Default is 8.5 degrees for 3 small stars, use 7.083 degrees for 3 medium-sized stars.
    * @param {Intl.DateTimeFormat} timeFormat
    * @return {Object[]}
    */
@@ -3095,17 +3129,6 @@ const days = {
   SAT: 6
 };
 
-/**
- * @private
- * @constant
- * This method returns the tzais (nightfall) based on the opinion of the
- * Geonim calculated as 30 minutes after sunset during the equinox
- * (on March 16, about 4 days before the astronomical equinox, the day that
- * a solar hour is 60 minutes) in Yerushalayim.
- * @see {https://kosherjava.com/zmanim/docs/api/com/kosherjava/zmanim/ComplexZmanimCalendar.html#getTzaisGeonim7Point083Degrees()}
- */
-const TZEIT_3MEDIUM_STARS = 7.083;
-
 /**
  * @private
  * @param {Event} e
@@ -3265,10 +3288,10 @@ class CandleLightingEvent extends TimedEvent {
  * Makes a pair of events representing fast start and end times
  * @private
  * @param {Event} ev
- * @param {Location} location
+ * @param {CalOptions} options
  * @return {Event}
  */
-function makeFastStartEnd(ev, location) {
+function makeFastStartEnd(ev, options) {
   const desc = ev.getDesc();
   if (desc === 'Yom Kippur') {
     return ev;
@@ -3276,17 +3299,19 @@ function makeFastStartEnd(ev, location) {
   ev = ev.clone();
   const hd = ev.getDate();
   const dt = hd.greg();
+  const location = options.location;
+  const fastEndDeg = options.fastEndDeg;
   const zmanim = new Zmanim(dt, location.getLatitude(), location.getLongitude());
   if (desc === 'Erev Tish\'a B\'Av') {
     const sunset = zmanim.sunset();
     ev.startEvent = makeTimedEvent(hd, sunset, 'Fast begins', ev, location);
   } else if (desc.startsWith('Tish\'a B\'Av')) {
-    ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(TZEIT_3MEDIUM_STARS), 'Fast ends', ev, location);
+    ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(fastEndDeg), 'Fast ends', ev, location);
   } else {
     const dawn = zmanim.alotHaShachar();
     ev.startEvent = makeTimedEvent(hd, dawn, 'Fast begins', ev, location);
     if (dt.getDay() !== 5 && !(hd.getDate() === 14 && hd.getMonth() === months.NISAN)) {
-      ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(TZEIT_3MEDIUM_STARS), 'Fast ends', ev, location);
+      ev.endEvent = makeTimedEvent(hd, zmanim.tzeit(fastEndDeg), 'Fast ends', ev, location);
     }
   }
   return ev;
@@ -4478,10 +4503,10 @@ var store$1 = sharedStore;
 (shared$3.exports = function (key, value) {
   return store$1[key] || (store$1[key] = value !== undefined ? value : {});
 })('versions', []).push({
-  version: '3.33.0',
+  version: '3.33.2',
   mode: 'global',
   copyright: '© 2014-2023 Denis Pushkarev (zloirock.ru)',
-  license: 'https://github.com/zloirock/core-js/blob/v3.33.0/LICENSE',
+  license: 'https://github.com/zloirock/core-js/blob/v3.33.2/LICENSE',
   source: 'https://github.com/zloirock/core-js'
 });
 
@@ -5940,7 +5965,7 @@ function getBirthdayOrAnniversary_(hyear, gdate) {
   return new HDate(day, month, hyear);
 }
 
-const version="4.4.1";
+const version="4.5.0";
 
 const headers$1={"plural-forms":"nplurals=2; plural=(n > 1);"};const contexts$1={"":{Shabbat:["Shabbos"],"Achrei Mot":["Achrei Mos"],Bechukotai:["Bechukosai"],"Beha'alotcha":["Beha'aloscha"],Bereshit:["Bereshis"],Chukat:["Chukas"],"Erev Shavuot":["Erev Shavuos"],"Erev Sukkot":["Erev Sukkos"],"Ki Tavo":["Ki Savo"],"Ki Teitzei":["Ki Seitzei"],"Ki Tisa":["Ki Sisa"],Matot:["Matos"],"Purim Katan":["Purim Koton"],"Shabbat Chazon":["Shabbos Chazon"],"Shabbat HaChodesh":["Shabbos HaChodesh"],"Shabbat HaGadol":["Shabbos HaGadol"],"Shabbat Nachamu":["Shabbos Nachamu"],"Shabbat Parah":["Shabbos Parah"],"Shabbat Shekalim":["Shabbos Shekalim"],"Shabbat Shuva":["Shabbos Shuvah"],"Shabbat Zachor":["Shabbos Zachor"],Shavuot:["Shavuos"],"Shavuot I":["Shavuos I"],"Shavuot II":["Shavuos II"],Shemot:["Shemos"],"Shmini Atzeret":["Shmini Atzeres"],"Simchat Torah":["Simchas Torah"],Sukkot:["Sukkos"],"Sukkot I":["Sukkos I"],"Sukkot II":["Sukkos II"],"Sukkot II (CH''M)":["Sukkos II (CH''M)"],"Sukkot III (CH''M)":["Sukkos III (CH''M)"],"Sukkot IV (CH''M)":["Sukkos IV (CH''M)"],"Sukkot V (CH''M)":["Sukkos V (CH''M)"],"Sukkot VI (CH''M)":["Sukkos VI (CH''M)"],"Sukkot VII (Hoshana Raba)":["Sukkos VII (Hoshana Raba)"],"Ta'anit Bechorot":["Ta'anis Bechoros"],"Ta'anit Esther":["Ta'anis Esther"],Toldot:["Toldos"],Vaetchanan:["Vaeschanan"],Yitro:["Yisro"],"Vezot Haberakhah":["Vezos Haberakhah"],Parashat:["Parshas"],"Leil Selichot":["Leil Selichos"],"Shabbat Mevarchim Chodesh":["Shabbos Mevorchim Chodesh"],"Shabbat Shirah":["Shabbos Shirah"],Tevet:["Teves"],"Asara B'Tevet":["Asara B'Teves"],"Alot HaShachar":["Alos HaShachar"],"Kriat Shema, sof zeman":["Krias Shema, sof zman"],"Tefilah, sof zeman":["Tefilah, sof zman"],"Kriat Shema, sof zeman (MGA)":["Krias Shema, sof zman (MGA)"],"Tefilah, sof zeman (MGA)":["Tefilah, sof zman (MGA)"],"Chatzot HaLailah":["Chatzos HaLailah"],"Chatzot hayom":["Chatzos"],"Tzeit HaKochavim":["Tzeis HaKochavim"],"Birkat Hachamah":["Birkas Hachamah"],"Shushan Purim Katan":["Shushan Purim Koton"]}};var poAshkenazi = {headers:headers$1,contexts:contexts$1};
 
@@ -6695,11 +6720,15 @@ const MAJOR_FAST = flags.MAJOR_FAST;
 const ROSH_CHODESH = flags.ROSH_CHODESH;
 const PARSHA_HASHAVUA = flags.PARSHA_HASHAVUA;
 const DAF_YOMI = flags.DAF_YOMI;
+const MISHNA_YOMI = flags.MISHNA_YOMI;
+const NACH_YOMI = flags.NACH_YOMI;
+const YERUSHALMI_YOMI = flags.YERUSHALMI_YOMI;
 const OMER_COUNT = flags.OMER_COUNT;
 const SHABBAT_MEVARCHIM = flags.SHABBAT_MEVARCHIM;
 const MINOR_HOLIDAY = flags.MINOR_HOLIDAY;
 const EREV = flags.EREV;
 const CHOL_HAMOED = flags.CHOL_HAMOED;
+const YOM_KIPPUR_KATAN = flags.YOM_KIPPUR_KATAN;
 const unrecognizedAlreadyWarned = Object.create(null);
 const RECOGNIZED_OPTIONS = {
   location: 1,
@@ -6713,6 +6742,7 @@ const RECOGNIZED_OPTIONS = {
   candleLightingMins: 1,
   havdalahMins: 1,
   havdalahDeg: 1,
+  fastEndDeg: 1,
   sedrot: 1,
   il: 1,
   noMinorFast: 1,
@@ -6776,6 +6806,27 @@ const geoIdCandleOffset = {
   '293067': 30 // Zikhron Yaakov
 };
 
+/**
+ * @private
+ * @constant
+ * This calculation is based on the position of the sun 36 minutes after sunset in Jerusalem
+ * around the equinox / equilux, which is 8.5° below geometric zenith.
+ * The Ohr Meir considers this the time that 3 small stars are visible,
+ * which is later than the required 3 medium stars.
+ * @see {https://kosherjava.com/zmanim/docs/api/com/kosherjava/zmanim/ZmanimCalendar.html#ZENITH_8_POINT_5}
+ */
+const TZEIT_3SMALL_STARS = 8.5;
+
+/**
+ * @private
+ * @constant
+ * This calculation is based on observation of 3 medium sized stars by Dr. Baruch Cohen
+ * in his calendar published in in 1899 in Strasbourg, France.
+ * This calculates to 7.0833333° below geometric zenith.
+ * @see {https://kosherjava.com/zmanim/docs/api/com/kosherjava/zmanim/ComplexZmanimCalendar.html#ZENITH_7_POINT_083}
+ */
+const TZEIT_3MEDIUM_STARS = 7.0833333;
+
 /**
  * Modifies options in-place
  * @private
@@ -6810,7 +6861,10 @@ function checkCandleOptions(options) {
   } else if (typeof options.havdalahDeg === 'number') {
     options.havdalahDeg = Math.abs(options.havdalahDeg);
   } else {
-    options.havdalahDeg = 8.5;
+    options.havdalahDeg = TZEIT_3SMALL_STARS;
+  }
+  if (typeof options.fastEndDeg !== 'number') {
+    options.fastEndDeg = TZEIT_3MEDIUM_STARS;
   }
 }
 
@@ -6829,10 +6883,14 @@ function checkCandleOptions(options) {
  * @property {number} havdalahMins - minutes after sundown for Havdalah (typical values are 42, 50, or 72).
  *      If `undefined` (the default), calculate Havdalah according to Tzeit Hakochavim -
  *      Nightfall (the point when 3 small stars are observable in the night time sky with
- *      the naked eye). If `0`, Havdalah times are supressed.
+ *      the naked eye). If `0`, Havdalah times are suppressed.
  * @property {number} havdalahDeg - degrees for solar depression for Havdalah.
- *      Default is 8.5 degrees for 3 small stars. use 7.083 degress for 3 medium-sized stars.
- *      If `0`, Havdalah times are supressed.
+ *      Default is 8.5 degrees for 3 small stars. use 7.083 degrees for 3 medium-sized stars
+ *      (observed by Dr. Baruch (Berthold) Cohn in his luach published in France in 1899).
+ *      If `0`, Havdalah times are suppressed.
+ * @property {number} fastEndDeg - degrees for solar depression for end of fast days.
+ *      Default is 7.083 degrees for 3 medium-sized stars. Other commonly-used values include
+ *      6.45 degrees, as calculated by Rabbi Yechiel Michel Tucazinsky.
  * @property {boolean} sedrot - calculate parashah hashavua on Saturdays
  * @property {boolean} il - Israeli holiday and sedra schedule
  * @property {boolean} noMinorFast - suppress minor fasts
@@ -6955,33 +7013,7 @@ function getStartAndEnd(options) {
 function getMaskFromOptions(options) {
   var _options$location;
   if (typeof options.mask === 'number') {
-    const m = options.mask;
-    if (m & ROSH_CHODESH) delete options.noRoshChodesh;
-    if (m & MODERN_HOLIDAY) delete options.noModern;
-    if (m & MINOR_FAST) delete options.noMinorFast;
-    if (m & SPECIAL_SHABBAT) delete options.noSpecialShabbat;
-    if (m & PARSHA_HASHAVUA) options.sedrot = true;
-    if (m & DAF_YOMI) {
-      options.dailyLearning = options.dailyLearning || {};
-      options.dailyLearning.dafYomi = true;
-    }
-    if (m & OMER_COUNT) options.omer = true;
-    if (m & SHABBAT_MEVARCHIM) options.shabbatMevarchim = true;
-    if (m & flags.MISHNA_YOMI) {
-      options.dailyLearning = options.dailyLearning || {};
-      options.dailyLearning.mishnaYomi = true;
-    }
-    if (m & flags.NACH_YOMI) {
-      options.dailyLearning = options.dailyLearning || {};
-      options.dailyLearning.nachYomi = true;
-    }
-    if (m & flags.YOM_KIPPUR_KATAN) options.yomKippurKatan = true;
-    if (m & flags.YERUSHALMI_YOMI) {
-      options.dailyLearning = options.dailyLearning || {};
-      options.dailyLearning.yerushalmi = 1;
-    }
-    options.userMask = true;
-    return m;
+    return setOptionsFromMask(options);
   }
   const il = options.il || ((_options$location = options.location) === null || _options$location === void 0 ? void 0 : _options$location.il) || false;
   let mask = 0;
@@ -7023,7 +7055,7 @@ function getMaskFromOptions(options) {
     mask |= SHABBAT_MEVARCHIM;
   }
   if (options.yomKippurKatan) {
-    mask |= flags.YOM_KIPPUR_KATAN;
+    mask |= YOM_KIPPUR_KATAN;
   }
   if (options.dailyLearning) {
     const dailyLearning = options.dailyLearning;
@@ -7031,13 +7063,13 @@ function getMaskFromOptions(options) {
       mask |= DAF_YOMI;
     }
     if (dailyLearning.mishnaYomi) {
-      mask |= flags.MISHNA_YOMI;
+      mask |= MISHNA_YOMI;
     }
     if (dailyLearning.nachYomi) {
-      mask |= flags.NACH_YOMI;
+      mask |= NACH_YOMI;
     }
     if (dailyLearning.yerushalmi) {
-      mask |= flags.YERUSHALMI_YOMI;
+      mask |= YERUSHALMI_YOMI;
     }
   }
   return mask;
@@ -7059,6 +7091,40 @@ const hour12cc = {
   ZA: 1
 };
 
+/**
+ * @private
+ * @param {CalOptions} options
+ * @return {number}
+ */
+function setOptionsFromMask(options) {
+  const m = options.mask;
+  if (m & ROSH_CHODESH) delete options.noRoshChodesh;
+  if (m & MODERN_HOLIDAY) delete options.noModern;
+  if (m & MINOR_FAST) delete options.noMinorFast;
+  if (m & SPECIAL_SHABBAT) delete options.noSpecialShabbat;
+  if (m & PARSHA_HASHAVUA) options.sedrot = true;
+  if (m & (DAF_YOMI | MISHNA_YOMI | NACH_YOMI | YERUSHALMI_YOMI)) {
+    options.dailyLearning = options.dailyLearning || {};
+    if (m & DAF_YOMI) {
+      options.dailyLearning.dafYomi = true;
+    }
+    if (m & MISHNA_YOMI) {
+      options.dailyLearning.mishnaYomi = true;
+    }
+    if (m & NACH_YOMI) {
+      options.dailyLearning.nachYomi = true;
+    }
+    if (m & YERUSHALMI_YOMI) {
+      options.dailyLearning.yerushalmi = 1;
+    }
+  }
+  if (m & OMER_COUNT) options.omer = true;
+  if (m & SHABBAT_MEVARCHIM) options.shabbatMevarchim = true;
+  if (m & YOM_KIPPUR_KATAN) options.yomKippurKatan = true;
+  options.userMask = true;
+  return m;
+}
+
 /**
  * @private
  * @param {Event} ev
@@ -7145,10 +7211,10 @@ class HebrewCalendar {
    * These defaults can be changed using these options:
    * * `options.candleLightingMins` - minutes before sundown to light candles
    * * `options.havdalahMins` - minutes after sundown for Havdalah (typical values are 42, 50, or 72).
-   *    Havdalah times are supressed when `options.havdalahMins=0`.
+   *    Havdalah times are suppressed when `options.havdalahMins=0`.
    * * `options.havdalahDeg` - degrees for solar depression for Havdalah.
-   *    Default is 8.5 degrees for 3 small stars. Use 7.083 degress for 3 medium-sized stars.
-   *    Havdalah times are supressed when `options.havdalahDeg=0`.
+   *    Default is 8.5 degrees for 3 small stars. Use 7.083 degrees for 3 medium-sized stars.
+   *    Havdalah times are suppressed when `options.havdalahDeg=0`.
    *
    * If both `options.candlelighting=true` and `options.location` is specified,
    * Chanukah candle-lighting times and minor fast start/end times will also be generated.
@@ -7552,7 +7618,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
   }
 
   const eFlags = ev.getFlags();
-  if (!options.yomKippurKatan && eFlags & flags.YOM_KIPPUR_KATAN || options.noModern && eFlags & MODERN_HOLIDAY) {
+  if (!options.yomKippurKatan && eFlags & YOM_KIPPUR_KATAN || options.noModern && eFlags & MODERN_HOLIDAY) {
     return candlesEv; // bail out early
   }
 
@@ -7560,7 +7626,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
   const isMajorFast = Boolean(eFlags & MAJOR_FAST);
   const isMinorFast = Boolean(eFlags & MINOR_FAST);
   if (options.candlelighting && (isMajorFast || isMinorFast)) {
-    ev = makeFastStartEnd(ev, location);
+    ev = makeFastStartEnd(ev, options);
     if (ev.startEvent && (isMajorFast || isMinorFast && !options.noMinorFast)) {
       events.push(ev.startEvent);
     }
@@ -7584,7 +7650,7 @@ function appendHolidayAndRelated(events, ev, options, candlesEv, dow) {
         candlesEv = undefined;
       }
     }
-    if (!options.noHolidays || options.yomKippurKatan && eFlags & flags.YOM_KIPPUR_KATAN) {
+    if (!options.noHolidays || options.yomKippurKatan && eFlags & YOM_KIPPUR_KATAN) {
       events.push(ev); // the original event itself
     }
   }