bible-passage-reference-parser 3.1.0 → 3.2.0

package/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2024 Stephen Smith
+Copyright (c) 2011-2026 Stephen Smith
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/{Readme.md → README.md}

@@ -300,7 +300,7 @@ The `chapters` key lists the number of verses in each chapter: `chapters["Gen"][
   * `bc`: OSIS refs get reduced to complete chapters if possible, but not whole books. "Gen.1.1-Gen.50.26" → "Gen.1-Gen.50".
   * `bcp`: Same as `bc` but preserves partial verses when they appear. "Genesis 1:1a-50:26" parses as "Gen.1.1!a-Gen.50.26", while "Genesis 1:1-50:25" still parses as "Gen.1-Gen.50".
   * `bcv`: OSIS refs always include the full book, chapter, and verse. "Gen.1" → "Gen.1.1-Gen.1.31".
-  * `bcvp`: Same as `bc` but preserves partial verses when they appear. "Gen 1:1a" parses as "Gen.1.1!a", while "Genesis 1:1" still parses as "Gen.1.1". In all these `p` cases, the "partial" indicator is returned exactly as it appears in the text, so non-Latin languages may have non-Latin characters after the `!` character in the OSIS ref.
+  * `bcvp`: Same as `bcv` but preserves partial verses when they appear. "Gen 1:1a" parses as "Gen.1.1!a", while "Genesis 1:1" still parses as "Gen.1.1". In all these `p` cases, the "partial" indicator is returned exactly as it appears in the text, so non-Latin languages may have non-Latin characters after the `!` character in the OSIS ref.
 
 ### Sequence
 
@@ -592,7 +592,7 @@ This dataset has a few limitations:
 
 ## OSIS
 
-[OSIS](https://crosswire.org/osis/) is a system for marking up Bibles in XML. The BCV parser only borrows the OSIS system for [book abbreviations](http://www.crosswire.org/wiki/OSIS_Book_Abbreviations) and references. You can control the OSIS specificity using the `osis_compaction_strategy` option. I like OSIS references because, programmatically, they're easy to handle.
+[OSIS](https://crosswire.org/osis/) is a system for marking up Bibles in XML. The BCV parser only borrows the OSIS system for [book abbreviations](http://www.crosswire.org/wiki/OSIS_Book_Abbreviations) and references. You can control the OSIS specificity using the `osis_compaction_strategy` option. I like OSIS references because, programmatically, they're easy to handle: they always include a book name along with optional chapters, verses, and partial verses, depending on the level of specificity you need.
 
 The parser emits `GkEsth` for Greek Esther rather than just `Esth`. It can include `Ps151` as part of the Psalms (`Ps.151.1`)—the default—or as its own book (`Ps151.1.1`), depending on the `ps151_strategy` option.
 
@@ -650,7 +650,7 @@ The third tricky case stems from strings like `Psalm 123-24`. The grammar output
 
 The fourth tricky case resembles the first one: `Jeremiah 33-11` isn't the invalid range `Jer.33-Jer.11` but rather the `bcv` `Jer.33.11`.
 
-If we still couldn't make sense of the range, then we treat is as a sequence of verses instead of a range: `Psalm 120-119` becomes `Ps.120,Ps.119`.
+If we still couldn't make sense of the range, then we treat it as a sequence of verses instead of a range: `Psalm 120-119` becomes `Ps.120,Ps.119`.
 
 ### Translations
 
@@ -853,12 +853,19 @@ The code in this project is licensed under the standard MIT License.
 
 Here are improvements I have in mind for this parser.
 
-1. Change the build process to be less finicky. The Perl is brittle and hard to debug. I'd like to remove nearly all the compile-time logic. Target release: 4.0.0 (January 2026).
-2. Move language-definition files to a new repo to decouple the core parser logic from the language data, now that (as of 3.1.0) each language no longer requires its own grammar. This change will also allow adding significantly more languages but will require using ES Modules to take advantage of them, so the CommonJS interface will likely be deprecated in 4.0.0 (though current files will remain for backwards compatibility). Existing language support will stay in the current repo so that there are no new dependencies for existing languages, but all the raw language data will likely move elsewhere. Target release: 4.0.0.
-3. Improve type usage. This is my first experience with Typescript, and I'm confident a lot can be improved.
+1. Fully migrate language source files (but not the existing language files in `esm` so that you don't need to change any existing code) out of this repo. Target release: 4.0.0 (July 2026).
+2. Improve type usage. This is my first experience with Typescript, and I'm confident a lot can be improved.
 
 ## Changelog
 
+January 31, 2026 (3.2.0). Full release on Github and npm.
+
+January 28, 2026 (3.2.0-beta).
+
+* This release deprecates the language data files in `src/`. They're rebuilt in (hopefully) more-understandable yaml files in a [new repo](https://github.com/openbibleinfo/Bible-Passage-Reference-Parser-Languages). This change allows the core parser and language files to evolve independently and provides a sounder, less "magical" technical foundation for the languages. The 4.0.0 release will remove the source language files and related build code. To preserve backwards compatibility, there will be no changes to the languages in `esm/` or `js/`. But the language files in `esm/` will be replaced by newly built language files from the new repo. Most importantly, you don't need to change any existing code. If you want to try the new repo, you can clone it and `import` the language file that you want from there.
+* Fixed `add_books()` custom patterns so that `osis_and_indices()` works without requiring capture groups. (Thanks to [emmaus-zam](https://github.com/emmaus-zam) for reporting this. Closes #70.)
+
+
 July 31, 2025 (3.1.0). Full release on Github and npm. Ensured `add_translations()` reflects the current `case_sensitive` option.
 
 July 29, 2025 (3.1.0-beta). Added `bp` and `bcp` for `osis_compaction_strategy` so that you can work at the level of precision that's right for your application. Fixed a bug in `grammar` options that wouldn't always respect `c_sep` values.

package/cjs/mk_bcv_parser.js

@@ -5086,12 +5086,12 @@ var bcv_regexps = class {
       {
         osis: ["Gen"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*книга\s*Мојсеева|[1I]\.\s*книга\s*Мојсеева|[1I]\s*книга\s*Мојсеева|Настанување|Битие|Gen))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*)?Мојсеева|[1I]\.\s*(?:книга\s*)?Мојсеева|[1I]\s*(?:книга\s*)?Мојсеева|Настанување|Битие|Gen))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Exod"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*книга\s*Мојсеева|(?:II|2)\.\s*книга\s*Мојсеева|(?:II|2)\s*книга\s*Мојсеева|Излез|Exod))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*)?Мојсеева|(?:II|2)\.\s*(?:книга\s*)?Мојсеева|(?:II|2)\s*(?:книга\s*)?Мојсеева|Излез|Exod))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Bel"],
@@ -5101,12 +5101,12 @@ var bcv_regexps = class {
       {
         osis: ["Lev"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Трета\s*книга\s*Мојсеева|Левитска\s*книга|Левит(?:ска)?|Lev))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Трет[ао]\s*(?:книга\s*)?Мојсеева|(?:III|3)\.\s*(?:книга\s*)?Мојсеева|(?:III|3)\s*(?:книга\s*)?Мојсеева|Левитска\s*книга|Левит(?:ска)?|Lev))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Num"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Четврта\s*книга\s*Мојсеева|Броеви|Num))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Четврта\s*(?:книга\s*)?Мојсеева|(?:IV|4)\.\s*(?:книга\s*)?Мојсеева|(?:IV|4)\s*(?:книга\s*)?Мојсеева|Броеви|Num))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Sir"],
@@ -5141,7 +5141,7 @@ var bcv_regexps = class {
       {
         osis: ["Deut"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:П(?:етта\s*книга\s*Мојсеева|овторени\s*закони)|Второзаконие|Deut))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:П(?:етта\s*(?:книга\s*)?Мојсеева|овторени\s*закони)|[5V]\.\s*(?:книга\s*)?Мојсеева|[5V]\s*(?:книга\s*)?Мојсеева|Второзаконие|Deut))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Josh"],
@@ -5156,7 +5156,7 @@ var bcv_regexps = class {
       {
         osis: ["Ruth"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Ruth|Рут))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Ruth|Рута?))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Esd"],
@@ -5176,22 +5176,22 @@ var bcv_regexps = class {
       {
         osis: ["2Sam"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*Самоилова|Самуил)|(?:II|2)\.\s*(?:книга\s*Самоилова|Самуил)|(?:II|2)\s*(?:книга\s*Самоилова|Самуил)|2Sam))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|(?:II|2)\.\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|(?:II|2)\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|2Sam))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Sam"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*Самоилова|Самуил)|[1I]\.\s*(?:книга\s*Самоилова|Самуил)|[1I]\s*(?:книга\s*Самоилова|Самуил)|1Sam))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|[1I]\.\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|[1I]\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|1Sam))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["2Kgs"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*за\s*царевите|Цареви)|(?:II|2)\.\s*(?:книга\s*за\s*царевите|Цареви)|(?:II|2)\s*(?:книга\s*за\s*царевите|Цареви)|2Kgs))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|(?:II|2)\.\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|(?:II|2)\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|2Kgs))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Kgs"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*за\s*царевите|Цареви)|[1I]\.\s*(?:книга\s*за\s*царевите|Цареви)|[1I]\s*(?:книга\s*за\s*царевите|Цареви)|1Kgs))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|[1I]\.\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|[1I]\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|1Kgs))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["2Chr"],
@@ -5206,7 +5206,7 @@ var bcv_regexps = class {
       {
         osis: ["Ezra"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Ezra|Езра))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Езд?ра|Ezra))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Neh"],
@@ -5242,7 +5242,7 @@ var bcv_regexps = class {
       {
         osis: ["Prov"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Пословици|Изреки|Prov))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Мудри\s*изреки|Пословици|Изреки|Prov))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Eccl"],
@@ -5257,7 +5257,7 @@ var bcv_regexps = class {
       {
         osis: ["Song"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Песна(?:та\s*на(?:д\s*песните|\s*Соломон)|\s*над\s*песните)|Црковни\s*химни|Song))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Песна(?:та\s*на(?:д\s*песните|\s*Соломон)|\s*на(?:д\s*песните|\s*Соломон))|Song))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Jer"],
@@ -5372,7 +5372,7 @@ var bcv_regexps = class {
       {
         osis: ["Acts"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Дела(?:\s*(?:на\s*(?:светите\s*апостоли|апостолите)|Ап))?|Acts))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Дела(?:\s*(?:на\s*(?:светите\s*апостоли|апостолите)|апостолски|Ап))?|Acts))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Rom"],
@@ -5382,22 +5382,22 @@ var bcv_regexps = class {
       {
         osis: ["2Cor"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|2Cor))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|2Cor))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Cor"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|1Cor))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|1Cor))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Gal"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Галатија|Галат(?:јани|ите)|Gal))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Галатија|Галат(?:јан)?ите|Галатјани|Gal))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Eph"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Ефес|Ефе(?:шаните|сјани)|Eph))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Ефес|Ефе(?:сј|ш)аните|Ефесјани|Eph))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Phil"],
@@ -5407,27 +5407,27 @@ var bcv_regexps = class {
       {
         osis: ["Col"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Колос|Коло(?:шаните|сјани)|Col))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Колос|Коло(?:сј|ш)аните|Колосјани|Col))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["2Thess"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|2Thess))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|2Thess))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Thess"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|1Thess))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|1Thess))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["2Tim"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|2Tim))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|2Tim))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Tim"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|1Tim))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|1Tim))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Titus"],

package/esm/bcv_parser.js

@@ -4740,7 +4740,7 @@ var bcv_regexps_manager = class {
       }
       const book_data = this.get_book_testaments(pattern);
       const regexps = this.get_book_pattern_regexps(pattern, book_data);
-      const regexp = new RegExp(regexps.pre_regexp.source + regexps.regexp.source + regexps.post_regexp.source, "giu");
+      const regexp = new RegExp(regexps.pre_regexp.source + "(" + regexps.regexp.source + ")" + regexps.post_regexp.source, "giu");
       const position = typeof pattern.insert_at === "string" ? pattern.insert_at : "start";
       const insert_object = {
         osis: pattern.osis,
@@ -5030,7 +5030,7 @@ var bcv_parser = class {
     if (lang == null) {
       if (typeof grammar === "undefined") {
         throw `When creating a new bcv_parser object using ES Modules, please provide a language object. For example, here's how to provide English:
-import * as lang from "es/lang/en.js";
+import * as lang from "esm/lang/en.js";
 const bcv = new bcv_parser(lang);`;
       }
       this.translations = new bcv_translations();

package/esm/lang/mk.js

@@ -36,12 +36,12 @@ var bcv_regexps = class {
       {
         osis: ["Gen"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*книга\s*Мојсеева|[1I]\.\s*книга\s*Мојсеева|[1I]\s*книга\s*Мојсеева|Настанување|Битие|Gen))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*)?Мојсеева|[1I]\.\s*(?:книга\s*)?Мојсеева|[1I]\s*(?:книга\s*)?Мојсеева|Настанување|Битие|Gen))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Exod"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*книга\s*Мојсеева|(?:II|2)\.\s*книга\s*Мојсеева|(?:II|2)\s*книга\s*Мојсеева|Излез|Exod))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*)?Мојсеева|(?:II|2)\.\s*(?:книга\s*)?Мојсеева|(?:II|2)\s*(?:книга\s*)?Мојсеева|Излез|Exod))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Bel"],
@@ -51,12 +51,12 @@ var bcv_regexps = class {
       {
         osis: ["Lev"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Трета\s*книга\s*Мојсеева|Левитска\s*книга|Левит(?:ска)?|Lev))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Трет[ао]\s*(?:книга\s*)?Мојсеева|(?:III|3)\.\s*(?:книга\s*)?Мојсеева|(?:III|3)\s*(?:книга\s*)?Мојсеева|Левитска\s*книга|Левит(?:ска)?|Lev))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Num"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Четврта\s*книга\s*Мојсеева|Броеви|Num))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Четврта\s*(?:книга\s*)?Мојсеева|(?:IV|4)\.\s*(?:книга\s*)?Мојсеева|(?:IV|4)\s*(?:книга\s*)?Мојсеева|Броеви|Num))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Sir"],
@@ -91,7 +91,7 @@ var bcv_regexps = class {
       {
         osis: ["Deut"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:П(?:етта\s*книга\s*Мојсеева|овторени\s*закони)|Второзаконие|Deut))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:П(?:етта\s*(?:книга\s*)?Мојсеева|овторени\s*закони)|[5V]\.\s*(?:книга\s*)?Мојсеева|[5V]\s*(?:книга\s*)?Мојсеева|Второзаконие|Deut))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Josh"],
@@ -106,7 +106,7 @@ var bcv_regexps = class {
       {
         osis: ["Ruth"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Ruth|Рут))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Ruth|Рута?))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Esd"],
@@ -126,22 +126,22 @@ var bcv_regexps = class {
       {
         osis: ["2Sam"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*Самоилова|Самуил)|(?:II|2)\.\s*(?:книга\s*Самоилова|Самуил)|(?:II|2)\s*(?:книга\s*Самоилова|Самуил)|2Sam))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|(?:II|2)\.\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|(?:II|2)\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|2Sam))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Sam"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*Самоилова|Самуил)|[1I]\.\s*(?:книга\s*Самоилова|Самуил)|[1I]\s*(?:книга\s*Самоилова|Самуил)|1Sam))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|[1I]\.\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|[1I]\s*(?:книга\s*Самоилова|Сам(?:уил(?:ова)?|оилова))|1Sam))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["2Kgs"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*за\s*царевите|Цареви)|(?:II|2)\.\s*(?:книга\s*за\s*царевите|Цареви)|(?:II|2)\s*(?:книга\s*за\s*царевите|Цареви)|2Kgs))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|(?:II|2)\.\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|(?:II|2)\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|2Kgs))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Kgs"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*за\s*царевите|Цареви)|[1I]\.\s*(?:книга\s*за\s*царевите|Цареви)|[1I]\s*(?:книга\s*за\s*царевите|Цареви)|1Kgs))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|[1I]\.\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|[1I]\s*(?:книга\s*(?:за\s*царевите|цареви(?:те)?)|Цареви(?:те)?)|1Kgs))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["2Chr"],
@@ -156,7 +156,7 @@ var bcv_regexps = class {
       {
         osis: ["Ezra"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Ezra|Езра))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Езд?ра|Ezra))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Neh"],
@@ -192,7 +192,7 @@ var bcv_regexps = class {
       {
         osis: ["Prov"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Пословици|Изреки|Prov))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Мудри\s*изреки|Пословици|Изреки|Prov))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Eccl"],
@@ -207,7 +207,7 @@ var bcv_regexps = class {
       {
         osis: ["Song"],
         testament: "o",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Песна(?:та\s*на(?:д\s*песните|\s*Соломон)|\s*над\s*песните)|Црковни\s*химни|Song))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Песна(?:та\s*на(?:д\s*песните|\s*Соломон)|\s*на(?:д\s*песните|\s*Соломон))|Song))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Jer"],
@@ -322,7 +322,7 @@ var bcv_regexps = class {
       {
         osis: ["Acts"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Дела(?:\s*(?:на\s*(?:светите\s*апостоли|апостолите)|Ап))?|Acts))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Дела(?:\s*(?:на\s*(?:светите\s*апостоли|апостолите)|апостолски|Ап))?|Acts))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Rom"],
@@ -332,22 +332,22 @@ var bcv_regexps = class {
       {
         osis: ["2Cor"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|2Cor))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|2Cor))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Cor"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:[кќ]аните|тјани))|1Cor))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Коринт|Корин(?:(?:тј|[кќ])аните|(?:тј|[кќ])ани))|1Cor))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Gal"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Галатија|Галат(?:јани|ите)|Gal))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Галатија|Галат(?:јан)?ите|Галатјани|Gal))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Eph"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Ефес|Ефе(?:шаните|сјани)|Eph))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Ефес|Ефе(?:сј|ш)аните|Ефесјани|Eph))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Phil"],
@@ -357,27 +357,27 @@ var bcv_regexps = class {
       {
         osis: ["Col"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Колос|Коло(?:шаните|сјани)|Col))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}]))((?:Писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Колос|Коло(?:сј|ш)аните|Колосјани|Col))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["2Thess"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|2Thess))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|2Thess))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Thess"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:ците|јани))|1Thess))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*христијаните\s*во\s*Солун|Солун(?:(?:јан|ц)ите|јани))|1Thess))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["2Tim"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|2Tim))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Втор[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|(?:II|2)\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|(?:II|2)\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|2Tim))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["1Tim"],
         testament: "n",
-        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*)?Тимотеј|1Tim))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
+        regexp: /(?:^|(?<=[^\p{L}\p{N}])(?<!\d:(?=\d)))((?:Прв[ао]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|[1I]\.\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|[1I]\s*(?:писмо\s*од\s*апостол\s*Павле\s*до\s*Тимотеј|Тимоте(?:ева|ј))|1Tim))(?:(?=[\d\s.:,;\x1e\x1f&\(\)（）\[\]\/"'\*=~\-–—])|$)/giu
       },
       {
         osis: ["Titus"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bible-passage-reference-parser",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Identifies and parses Bible references (like John 3:16) in over 40 languages.",
   "main": "esm/",
   "directories": {