linkture 3.2.4__py3-none-any.whl → 3.3.0__py3-none-any.whl

linkture/linkture.py

@@ -27,7 +27,7 @@
 """
 
 __app__ = 'linkture'
-__version__ = 'v3.2.4'
+__version__ = 'v3.3.0'
 
 
 import json, regex, sqlite3
@@ -36,7 +36,7 @@ from pathlib import Path
 from unidecode import unidecode
 
 
-_available_languages = ('Cebuano', 'Chinese', 'Danish', 'Dutch', 'English', 'Ewe', 'French', 'German', 'Greek', 'Hungarian', 'Italian', 'Japanese', 'Korean', 'Norwegian', 'Polish', 'Portuguese', 'Romanian', 'Russian', 'Spanish', 'Swedish', 'Tagalog', 'Ukrainian')
+_available_languages = ('Cebuano', 'Chinese', 'Danish', 'Dutch', 'English', 'Ewe', 'French', 'German', 'Greek', 'Hungarian', 'Indonesian', 'Italian', 'Japanese', 'Korean', 'Norwegian', 'Polish', 'Portuguese', 'Romanian', 'Russian', 'Spanish', 'Swedish', 'Tagalog', 'Ukrainian')
 _non_latin = ('Chinese', 'Greek', 'Japanese', 'Korean', 'Russian', 'Ukrainian')
 
 
@@ -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
 

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"],

{linkture-3.2.4.dist-info → linkture-3.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linkture
-Version: 3.2.4
+Version: 3.3.0
 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>
@@ -68,9 +68,9 @@ options:
   -v                    show version and exit
   -q                    don't show errors
   -o out-file           output file (terminal output if not provided)
-  --language {Cebuano,Chinese,Danish,Dutch,English,Ewe,French,German,Greek,Hungarian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Romanian,Russian,Spanish,Swedish,Tagalog,Ukrainian}
+  --language {Cebuano,Chinese,Danish,Dutch,English,Ewe,French,German,Greek,Hungarian,Indonesian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Romanian,Russian,Spanish,Swedish,Tagalog,Ukrainian}
                         indicate source language for book names (English if unspecified)
-  --translate {Cebuano,Chinese,Danish,Dutch,English,Ewe,French,German,Greek,Hungarian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Romanian,Russian,Spanish,Swedish,Tagalog,Ukrainian}
+  --translate {Cebuano,Chinese,Danish,Dutch,English,Ewe,French,German,Greek,Hungarian,Indonesian,Italian,Japanese,Korean,Norwegian,Polish,Portuguese,Romanian,Russian,Spanish,Swedish,Tagalog,Ukrainian}
                         indicate output language for book names (same as source if unspecified)
   -s separator          segment separator (space by default)
   -u                    capitalize (upper-case) book names

linkture-3.3.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+linkture-3.3.0.dist-info/METADATA,sha256=nePUbYNt7TwToC8ER7g_8NAtJVM7OGipcrJxFbPCxPw,11679
+linkture-3.3.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+linkture-3.3.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+linkture-3.3.0.dist-info/licenses/LICENSE,sha256=kPqKoVmo3Tx1HgQvqfjBZuYkjT1mZXnQ5R0KBbEeFfs,1064
+linkture/__init__.py,sha256=-CsRDvXLUig8T6RvwkktRP8e8DWrpjlyqBcw26kOv1E,47
+linkture/__main__.py,sha256=IjxrpZGZKIr7mHPGs_mMVaB6ipou_ArYgvs4wRFkxXM,6607
+linkture/linkture.py,sha256=erB0sRVIKGQeRjnv_RYMOl_Ahb9TSMKTgwrixgsdIDY,25583
+linkture/res/custom.json,sha256=ngpVe8OrnhBUTpJKcJc_W9rwxtEWq7qbt3_NPbGL6h0,2139
+linkture/res/resources.db,sha256=MjQab_QQdfR2YfZpU6TWHOO3irLytnx00iy7YYASR6k,573440
+linkture-3.3.0.dist-info/RECORD,,

{linkture-3.2.4.dist-info → linkture-3.3.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.4)
+Generator: pdm-backend (2.4.5)
 Root-Is-Purelib: true
 Tag: py3-none-any

linkture-3.2.4.dist-info/RECORD

@@ -1,10 +0,0 @@
-linkture-3.2.4.dist-info/METADATA,sha256=TWy_xICSRj4N_n3lHw9E9raYZbu2TixegexyvivcI6U,11657
-linkture-3.2.4.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-linkture-3.2.4.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-linkture-3.2.4.dist-info/licenses/LICENSE,sha256=kPqKoVmo3Tx1HgQvqfjBZuYkjT1mZXnQ5R0KBbEeFfs,1064
-linkture/__init__.py,sha256=-CsRDvXLUig8T6RvwkktRP8e8DWrpjlyqBcw26kOv1E,47
-linkture/__main__.py,sha256=IjxrpZGZKIr7mHPGs_mMVaB6ipou_ArYgvs4wRFkxXM,6607
-linkture/linkture.py,sha256=9X5aTjY5k1HmMwfqLAs8F6817jRuDNvajFmQ6B313aU,25330
-linkture/res/custom.json,sha256=ulF5FMx27uomKsA2xoW5NPB0fa4bq2FyLChgbW-AYSM,2120
-linkture/res/resources.db,sha256=z6f__fs94DWnoaIxyATHaoDsgs4C2d2FGhHe-mCB-8Y,577536
-linkture-3.2.4.dist-info/RECORD,,