summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--versification/canon.af.xml6
-rw-r--r--versification/canon.bible.xml204
-rw-r--r--versification/canon.lds.xml16
-rw-r--r--versification/canon.naghammadi.xml12
-rw-r--r--versification/canon.nta.xml20
-rw-r--r--versification/canon.otp.xml40
-rw-r--r--versification/v11nsys.pl52
7 files changed, 299 insertions, 51 deletions
diff --git a/versification/canon.af.xml b/versification/canon.af.xml
index d0a7121..7feea23 100644
--- a/versification/canon.af.xml
+++ b/versification/canon.af.xml
@@ -13,11 +13,17 @@
<id>1Clem</id>
<abbr>1Cl</abbr>
<name>I Clement</name>
+ <name>IClement</name>
+ <name>1 Clement</name>
+ <name>1Clement</name>
</book>
<book>
<id>2Clem</id>
<abbr>2Cl</abbr>
<name>II Clement</name>
+ <name>IIClement</name>
+ <name>2 Clement</name>
+ <name>2Clement</name>
</book>
<book>
<id>Did</id>
diff --git a/versification/canon.bible.xml b/versification/canon.bible.xml
index e97ecf6..5a621e5 100644
--- a/versification/canon.bible.xml
+++ b/versification/canon.bible.xml
@@ -6,6 +6,7 @@
<id>Gen</id>
<abbr>Ge</abbr>
<name>Genesis</name>
+ <name>G</name>
</book>
<book>
<id>Exod</id>
@@ -22,23 +23,27 @@
<id>Num</id>
<abbr>Nu</abbr>
<name>Numbers</name>
+ <name>N</name>
</book>
<book>
<id>Deut</id>
<abbr>Deu</abbr>
<abbr>De</abbr>
<name>Deuteronomy</name>
+ <name>D</name>
</book>
<book>
<id>Josh</id>
<abbr>Jos</abbr>
<name>Joshua</name>
+ <name>J</name>
</book>
<book>
<id>Judg</id>
<abbr>Jdg</abbr>
<!-- used by OLB, but overlaps with Jude abbrev <abbr>Jud</abbr> -->
<name>Judges</name>
+ <name>Jdgs</name>
</book>
<book>
<id>Ruth</id>
@@ -50,31 +55,57 @@
<id>1Sam</id>
<abbr>1Sa</abbr>
<name>I Samuel</name>
+ <name>ISamuel</name>
+ <name>1 Samuel</name>
+ <name>1Samuel</name>
</book>
<book>
<id>2Sam</id>
<abbr>2Sa</abbr>
<name>II Samuel</name>
+ <name>IISamuel</name>
+ <name>2 Samuel</name>
+ <name>2Samuel</name>
</book>
<book>
<id>1Kgs</id>
<abbr>1Ki</abbr>
<name>I Kings</name>
+ <name>IKings</name>
+ <name>1 Kings</name>
+ <name>1Kings</name>
+ <name>I Kgs</name>
+ <name>IKgs</name>
+ <name>1 Kgs</name>
+ <name>1Kgs</name>
</book>
<book>
<id>2Kgs</id>
<abbr>2Ki</abbr>
<name>II Kings</name>
+ <name>IIKings</name>
+ <name>2 Kings</name>
+ <name>2Kings</name>
+ <name>II Kgs</name>
+ <name>IIKgs</name>
+ <name>2 Kgs</name>
+ <name>2Kgs</name>
</book>
<book>
<id>1Chr</id>
<abbr>1Ch</abbr>
<name>I Chronicles</name>
+ <name>IChronicles</name>
+ <name>1 Chronicles</name>
+ <name>1Chronicles</name>
</book>
<book>
<id>2Chr</id>
<abbr>2Ch</abbr>
<name>II Chronicles</name>
+ <name>IIChronicles</name>
+ <name>2 Chronicles</name>
+ <name>2Chronicles</name>
</book>
<book>
<id>Ezra</id>
@@ -91,6 +122,7 @@
<abbr>Est</abbr>
<abbr>Es</abbr>
<name>Esther</name>
+ <name>Ester</name>
</book>
<book>
<id>Job</id>
@@ -100,6 +132,9 @@
<id>Ps</id>
<abbr>Psa</abbr>
<name>Psalms</name>
+ <name>P</name>
+ <name>Psm</name>
+ <name>Pss</name>
</book>
<book>
<id>Prov</id>
@@ -112,7 +147,8 @@
<abbr>Ecc</abbr>
<abbr>Ec</abbr>
<name>Ecclesiastes</name>
- <name>Qohelot</name>
+ <name>Qohelet</name>
+ <name>Qoheleth</name>
</book>
<book>
<id>Song</id>
@@ -120,6 +156,9 @@
<abbr>So</abbr>
<name>Song of Solomon</name>
<name>Canticle of Canticles</name>
+ <name>Sng</name>
+ <name>Solomon</name>
+ <name>Song of Songs</name>
</book>
<book>
<id>Isa</id>
@@ -138,6 +177,7 @@
<id>Ezek</id>
<abbr>Eze</abbr>
<name>Ezekiel</name>
+ <name>Ezk</name>
</book>
<book>
<id>Dan</id>
@@ -153,6 +193,7 @@
<id>Joel</id>
<abbr>Joe</abbr>
<name>Joel</name>
+ <name>Jol</name>
</book>
<book>
<id>Amos</id>
@@ -179,6 +220,7 @@
<id>Nah</id>
<abbr>Na</abbr>
<name>Nahum</name>
+ <name>Nam</name>
</book>
<book>
<id>Hab</id>
@@ -206,25 +248,32 @@
<book>
<id>Matt</id>
<abbr>Mat</abbr>
- <abbr>Mt</abbr>
<name>Matthew</name>
+ <name>Ma</name>
+ <name>Mt</name>
</book>
<book>
<id>Mark</id>
<abbr>Mar</abbr>
- <abbr>Mk</abbr>
<name>Mark</name>
+ <name>Mk</name>
+ <name>Mrk</name>
</book>
<book>
<id>Luke</id>
<abbr>Luk</abbr>
<abbr>Lu</abbr>
<name>Luke</name>
+ <name>L</name>
+ <name>Lk</name>
</book>
<book>
<id>John</id>
<abbr>Joh</abbr>
<name>John</name>
+ <name>Jhn</name>
+ <name>Jn</name>
+ <name>Jo</name>
</book>
<book>
<id>Acts</id>
@@ -241,11 +290,25 @@
<id>1Cor</id>
<abbr>1Co</abbr>
<name>I Corinthians</name>
+ <name>ICorinthians</name>
+ <name>1 Corinthians</name>
+ <name>1Corinthians</name>
+ <name>I C</name>
+ <name>IC</name>
+ <name>1 C</name>
+ <name>1C</name>
</book>
<book>
<id>2Cor</id>
<abbr>2Co</abbr>
<name>II Corinthians</name>
+ <name>IICorinthians</name>
+ <name>2 Corinthians</name>
+ <name>2Corinthians</name>
+ <name>II C</name>
+ <name>IIC</name>
+ <name>2 C</name>
+ <name>2C</name>
</book>
<book>
<id>Gal</id>
@@ -255,36 +318,50 @@
<book>
<id>Eph</id>
<name>Ephesians</name>
+ <name>E</name>
</book>
<book>
<id>Phil</id>
<abbr>Phi</abbr>
- <abbr>Php</abbr>
<name>Philippians</name>
+ <name>Php</name>
</book>
<book>
<id>Col</id>
<name>Colossians</name>
+ <name>C</name>
</book>
<book>
<id>1Thess</id>
<abbr>1Th</abbr>
<name>I Thessalonians</name>
+ <name>IThessalonians</name>
+ <name>1 Thessalonians</name>
+ <name>1Thessalonians</name>
</book>
<book>
<id>2Thess</id>
<abbr>2Th</abbr>
<name>II Thessalonians</name>
+ <name>IIThessalonians</name>
+ <name>2 Thessalonians</name>
+ <name>2Thessalonians</name>
</book>
<book>
<id>1Tim</id>
<abbr>1Ti</abbr>
<name>I Timothy</name>
+ <name>ITimothy</name>
+ <name>1 Timothy</name>
+ <name>1Timothy</name>
</book>
<book>
<id>2Tim</id>
<abbr>2Ti</abbr>
<name>II Timothy</name>
+ <name>IITimothy</name>
+ <name>2 Timothy</name>
+ <name>2Timothy</name>
</book>
<book>
<id>Titus</id>
@@ -293,12 +370,13 @@
</book>
<book>
<id>Phlm</id>
- <abbr>Phm</abbr>
<name>Philemon</name>
+ <name>Phm</name>
</book>
<book>
<id>Heb</id>
<name>Hebrews</name>
+ <name>H</name>
</book>
<book>
<id>Jas</id>
@@ -309,26 +387,61 @@
<id>1Pet</id>
<abbr>1Pe</abbr>
<name>I Peter</name>
+ <name>IPeter</name>
+ <name>1 Peter</name>
+ <name>1Peter</name>
+ <name>I Ptr</name>
+ <name>IPtr</name>
+ <name>1 Ptr</name>
+ <name>1Ptr</name>
</book>
<book>
<id>2Pet</id>
<abbr>2Pe</abbr>
<name>II Peter</name>
+ <name>IIPeter</name>
+ <name>2 Peter</name>
+ <name>2Peter</name>
+ <name>II Ptr</name>
+ <name>IIPtr</name>
+ <name>2 Ptr</name>
+ <name>2Ptr</name>
</book>
<book>
<id>1John</id>
<abbr>1Jo</abbr>
<name>I John</name>
+ <name>IJohn</name>
+ <name>1 John</name>
+ <name>1John</name>
+ <name>I Jn</name>
+ <name>IJn</name>
+ <name>1 Jn</name>
+ <name>1Jn</name>
</book>
<book>
<id>2John</id>
<abbr>2Jo</abbr>
<name>II John</name>
+ <name>IIJohn</name>
+ <name>2 John</name>
+ <name>2John</name>
+ <name>II Jn</name>
+ <name>IIJn</name>
+ <name>2 Jn</name>
+ <name>2Jn</name>
</book>
<book>
<id>3John</id>
<abbr>3Jo</abbr>
<name>III John</name>
+ <name>IIIJohn</name>
+ <name>3 John</name>
+ <name>3John</name>
+ <name>III Jn</name>
+ <name>IIIJn</name>
+ <name>3 Jn</name>
+ <name>3Jn</name>
</book>
<book>
<id>Jude</id>
@@ -339,11 +452,14 @@
<id>Rev</id>
<abbr>Re</abbr>
<name>Revelation of John</name>
+ <name>Apocalypse of St. John</name>
+ <name>Apocalypse of John</name>
</book>
<!-- Catholic Deuterocanon -->
<book>
<id>Tob</id>
<name>Tobit</name>
+ <name>Tbt</name>
</book>
<book>
<id>Jdt</id>
@@ -358,53 +474,84 @@
<id>Sir</id>
<name>Sirach</name>
<name>Ecclesiasticus</name>
+ <name>Wisdom of Jesus Son of Sirach</name>
+ <name>Wisdom of Ben Sira</name>
</book>
<book>
<id>Bar</id>
<name>Baruch</name>
<name>I Baruch</name>
+ <name>IBaruch</name>
+ <name>1 Baruch</name>
+ <name>1Baruch</name>
</book>
<book>
<id>EpJer</id>
- <abbr>Epj</abbr>
<name>Epistle of Jeremiah</name>
+ <name>Epj</name>
</book>
<book>
<id>1Esd</id>
<abbr>1Es</abbr>
<abbr>3Es</abbr>
<name>I Esdras</name>
+ <name>IEsdras</name>
+ <name>1 Esdras</name>
+ <name>1Esdras</name>
<name>III Ezra</name>
+ <name>IIIEzra</name>
+ <name>3 Ezra</name>
+ <name>3Ezra</name>
<name>Esdras A</name>
+ <name>EsdrasA</name>
</book>
<book>
<id>2Esd</id>
<abbr>2Es</abbr>
<abbr>4Es</abbr>
<name>II Esdras</name>
+ <name>IIEsdras</name>
+ <name>2 Esdras</name>
+ <name>2Esdras</name>
<name>IV Ezra</name>
+ <name>IVEzra</name>
+ <name>4 Ezra</name>
+ <name>4Ezra</name>
<name>Esdras B</name>
+ <name>EsdrasB</name>
</book>
<book>
<id>1Macc</id>
<abbr>1Ma</abbr>
<name>I Maccabees</name>
+ <name>IMaccabees</name>
+ <name>1 Maccabees</name>
+ <name>1Maccabees</name>
</book>
<book>
<id>2Macc</id>
<abbr>2Ma</abbr>
<name>II Maccabees</name>
+ <name>IIMaccabees</name>
+ <name>2 Maccabees</name>
+ <name>2Maccabees</name>
</book>
<!-- LXX -->
<book>
<id>3Macc</id>
<abbr>3Ma</abbr>
<name>III Maccabees</name>
+ <name>IIIMaccabees</name>
+ <name>3 Maccabees</name>
+ <name>3Maccabees</name>
</book>
<book>
<id>4Macc</id>
<abbr>4Ma</abbr>
<name>IV Maccabees</name>
+ <name>IVMaccabees</name>
+ <name>4 Maccabees</name>
+ <name>4Maccabees</name>
</book>
<book>
<id>Odes</id>
@@ -421,28 +568,32 @@
<abbr>Psx</abbr>
<abbr>2Ps</abbr>
<name>Additional Psalm</name>
+ <name>Psalm 151</name>
</book>
<book>
<id>EsthGr</id>
- <abbr>Esg</abbr>
<name>Esther (Greek)</name>
+ <name>Esg</name>
</book>
<book>
<id>DanGr</id>
- <abbr>Dng</abbr>
<abbr>Daa</abbr>
<name>Daniel (Greek)</name>
+ <name>Dng</name>
</book>
<!-- Vulgate -->
<book>
- <id>EpLao</id>
- <abbr>Lao</abbr>
+ <id>Lao</id>
<name>Laodiceans</name>
+ <name>EpLao</name>
</book>
<!--Ethiopian Orthodox Canon -->
<book>
<id>1En</id>
<name>I Enoch</name>
+ <name>IEnoch</name>
+ <name>1 Enoch</name>
+ <name>1Enoch</name>
<name>Ethiopic Apocalypse of Enoch</name>
</book>
<book>
@@ -453,13 +604,15 @@
<book>
<id>AddEsth</id>
<name>Additions to Esther</name>
+ <name>Esther (Additions)</name>
</book>
<book>
<id>PrAzar</id>
- <abbr>Aza</abbr>
- <abbr>Pra</abbr>
<name>Prayer of Azariah</name>
<name>Song of the Three Children</name>
+ <name>Azariah</name>
+ <name>Aza</name>
+ <name>Pra</name>
</book>
<book>
<id>Sus</id>
@@ -471,59 +624,62 @@
</book>
<book>
<id>PrMan</id>
- <abbr>Prm</abbr>
- <abbr>Man</abbr>
<name>Prayer of Manasses</name>
+ <name>Prayer of Manasseh</name>
+ <name>Prm</name>
+ <name>Manasses</name>
+ <name>Manasseh</name>
+ <name>Man</name>
</book>
<book>
<id>SirP</id>
- <abbr>Sip</abbr>
<name>Sirach (Prologue)</name>
+ <name>Sip</name>
</book>
<!-- LXX variants -->
<book>
<id>JoshA</id>
- <abbr>Jsa</abbr>
<name>Joshua (Codex Alexandrinus)</name>
+ <name>Jsa</name>
</book>
<book>
<id>JoshB</id>
- <abbr>Jsb</abbr>
<name>Joshua (Codex Vaticanus)</name>
+ <name>Jsb</name>
</book>
<book>
<id>JudgA</id>
- <abbr>Jda</abbr>
<name>Joshua (Codex Alexandrinus)</name>
+ <name>Jda</name>
</book>
<book>
<id>JudgB</id>
- <abbr>Jdb</abbr>
<name>Joshua (Codex Vaticanus)</name>
+ <name>Jdb</name>
</book>
<book>
<id>TobBA</id>
- <abbr>Tba</abbr>
<name>Tobit (Codices Vaticanus Alexandrinusque)</name>
+ <name>Tba</name>
</book>
<book>
<id>TobS</id>
- <abbr>Tbs</abbr>
<name>Tobit (Codex Sinaiticus)</name>
+ <name>Tbs</name>
</book>
<book>
<id>DanTheo</id>
- <abbr>Dat</abbr>
<name>Daniel (Theodotion)</name>
+ <name>Dat</name>
</book>
<book>
<id>SusTheo</id>
- <abbr>Sut</abbr>
<name>Susanna (Theodotion)</name>
+ <name>Sut</name>
</book>
<book>
<id>BelTheo</id>
- <abbr>Bet</abbr>
<name>Bel and the Dragon (Theodotion)</name>
+ <name>Bet</name>
</book>
</collection>
diff --git a/versification/canon.lds.xml b/versification/canon.lds.xml
index 2d04802..3846797 100644
--- a/versification/canon.lds.xml
+++ b/versification/canon.lds.xml
@@ -8,10 +8,16 @@
<book>
<id>1Ne</id>
<name>I Nephi</name>
+ <name>INephi</name>
+ <name>1 Nephi</name>
+ <name>1Nephi</name>
</book>
<book>
<id>2Ne</id>
<name>II Nephi</name>
+ <name>IINephi</name>
+ <name>2 Nephi</name>
+ <name>2Nephi</name>
</book>
<book>
<id>Jacob</id>
@@ -48,10 +54,16 @@
<book>
<id>3Ne</id>
<name>III Nephi</name>
+ <name>IIINephi</name>
+ <name>3 Nephi</name>
+ <name>3Nephi</name>
</book>
<book>
<id>4Ne</id>
<name>IV Nephi</name>
+ <name>IVNephi</name>
+ <name>4 Nephi</name>
+ <name>4Nephi</name>
</book>
<book>
<id>Morm</id>
@@ -78,10 +90,12 @@
</book>
<book>
<id>JSM</id>
+ <abbr>JS-M</abbr>
<name>Joseph Smith-Matthew</name>
</book>
<book>
<id>JSH</id>
+ <abbr>JS-H</abbr>
<name>Joseph Smith-History</name>
</book>
<book>
@@ -93,7 +107,9 @@
<book>
<id>DC</id>
+ <abbr>D&amp;C</abbr>
<name>Doctrine and Covenants</name>
+ <name>Doctrine &amp; Covenants</name>
</book>
<book>
<id>OD</id>
diff --git a/versification/canon.naghammadi.xml b/versification/canon.naghammadi.xml
index 2b52440..19d628d 100644
--- a/versification/canon.naghammadi.xml
+++ b/versification/canon.naghammadi.xml
@@ -28,10 +28,16 @@
<book>
<id>1ApJas</id>
<name>I Apocalypse of James</name>
+ <name>IApocalypse of James</name>
+ <name>1 Apocalypse of James</name>
+ <name>1Apocalypse of James</name>
</book>
<book>
<id>2ApJas</id>
<name>II Apocalypse of James</name>
+ <name>IIApocalypse of James</name>
+ <name>2 Apocalypse of James</name>
+ <name>2Apocalypse of James</name>
</book>
<book>
<id>ApPaul</id>
@@ -54,7 +60,8 @@
<name>Dialogue of the Savior</name>
</book>
<book>
- <id>Disc8-9</id>
+ <id>Disc89</id>
+ <abbr>Disc8-9</abbr>
<name>Discourse on the Eighth and Ninth</name>
</book>
<book>
@@ -202,8 +209,7 @@
<book>
<id>PlatoRep</id>
- <name>"Plato</name>
- <name> Republic 588A-589B"</name>
+ <name>Plato Republic 588A-589B</name>
</book>
<book>
<id>ScribalNote</id>
diff --git a/versification/canon.nta.xml b/versification/canon.nta.xml
index 1ff8617..35fc952 100644
--- a/versification/canon.nta.xml
+++ b/versification/canon.nta.xml
@@ -19,15 +19,22 @@
<book>
<id>InfGos</id>
<abbr>1In</abbr>
- <abbr>Inf</abbr>
<name>I Infancy Gospel</name>
+ <name>IInfancy Gospel</name>
+ <name>1 Infancy Gospel</name>
+ <name>1Infancy Gospel</name>
+ <name>Inf</name>
+ <name>Infancy</name>
</book>
<book>
<id>InfGosThom</id>
<abbr>2In</abbr>
- <abbr>IGT</abbr>
<name>II Infancy Gospel</name>
+ <name>IIInfancy Gospel</name>
+ <name>2 Infancy Gospel</name>
+ <name>2Infancy Gospel</name>
<name>Infancy Gospel of Thomas</name>
+ <name>IGT</name>
</book>
<book>
<id>Abgar</id>
@@ -96,6 +103,9 @@
<book>
<id>3Cor</id>
<name>III Corinthians</name>
+ <name>IIICorinthians</name>
+ <name>3 Corinthians</name>
+ <name>3Corinthians</name>
</book>
<book>
<id>CorCorr</id>
@@ -321,10 +331,16 @@
<book>
<id>5Ezra</id>
<name>V Ezra</name>
+ <name>VEzra</name>
+ <name>5 Ezra</name>
+ <name>5Ezra</name>
</book>
<book>
<id>6Ezra</id>
<name>VI Ezra</name>
+ <name>VIEzra</name>
+ <name>6 Ezra</name>
+ <name>6Ezra</name>
</book>
<book>
<id>ChrSib</id>
diff --git a/versification/canon.otp.xml b/versification/canon.otp.xml
index 7cdbd63..2836156 100644
--- a/versification/canon.otp.xml
+++ b/versification/canon.otp.xml
@@ -2,7 +2,6 @@
<collection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="canon.xsd">
<!-- Collection name: otp -->
-
<!-- OT Pseudepigrapha -->
<book>
@@ -54,18 +53,27 @@
<id>2Bar</id>
<abbr>2Ba</abbr>
<name>II Baruch</name>
+ <name>IIBaruch</name>
+ <name>2 Baruch</name>
+ <name>2Baruch</name>
<name>Syriac Apocalypse of Baruch</name>
</book>
<book>
<id>3Bar</id>
<abbr>3Ba</abbr>
<name>III Baruch</name>
+ <name>IIIBaruch</name>
+ <name>3 Baruch</name>
+ <name>3Baruch</name>
<name>Greek Apocalypse of Baruch</name>
</book>
<book>
<id>4Bar</id>
<abbr>4Ba</abbr>
<name>IV Baruch</name>
+ <name>IVBaruch</name>
+ <name>4 Baruch</name>
+ <name>4Baruch</name>
<name>Paraleipomena Jeremiou</name>
</book>
<book>
@@ -98,13 +106,18 @@
</book>
<book>
<id>2En</id>
- <abbr>2En</abbr>
<name>II Enoch</name>
+ <name>IIEnoch</name>
+ <name>2 Enoch</name>
+ <name>2Enoch</name>
<name>Slavonic Apocalypse of Enoch</name>
</book>
<book>
<id>3En</id>
<name>III Enoch</name>
+ <name>IIIEnoch</name>
+ <name>3 Enoch</name>
+ <name>3Enoch</name>
<name>Hebrew Apocalypse of Enoch</name>
</book>
<book>
@@ -112,7 +125,8 @@
<name>Eupolemus</name>
</book>
<book>
- <id>Ps-Eup</id>
+ <id>PsEup</id>
+ <abbr>Ps-Eup</abbr>
<name>Pseudo-Eupolemus</name>
</book>
<book>
@@ -148,7 +162,8 @@
<name>Hecataeus Abdera</name>
</book>
<book>
- <id>Ps-Hec</id>
+ <id>PsHec</id>
+ <abbr>Ps-Hec</abbr>
<name>Pseudo-Hecataeus</name>
</book>
<book>
@@ -223,6 +238,8 @@
<id>5Mac</id>
<abbr>5Ma</abbr>
<name>V Maccabees</name>
+ <name>5 Maccabees</name>
+ <name>5Maccabees</name>
</book>
<book>
<id>SyrMen</id>
@@ -249,7 +266,8 @@
<name>Book of Noah</name>
</book>
<book>
- <id>Ps-Orph</id>
+ <id>PsOrph</id>
+ <abbr>Ps-Orph</abbr>
<name>Orphica</name>
<name>Pseudo-Orpheus</name>
</book>
@@ -258,11 +276,13 @@
<name>Philo the Epic Poet</name>
</book>
<book>
- <id>Ps-Philo</id>
+ <id>PsPhilo</id>
+ <abbr>Ps-Philo</abbr>
<name>Pseudo-Philo</name>
</book>
<book>
- <id>Ps-Phoc</id>
+ <id>PsPhoc</id>
+ <abbr>Ps-Phoc</abbr>
<name>Pseudo-Phocyclides</name>
</book>
<book>
@@ -426,11 +446,17 @@
</book>
<book>
<id>1AdamEve</id>
+ <name>I Adam and Eve</name>
+ <name>IAdam and Eve</name>
<name>1 Adam and Eve</name>
+ <name>1Adam and Eve</name>
</book>
<book>
<id>2AdamEve</id>
<name>II Adam and Eve</name>
+ <name>IIAdam and Eve</name>
+ <name>2 Adam and Eve</name>
+ <name>2Adam and Eve</name>
</book>
</collection>
diff --git a/versification/v11nsys.pl b/versification/v11nsys.pl
index 6b40b84..fe0223d 100644
--- a/versification/v11nsys.pl
+++ b/versification/v11nsys.pl
@@ -22,11 +22,13 @@ sub buildBooks {
if ($osis{lc($lastBook)} eq "Matt") {
$otnt = 1;
}
+
+ $osisBook = $osis{lc($lastBook)};
if ($otnt == 0) {
- $otbooks .= "\t{\"$idmap{$osis{lc($lastBook)}}\", \"$osis{lc($lastBook)}\", \"$osis{lc($lastBook)}\", $cCount},\n";
+ $otbooks .= "\t{\"$idmap{$osisBook}\", \"$osisBook\", \"$osisBook\", $cCount},\n";
}
else {
- $ntbooks .= "\t{\"$idmap{$osis{lc($lastBook)}}\", \"$osis{lc($lastBook)}\", \"$osis{lc($lastBook)}\", $cCount},\n";
+ $ntbooks .= "\t{\"$idmap{$osisBook}\", \"$osisBook\", \"$osisBook\", $cCount},\n";
}
}
@@ -51,49 +53,67 @@ foreach $mapfile (@canons) {
$line = $_;
$line =~ s/<!\-\-.+?\-\->//g;
+ $line =~ s/\&amp;/\&/g;
if ($line =~ /<id>(.+?)<\/id>/) {
$id = $1;
$osis{lc($id)} = $id;
}
elsif ($line =~ /<abbr>(.+?)<\/abbr>/) {
- $osis{lc($1)} = $id;
+ $name = $1;
+ if ($osis{lc($name)} eq "") {
+ $osis{lc($name)} = $id;
+ }
+ else {
+ print "ERROR: Duplicate mapping from $id found in $mapfile (<abbr>).\n";
+ }
}
elsif ($line =~ /<name>(.+?)<\/name>/) {
$name = $1;
-
+ if ($osis{lc($name)} eq "") {
+ $osis{lc($name)} = $id;
+ }
+ else {
+ print "ERROR: Duplicate mapping from $id found in $mapfile (<name>).\n";
+ }
+
if ($idmap{$id} eq "") {
$idmap{$id} = $name;
}
else {
# Duplicates most likely indicate alternate names, so ignore them.
-# print "ERROR: Duplicate mapping from $id found in $mapfile.\n"
+# print "ERROR: Duplicate mapping from $id found in $mapfile.\n";
}
}
}
close (MAP);
}
-
-$bwMode = false;
+die();
if (@ARGV[0] ne "") {
$n = 0;
+ $mode = "xml";
while (@ARGV[$n] ne "") {
- if ($n == 0 && @ARGV[0] eq "--nosis") {
- $bwMode = true;
+ if ($n == 0 && @ARGV[0] eq "--vpl") {
+ $mode = "vpl";
+ }
+ elsif ($n == 0 && @ARGV[0] eq "--imp") {
+ $mode = "imp";
+ }
+ elsif ($n == 0 && @ARGV[0] eq "--xml") {
+ $mode = "xml";
}
else {
push @srcfiles, @ARGV[$n];
}
$n++;
}
- $vplStyle = true;
}
else {
opendir (DIR, ".");
@srcfiles = grep /Bible\.[^\.]+\.xml$/, readdir DIR;
closedir(DIR);
- $vplStyle = false;
+ $mode = "xml";
}
foreach $infile (@srcfiles) {
@@ -127,7 +147,7 @@ foreach $infile (@srcfiles) {
$vm = "/******************************************************************************\n * Maximum verses per chapter\n */\n\nint vm$v11n\[\] = {";
$otbooks = "/******************************************************************************\n * [on]tbooks$v11n - initialize static instance for all canonical text names\n * and chapmax\n */\nstruct sbook otbooks$v11n\[\] = {\n";
$ntbooks = "struct sbook ntbooks$v11n\[\] = {\n";
- $booksCloser = "\t{\"\", \"\", \"\", 0}\n};\n";
+ $booksCloser = "\t{\"\", \"\", \"\", 0}\n};\n\n";
$otnt = 0; # 0 = ot, 1 = nt
@@ -139,9 +159,11 @@ foreach $infile (@srcfiles) {
if ($line =~ /<osisID.+?code=\"(.+?)\"\/>/) {
$osisID = $1;
}
- elsif ($vplStyle == true && $line =~ /^([^ ]+ [^ :]+:[^ :]+)/) {
- $osisID = $1;
- $osisID =~ s/[ :]/\./g;
+ elsif ($mode eq "vpl" && $line =~ /^(.+?) ([0-9A-Za-z]+):([0-9A-Za-z]+)/) {
+ $osisID = "$1.$2.$3";
+ }
+ elsif ($mode eq "imp" && $line =~ /^\$\$\$(.+?) ([0-9A-Za-z]+):([0-9A-Za-z]+)/) {
+ $osisID = "$1.$2.$3";
}
if ($osisID ne "") {
generated by cgit (git 2.34.1) at 2024-09-20 03:41:30 +0000