linkture 3.2.5__tar.gz → 3.3.1__tar.gz

{linkture-3.2.5 → linkture-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linkture
-Version: 3.2.5
+Version: 3.3.1
 Summary: PARSE and PROCESS BIBLE SCRIPTURE REFERENCES: extract, tag, link, rewrite, translate, BCV-encode and decode
 Keywords: bible,scriptures,scripture-references,scripture-translation,scripture-parser,scripture-linker
 Author-Email: "Eryk J." <infiniti@inventati.org>

{linkture-3.2.5 → linkture-3.3.1}/pyproject.toml

@@ -36,7 +36,7 @@ keywords = [
     "scripture-parser",
     "scripture-linker",
 ]
-version = "3.2.5"
+version = "3.3.1"
 
 [project.license]
 text = "MIT"

{linkture-3.2.5 → linkture-3.3.1}/src/linkture/linkture.py

@@ -27,7 +27,7 @@
 """
 
 __app__ = 'linkture'
-__version__ = 'v3.2.5'
+__version__ = 'v3.3.1'
 
 
 import json, regex, sqlite3
@@ -218,7 +218,8 @@ class Scriptures():
 
         self._reported = []
         text = regex.sub(self._first_pass, r, text)
-        return regex.sub(self._second_pass, r, text)
+        text = regex.sub(self._second_pass, r, text)
+        return text
 
 
     def list_scriptures(self, text):
@@ -227,7 +228,8 @@ class Scriptures():
         for scripture in regex.findall(self._tagged, text):
             script = scripture.strip('}{')
             if self._rewrite:
-                script = self.decode_scriptures(self._encoded[script])[0]
+                temp = self.decode_scriptures(self._encoded[script])
+                script = temp[0] if temp else script
             if self._upper:
                 script = script.upper()
             lst.append(script)
@@ -241,7 +243,8 @@ class Scriptures():
         def r(match):
             script = match.group(1).strip('}{')
             if self._rewrite:
-                script = self.decode_scriptures(self._encoded[script])[0]
+                temp = self.decode_scriptures(self._encoded[script])
+                script = temp[0] if temp else script
             if self._upper:
                 script = script.upper()
             if tag:
@@ -286,7 +289,11 @@ class Scriptures():
                 return None
             if not (0 < c <= self._ranges.loc[(self._ranges.Book == b) & (self._ranges.Chapter.isnull()), ['Last']].values[0]): # chapter out of range
                 return None
-            if not (0 < v <= self._ranges.loc[(self._ranges.Book == b) & (self._ranges.Chapter == c), ['Last']].values[0]): # verse out of range
+            if b == 19 and c in self._headings:
+                first = 0
+            else:
+                first = 1
+            if not (first <= v <= self._ranges.loc[(self._ranges.Book == b) & (self._ranges.Chapter == c), ['Last']].values[0]): # verse out of range
                 return None
             return True
 
@@ -445,7 +452,7 @@ class Scriptures():
 
     def _decode_scripture(self, bcv_range, book='', chap=0, sep=';'):
         if not bcv_range:
-            return None, '', 0, False
+            return None, '', 0, False, ''
         start, end = bcv_range
         sb = int(start[:2])
         sc = int(start[2:5])
@@ -455,22 +462,21 @@ class Scriptures():
         ev = int(end[5:])
 
         if not (sb == eb):
-            return None, '', 0, False
+            return None, '', 0, False, ''
         if not ((0 < sb <= 66) & (sb == eb)): # book out of range
-            return None, '', 0, False
+            return None, '', 0, False, ''
         lc = self._ranges.loc[(self._ranges.Book == sb) & (self._ranges.Chapter.isnull()), ['Last']].values[0][0]
         if not (0 < sc <= ec <= lc): # chapter(s) out of range
-            return None, '', 0, False
+            return None, '', 0, False, ''
         se = self._ranges.loc[(self._ranges.Book == sb) & (self._ranges.Chapter == sc), ['Last']].values[0][0]
         le = self._ranges.loc[(self._ranges.Book == sb) & (self._ranges.Chapter == ec), ['Last']].values[0][0]
-        minsv = minev = 1
-        if sb == 19:
-            if sc in self._headings: # some chapters start at verse 0
-                minsv = 0
-            if ec in self._headings:
-                minev = 0
+        minev = 1
+        minsv = 1
+        if sb == 19 and (sc in self._headings):
+            minsv = 0
+            le += 1
         if not ((minsv <= sv <= se) & (minev <= ev <= le)): # verse(s) out of range
-            return None, '', 0, False
+            return None, '', 0, False, ''
         bk_name = self._tr_book_names[sb]
         if book == bk_name:
             cont = True
@@ -580,8 +586,9 @@ class Scriptures():
             sep = ';'
             for bcv_range in self._encoded[scripture]:
                 scrip, bk, ch, _, sep = self._decode_scripture(bcv_range, bk, ch, sep)
-                lnk = convert_range(bcv_range)
-                output += regex.sub(self._chunk, r2, scrip)
+                if scrip:
+                    lnk = convert_range(bcv_range)
+                    output += regex.sub(self._chunk, r2, scrip)
             self._linked[scripture] = output.strip(' ;,')
             if self._upper:
                 output = output.upper()

{linkture-3.2.5 → linkture-3.3.1}/src/linkture/res/custom.json

@@ -57,6 +57,7 @@
     [12, "2do Reyes, II Reyes"],
     [13, "1ro Crónicas, I Crónicas"],
     [14, "2do Crónicas, II Crónicas"],
+    [19, "Salmo"],
     [20, "Pro"],
     [22, "Cantar de los Cantares, Cantar, Cnt"],
     [23, "Isa"],