@hebcal/leyning 6.2.3 → 7.0.0

package/dist/bundle.js

@@ -1,4 +1,4 @@
-/*! @hebcal/leyning v6.2.3 */
+/*! @hebcal/leyning v7.0.0 */
 var hebcal__leyning = (function (exports, core) {
 'use strict';
 
@@ -12,6 +12,238 @@ function _typeof(obj) {
   }, _typeof(obj);
 }
 
+var Genesis=[0,31,25,24,26,32,22,24,22,29,32,32,20,18,24,21,16,27,33,38,18,34,24,20,67,34,35,46,22,35,43,54,33,20,31,29,43,36,30,23,23,57,38,34,34,28,34,31,22,33,26];var Exodus=[0,22,25,22,31,23,30,29,28,35,29,10,51,22,31,27,36,16,27,25,26,37,30,33,18,40,37,21,43,46,38,18,35,23,35,35,38,29,31,43,38];var Leviticus=[0,17,16,17,35,26,23,38,36,24,20,47,8,59,57,33,34,16,30,37,27,24,33,44,23,55,46,34];var Numbers=[0,54,34,51,49,31,27,89,26,23,36,35,16,33,45,41,35,28,32,22,29,35,41,30,25,19,65,23,31,39,17,54,42,56,29,34,13];var Deuteronomy=[0,46,37,29,49,30,25,26,20,29,22,32,31,19,29,23,22,20,22,21,20,23,29,26,22,19,19,26,69,28,20,30,52,29,12];var Joshua=[0,18,24,17,24,15,27,26,35,27,43,23,24,33,15,63,10,18,28,51,9,45,34,16,33];var Judges=[0,36,23,31,24,31,40,25,35,57,18,40,15,25,20,20,31,13,31,30,48,25];var Ruth=[0,22,23,18,22];var Isaiah=[0,31,22,26,6,30,13,25,23,20,34,16,6,22,32,9,14,14,7,25,6,17,25,18,23,12,21,13,29,24,33,9,20,24,17,10,22,38,22,8,31,29,25,28,28,25,13,15,22,26,11,23,15,12,17,13,12,21,14,21,22,11,12,19,11,25,24];var Jeremiah=[0,19,37,25,31,31,30,34,23,25,25,23,17,27,22,21,21,27,23,15,18,14,30,40,10,38,24,22,17,32,24,40,44,26,22,19,32,21,28,18,16,18,22,13,30,5,28,7,47,39,46,64,34];var Lamentations=[0,22,22,66,22,22];var Baruch=[0,22,35,38,37,9,72];var Ezekiel=[0,28,10,27,17,17,14,27,18,11,22,25,28,23,23,8,63,24,32,14,44,37,31,49,27,17,21,36,26,21,26,18,32,33,31,15,38,28,23,29,49,26,20,27,31,25,24,23,35];var Daniel=[0,21,49,100,34,30,29,28,27,27,21,45,13,64,42];var Hosea=[0,9,25,5,19,15,11,16,14,17,15,11,15,15,10];var Joel=[0,20,27,5,21];var Amos=[0,15,16,15,13,27,14,17,14,15];var Obadiah=[0,21];var Jonah=[0,16,11,10,11];var Micah=[0,16,13,12,14,14,16,20];var Nachum=[0,14,14,19];var Habakkuk=[0,17,20,19];var Zephaniah=[0,18,15,20];var Haggai=[0,15,23];var Zechariah=[0,17,17,10,14,11,15,14,23,17,12,17,14,9,21];var Malachi=[0,14,17,24];var numverses = {Genesis:Genesis,Exodus:Exodus,Leviticus:Leviticus,Numbers:Numbers,Deuteronomy:Deuteronomy,Joshua:Joshua,Judges:Judges,Ruth:Ruth,"I Samuel":[0,28,36,21,22,12,21,17,22,27,27,15,25,23,52,35,23,58,30,24,42,16,23,28,23,43,25,12,25,11,31,13],"II Samuel":[0,27,32,39,12,25,23,29,18,13,19,27,31,39,33,37,23,29,32,44,26,22,51,39,25],"I Kings":[0,53,46,28,20,32,38,51,66,28,29,43,33,34,31,34,34,24,46,21,43,29,54],"II Kings":[0,18,25,27,44,27,33,20,29,37,36,20,22,25,29,38,20,41,37,37,21,26,20,37,20,30],Isaiah:Isaiah,Jeremiah:Jeremiah,Lamentations:Lamentations,Baruch:Baruch,Ezekiel:Ezekiel,Daniel:Daniel,Hosea:Hosea,Joel:Joel,Amos:Amos,Obadiah:Obadiah,Jonah:Jonah,Micah:Micah,Nachum:Nachum,Habakkuk:Habakkuk,Zephaniah:Zephaniah,Haggai:Haggai,Zechariah:Zechariah,Malachi:Malachi};
+
+/**
+ * Names of the books of the Torah. BOOK[1] === 'Genesis'
+ * @readonly
+ * @const {string[]}
+ */
+var BOOK = ['', 'Genesis', 'Exodus', 'Leviticus', 'Numbers', 'Deuteronomy'];
+
+/**
+ * Formats parsha as a string
+ * @param {string|string[]} parsha untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei']
+ * @return {string}
+ */
+function parshaToString(parsha) {
+  if (typeof parsha === 'string') {
+    return parsha;
+  } else if (!Array.isArray(parsha) || parsha.length === 0 || parsha.length > 2) {
+    throw new TypeError("Bad parsha argument: ".concat(parsha));
+  }
+  var s = parsha[0];
+  if (parsha.length == 2) {
+    s += '-' + parsha[1];
+  }
+  return s;
+}
+
+/**
+ * Represents an aliyah
+ * @typedef {Object} Aliyah
+ * @property {string} k - Book (e.g. "Numbers")
+ * @property {string} b - beginning verse (e.g. "28:9")
+ * @property {string} e - ending verse (e.g. "28:15")
+ * @property {number} [v] - number of verses
+ * @property {number} [p] - parsha number (1=Bereshit, 54=Vezot HaBracha)
+ */
+
+/**
+ * Makes a deep copy of the src object using JSON stringify and parse
+ * @param {any} src
+ * @return {any}
+ */
+function clone(src) {
+  return JSON.parse(JSON.stringify(src));
+}
+
+/**
+ * Calculates the number of verses in an aliyah or haftara based on
+ * the `b` (begin verse), `e` (end verse) and `k` (book).
+ * Modifies `aliyah` by setting the `v` field.
+ * @param {Aliyah} aliyah
+ * @return {number}
+ */
+function calculateNumVerses(aliyah) {
+  if (aliyah.v) {
+    return aliyah.v;
+  }
+  var chapVerseBegin = aliyah.b.split(':');
+  var chapVerseEnd = aliyah.e.split(':');
+  var c1 = parseInt(chapVerseBegin[0], 10);
+  var c2 = parseInt(chapVerseEnd[0], 10);
+  var v1 = parseInt(chapVerseBegin[1], 10);
+  var v2 = parseInt(chapVerseEnd[1], 10);
+  if (c1 === c2) {
+    aliyah.v = v2 - v1 + 1;
+  } else if (typeof aliyah.k === 'string') {
+    var numv = numverses[aliyah.k];
+    if (_typeof(numv) !== 'object' || !numv.length) {
+      throw new ReferenceError("Can't find numverses for ".concat(aliyah.k));
+    }
+    var total = numv[c1] - v1 + 1;
+    for (var chap = c1 + 1; chap < c2; chap++) {
+      total += numv[chap];
+    }
+    total += v2;
+    aliyah.v = total;
+  }
+  return aliyah.v;
+}
+
+/**
+ * Formats an aliyah object like "Numbers 28:9-28:15"
+ * @param {Aliyah} a aliyah
+ * @return {string}
+ */
+function formatAliyahWithBook(a) {
+  return "".concat(a.k, " ").concat(a.b, "-").concat(a.e);
+}
+
+/**
+ * Formats an aliyah object like "Numbers 28:9-15"
+ * @param {Aliyah} aliyah
+ * @param {boolean} showBook
+ * @return {string}
+ */
+function formatAliyahShort(aliyah, showBook) {
+  var begin = aliyah.b;
+  var end0 = aliyah.e;
+  var prefix = showBook ? aliyah.k + ' ' : '';
+  if (begin === end0) {
+    return "".concat(prefix).concat(begin);
+  }
+  var cv1 = begin.split(':');
+  var cv2 = end0.split(':');
+  var end = cv1[0] === cv2[0] ? cv2[1] : end0;
+  return "".concat(prefix).concat(begin, "-").concat(end);
+}
+
+/**
+ * Returns the total number of verses in an array of Aliyah (or haftarah) objects
+ * @param {Aliyah|Aliyah[]} aliyot
+ * @return {number}
+ */
+function sumVerses(aliyot) {
+  return Array.isArray(aliyot) ? aliyot.reduce(function (prev, cur) {
+    return prev + cur.v;
+  }, 0) : aliyot.v;
+}
+
+/**
+ * @private
+ * @param {Aliyah|Aliyah[]} haft
+ * @return {Aliyah|Aliyah[]}
+ */
+function cloneHaftara(haft) {
+  if (!haft) {
+    return haft;
+  }
+  var dest = clone(haft);
+  if (Array.isArray(dest)) {
+    dest.map(calculateNumVerses);
+  } else {
+    calculateNumVerses(dest);
+  }
+  return dest;
+}
+
+/**
+ * @private
+ * @param {string} a
+ * @param {string} b
+ * @return {boolean}
+ */
+function isChapVerseBefore(a, b) {
+  var cv1 = a.split(':').map(function (x) {
+    return +x;
+  });
+  var cv2 = b.split(':').map(function (x) {
+    return +x;
+  });
+  return cv1[0] * 100 + cv1[1] < cv2[0] * 100 + cv2[1];
+}
+
+/**
+ * Summarizes an `AliyotMap` by collapsing all adjacent aliyot.
+ * Finds any non-overlapping parts (e.g. special 7th aliyah or maftir)
+ * @param {Object<string,Aliyah>} aliyot
+ * @return {Aliyah[]}
+ */
+function makeLeyningParts(aliyot) {
+  var nums = Object.keys(aliyot).filter(function (x) {
+    return x.length === 1;
+  });
+  var start = aliyot[nums[0]];
+  var end = start;
+  var parts = [];
+  for (var i = 0; i < nums.length; i++) {
+    var num = nums[i];
+    var aliyah = aliyot[num];
+    if (i === nums.length - 1 && aliyah.k === end.k && aliyah.e === end.e) {
+      // short-circuit when final aliyah is within the previous (e.g. M inside of 7)
+      continue;
+    }
+    var prevEndChap = +end.e.split(':')[0];
+    var curStartChap = +aliyah.b.split(':')[0];
+    var sameOrNextChap = curStartChap === prevEndChap || curStartChap === prevEndChap + 1;
+    if (i !== 0 && (aliyah.k !== start.k || isChapVerseBefore(aliyah.b, start.e) || !sameOrNextChap)) {
+      parts.push({
+        k: start.k,
+        b: start.b,
+        e: end.e
+      });
+      start = aliyah;
+    }
+    end = aliyah;
+  }
+  parts.push({
+    k: start.k,
+    b: start.b,
+    e: end.e
+  });
+  return parts;
+}
+
+/**
+ * Returns a string representation of the leyning parts.
+ * Separate verse ranges read from the same book are separated
+ * by commas, e.g. `Isaiah 6:1-7:6, 9:5-6`.
+ * Verse ranges from different books are separated by semicolons,
+ * e.g. `Genesis 21:1-34; Numbers 29:1-6`.
+ * @param {Aliyah|Aliyah[]} parts
+ * @return {string}
+ */
+function makeSummaryFromParts(parts) {
+  if (!Array.isArray(parts)) {
+    parts = [parts];
+  }
+  var prev = parts[0];
+  var summary = formatAliyahShort(prev, true);
+  for (var i = 1; i < parts.length; i++) {
+    var part = parts[i];
+    if (part.k === prev.k) {
+      summary += ', ';
+    } else {
+      summary += "; ".concat(part.k, " ");
+    }
+    summary += formatAliyahShort(part, false);
+    prev = part;
+  }
+  return summary;
+}
+
+/**
+ * Makes a summary of the leyning, like "Genesis 6:9-11:32"
+ * @param {Object<string,Aliyah>} aliyot
+ * @return {string}
+ */
+function makeLeyningSummary(aliyot) {
+  var parts = makeLeyningParts(aliyot);
+  return makeSummaryFromParts(parts);
+}
+
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
 var check = function (it) {
@@ -19,7 +251,7 @@ var check = function (it) {
 };
 
 // https://github.com/zloirock/core-js/issues/86#issuecomment-115759028
-var global$b =
+var global$a =
   // eslint-disable-next-line es/no-global-this -- safe
   check(typeof globalThis == 'object' && globalThis) ||
   check(typeof window == 'object' && window) ||
@@ -31,7 +263,7 @@ var global$b =
 
 var objectGetOwnPropertyDescriptor = {};
 
-var fails$9 = function (exec) {
+var fails$8 = function (exec) {
   try {
     return !!exec();
   } catch (error) {
@@ -39,17 +271,17 @@ var fails$9 = function (exec) {
   }
 };
 
-var fails$8 = fails$9;
+var fails$7 = fails$8;
 
 // Detect IE8's incomplete defineProperty implementation
-var descriptors = !fails$8(function () {
+var descriptors = !fails$7(function () {
   // eslint-disable-next-line es/no-object-defineproperty -- required for testing
   return Object.defineProperty({}, 1, { get: function () { return 7; } })[1] != 7;
 });
 
-var fails$7 = fails$9;
+var fails$6 = fails$8;
 
-var functionBindNative = !fails$7(function () {
+var functionBindNative = !fails$6(function () {
   // eslint-disable-next-line es/no-function-prototype-bind -- safe
   var test = (function () { /* empty */ }).bind();
   // eslint-disable-next-line no-prototype-builtins -- safe
@@ -111,19 +343,19 @@ var classofRaw = function (it) {
 };
 
 var uncurryThis$7 = functionUncurryThis;
-var fails$6 = fails$9;
-var classof$1 = classofRaw;
+var fails$5 = fails$8;
+var classof = classofRaw;
 
 var $Object$2 = Object;
 var split = uncurryThis$7(''.split);
 
 // fallback for non-array-like ES3 and non-enumerable old V8 strings
-var indexedObject = fails$6(function () {
+var indexedObject = fails$5(function () {
   // throws an error in rhino, see https://github.com/mozilla/rhino/issues/346
   // eslint-disable-next-line no-prototype-builtins -- safe
   return !$Object$2('z').propertyIsEnumerable(0);
 }) ? function (it) {
-  return classof$1(it) == 'String' ? split(it, '') : $Object$2(it);
+  return classof(it) == 'String' ? split(it, '') : $Object$2(it);
 } : $Object$2;
 
 // we can't use just `it == null` since of `document.all` special case
@@ -134,21 +366,21 @@ var isNullOrUndefined$2 = function (it) {
 
 var isNullOrUndefined$1 = isNullOrUndefined$2;
 
-var $TypeError$6 = TypeError;
+var $TypeError$5 = TypeError;
 
 // `RequireObjectCoercible` abstract operation
 // https://tc39.es/ecma262/#sec-requireobjectcoercible
 var requireObjectCoercible$2 = function (it) {
-  if (isNullOrUndefined$1(it)) throw $TypeError$6("Can't call method on " + it);
+  if (isNullOrUndefined$1(it)) throw $TypeError$5("Can't call method on " + it);
   return it;
 };
 
 // toObject with fallback for non-array-like ES3 strings
-var IndexedObject$1 = indexedObject;
+var IndexedObject = indexedObject;
 var requireObjectCoercible$1 = requireObjectCoercible$2;
 
 var toIndexedObject$4 = function (it) {
-  return IndexedObject$1(requireObjectCoercible$1(it));
+  return IndexedObject(requireObjectCoercible$1(it));
 };
 
 var documentAll$2 = typeof document == 'object' && document.all;
@@ -184,7 +416,7 @@ var isObject$5 = $documentAll.IS_HTMLDDA ? function (it) {
   return typeof it == 'object' ? it !== null : isCallable$9(it);
 };
 
-var global$a = global$b;
+var global$9 = global$a;
 var isCallable$8 = isCallable$a;
 
 var aFunction = function (argument) {
@@ -192,7 +424,7 @@ var aFunction = function (argument) {
 };
 
 var getBuiltIn$3 = function (namespace, method) {
-  return arguments.length < 2 ? aFunction(global$a[namespace]) : global$a[namespace] && global$a[namespace][method];
+  return arguments.length < 2 ? aFunction(global$9[namespace]) : global$9[namespace] && global$9[namespace][method];
 };
 
 var uncurryThis$6 = functionUncurryThis;
@@ -203,11 +435,11 @@ var getBuiltIn$2 = getBuiltIn$3;
 
 var engineUserAgent = getBuiltIn$2('navigator', 'userAgent') || '';
 
-var global$9 = global$b;
+var global$8 = global$a;
 var userAgent = engineUserAgent;
 
-var process = global$9.process;
-var Deno = global$9.Deno;
+var process = global$8.process;
+var Deno = global$8.Deno;
 var versions = process && process.versions || Deno && Deno.version;
 var v8 = versions && versions.v8;
 var match, version;
@@ -234,10 +466,10 @@ var engineV8Version = version;
 /* eslint-disable es/no-symbol -- required for testing */
 
 var V8_VERSION = engineV8Version;
-var fails$5 = fails$9;
+var fails$4 = fails$8;
 
 // eslint-disable-next-line es/no-object-getownpropertysymbols -- required for testing
-var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$5(function () {
+var symbolConstructorDetection = !!Object.getOwnPropertySymbols && !fails$4(function () {
   var symbol = Symbol();
   // Chrome 38 Symbol has incorrect toString conversion
   // `get-own-property-symbols` polyfill symbols converted to object are not Symbol instances
@@ -281,29 +513,29 @@ var tryToString$1 = function (argument) {
 var isCallable$6 = isCallable$a;
 var tryToString = tryToString$1;
 
-var $TypeError$5 = TypeError;
+var $TypeError$4 = TypeError;
 
 // `Assert: IsCallable(argument) is true`
-var aCallable$2 = function (argument) {
+var aCallable$1 = function (argument) {
   if (isCallable$6(argument)) return argument;
-  throw $TypeError$5(tryToString(argument) + ' is not a function');
+  throw $TypeError$4(tryToString(argument) + ' is not a function');
 };
 
-var aCallable$1 = aCallable$2;
+var aCallable = aCallable$1;
 var isNullOrUndefined = isNullOrUndefined$2;
 
 // `GetMethod` abstract operation
 // https://tc39.es/ecma262/#sec-getmethod
 var getMethod$1 = function (V, P) {
   var func = V[P];
-  return isNullOrUndefined(func) ? undefined : aCallable$1(func);
+  return isNullOrUndefined(func) ? undefined : aCallable(func);
 };
 
 var call$2 = functionCall;
 var isCallable$5 = isCallable$a;
 var isObject$4 = isObject$5;
 
-var $TypeError$4 = TypeError;
+var $TypeError$3 = TypeError;
 
 // `OrdinaryToPrimitive` abstract operation
 // https://tc39.es/ecma262/#sec-ordinarytoprimitive
@@ -312,29 +544,33 @@ var ordinaryToPrimitive$1 = function (input, pref) {
   if (pref === 'string' && isCallable$5(fn = input.toString) && !isObject$4(val = call$2(fn, input))) return val;
   if (isCallable$5(fn = input.valueOf) && !isObject$4(val = call$2(fn, input))) return val;
   if (pref !== 'string' && isCallable$5(fn = input.toString) && !isObject$4(val = call$2(fn, input))) return val;
-  throw $TypeError$4("Can't convert object to primitive value");
+  throw $TypeError$3("Can't convert object to primitive value");
 };
 
-var shared$3 = {exports: {}};
+var sharedExports = {};
+var shared$3 = {
+  get exports(){ return sharedExports; },
+  set exports(v){ sharedExports = v; },
+};
 
-var global$8 = global$b;
+var global$7 = global$a;
 
 // eslint-disable-next-line es/no-object-defineproperty -- safe
 var defineProperty$1 = Object.defineProperty;
 
 var defineGlobalProperty$3 = function (key, value) {
   try {
-    defineProperty$1(global$8, key, { value: value, configurable: true, writable: true });
+    defineProperty$1(global$7, key, { value: value, configurable: true, writable: true });
   } catch (error) {
-    global$8[key] = value;
+    global$7[key] = value;
   } return value;
 };
 
-var global$7 = global$b;
+var global$6 = global$a;
 var defineGlobalProperty$2 = defineGlobalProperty$3;
 
 var SHARED = '__core-js_shared__';
-var store$3 = global$7[SHARED] || defineGlobalProperty$2(SHARED, {});
+var store$3 = global$6[SHARED] || defineGlobalProperty$2(SHARED, {});
 
 var sharedStore = store$3;
 
@@ -356,12 +592,12 @@ var $Object = Object;
 
 // `ToObject` abstract operation
 // https://tc39.es/ecma262/#sec-toobject
-var toObject$2 = function (argument) {
+var toObject$1 = function (argument) {
   return $Object(requireObjectCoercible(argument));
 };
 
 var uncurryThis$5 = functionUncurryThis;
-var toObject$1 = toObject$2;
+var toObject = toObject$1;
 
 var hasOwnProperty = uncurryThis$5({}.hasOwnProperty);
 
@@ -369,7 +605,7 @@ var hasOwnProperty = uncurryThis$5({}.hasOwnProperty);
 // https://tc39.es/ecma262/#sec-hasownproperty
 // eslint-disable-next-line es/no-object-hasown -- safe
 var hasOwnProperty_1 = Object.hasOwn || function hasOwn(it, key) {
-  return hasOwnProperty(toObject$1(it), key);
+  return hasOwnProperty(toObject(it), key);
 };
 
 var uncurryThis$4 = functionUncurryThis;
@@ -382,15 +618,15 @@ var uid$2 = function (key) {
   return 'Symbol(' + (key === undefined ? '' : key) + ')_' + toString(++id + postfix, 36);
 };
 
-var global$6 = global$b;
-var shared$2 = shared$3.exports;
+var global$5 = global$a;
+var shared$2 = sharedExports;
 var hasOwn$6 = hasOwnProperty_1;
 var uid$1 = uid$2;
 var NATIVE_SYMBOL = symbolConstructorDetection;
 var USE_SYMBOL_AS_UID = useSymbolAsUid;
 
 var WellKnownSymbolsStore = shared$2('wks');
-var Symbol$1 = global$6.Symbol;
+var Symbol$1 = global$5.Symbol;
 var symbolFor = Symbol$1 && Symbol$1['for'];
 var createWellKnownSymbol = USE_SYMBOL_AS_UID ? Symbol$1 : Symbol$1 && Symbol$1.withoutSetter || uid$1;
 
@@ -414,7 +650,7 @@ var getMethod = getMethod$1;
 var ordinaryToPrimitive = ordinaryToPrimitive$1;
 var wellKnownSymbol = wellKnownSymbol$1;
 
-var $TypeError$3 = TypeError;
+var $TypeError$2 = TypeError;
 var TO_PRIMITIVE = wellKnownSymbol('toPrimitive');
 
 // `ToPrimitive` abstract operation
@@ -427,7 +663,7 @@ var toPrimitive$1 = function (input, pref) {
     if (pref === undefined) pref = 'default';
     result = call$1(exoticToPrim, input, pref);
     if (!isObject$3(result) || isSymbol$1(result)) return result;
-    throw $TypeError$3("Can't convert object to primitive value");
+    throw $TypeError$2("Can't convert object to primitive value");
   }
   if (pref === undefined) pref = 'number';
   return ordinaryToPrimitive(input, pref);
@@ -443,10 +679,10 @@ var toPropertyKey$2 = function (argument) {
   return isSymbol(key) ? key : key + '';
 };
 
-var global$5 = global$b;
+var global$4 = global$a;
 var isObject$2 = isObject$5;
 
-var document$1 = global$5.document;
+var document$1 = global$4.document;
 // typeof document.createElement is 'object' in old IE
 var EXISTS$1 = isObject$2(document$1) && isObject$2(document$1.createElement);
 
@@ -455,11 +691,11 @@ var documentCreateElement = function (it) {
 };
 
 var DESCRIPTORS$7 = descriptors;
-var fails$4 = fails$9;
+var fails$3 = fails$8;
 var createElement = documentCreateElement;
 
 // Thanks to IE8 for its funny defineProperty
-var ie8DomDefine = !DESCRIPTORS$7 && !fails$4(function () {
+var ie8DomDefine = !DESCRIPTORS$7 && !fails$3(function () {
   // eslint-disable-next-line es/no-object-defineproperty -- required for testing
   return Object.defineProperty(createElement('div'), 'a', {
     get: function () { return 7; }
@@ -492,11 +728,11 @@ objectGetOwnPropertyDescriptor.f = DESCRIPTORS$6 ? $getOwnPropertyDescriptor$1 :
 var objectDefineProperty = {};
 
 var DESCRIPTORS$5 = descriptors;
-var fails$3 = fails$9;
+var fails$2 = fails$8;
 
 // V8 ~ Chrome 36-
 // https://bugs.chromium.org/p/v8/issues/detail?id=3334
-var v8PrototypeDefineBug = DESCRIPTORS$5 && fails$3(function () {
+var v8PrototypeDefineBug = DESCRIPTORS$5 && fails$2(function () {
   // eslint-disable-next-line es/no-object-defineproperty -- required for testing
   return Object.defineProperty(function () { /* empty */ }, 'prototype', {
     value: 42,
@@ -507,12 +743,12 @@ var v8PrototypeDefineBug = DESCRIPTORS$5 && fails$3(function () {
 var isObject$1 = isObject$5;
 
 var $String = String;
-var $TypeError$2 = TypeError;
+var $TypeError$1 = TypeError;
 
 // `Assert: Type(argument) is Object`
 var anObject$2 = function (argument) {
   if (isObject$1(argument)) return argument;
-  throw $TypeError$2($String(argument) + ' is not an object');
+  throw $TypeError$1($String(argument) + ' is not an object');
 };
 
 var DESCRIPTORS$4 = descriptors;
@@ -521,7 +757,7 @@ var V8_PROTOTYPE_DEFINE_BUG = v8PrototypeDefineBug;
 var anObject$1 = anObject$2;
 var toPropertyKey = toPropertyKey$2;
 
-var $TypeError$1 = TypeError;
+var $TypeError = TypeError;
 // eslint-disable-next-line es/no-object-defineproperty -- safe
 var $defineProperty = Object.defineProperty;
 // eslint-disable-next-line es/no-object-getownpropertydescriptor -- safe
@@ -554,7 +790,7 @@ objectDefineProperty.f = DESCRIPTORS$4 ? V8_PROTOTYPE_DEFINE_BUG ? function defi
   if (IE8_DOM_DEFINE) try {
     return $defineProperty(O, P, Attributes);
   } catch (error) { /* empty */ }
-  if ('get' in Attributes || 'set' in Attributes) throw $TypeError$1('Accessors not supported');
+  if ('get' in Attributes || 'set' in Attributes) throw $TypeError('Accessors not supported');
   if ('value' in Attributes) O[P] = Attributes.value;
   return O;
 };
@@ -570,7 +806,11 @@ var createNonEnumerableProperty$2 = DESCRIPTORS$3 ? function (object, key, value
   return object;
 };
 
-var makeBuiltIn$2 = {exports: {}};
+var makeBuiltInExports = {};
+var makeBuiltIn$2 = {
+  get exports(){ return makeBuiltInExports; },
+  set exports(v){ makeBuiltInExports = v; },
+};
 
 var DESCRIPTORS$2 = descriptors;
 var hasOwn$4 = hasOwnProperty_1;
@@ -605,14 +845,14 @@ if (!isCallable$4(store$1.inspectSource)) {
 
 var inspectSource$1 = store$1.inspectSource;
 
-var global$4 = global$b;
+var global$3 = global$a;
 var isCallable$3 = isCallable$a;
 
-var WeakMap$1 = global$4.WeakMap;
+var WeakMap$1 = global$3.WeakMap;
 
 var weakMapBasicDetection = isCallable$3(WeakMap$1) && /native code/.test(String(WeakMap$1));
 
-var shared$1 = shared$3.exports;
+var shared$1 = sharedExports;
 var uid = uid$2;
 
 var keys = shared$1('keys');
@@ -624,7 +864,7 @@ var sharedKey$1 = function (key) {
 var hiddenKeys$3 = {};
 
 var NATIVE_WEAK_MAP = weakMapBasicDetection;
-var global$3 = global$b;
+var global$2 = global$a;
 var isObject = isObject$5;
 var createNonEnumerableProperty$1 = createNonEnumerableProperty$2;
 var hasOwn$3 = hasOwnProperty_1;
@@ -633,8 +873,8 @@ var sharedKey = sharedKey$1;
 var hiddenKeys$2 = hiddenKeys$3;
 
 var OBJECT_ALREADY_INITIALIZED = 'Object already initialized';
-var TypeError$1 = global$3.TypeError;
-var WeakMap = global$3.WeakMap;
+var TypeError$1 = global$2.TypeError;
+var WeakMap = global$2.WeakMap;
 var set, get, has;
 
 var enforce = function (it) {
@@ -694,7 +934,7 @@ var internalState = {
   getterFor: getterFor
 };
 
-var fails$2 = fails$9;
+var fails$1 = fails$8;
 var isCallable$2 = isCallable$a;
 var hasOwn$2 = hasOwnProperty_1;
 var DESCRIPTORS$1 = descriptors;
@@ -707,7 +947,7 @@ var getInternalState = InternalStateModule.get;
 // eslint-disable-next-line es/no-object-defineproperty -- safe
 var defineProperty = Object.defineProperty;
 
-var CONFIGURABLE_LENGTH = DESCRIPTORS$1 && !fails$2(function () {
+var CONFIGURABLE_LENGTH = DESCRIPTORS$1 && !fails$1(function () {
   return defineProperty(function () { /* empty */ }, 'length', { value: 8 }).length !== 8;
 });
 
@@ -746,7 +986,7 @@ Function.prototype.toString = makeBuiltIn$1(function toString() {
 
 var isCallable$1 = isCallable$a;
 var definePropertyModule$1 = objectDefineProperty;
-var makeBuiltIn = makeBuiltIn$2.exports;
+var makeBuiltIn = makeBuiltInExports;
 var defineGlobalProperty$1 = defineGlobalProperty$3;
 
 var defineBuiltIn$1 = function (O, key, value, options) {
@@ -822,19 +1062,19 @@ var toLength = toLength$1;
 
 // `LengthOfArrayLike` abstract operation
 // https://tc39.es/ecma262/#sec-lengthofarraylike
-var lengthOfArrayLike$2 = function (obj) {
+var lengthOfArrayLike$1 = function (obj) {
   return toLength(obj.length);
 };
 
 var toIndexedObject$2 = toIndexedObject$4;
 var toAbsoluteIndex = toAbsoluteIndex$1;
-var lengthOfArrayLike$1 = lengthOfArrayLike$2;
+var lengthOfArrayLike = lengthOfArrayLike$1;
 
 // `Array.prototype.{ indexOf, includes }` methods implementation
-var createMethod$2 = function (IS_INCLUDES) {
+var createMethod$1 = function (IS_INCLUDES) {
   return function ($this, el, fromIndex) {
     var O = toIndexedObject$2($this);
-    var length = lengthOfArrayLike$1(O);
+    var length = lengthOfArrayLike(O);
     var index = toAbsoluteIndex(fromIndex, length);
     var value;
     // Array#includes uses SameValueZero equality algorithm
@@ -853,10 +1093,10 @@ var createMethod$2 = function (IS_INCLUDES) {
 var arrayIncludes = {
   // `Array.prototype.includes` method
   // https://tc39.es/ecma262/#sec-array.prototype.includes
-  includes: createMethod$2(true),
+  includes: createMethod$1(true),
   // `Array.prototype.indexOf` method
   // https://tc39.es/ecma262/#sec-array.prototype.indexof
-  indexOf: createMethod$2(false)
+  indexOf: createMethod$1(false)
 };
 
 var uncurryThis$2 = functionUncurryThis;
@@ -940,7 +1180,7 @@ var copyConstructorProperties$1 = function (target, source, exceptions) {
   }
 };
 
-var fails$1 = fails$9;
+var fails = fails$8;
 var isCallable = isCallable$a;
 
 var replacement = /#|\.prototype\./;
@@ -949,7 +1189,7 @@ var isForced$1 = function (feature, detection) {
   var value = data[normalize(feature)];
   return value == POLYFILL ? true
     : value == NATIVE ? false
-    : isCallable(detection) ? fails$1(detection)
+    : isCallable(detection) ? fails(detection)
     : !!detection;
 };
 
@@ -963,7 +1203,7 @@ var POLYFILL = isForced$1.POLYFILL = 'P';
 
 var isForced_1 = isForced$1;
 
-var global$2 = global$b;
+var global$1 = global$a;
 var getOwnPropertyDescriptor = objectGetOwnPropertyDescriptor.f;
 var createNonEnumerableProperty = createNonEnumerableProperty$2;
 var defineBuiltIn = defineBuiltIn$1;
@@ -992,11 +1232,11 @@ var _export = function (options, source) {
   var STATIC = options.stat;
   var FORCED, target, key, targetProperty, sourceProperty, descriptor;
   if (GLOBAL) {
-    target = global$2;
+    target = global$1;
   } else if (STATIC) {
-    target = global$2[TARGET] || defineGlobalProperty(TARGET, {});
+    target = global$1[TARGET] || defineGlobalProperty(TARGET, {});
   } else {
-    target = (global$2[TARGET] || {}).prototype;
+    target = (global$1[TARGET] || {}).prototype;
   }
   if (target) for (key in source) {
     sourceProperty = source[key];
@@ -1018,320 +1258,15 @@ var _export = function (options, source) {
   }
 };
 
-var aCallable = aCallable$2;
-var toObject = toObject$2;
-var IndexedObject = indexedObject;
-var lengthOfArrayLike = lengthOfArrayLike$2;
+var internalObjectKeys = objectKeysInternal;
+var enumBugKeys = enumBugKeys$2;
 
-var $TypeError = TypeError;
-
-// `Array.prototype.{ reduce, reduceRight }` methods implementation
-var createMethod$1 = function (IS_RIGHT) {
-  return function (that, callbackfn, argumentsLength, memo) {
-    aCallable(callbackfn);
-    var O = toObject(that);
-    var self = IndexedObject(O);
-    var length = lengthOfArrayLike(O);
-    var index = IS_RIGHT ? length - 1 : 0;
-    var i = IS_RIGHT ? -1 : 1;
-    if (argumentsLength < 2) while (true) {
-      if (index in self) {
-        memo = self[index];
-        index += i;
-        break;
-      }
-      index += i;
-      if (IS_RIGHT ? index < 0 : length <= index) {
-        throw $TypeError('Reduce of empty array with no initial value');
-      }
-    }
-    for (;IS_RIGHT ? index >= 0 : length > index; index += i) if (index in self) {
-      memo = callbackfn(memo, self[index], index, O);
-    }
-    return memo;
-  };
-};
-
-var arrayReduce = {
-  // `Array.prototype.reduce` method
-  // https://tc39.es/ecma262/#sec-array.prototype.reduce
-  left: createMethod$1(false),
-  // `Array.prototype.reduceRight` method
-  // https://tc39.es/ecma262/#sec-array.prototype.reduceright
-  right: createMethod$1(true)
-};
-
-var fails = fails$9;
-
-var arrayMethodIsStrict$1 = function (METHOD_NAME, argument) {
-  var method = [][METHOD_NAME];
-  return !!method && fails(function () {
-    // eslint-disable-next-line no-useless-call -- required for testing
-    method.call(null, argument || function () { return 1; }, 1);
-  });
-};
-
-var classof = classofRaw;
-var global$1 = global$b;
-
-var engineIsNode = classof(global$1.process) == 'process';
-
-var $$1 = _export;
-var $reduce = arrayReduce.left;
-var arrayMethodIsStrict = arrayMethodIsStrict$1;
-var CHROME_VERSION = engineV8Version;
-var IS_NODE = engineIsNode;
-
-var STRICT_METHOD = arrayMethodIsStrict('reduce');
-// Chrome 80-82 has a critical bug
-// https://bugs.chromium.org/p/chromium/issues/detail?id=1049982
-var CHROME_BUG = !IS_NODE && CHROME_VERSION > 79 && CHROME_VERSION < 83;
-
-// `Array.prototype.reduce` method
-// https://tc39.es/ecma262/#sec-array.prototype.reduce
-$$1({ target: 'Array', proto: true, forced: !STRICT_METHOD || CHROME_BUG }, {
-  reduce: function reduce(callbackfn /* , initialValue */) {
-    var length = arguments.length;
-    return $reduce(this, callbackfn, length, length > 1 ? arguments[1] : undefined);
-  }
-});
-
-var Genesis=[0,31,25,24,26,32,22,24,22,29,32,32,20,18,24,21,16,27,33,38,18,34,24,20,67,34,35,46,22,35,43,54,33,20,31,29,43,36,30,23,23,57,38,34,34,28,34,31,22,33,26];var Exodus=[0,22,25,22,31,23,30,29,28,35,29,10,51,22,31,27,36,16,27,25,26,37,30,33,18,40,37,21,43,46,38,18,35,23,35,35,38,29,31,43,38];var Leviticus=[0,17,16,17,35,26,23,38,36,24,20,47,8,59,57,33,34,16,30,37,27,24,33,44,23,55,46,34];var Numbers=[0,54,34,51,49,31,27,89,26,23,36,35,16,33,45,41,35,28,32,22,29,35,41,30,25,19,65,23,31,39,17,54,42,56,29,34,13];var Deuteronomy=[0,46,37,29,49,30,25,26,20,29,22,32,31,19,29,23,22,20,22,21,20,23,29,26,22,19,19,26,69,28,20,30,52,29,12];var Joshua=[0,18,24,17,24,15,27,26,35,27,43,23,24,33,15,63,10,18,28,51,9,45,34,16,33];var Judges=[0,36,23,31,24,31,40,25,35,57,18,40,15,25,20,20,31,13,31,30,48,25];var Ruth=[0,22,23,18,22];var Isaiah=[0,31,22,26,6,30,13,25,23,20,34,16,6,22,32,9,14,14,7,25,6,17,25,18,23,12,21,13,29,24,33,9,20,24,17,10,22,38,22,8,31,29,25,28,28,25,13,15,22,26,11,23,15,12,17,13,12,21,14,21,22,11,12,19,11,25,24];var Jeremiah=[0,19,37,25,31,31,30,34,23,25,25,23,17,27,22,21,21,27,23,15,18,14,30,40,10,38,24,22,17,32,24,40,44,26,22,19,32,21,28,18,16,18,22,13,30,5,28,7,47,39,46,64,34];var Lamentations=[0,22,22,66,22,22];var Baruch=[0,22,35,38,37,9,72];var Ezekiel=[0,28,10,27,17,17,14,27,18,11,22,25,28,23,23,8,63,24,32,14,44,37,31,49,27,17,21,36,26,21,26,18,32,33,31,15,38,28,23,29,49,26,20,27,31,25,24,23,35];var Daniel=[0,21,49,100,34,30,29,28,27,27,21,45,13,64,42];var Hosea=[0,9,25,5,19,15,11,16,14,17,15,11,15,15,10];var Joel=[0,20,27,5,21];var Amos=[0,15,16,15,13,27,14,17,14,15];var Obadiah=[0,21];var Jonah=[0,16,11,10,11];var Micah=[0,16,13,12,14,14,16,20];var Nachum=[0,14,14,19];var Habakkuk=[0,17,20,19];var Zephaniah=[0,18,15,20];var Haggai=[0,15,23];var Zechariah=[0,17,17,10,14,11,15,14,23,17,12,17,14,9,21];var Malachi=[0,14,17,24];var numverses = {Genesis:Genesis,Exodus:Exodus,Leviticus:Leviticus,Numbers:Numbers,Deuteronomy:Deuteronomy,Joshua:Joshua,Judges:Judges,Ruth:Ruth,"I Samuel":[0,28,36,21,22,12,21,17,22,27,27,15,25,23,52,35,23,58,30,24,42,16,23,28,23,43,25,12,25,11,31,13],"II Samuel":[0,27,32,39,12,25,23,29,18,13,19,27,31,39,33,37,23,29,32,44,26,22,51,39,25],"I Kings":[0,53,46,28,20,32,38,51,66,28,29,43,33,34,31,34,34,24,46,21,43,29,54],"II Kings":[0,18,25,27,44,27,33,20,29,37,36,20,22,25,29,38,20,41,37,37,21,26,20,37,20,30],Isaiah:Isaiah,Jeremiah:Jeremiah,Lamentations:Lamentations,Baruch:Baruch,Ezekiel:Ezekiel,Daniel:Daniel,Hosea:Hosea,Joel:Joel,Amos:Amos,Obadiah:Obadiah,Jonah:Jonah,Micah:Micah,Nachum:Nachum,Habakkuk:Habakkuk,Zephaniah:Zephaniah,Haggai:Haggai,Zechariah:Zechariah,Malachi:Malachi};
-
-/**
- * Names of the books of the Torah. BOOK[1] === 'Genesis'
- * @readonly
- * @const {string[]}
- */
-var BOOK = ['', 'Genesis', 'Exodus', 'Leviticus', 'Numbers', 'Deuteronomy'];
-
-/**
- * Formats parsha as a string
- * @param {string[]} parsha
- * @return {string}
- */
-function parshaToString(parsha) {
-  var s = parsha[0];
-  if (parsha.length == 2) {
-    s += '-' + parsha[1];
-  }
-  return s;
-}
-
-/**
- * Represents an aliyah
- * @typedef {Object} Aliyah
- * @property {string} k - Book (e.g. "Numbers")
- * @property {string} b - beginning verse (e.g. "28:9")
- * @property {string} e - ending verse (e.g. "28:15")
- * @property {number} [v] - number of verses
- * @property {number} [p] - parsha number (1=Bereshit, 54=Vezot HaBracha)
- */
-
-/**
- * Makes a deep copy of the src object using JSON stringify and parse
- * @param {any} src
- * @return {any}
- */
-function clone(src) {
-  return JSON.parse(JSON.stringify(src));
-}
-
-/**
- * Calculates the number of verses in an aliyah or haftara based on
- * the `b` (begin verse), `e` (end verse) and `k` (book).
- * Modifies `aliyah` by setting the `v` field.
- * @param {Aliyah} aliyah
- * @return {number}
- */
-function calculateNumVerses(aliyah) {
-  if (aliyah.v) {
-    return aliyah.v;
-  }
-  var chapVerseBegin = aliyah.b.split(':');
-  var chapVerseEnd = aliyah.e.split(':');
-  var c1 = parseInt(chapVerseBegin[0], 10);
-  var c2 = parseInt(chapVerseEnd[0], 10);
-  var v1 = parseInt(chapVerseBegin[1], 10);
-  var v2 = parseInt(chapVerseEnd[1], 10);
-  if (c1 === c2) {
-    aliyah.v = v2 - v1 + 1;
-  } else if (typeof aliyah.k === 'string') {
-    var numv = numverses[aliyah.k];
-    if (_typeof(numv) !== 'object' || !numv.length) {
-      throw new ReferenceError("Can't find numverses for ".concat(aliyah.k));
-    }
-    var total = numv[c1] - v1 + 1;
-    for (var chap = c1 + 1; chap < c2; chap++) {
-      total += numv[chap];
-    }
-    total += v2;
-    aliyah.v = total;
-  }
-  return aliyah.v;
-}
-
-/**
- * Formats an aliyah object like "Numbers 28:9-28:15"
- * @param {Aliyah} a aliyah
- * @return {string}
- */
-function formatAliyahWithBook(a) {
-  return "".concat(a.k, " ").concat(a.b, "-").concat(a.e);
-}
-
-/**
- * Formats an aliyah object like "Numbers 28:9-15"
- * @param {Aliyah} aliyah
- * @param {boolean} showBook
- * @return {string}
- */
-function formatAliyahShort(aliyah, showBook) {
-  var begin = aliyah.b;
-  var end0 = aliyah.e;
-  var prefix = showBook ? aliyah.k + ' ' : '';
-  if (begin === end0) {
-    return "".concat(prefix).concat(begin);
-  }
-  var cv1 = begin.split(':');
-  var cv2 = end0.split(':');
-  var end = cv1[0] === cv2[0] ? cv2[1] : end0;
-  return "".concat(prefix).concat(begin, "-").concat(end);
-}
-
-/**
- * Returns the total number of verses in an array of Aliyah (or haftarah) objects
- * @param {Aliyah|Aliyah[]} aliyot
- * @return {number}
- */
-function sumVerses(aliyot) {
-  return Array.isArray(aliyot) ? aliyot.reduce(function (prev, cur) {
-    return prev + cur.v;
-  }, 0) : aliyot.v;
-}
-
-/**
- * @private
- * @param {Aliyah|Aliyah[]} haft
- * @return {Aliyah|Aliyah[]}
- */
-function cloneHaftara(haft) {
-  if (!haft) {
-    return haft;
-  }
-  var dest = clone(haft);
-  if (Array.isArray(dest)) {
-    dest.map(calculateNumVerses);
-  } else {
-    calculateNumVerses(dest);
-  }
-  return dest;
-}
-
-/**
- * @private
- * @param {string} a
- * @param {string} b
- * @return {boolean}
- */
-function isChapVerseBefore(a, b) {
-  var cv1 = a.split(':').map(function (x) {
-    return +x;
-  });
-  var cv2 = b.split(':').map(function (x) {
-    return +x;
-  });
-  return cv1[0] * 100 + cv1[1] < cv2[0] * 100 + cv2[1];
-}
-
-/**
- * Summarizes an `AliyotMap` by collapsing all adjacent aliyot.
- * Finds any non-overlapping parts (e.g. special 7th aliyah or maftir)
- * @param {Object<string,Aliyah>} aliyot
- * @return {Aliyah[]}
- */
-function makeLeyningParts(aliyot) {
-  var nums = Object.keys(aliyot).filter(function (x) {
-    return x.length === 1;
-  });
-  var start = aliyot[nums[0]];
-  var end = start;
-  var parts = [];
-  for (var i = 0; i < nums.length; i++) {
-    var num = nums[i];
-    var aliyah = aliyot[num];
-    if (i === nums.length - 1 && aliyah.k === end.k && aliyah.e === end.e) {
-      // short-circuit when final aliyah is within the previous (e.g. M inside of 7)
-      continue;
-    }
-    var prevEndChap = +end.e.split(':')[0];
-    var curStartChap = +aliyah.b.split(':')[0];
-    var sameOrNextChap = curStartChap === prevEndChap || curStartChap === prevEndChap + 1;
-    if (i !== 0 && (aliyah.k !== start.k || isChapVerseBefore(aliyah.b, start.e) || !sameOrNextChap)) {
-      parts.push({
-        k: start.k,
-        b: start.b,
-        e: end.e
-      });
-      start = aliyah;
-    }
-    end = aliyah;
-  }
-  parts.push({
-    k: start.k,
-    b: start.b,
-    e: end.e
-  });
-  return parts;
-}
-
-/**
- * Returns a string representation of the leyning parts.
- * Separate verse ranges read from the same book are separated
- * by commas, e.g. `Isaiah 6:1-7:6, 9:5-6`.
- * Verse ranges from different books are separated by semicolons,
- * e.g. `Genesis 21:1-34; Numbers 29:1-6`.
- * @param {Aliyah|Aliyah[]} parts
- * @return {string}
- */
-function makeSummaryFromParts(parts) {
-  if (!Array.isArray(parts)) {
-    parts = [parts];
-  }
-  var prev = parts[0];
-  var summary = formatAliyahShort(prev, true);
-  for (var i = 1; i < parts.length; i++) {
-    var part = parts[i];
-    if (part.k === prev.k) {
-      summary += ', ';
-    } else {
-      summary += "; ".concat(part.k, " ");
-    }
-    summary += formatAliyahShort(part, false);
-    prev = part;
-  }
-  return summary;
-}
-
-/**
- * Makes a summary of the leyning, like "Genesis 6:9-11:32"
- * @param {Object<string,Aliyah>} aliyot
- * @return {string}
- */
-function makeLeyningSummary(aliyot) {
-  var parts = makeLeyningParts(aliyot);
-  return makeSummaryFromParts(parts);
-}
-
-var internalObjectKeys = objectKeysInternal;
-var enumBugKeys = enumBugKeys$2;
-
-// `Object.keys` method
-// https://tc39.es/ecma262/#sec-object.keys
-// eslint-disable-next-line es/no-object-keys -- safe
-var objectKeys$1 = Object.keys || function keys(O) {
-  return internalObjectKeys(O, enumBugKeys);
-};
+// `Object.keys` method
+// https://tc39.es/ecma262/#sec-object.keys
+// eslint-disable-next-line es/no-object-keys -- safe
+var objectKeys$1 = Object.keys || function keys(O) {
+  return internalObjectKeys(O, enumBugKeys);
+};
 
 var DESCRIPTORS = descriptors;
 var uncurryThis = functionUncurryThis;
@@ -1430,6 +1365,9 @@ var HOLIDAY_IGNORE_MASK = core.flags.DAF_YOMI | core.flags.OMER_COUNT | core.fla
  */
 function getLeyningKeyForEvent(ev) {
   var il = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  if (typeof ev.eventTime !== 'undefined') {
+    return undefined;
+  }
   var mask = ev.getFlags();
   if (mask & HOLIDAY_IGNORE_MASK) {
     return undefined;
@@ -1492,6 +1430,9 @@ function getLeyningKeyForEvent(ev) {
   } else if (il && desc == 'Shmini Atzeret') {
     return 'Simchat Torah';
   }
+  if (desc === 'Chag HaBanot') {
+    return undefined;
+  }
   if (isShabbat && 'Shabbat' != desc.substring(0, 7)) {
     if (isRoshChodesh) {
       if (desc === 'Rosh Chodesh Tevet') {
@@ -1536,6 +1477,16 @@ function getLeyningKeyForEvent(ev) {
   return undefined;
 }
 
+/**
+ * Leyning for a parsha hashavua or holiday
+ * @typedef {Object} SpecialReading
+ * @property {Object<string,Aliyah>} aliyot - Map of aliyot `1` through `7` plus `M` for maftir
+ * @property {Object<string,string>} [reason] - Explanations for special readings,
+ *    keyed by aliyah number, `M` for maftir or `haftara` for Haftarah
+ * @property {Aliyah|Aliyah[]} haft - Haftarah object(s)
+ * @property {Aliyah|Aliyah[]} seph - Haftarah object(s)
+ */
+
 /**
  * @private
  * @param {Object<string,Aliyah>} aliyot
@@ -1579,25 +1530,23 @@ function mergeAliyotWithSpecial(aliyot, special) {
  * a special maftir or Haftara (for example Shabbat HaGadol, Shabbat Chanukah, Rosh
  * Chodesh or Machar Chodesh, etc.).
  *
- * If a special maftir occurs, modifies `aliyot` to replace `M` and sets `reason.M`
- * (and in some cases modifies the 6th and 7th aliyah, setting `reason['7']`).
+ * This function does not modify `aliyot`. Instead, it returns a deep copy
+ * with `aliyot['M']` replaced and sets `reason.M`
+ * (and in some cases the 6th and 7th aliyah, setting `reason['7']`).
  *
- * If a special Haftarah applies, returns the Haftarah object and sets `reason.haftara`.
- * If no special Haftarah, returns `undefined`
+ * If a special Haftarah applies, the result will have a `haft` property
+ * pointing to Haftarah object and sets `reason.haftara`.
+ * @param {string[]} parsha
  * @param {HDate} hd
  * @param {boolean} il
  * @param {Object<string,Aliyah>} aliyot
- * @param {Object<string,string>} reason
- * @param {string[]} parsha
- * @param {boolean} [wantSeph]
- * @return {Aliyah | Aliyah[]}
+ * @return {SpecialReading}
  */
-function specialReadings(hd, il, aliyot, reason, parsha) {
-  var wantSeph = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+function specialReadings2(parsha, hd, il, aliyot) {
   var haft;
   var seph;
   var specialHaft = false;
-  var parshaName = parsha ? parshaToString(parsha) : null;
+  var reason = {};
 
   // eslint-disable-next-line require-jsdoc
   function handleSpecial(key) {
@@ -1615,18 +1564,21 @@ function specialReadings(hd, il, aliyot, reason, parsha) {
       }
     }
     if (special.fullkriyah) {
-      mergeAliyotWithSpecial(aliyot, special.fullkriyah);
+      var aliyotMap = clone(aliyot);
+      mergeAliyotWithSpecial(aliyotMap, special.fullkriyah);
       Object.keys(special.fullkriyah).map(function (k) {
         return reason[k] = key;
       });
+      aliyot = aliyotMap;
     }
   }
+  var parshaName = parshaToString(parsha);
   var events0 = core.HebrewCalendar.getHolidaysOnDate(hd, il) || [];
   var events = events0.filter(function (ev) {
     return !(ev.getFlags() & core.flags.ROSH_CHODESH);
   });
   events.forEach(function (ev) {
-    if (ev.getDesc() === 'Shabbat Shuva' && parshaName) {
+    if (ev.getDesc() === 'Shabbat Shuva') {
       handleSpecial("Shabbat Shuva (with ".concat(parshaName, ")"));
     } else {
       var key = getLeyningKeyForEvent(ev, il);
@@ -1651,14 +1603,12 @@ function specialReadings(hd, il, aliyot, reason, parsha) {
       }
     }
   }
-  if (wantSeph && haft) {
-    return {
-      haft: haft,
-      seph: seph
-    };
-  } else {
-    return haft;
-  }
+  return {
+    aliyot: aliyot,
+    reason: reason,
+    haft: haft,
+    seph: seph
+  };
 }
 
 var Bereshit={num:1,hebrew:"בְּרֵאשִׁית",book:1,haft:{k:"Isaiah",b:"42:5",e:"43:10"},seph:{k:"Isaiah",b:"42:5",e:"42:21"},fullkriyah:{"1":["1:1","2:3"],"2":["2:4","2:19"],"3":["2:20","3:21"],"4":["3:22","4:18"],"5":["4:19","4:22"],"6":["4:23","5:24"],"7":["5:25","6:8"],M:["6:5","6:8"]},weekday:{"1":["1:1","1:5"],"2":["1:6","1:8"],"3":["1:9","1:13"]}};var Noach={num:2,hebrew:"נֹחַ",book:1,haft:{k:"Isaiah",b:"54:1",e:"55:5"},seph:{k:"Isaiah",b:"54:1",e:"54:10"},fullkriyah:{"1":["6:9","6:22"],"2":["7:1","7:16"],"3":["7:17","8:14"],"4":["8:15","9:7"],"5":["9:8","9:17"],"6":["9:18","10:32"],"7":["11:1","11:32"],M:["11:29","11:32"]},weekday:{"1":["6:9","6:16"],"2":["6:17","6:19"],"3":["6:20","6:22"]}};var Vayera={num:4,hebrew:"וַיֵּרָא",book:1,haft:{k:"II Kings",b:"4:1",e:"4:37"},seph:{k:"II Kings",b:"4:1",e:"4:23"},fullkriyah:{"1":["18:1","18:14"],"2":["18:15","18:33"],"3":["19:1","19:20"],"4":["19:21","21:4"],"5":["21:5","21:21"],"6":["21:22","21:34"],"7":["22:1","22:24"],M:["22:20","22:24"]},weekday:{"1":["18:1","18:5"],"2":["18:6","18:8"],"3":["18:9","18:14"]}};var Toldot={num:6,hebrew:"תּוֹלְדוֹת",book:1,haft:{k:"Malachi",b:"1:1",e:"2:7"},fullkriyah:{"1":["25:19","26:5"],"2":["26:6","26:12"],"3":["26:13","26:22"],"4":["26:23","26:29"],"5":["26:30","27:27"],"6":["27:28","28:4"],"7":["28:5","28:9"],M:["28:7","28:9"]},weekday:{"1":["25:19","25:22"],"2":["25:23","25:26"],"3":["25:27","26:5"]}};var Vayetzei={num:7,hebrew:"וַיֵּצֵא",book:1,haft:{k:"Hosea",b:"12:13",e:"14:10"},seph:{k:"Hosea",b:"11:7",e:"12:12"},fullkriyah:{"1":["28:10","28:22"],"2":["29:1","29:17"],"3":["29:18","30:13"],"4":["30:14","30:27"],"5":["30:28","31:16"],"6":["31:17","31:42"],"7":["31:43","32:3"],M:["32:1","32:3"]},weekday:{"1":["28:10","28:12"],"2":["28:13","28:17"],"3":["28:18","28:22"]}};var Vayishlach={num:8,hebrew:"וַיִּשְׁלַח",book:1,haft:{k:"Obadiah",b:"1:1",e:"1:21"},fullkriyah:{"1":["32:4","32:13"],"2":["32:14","32:30"],"3":["32:31","33:5"],"4":["33:6","33:20"],"5":["34:1","35:11"],"6":["35:12","36:19"],"7":["36:20","36:43"],M:["36:40","36:43"]},weekday:{"1":["32:4","32:6"],"2":["32:7","32:9"],"3":["32:10","32:13"]}};var Vayeshev={num:9,hebrew:"וַיֵּשֶׁב",book:1,haft:{k:"Amos",b:"2:6",e:"3:8"},fullkriyah:{"1":["37:1","37:11"],"2":["37:12","37:22"],"3":["37:23","37:36"],"4":["38:1","38:30"],"5":["39:1","39:6"],"6":["39:7","39:23"],"7":["40:1","40:23"],M:["40:20","40:23"]},weekday:{"1":["37:1","37:3"],"2":["37:4","37:7"],"3":["37:8","37:11"]}};var Miketz={num:10,hebrew:"מִקֵּץ",book:1,haft:{k:"I Kings",b:"3:15",e:"4:1"},fullkriyah:{"1":["41:1","41:14"],"2":["41:15","41:38"],"3":["41:39","41:52"],"4":["41:53","42:18"],"5":["42:19","43:15"],"6":["43:16","43:29"],"7":["43:30","44:17"],M:["44:14","44:17"]},weekday:{"1":["41:1","41:4"],"2":["41:5","41:7"],"3":["41:8","41:14"]}};var Vayigash={num:11,hebrew:"וַיִּגַּשׁ",book:1,haft:{k:"Ezekiel",b:"37:15",e:"37:28"},fullkriyah:{"1":["44:18","44:30"],"2":["44:31","45:7"],"3":["45:8","45:18"],"4":["45:19","45:27"],"5":["45:28","46:27"],"6":["46:28","47:10"],"7":["47:11","47:27"],M:["47:25","47:27"]},weekday:{"1":["44:18","44:20"],"2":["44:21","44:24"],"3":["44:25","44:30"]}};var Vayechi={num:12,hebrew:"וַיְחִי",book:1,haft:{k:"I Kings",b:"2:1",e:"2:12"},fullkriyah:{"1":["47:28","48:9"],"2":["48:10","48:16"],"3":["48:17","48:22"],"4":["49:1","49:18"],"5":["49:19","49:26"],"6":["49:27","50:20"],"7":["50:21","50:26"],M:["50:23","50:26"]},weekday:{"1":["47:28","47:31"],"2":["48:1","48:3"],"3":["48:4","48:9"]}};var Shemot={num:13,hebrew:"שְׁמוֹת",book:2,haft:[{k:"Isaiah",b:"27:6",e:"28:13"},{k:"Isaiah",b:"29:22",e:"29:23"}],seph:{k:"Jeremiah",b:"1:1",e:"2:3"},fullkriyah:{"1":["1:1","1:17"],"2":["1:18","2:10"],"3":["2:11","2:25"],"4":["3:1","3:15"],"5":["3:16","4:17"],"6":["4:18","4:31"],"7":["5:1","6:1"],M:["5:22","6:1"]},weekday:{"1":["1:1","1:7"],"2":["1:8","1:12"],"3":["1:13","1:17"]}};var Vaera={num:14,hebrew:"וָאֵרָא",book:2,haft:{k:"Ezekiel",b:"28:25",e:"29:21"},fullkriyah:{"1":["6:2","6:13"],"2":["6:14","6:28"],"3":["6:29","7:7"],"4":["7:8","8:6"],"5":["8:7","8:18"],"6":["8:19","9:16"],"7":["9:17","9:35"],M:["9:33","9:35"]},weekday:{"1":["6:2","6:5"],"2":["6:6","6:9"],"3":["6:10","6:13"]}};var Bo={num:15,hebrew:"בֹּא",book:2,haft:{k:"Jeremiah",b:"46:13",e:"46:28"},fullkriyah:{"1":["10:1","10:11"],"2":["10:12","10:23"],"3":["10:24","11:3"],"4":["11:4","12:20"],"5":["12:21","12:28"],"6":["12:29","12:51"],"7":["13:1","13:16"],M:["13:14","13:16"]},weekday:{"1":["10:1","10:3"],"2":["10:4","10:6"],"3":["10:7","10:11"]}};var Beshalach={num:16,hebrew:"בְּשַׁלַּח",book:2,haft:{k:"Judges",b:"4:4",e:"5:31"},seph:{k:"Judges",b:"5:1",e:"5:31"},fullkriyah:{"1":["13:17","14:8"],"2":["14:9","14:14"],"3":["14:15","14:25"],"4":["14:26","15:26"],"5":["15:27","16:10"],"6":["16:11","16:36"],"7":["17:1","17:16"],M:["17:14","17:16"]},weekday:{"1":["13:17","13:22"],"2":["14:1","14:4"],"3":["14:5","14:8"]}};var Yitro={num:17,hebrew:"יִתְרוֹ",book:2,haft:[{k:"Isaiah",b:"6:1",e:"7:6"},{k:"Isaiah",b:"9:5",e:"9:6"}],seph:{k:"Isaiah",b:"6:1",e:"6:13"},fullkriyah:{"1":["18:1","18:12"],"2":["18:13","18:23"],"3":["18:24","18:27"],"4":["19:1","19:6"],"5":["19:7","19:19"],"6":["19:20","20:14"],"7":["20:15","20:23"],M:["20:19","20:23"]},weekday:{"1":["18:1","18:4"],"2":["18:5","18:8"],"3":["18:9","18:12"]}};var Mishpatim={num:18,hebrew:"מִּשְׁפָּטִים",book:2,haft:[{k:"Jeremiah",b:"34:8",e:"34:22"},{k:"Jeremiah",b:"33:25",e:"33:26"}],fullkriyah:{"1":["21:1","21:19"],"2":["21:20","22:3"],"3":["22:4","22:26"],"4":["22:27","23:5"],"5":["23:6","23:19"],"6":["23:20","23:25"],"7":["23:26","24:18"],M:["24:15","24:18"]},weekday:{"1":["21:1","21:6"],"2":["21:7","21:11"],"3":["21:12","21:19"]}};var Terumah={num:19,hebrew:"תְּרוּמָה",book:2,haft:{k:"I Kings",b:"5:26",e:"6:13"},fullkriyah:{"1":["25:1","25:16"],"2":["25:17","25:30"],"3":["25:31","26:14"],"4":["26:15","26:30"],"5":["26:31","26:37"],"6":["27:1","27:8"],"7":["27:9","27:19"],M:["27:17","27:19"]},weekday:{"1":["25:1","25:5"],"2":["25:6","25:9"],"3":["25:10","25:16"]}};var Tetzaveh={num:20,hebrew:"תְּצַוֶּה",book:2,haft:{k:"Ezekiel",b:"43:10",e:"43:27"},fullkriyah:{"1":["27:20","28:12"],"2":["28:13","28:30"],"3":["28:31","28:43"],"4":["29:1","29:18"],"5":["29:19","29:37"],"6":["29:38","29:46"],"7":["30:1","30:10"],M:["30:8","30:10"]},weekday:{"1":["27:20","28:5"],"2":["28:6","28:9"],"3":["28:10","28:12"]}};var Vayakhel={num:22,hebrew:"וַיַּקְהֵל",book:2,haft:{k:"I Kings",b:"7:40",e:"7:50"},seph:{k:"I Kings",b:"7:13",e:"7:26"},fullkriyah:{"1":["35:1","35:20"],"2":["35:21","35:29"],"3":["35:30","36:7"],"4":["36:8","36:19"],"5":["36:20","37:16"],"6":["37:17","37:29"],"7":["38:1","38:20"],M:["38:18","38:20"]},weekday:{"1":["35:1","35:3"],"2":["35:4","35:10"],"3":["35:11","35:20"]}};var Pekudei={num:23,hebrew:"פְקוּדֵי",book:2,haft:{k:"I Kings",b:"7:51",e:"8:21"},seph:{k:"I Kings",b:"7:40",e:"7:50"},fullkriyah:{"1":["38:21","39:1"],"2":["39:2","39:21"],"3":["39:22","39:32"],"4":["39:33","39:43"],"5":["40:1","40:16"],"6":["40:17","40:27"],"7":["40:28","40:38"],M:["40:34","40:38"]},weekday:{"1":["38:21","38:23"],"2":["38:24","38:27"],"3":["38:28","39:1"]}};var Vayikra={num:24,hebrew:"וַיִּקְרָא",book:3,haft:{k:"Isaiah",b:"43:21",e:"44:23"},fullkriyah:{"1":["1:1","1:13"],"2":["1:14","2:6"],"3":["2:7","2:16"],"4":["3:1","3:17"],"5":["4:1","4:26"],"6":["4:27","5:10"],"7":["5:11","5:26"],M:["5:24","5:26"]},weekday:{"1":["1:1","1:4"],"2":["1:5","1:9"],"3":["1:10","1:13"]}};var Tzav={num:25,hebrew:"צַו",book:3,haft:[{k:"Jeremiah",b:"7:21",e:"8:3"},{k:"Jeremiah",b:"9:22",e:"9:23"}],fullkriyah:{"1":["6:1","6:11"],"2":["6:12","7:10"],"3":["7:11","7:38"],"4":["8:1","8:13"],"5":["8:14","8:21"],"6":["8:22","8:29"],"7":["8:30","8:36"],M:["8:33","8:36"]},weekday:{"1":["6:1","6:3"],"2":["6:4","6:6"],"3":["6:7","6:11"]}};var Shmini={num:26,hebrew:"שְּׁמִינִי",book:3,haft:{k:"II Samuel",b:"6:1",e:"7:17"},seph:{k:"II Samuel",b:"6:1",e:"6:19"},fullkriyah:{"1":["9:1","9:16"],"2":["9:17","9:23"],"3":["9:24","10:11"],"4":["10:12","10:15"],"5":["10:16","10:20"],"6":["11:1","11:32"],"7":["11:33","11:47"],M:["11:45","11:47"]},weekday:{"1":["9:1","9:6"],"2":["9:7","9:10"],"3":["9:11","9:16"]}};var Tazria={num:27,hebrew:"תַזְרִיעַ",book:3,haft:{k:"II Kings",b:"4:42",e:"5:19"},fullkriyah:{"1":["12:1","13:5"],"2":["13:6","13:17"],"3":["13:18","13:23"],"4":["13:24","13:28"],"5":["13:29","13:39"],"6":["13:40","13:54"],"7":["13:55","13:59"],M:["13:57","13:59"]},weekday:{"1":["12:1","12:4"],"2":["12:5","12:8"],"3":["13:1","13:5"]}};var Metzora={num:28,hebrew:"מְּצֹרָע",book:3,haft:{k:"II Kings",b:"7:3",e:"7:20"},fullkriyah:{"1":["14:1","14:12"],"2":["14:13","14:20"],"3":["14:21","14:32"],"4":["14:33","14:53"],"5":["14:54","15:15"],"6":["15:16","15:28"],"7":["15:29","15:33"],M:["15:31","15:33"]},weekday:{"1":["14:1","14:5"],"2":["14:6","14:9"],"3":["14:10","14:12"]}};var Kedoshim={num:30,hebrew:"קְדשִׁים",book:3,haft:{k:"Amos",b:"9:7",e:"9:15"},seph:{k:"Ezekiel",b:"20:2",e:"20:20"},fullkriyah:{"1":["19:1","19:14"],"2":["19:15","19:22"],"3":["19:23","19:32"],"4":["19:33","19:37"],"5":["20:1","20:7"],"6":["20:8","20:22"],"7":["20:23","20:27"],M:["20:25","20:27"]},weekday:{"1":["19:1","19:4"],"2":["19:5","19:10"],"3":["19:11","19:14"]}};var Emor={num:31,hebrew:"אֱמוֹר",book:3,haft:{k:"Ezekiel",b:"44:15",e:"44:31"},fullkriyah:{"1":["21:1","21:15"],"2":["21:16","22:16"],"3":["22:17","22:33"],"4":["23:1","23:22"],"5":["23:23","23:32"],"6":["23:33","23:44"],"7":["24:1","24:23"],M:["24:21","24:23"]},weekday:{"1":["21:1","21:6"],"2":["21:7","21:12"],"3":["21:13","21:15"]}};var Behar={num:32,hebrew:"בְּהַר",book:3,haft:{k:"Jeremiah",b:"32:6",e:"32:27"},fullkriyah:{"1":["25:1","25:13"],"2":["25:14","25:18"],"3":["25:19","25:24"],"4":["25:25","25:28"],"5":["25:29","25:38"],"6":["25:39","25:46"],"7":["25:47","26:2"],M:["25:55","26:2"]},weekday:{"1":["25:1","25:3"],"2":["25:4","25:7"],"3":["25:8","25:13"]}};var Bechukotai={num:33,hebrew:"בְּחֻקֹּתַי",book:3,haft:{k:"Jeremiah",b:"16:19",e:"17:14"},fullkriyah:{"1":["26:3","26:5"],"2":["26:6","26:9"],"3":["26:10","26:46"],"4":["27:1","27:15"],"5":["27:16","27:21"],"6":["27:22","27:28"],"7":["27:29","27:34"],M:["27:32","27:34"]},weekday:{"1":["26:3","26:5"],"2":["26:6","26:9"],"3":["26:10","26:13"]}};var Bamidbar={num:34,hebrew:"בְּמִדְבַּר",book:4,haft:{k:"Hosea",b:"2:1",e:"2:22"},fullkriyah:{"1":["1:1","1:19"],"2":["1:20","1:54"],"3":["2:1","2:34"],"4":["3:1","3:13"],"5":["3:14","3:39"],"6":["3:40","3:51"],"7":["4:1","4:20"],M:["4:17","4:20"]},weekday:{"1":["1:1","1:4"],"2":["1:5","1:16"],"3":["1:17","1:19"]}};var Nasso={num:35,hebrew:"נָשׂא",book:4,haft:{k:"Judges",b:"13:2",e:"13:25"},fullkriyah:{"1":["4:21","4:37"],"2":["4:38","4:49"],"3":["5:1","5:10"],"4":["5:11","6:27"],"5":["7:1","7:41"],"6":["7:42","7:71"],"7":["7:72","7:89"],M:["7:87","7:89"]},weekday:{"1":["4:21","4:24"],"2":["4:25","4:28"],"3":["4:29","4:33"]}};var Korach={num:38,hebrew:"קוֹרַח",book:4,haft:{k:"I Samuel",b:"11:14",e:"12:22"},fullkriyah:{"1":["16:1","16:13"],"2":["16:14","16:19"],"3":["16:20","17:8"],"4":["17:9","17:15"],"5":["17:16","17:24"],"6":["17:25","18:20"],"7":["18:21","18:32"],M:["18:30","18:32"]},weekday:{"1":["16:1","16:3"],"2":["16:4","16:7"],"3":["16:8","16:13"]}};var Chukat={num:39,hebrew:"חֻקַּת",book:4,haft:{k:"Judges",b:"11:1",e:"11:33"},fullkriyah:{"1":["19:1","19:17"],"2":["19:18","20:6"],"3":["20:7","20:13"],"4":["20:14","20:21"],"5":["20:22","21:9"],"6":["21:10","21:20"],"7":["21:21","22:1"],M:["21:34","22:1"]},weekday:{"1":["19:1","19:6"],"2":["19:7","19:9"],"3":["19:10","19:17"]}};var Balak={num:40,hebrew:"בָּלָק",book:4,haft:{k:"Micah",b:"5:6",e:"6:8"},fullkriyah:{"1":["22:2","22:12"],"2":["22:13","22:20"],"3":["22:21","22:38"],"4":["22:39","23:12"],"5":["23:13","23:26"],"6":["23:27","24:13"],"7":["24:14","25:9"],M:["25:7","25:9"]},weekday:{"1":["22:2","22:4"],"2":["22:5","22:7"],"3":["22:8","22:12"]}};var Pinchas={num:41,hebrew:"פִּינְחָס",book:4,haft:{k:"I Kings",b:"18:46",e:"19:21"},fullkriyah:{"1":["25:10","26:4"],"2":["26:5","26:51"],"3":["26:52","27:5"],"4":["27:6","27:23"],"5":["28:1","28:15"],"6":["28:16","29:11"],"7":["29:12","30:1"],M:["29:35","30:1"]},weekday:{"1":["25:10","25:12"],"2":["25:13","25:15"],"3":["25:16","26:4"]}};var Matot={num:42,hebrew:"מַּטּוֹת",book:4,haft:{k:"Jeremiah",b:"1:1",e:"2:3"},fullkriyah:{"1":["30:2","30:17"],"2":["31:1","31:12"],"3":["31:13","31:24"],"4":["31:25","31:41"],"5":["31:42","31:54"],"6":["32:1","32:19"],"7":["32:20","32:42"],M:["32:39","32:42"]},weekday:{"1":["30:2","30:9"],"2":["30:10","30:13"],"3":["30:14","30:17"]}};var Masei={num:43,hebrew:"מַסְעֵי",book:4,haft:[{k:"Jeremiah",b:"2:4",e:"2:28"},{k:"Jeremiah",b:"3:4",e:"3:4"}],seph:[{k:"Jeremiah",b:"2:4",e:"2:28"},{k:"Jeremiah",b:"4:1",e:"4:2"}],fullkriyah:{"1":["33:1","33:10"],"2":["33:11","33:49"],"3":["33:50","34:15"],"4":["34:16","34:29"],"5":["35:1","35:8"],"6":["35:9","35:34"],"7":["36:1","36:13"],M:["36:11","36:13"]},weekday:{"1":["33:1","33:3"],"2":["33:4","33:6"],"3":["33:7","33:10"]}};var Devarim={num:44,hebrew:"דְּבָרִים",book:5,haft:{k:"Isaiah",b:"1:1",e:"1:27"},fullkriyah:{"1":["1:1","1:10"],"2":["1:11","1:21"],"3":["1:22","1:38"],"4":["1:39","2:1"],"5":["2:2","2:30"],"6":["2:31","3:14"],"7":["3:15","3:22"],M:["3:20","3:22"]},weekday:{"1":["1:1","1:3"],"2":["1:4","1:7"],"3":["1:8","1:11"]}};var Vaetchanan={num:45,hebrew:"וָאֶתְחַנַּן",book:5,haft:{k:"Isaiah",b:"40:1",e:"40:26"},fullkriyah:{"1":["3:23","4:4"],"2":["4:5","4:40"],"3":["4:41","4:49"],"4":["5:1","5:18"],"5":["5:19","6:3"],"6":["6:4","6:25"],"7":["7:1","7:11"],M:["7:9","7:11"]},weekday:{"1":["3:23","3:25"],"2":["3:26","4:4"],"3":["4:5","4:8"]}};var Eikev={num:46,hebrew:"עֵקֶב",book:5,haft:{k:"Isaiah",b:"49:14",e:"51:3"},fullkriyah:{"1":["7:12","8:10"],"2":["8:11","9:3"],"3":["9:4","9:29"],"4":["10:1","10:11"],"5":["10:12","11:9"],"6":["11:10","11:21"],"7":["11:22","11:25"],M:["11:22","11:25"]},weekday:{"1":["7:12","7:21"],"2":["7:22","8:3"],"3":["8:4","8:10"]}};var Shoftim={num:48,hebrew:"שׁוֹפְטִים",book:5,haft:{k:"Isaiah",b:"51:12",e:"52:12"},fullkriyah:{"1":["16:18","17:13"],"2":["17:14","17:20"],"3":["18:1","18:5"],"4":["18:6","18:13"],"5":["18:14","19:13"],"6":["19:14","20:9"],"7":["20:10","21:9"],M:["21:7","21:9"]},weekday:{"1":["16:18","16:20"],"2":["16:21","17:10"],"3":["17:11","17:13"]}};var Nitzavim={num:51,hebrew:"נִצָּבִים",book:5,haft:{k:"Isaiah",b:"61:10",e:"63:9"},fullkriyah:{"1":["29:9","29:11"],"2":["29:12","29:14"],"3":["29:15","29:28"],"4":["30:1","30:6"],"5":["30:7","30:10"],"6":["30:11","30:14"],"7":["30:15","30:20"],M:["30:15","30:20"]},weekday:{"1":["29:9","29:11"],"2":["29:12","29:14"],"3":["29:15","29:28"]}};var Vayeilech={num:52,hebrew:"וַיֵּלֶךְ",book:5,haft:{k:"Isaiah",b:"55:6",e:"56:8"},fullkriyah:{"1":["31:1","31:3"],"2":["31:4","31:6"],"3":["31:7","31:9"],"4":["31:10","31:13"],"5":["31:14","31:19"],"6":["31:20","31:24"],"7":["31:25","31:30"],M:["31:28","31:30"]},weekday:{"1":["31:1","31:3"],"2":["31:4","31:6"],"3":["31:7","31:13"]}};var parshiyotObj = {Bereshit:Bereshit,Noach:Noach,"Lech-Lecha":{num:3,hebrew:"לֶךְ־לְךָ",book:1,haft:{k:"Isaiah",b:"40:27",e:"41:16"},fullkriyah:{"1":["12:1","12:13"],"2":["12:14","13:4"],"3":["13:5","13:18"],"4":["14:1","14:20"],"5":["14:21","15:6"],"6":["15:7","17:6"],"7":["17:7","17:27"],M:["17:24","17:27"]},weekday:{"1":["12:1","12:3"],"2":["12:4","12:9"],"3":["12:10","12:13"]}},Vayera:Vayera,"Chayei Sara":{num:5,hebrew:"חַיֵּי שָֹרָה",book:1,haft:{k:"I Kings",b:"1:1",e:"1:31"},fullkriyah:{"1":["23:1","23:16"],"2":["23:17","24:9"],"3":["24:10","24:26"],"4":["24:27","24:52"],"5":["24:53","24:67"],"6":["25:1","25:11"],"7":["25:12","25:18"],M:["25:16","25:18"]},weekday:{"1":["23:1","23:7"],"2":["23:8","23:12"],"3":["23:13","23:16"]}},Toldot:Toldot,Vayetzei:Vayetzei,Vayishlach:Vayishlach,Vayeshev:Vayeshev,Miketz:Miketz,Vayigash:Vayigash,Vayechi:Vayechi,Shemot:Shemot,Vaera:Vaera,Bo:Bo,Beshalach:Beshalach,Yitro:Yitro,Mishpatim:Mishpatim,Terumah:Terumah,Tetzaveh:Tetzaveh,"Ki Tisa":{num:21,hebrew:"כִּי תִשָּׂא",book:2,haft:{k:"I Kings",b:"18:1",e:"18:39"},seph:{k:"I Kings",b:"18:20",e:"18:39"},fullkriyah:{"1":["30:11","31:17"],"2":["31:18","33:11"],"3":["33:12","33:16"],"4":["33:17","33:23"],"5":["34:1","34:9"],"6":["34:10","34:26"],"7":["34:27","34:35"],M:["34:33","34:35"]},weekday:{"1":["30:11","30:13"],"2":["30:14","30:16"],"3":["30:17","30:21"]}},Vayakhel:Vayakhel,Pekudei:Pekudei,Vayikra:Vayikra,Tzav:Tzav,Shmini:Shmini,Tazria:Tazria,Metzora:Metzora,"Achrei Mot":{num:29,hebrew:"אַחֲרֵי מוֹת",book:3,haft:{k:"Ezekiel",b:"22:1",e:"22:19"},seph:{k:"Ezekiel",b:"22:1",e:"22:16"},fullkriyah:{"1":["16:1","16:17"],"2":["16:18","16:24"],"3":["16:25","16:34"],"4":["17:1","17:7"],"5":["17:8","18:5"],"6":["18:6","18:21"],"7":["18:22","18:30"],M:["18:28","18:30"]},weekday:{"1":["16:1","16:6"],"2":["16:7","16:11"],"3":["16:12","16:17"]}},Kedoshim:Kedoshim,Emor:Emor,Behar:Behar,Bechukotai:Bechukotai,Bamidbar:Bamidbar,Nasso:Nasso,"Beha'alotcha":{num:36,hebrew:"בְּהַעֲלֹתְךָ",book:4,haft:{k:"Zechariah",b:"2:14",e:"4:7"},fullkriyah:{"1":["8:1","8:14"],"2":["8:15","8:26"],"3":["9:1","9:14"],"4":["9:15","10:10"],"5":["10:11","10:34"],"6":["10:35","11:29"],"7":["11:30","12:16"],M:["12:14","12:16"]},weekday:{"1":["8:1","8:4"],"2":["8:5","8:9"],"3":["8:10","8:14"]}},"Sh'lach":{num:37,hebrew:"שְׁלַח־לְךָ",book:4,haft:{k:"Joshua",b:"2:1",e:"2:24"},fullkriyah:{"1":["13:1","13:20"],"2":["13:21","14:7"],"3":["14:8","14:25"],"4":["14:26","15:7"],"5":["15:8","15:16"],"6":["15:17","15:26"],"7":["15:27","15:41"],M:["15:37","15:41"]},weekday:{"1":["13:1","13:3"],"2":["13:4","13:16"],"3":["13:17","13:20"]}},Korach:Korach,Chukat:Chukat,Balak:Balak,Pinchas:Pinchas,Matot:Matot,Masei:Masei,Devarim:Devarim,Vaetchanan:Vaetchanan,Eikev:Eikev,"Re'eh":{num:47,hebrew:"רְאֵה",book:5,haft:{k:"Isaiah",b:"54:11",e:"55:5"},fullkriyah:{"1":["11:26","12:10"],"2":["12:11","12:28"],"3":["12:29","13:19"],"4":["14:1","14:21"],"5":["14:22","14:29"],"6":["15:1","15:18"],"7":["15:19","16:17"],M:["16:13","16:17"]},weekday:{"1":["11:26","11:31"],"2":["11:32","12:5"],"3":["12:6","12:10"]}},Shoftim:Shoftim,"Ki Teitzei":{num:49,hebrew:"כִּי־תֵצֵא",book:5,haft:{k:"Isaiah",b:"54:1",e:"54:10"},fullkriyah:{"1":["21:10","21:21"],"2":["21:22","22:7"],"3":["22:8","23:7"],"4":["23:8","23:24"],"5":["23:25","24:4"],"6":["24:5","24:13"],"7":["24:14","25:19"],M:["25:17","25:19"]},weekday:{"1":["21:10","21:14"],"2":["21:15","21:17"],"3":["21:18","21:21"]}},"Ki Tavo":{num:50,hebrew:"כִּי־תָבוֹא",book:5,haft:{k:"Isaiah",b:"60:1",e:"60:22"},fullkriyah:{"1":["26:1","26:11"],"2":["26:12","26:15"],"3":["26:16","26:19"],"4":["27:1","27:10"],"5":["27:11","28:6"],"6":["28:7","28:69"],"7":["29:1","29:8"],M:["29:6","29:8"]},weekday:{"1":["26:1","26:3"],"2":["26:4","26:11"],"3":["26:12","26:15"]}},Nitzavim:Nitzavim,Vayeilech:Vayeilech,"Ha'Azinu":{num:53,hebrew:"הַאֲזִינוּ",book:5,haft:{k:"II Samuel",b:"22:1",e:"22:51"},fullkriyah:{"1":["32:1","32:6"],"2":["32:7","32:12"],"3":["32:13","32:18"],"4":["32:19","32:28"],"5":["32:29","32:39"],"6":["32:40","32:43"],"7":["32:44","32:52"],M:["32:48","32:52"]},weekday:{"1":["32:1","32:3"],"2":["32:4","32:6"],"3":["32:7","32:12"]}},"Vezot Haberakhah":{num:54,hebrew:"וְזֹאת הַבְּרָכָה",book:5,haft:{k:"Joshua",b:"1:1",e:"1:18"},seph:{k:"Joshua",b:"1:1",e:"1:9"},fullkriyah:{"1":["33:1","33:7"],"2":["33:8","33:12"],"3":["33:13","33:17"],"4":["33:18","33:21"],"5":["33:22","33:26"],"6":["33:27","33:29"],"7":["34:1","34:12"]},weekday:{"1":["33:1","33:7"],"2":["33:8","33:12"],"3":["33:13","33:17"]}},"Vayakhel-Pekudei":{num:101,combined:true,p1:"Vayakhel",p2:"Pekudei",num1:22,num2:23,book:2,fullkriyah:{"1":["35:1","35:29"],"2":["35:30","37:16"],"3":["37:17","37:29"],"4":["38:1","39:1"],"5":["39:2","39:21"],"6":["39:22","39:43"],"7":["40:1","40:38"],M:["40:34","40:38"]}},"Tazria-Metzora":{num:102,combined:true,p1:"Tazria",p2:"Metzora",num1:27,num2:28,book:3,fullkriyah:{"1":["12:1","13:23"],"2":["13:24","13:39"],"3":["13:40","13:54"],"4":["13:55","14:20"],"5":["14:21","14:32"],"6":["14:33","15:15"],"7":["15:16","15:33"],M:["15:31","15:33"]}},"Achrei Mot-Kedoshim":{num:103,combined:true,p1:"Achrei Mot",p2:"Kedoshim",num1:29,num2:30,book:3,fullkriyah:{"1":["16:1","16:24"],"2":["16:25","17:7"],"3":["17:8","18:21"],"4":["18:22","19:14"],"5":["19:15","19:32"],"6":["19:33","20:7"],"7":["20:8","20:27"],M:["20:25","20:27"]}},"Behar-Bechukotai":{num:104,combined:true,p1:"Behar",p2:"Bechukotai",num1:32,num2:33,book:3,fullkriyah:{"1":["25:1","25:18"],"2":["25:19","25:28"],"3":["25:29","25:38"],"4":["25:39","26:9"],"5":["26:10","26:46"],"6":["27:1","27:15"],"7":["27:16","27:34"],M:["27:32","27:34"]}},"Chukat-Balak":{num:105,combined:true,p1:"Chukat",p2:"Balak",num1:39,num2:40,book:4,fullkriyah:{"1":["19:1","20:6"],"2":["20:7","20:21"],"3":["20:22","21:20"],"4":["21:21","22:12"],"5":["22:13","22:38"],"6":["22:39","23:26"],"7":["23:27","25:9"],M:["25:7","25:9"]}},"Matot-Masei":{num:106,combined:true,p1:"Matot",p2:"Masei",num1:42,num2:43,book:4,fullkriyah:{"1":["30:2","31:12"],"2":["31:13","31:54"],"3":["32:1","32:19"],"4":["32:20","33:49"],"5":["33:50","34:15"],"6":["34:16","35:8"],"7":["35:9","36:13"],M:["36:11","36:13"]}},"Nitzavim-Vayeilech":{num:107,combined:true,p1:"Nitzavim",p2:"Vayeilech",num1:51,num2:52,book:5,fullkriyah:{"1":["29:9","29:28"],"2":["30:1","30:6"],"3":["30:7","30:14"],"4":["30:15","31:6"],"5":["31:7","31:13"],"6":["31:14","31:19"],"7":["31:20","31:30"],M:["31:28","31:30"]}}};
@@ -1711,8 +1661,10 @@ var Bereshit={num:1,hebrew:"בְּרֵאשִׁית",book:1,haft:{k:"Isaiah",b:"4
  */
 function getLeyningForHoliday(ev) {
   var il = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  if (_typeof(ev) !== 'object' || !(ev instanceof core.Event)) {
+  if (_typeof(ev) !== 'object' || typeof ev.getFlags !== 'function') {
     throw new TypeError("Bad event argument: ".concat(ev));
+  } else if (typeof ev.eventTime !== 'undefined') {
+    return undefined;
   } else if (ev.getFlags() & core.flags.PARSHA_HASHAVUA) {
     throw new TypeError("Event should be a holiday: ".concat(ev.getDesc()));
   } else if (ev.getFlags() & HOLIDAY_IGNORE_MASK) {
@@ -1794,16 +1746,12 @@ function getHaftaraKey(parsha) {
 
 /**
  * Looks up regular leyning for a weekly parsha with no special readings
+ * @private
  * @param {string|string[]} parsha untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei']
  * @return {Leyning} map of aliyot
  */
-function getLeyningForParsha(parsha) {
-  var isParshaString = typeof parsha === 'string';
-  if (!isParshaString && (!Array.isArray(parsha) || parsha.length !== 1 && parsha.length !== 2)) {
-    throw new TypeError("Bad parsha argument: ".concat(parsha));
-  }
-  var name = isParshaString ? parsha : parshaToString(parsha);
-  var raw = parshiyotObj[name];
+function getLeyningForParshaShabbatOnly(parsha) {
+  var raw = lookupParsha(parsha);
   var fullkriyah = {};
   var book = BOOK[raw.book];
   Object.keys(raw.fullkriyah).forEach(function (num) {
@@ -1818,7 +1766,8 @@ function getLeyningForParsha(parsha) {
   Object.values(fullkriyah).map(function (aliyah) {
     return calculateNumVerses(aliyah);
   });
-  var parshaNameArray = isParshaString ? raw.combined ? [raw.p1, raw.p2] : [parsha] : parsha;
+  var name = parshaToString(parsha);
+  var parshaNameArray = raw.combined ? [raw.p1, raw.p2] : [name];
   var parts = makeLeyningParts(fullkriyah);
   var summary = makeSummaryFromParts(parts);
   /** @type {Leyning} */
@@ -1849,20 +1798,45 @@ function getLeyningForParsha(parsha) {
     result.sephardic = makeSummaryFromParts(seph);
     result.sephardicNumV = sumVerses(seph);
   }
-  var weekdaySrc = raw.weekday || parshiyotObj[parshaNameArray[0]].weekday;
-  if (weekdaySrc) {
-    var weekday = result.weekday = {};
-    ['1', '2', '3'].forEach(function (num) {
-      var src = weekdaySrc[num];
-      var aliyah = {
-        k: book,
-        b: src[0],
-        e: src[1]
-      };
-      calculateNumVerses(aliyah);
-      weekday[num] = aliyah;
-    });
+  return result;
+}
+
+/**
+ * Looks up Monday/Thursday aliyot for a regular parsha
+ * @param {string|string[]} parsha untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei']
+ * @return {Object<string,Aliyah>} map of aliyot
+ */
+function getWeekdayReading(parsha) {
+  var raw = lookupParsha(parsha);
+  var parshaMeta = raw.combined ? lookupParsha(raw.p1) : raw;
+  var aliyot = parshaMeta.weekday;
+  if (!aliyot) {
+    throw new Error("Parsha missing weekday: ".concat(parsha));
+  }
+  var book = BOOK[raw.book];
+  var weekday = {};
+  for (var i = 1; i <= 3; i++) {
+    var num = '' + i;
+    var src = aliyot[num];
+    var aliyah = {
+      k: book,
+      b: src[0],
+      e: src[1]
+    };
+    calculateNumVerses(aliyah);
+    weekday[num] = aliyah;
   }
+  return weekday;
+}
+
+/**
+ * Looks up regular leyning for a weekly parsha with no special readings
+ * @param {string|string[]} parsha untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei']
+ * @return {Leyning} map of aliyot
+ */
+function getLeyningForParsha(parsha) {
+  var result = getLeyningForParshaShabbatOnly(parsha);
+  result.weekday = getWeekdayReading(parsha);
   return result;
 }
 
@@ -1875,29 +1849,30 @@ function getLeyningForParsha(parsha) {
  */
 function getLeyningForParshaHaShavua(ev) {
   var il = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  if (!ev instanceof core.Event) {
+  if (_typeof(ev) !== 'object' || typeof ev.getFlags !== 'function') {
     throw new TypeError("Bad event argument: ".concat(ev));
   } else if (ev.getFlags() != core.flags.PARSHA_HASHAVUA) {
     throw new TypeError("Event must be parsha hashavua: ".concat(ev.getDesc()));
   }
   // first, collect the default aliyot and haftara
   var parsha = ev.parsha;
-  var result = getLeyningForParsha(parsha);
-  var reason = {};
+  var result = getLeyningForParshaShabbatOnly(parsha);
   var hd = ev.getDate();
   // Now, check for special maftir or haftara on same date
-  var specialHaftara = specialReadings(hd, il, result.fullkriyah, reason, parsha, true);
-  if (specialHaftara) {
-    var haft = result.haft = cloneHaftara(specialHaftara.haft);
+  var special = specialReadings2(parsha, hd, il, result.fullkriyah);
+  var reason = special.reason;
+  if (special.haft) {
+    var haft = result.haft = cloneHaftara(special.haft);
     result.haftara = makeSummaryFromParts(haft);
     result.haftaraNumV = sumVerses(haft);
-    if (specialHaftara.seph) {
-      var seph = result.seph = cloneHaftara(specialHaftara.seph);
+    if (special.seph) {
+      var seph = result.seph = cloneHaftara(special.seph);
       result.sephardic = makeSummaryFromParts(seph);
       result.sephardicNumV = sumVerses(seph);
     }
   }
   if (reason['7'] || reason['M']) {
+    result.fullkriyah = special.aliyot;
     var parts = makeLeyningParts(result.fullkriyah);
     result.summary = makeSummaryFromParts(parts);
     result.summaryParts = parts;
@@ -1920,8 +1895,6 @@ function getLeyningForParshaHaShavua(ev) {
       }
     });
   }
-  // to avoid confusion, don't include Saturday mincha reading here
-  delete result.weekday;
   return result;
 }
 
@@ -2016,15 +1989,11 @@ function findParshaHaShavua(saturday, il) {
 
 /**
  * Returns the parsha metadata
- * @param {string|string[]} parsha
+ * @param {string|string[]} parsha untranslated name like 'Pinchas' or ['Pinchas'] or ['Matot','Masei']
  * @return {ParshaMeta}
  */
 function lookupParsha(parsha) {
-  var isParshaString = typeof parsha === 'string';
-  if (!isParshaString && (!Array.isArray(parsha) || parsha.length !== 1 && parsha.length !== 2)) {
-    throw new TypeError("Bad parsha argument: ".concat(parsha));
-  }
-  var name = isParshaString ? parsha : parshaToString(parsha);
+  var name = parshaToString(parsha);
   var raw = parshiyotObj[name];
   if (_typeof(raw) !== 'object') {
     throw new TypeError("Bad parsha argument: ".concat(parsha));
@@ -2220,6 +2189,7 @@ exports.getLeyningForParshaHaShavua = getLeyningForParshaHaShavua;
 exports.getLeyningKeyForEvent = getLeyningKeyForEvent;
 exports.getLeyningOnDate = getLeyningOnDate;
 exports.getParshaDates = getParshaDates;
+exports.getWeekdayReading = getWeekdayReading;
 exports.hasFestival = hasFestival;
 exports.lookupFestival = lookupFestival;
 exports.lookupParsha = lookupParsha;
@@ -2227,7 +2197,7 @@ exports.makeLeyningParts = makeLeyningParts;
 exports.makeLeyningSummary = makeLeyningSummary;
 exports.makeSummaryFromParts = makeSummaryFromParts;
 exports.parshaToString = parshaToString;
-exports.specialReadings = specialReadings;
+exports.specialReadings2 = specialReadings2;
 exports.sumVerses = sumVerses;
 exports.writeCsvLines = writeCsvLines;
 exports.writeFullKriyahCsv = writeFullKriyahCsv;