added more alternate abbreviations

git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@169 07627401-56e2-0310-80f4-f8cd0041bdcd

5 files changed, 139 insertions, 52 deletions

diff --git a/versification/af.xml b/versification/af.xml
index 26bbe14..7cf68a0 100644
--- a/versification/af.xml
+++ b/versification/af.xml
@@ -6,6 +6,7 @@
 	<book>
 		<id>Barn</id>
 		<abbr>Brn</abbr>
+		<!-- used by OLB, but overlaps with Baruch abbrev <abbr>Bar</abbr> -->
 		<name>Barnabas</name>
 	</book>
 	<book>
@@ -33,49 +34,62 @@
 	</book>
 	<book>
 		<id>HermMan</id>
+		<abbr>Com</abbr>
+		<abbr>HCo</abbr>
 		<name>Hermas: Mandates</name>
 	</book>
 	<book>
 		<id>HermSim</id>
+		<abbr>Sim</abbr>
+		<abbr>HSm</abbr>
 		<name>Hermas: Similitudes</name>
 	</book>
 	<book>
 		<id>HermVis</id>
+		<abbr>Vis</abbr>
+		<abbr>HVs</abbr>
 		<name>Hermas: Visions</name>
 	</book>
 	<book>
 		<id>IgnMagn</id>
 		<abbr>IMg</abbr>
+		<abbr>Mag</abbr>
 		<name>Ignatius to the Magnesians</name>
 	</book>
 	<book>
 		<id>IgnPhld</id>
 		<abbr>IPh</abbr>
+		<!-- used by OLB, but overlaps with Philippians abbrev <abbr>Phi</abbr> -->
 		<name>Ignatius to the Philadephians</name>
 	</book>
 	<book>
 		<id>IgnPol</id>
 		<abbr>IPo</abbr>
+		<!-- used by OLB, but overlaps with Polycarp to the Philippians abbrev <abbr>Pol</abbr> -->
 		<name>Ignatius to Polycarp</name>
 	</book>
 	<book>
 		<id>IgnRom</id>
 		<abbr>IRo</abbr>
+		<!-- used by OLB, but overlaps with Romans abbrev <abbr>Rom</abbr> -->
 		<name>Ignatius to the Romans</name>
 	</book>
 	<book>
 		<id>IgnSmyrn</id>
 		<abbr>ISm</abbr>
+		<abbr>Smy</abbr>
 		<name>Ignatius to the Smyrnaeans</name>
 	</book>
 	<book>
 		<id>IgnTrall</id>
 		<abbr>ITr</abbr>
+		<abbr>Tra</abbr>
 		<name>Ignatius to the Trallians</name>
 	</book>
 	<book>
 		<id>IgnEph</id>
 		<abbr>IEp</abbr>
+		<!-- used by OLB, but overlaps with Ephesians abbrev <abbr>Eph</abbr> -->
 		<name>Ignatius to the Ephesians</name>
 	</book>
 	<book>
@@ -86,14 +100,24 @@
 	<book>
 	        <id>PolPhil</id>
 		<abbr>Pol</abbr>
+		<!-- used by OLB, but overlaps with Philippians abbrev <abbr>Php</abbr> -->
 		<name>Polycarp to the Philippians</name>
 	</book>
+	<book>
+	        <id>AposCreed</id>
+		<abbr>Apc</abbr>
+		<name>Apostles' Creed</name>
+	</book>
+	<book>
+	        <id>Pap</id>
+		<name>Fragments of Papias</name>
+	</book>
 
 	<!-- long versions -->
 
 	<book>
 		<id>IgnMagnLg</id>
-		<abbr>IMgl</abbr>
+		<abbr>IMl</abbr>
 		<name>Ignatius to the Magnesians (Longer)</name>
 	</book>
 	<book>
diff --git a/versification/bible.xml b/versification/bible.xml
index 4d5abb5..75d3e2b 100644
--- a/versification/bible.xml
+++ b/versification/bible.xml
@@ -4,24 +4,29 @@
 	<!-- Old Testament -->
 	<book>
 		<id>Gen</id>
+		<abbr>Ge</abbr>
 		<name>Genesis</name>
 	</book>
 	<book>
 		<id>Exod</id>
 		<abbr>Exo</abbr>
+		<abbr>Ex</abbr>
 		<name>Exodus</name>
 	</book>
 	<book>
 		<id>Lev</id>
+		<abbr>Le</abbr>
 		<name>Leviticus</name>
 	</book>
 	<book>
 		<id>Num</id>
+		<abbr>Nu</abbr>
 		<name>Numbers</name>
 	</book>
 	<book>
 		<id>Deut</id>
 		<abbr>Deu</abbr>
+		<abbr>De</abbr>
 		<name>Deuteronomy</name>
 	</book>
 	<book>
@@ -32,11 +37,13 @@
 	<book>
 		<id>Judg</id>
 		<abbr>Jdg</abbr>
+		<!-- used by OLB, but overlaps with Jude abbrev <abbr>Jud</abbr> -->
 		<name>Judges</name>
 	</book>
 	<book>
 		<id>Ruth</id>
 		<abbr>Rut</abbr>
+		<abbr>Ru</abbr>
 		<name>Ruth</name>
 	</book>
 	<book>
@@ -76,11 +83,13 @@
 	</book>
 	<book>
 		<id>Neh</id>
+		<abbr>Ne</abbr>
 		<name>Nehemiah</name>
 	</book>
 	<book>
 		<id>Esth</id>
 		<abbr>Est</abbr>
+		<abbr>Es</abbr>
 		<name>Esther</name>
 	</book>
 	<book>
@@ -95,17 +104,20 @@
 	<book>
 		<id>Prov</id>
 		<abbr>Pro</abbr>
+		<abbr>Pr</abbr>
 		<name>Proverbs</name>
 	</book>
 	<book>
 		<id>Eccl</id>
 		<abbr>Ecc</abbr>
+		<abbr>Ec</abbr>
 		<name>Ecclesiastes</name>
 		<name>Qohelot</name>
 	</book>
 	<book>
 		<id>Song</id>
 		<abbr>Sol</abbr>
+		<abbr>So</abbr>
 		<name>Song of Solomon</name>
 		<name>Canticle of Canticles</name>
 	</book>
@@ -119,6 +131,7 @@
 	</book>
 	<book>
 		<id>Lam</id>
+		<abbr>La</abbr>
 		<name>Lamentations</name>
 	</book>
 	<book>
@@ -128,10 +141,12 @@
 	</book>
 	<book>
 		<id>Dan</id>
+		<abbr>Da</abbr>
 		<name>Daniel</name>
 	</book>
 	<book>
 		<id>Hos</id>
+		<abbr>Ho</abbr>
 		<name>Hosea</name>
 	</book>
 	<book>
@@ -142,11 +157,13 @@
 	<book>
 		<id>Amos</id>
 		<abbr>Amo</abbr>
+		<abbr>Am</abbr>
 		<name>Amos</name>
 	</book>
 	<book>
 		<id>Obad</id>
 		<abbr>Oba</abbr>
+		<abbr>Ob</abbr>
 		<name>Obadiah</name>
 	</book>
 	<book>
@@ -160,6 +177,7 @@
 	</book>
 	<book>
 		<id>Nah</id>
+		<abbr>Na</abbr>
 		<name>Nahum</name>
 	</book>
 	<book>
@@ -188,16 +206,19 @@
 	<book>
 		<id>Matt</id>
 		<abbr>Mat</abbr>
+		<abbr>Mt</abbr>
 		<name>Matthew</name>
 	</book>
 	<book>
 		<id>Mark</id>
 		<abbr>Mar</abbr>
+		<abbr>Mk</abbr>
 		<name>Mark</name>
 	</book>
 	<book>
 		<id>Luke</id>
 		<abbr>Luk</abbr>
+		<abbr>Lu</abbr>
 		<name>Luke</name>
 	</book>
 	<book>
@@ -208,10 +229,12 @@
 	<book>
 		<id>Acts</id>
 		<abbr>Act</abbr>
+		<abbr>Ac</abbr>
 		<name>Acts</name>
 	</book>
 	<book>
 		<id>Rom</id>
+		<abbr>Ro</abbr>
 		<name>Romans</name>
 	</book>
 	<book>
@@ -226,6 +249,7 @@
 	</book>
 	<book>
 		<id>Gal</id>
+		<abbr>Ga</abbr>
 		<name>Galatians</name>
 	</book>
 	<book>
@@ -235,6 +259,7 @@
 	<book>
 		<id>Phil</id>
 		<abbr>Phi</abbr>
+		<abbr>Php</abbr>
 		<name>Philippians</name>
 	</book>
 	<book>
@@ -312,6 +337,7 @@
 	</book>
 	<book>
 		<id>Rev</id>
+		<abbr>Re</abbr>
 		<name>Revelation of John</name>
 	</book>
 	<!-- Catholic Deuterocanon -->
@@ -346,6 +372,7 @@
 	<book>
 		<id>1Esd</id>
 		<abbr>1Es</abbr>
+		<abbr>3Es</abbr>
 		<name>I Esdras</name>
 		<name>III Ezra</name>
 		<name>Esdras A</name>
@@ -392,6 +419,7 @@
 	<book>
 		<id>AddPs</id>
 		<abbr>Psx</abbr>
+		<abbr>2Ps</abbr>
 		<name>Additional Psalm</name>
 	</book>
 	<book>
@@ -428,6 +456,8 @@
 	</book>
 	<book>
 		<id>PrAzar</id>
+		<abbr>Aza</abbr>
+		<abbr>Pra</abbr>
 		<name>Prayer of Azariah</name>
 		<name>Song of the Three Children</name>
 	</book>
@@ -441,10 +471,15 @@
 	</book>
 	<book>
 		<id>PrMan</id>
-		<abbr>Pra</abbr>
 		<abbr>Prm</abbr>
+		<abbr>Man</abbr>
 		<name>Prayer of Manasses</name>
 	</book>
+	<book>
+		<id>SirP</id>
+		<abbr>Sip</abbr>
+		<name>Sirach (Prologue)</name>
+	</book>
 	<!-- LXX variants -->
 	<book>
 		<id>JoshA</id>
@@ -491,9 +526,4 @@
 		<abbr>Bet</abbr>
 		<name>Bel and the Dragon (Theodotion)</name>
 	</book>
-	<book>
-		<id>SirP</id>
-		<abbr>Sip</abbr>
-		<name>Sirach (Prologue)</name>
-	</book>
 </collection>
diff --git a/versification/nta.xml b/versification/nta.xml
index dcfff5f..2cab0b0 100644
--- a/versification/nta.xml
+++ b/versification/nta.xml
@@ -1,8 +1,70 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <collection>
 <!-- Collection name: nta -->
-
 	<!-- New Testament Apocrypha -->
+
+	<!-- Hone texts -->
+	<book>
+		<id>GBirthMary</id>
+		<abbr>Mary</abbr>
+		<abbr>Mry</abbr>
+		<name>Gospel of the Birth of Mary</name>
+	</book>
+	<book>
+		<id>ProtJas</id>
+		<!-- used by OLB, but overlaps with Proverbs abbrev <abbr>Pro</abbr> -->
+		<abbr>PrJ</abbr>
+		<name>Protevangelium of James</name>
+	</book>
+	<book>
+		<id>InfGos</id>
+		<abbr>1In</abbr>
+		<abbr>Inf</abbr>
+		<name>I Infancy Gospel</name>
+	</book>
+	<book>
+		<id>InfGosThom</id>
+		<abbr>2In</abbr>
+		<abbr>IGT</abbr>
+		<name>II Infancy Gospel</name>
+		<name>Infancy Gospel of Thomas</name>
+	</book>
+	<book>
+		<id>Abgar</id>
+		<abbr>Abg</abbr>
+		<name>Abgar Legend</name>
+		<name>Christ and Abgarus</name>
+	</book>
+	<book>
+		<id>GNic</id>
+		<abbr>Nic</abbr>
+		<abbr>GNi</abbr>
+		<name>Gospel of Nicodemus</name>
+	</book>
+	<book>
+		<id>CorPaulSen</id>
+		<abbr>Sen</abbr>
+		<abbr>PSe</abbr>
+		<name>Correspondence between Paul and Seneca</name>
+	</book>
+	<book>
+		<id>ActsPaulThecla</id>
+		<abbr>Pt</abbr>
+		<abbr>PTh</abbr>
+		<name>Acts of Paul and Thecla</name>
+	</book>
+	<book>
+		<id>LetHerPil</id>
+		<abbr>LHP</abbr>
+		<name>Letters of Herod and Pilate</name>
+	</book>
+	<book>
+		<id>GPet</id>
+		<abbr>GOP</abbr>
+		<name>Gospel of Peter</name>
+	</book>
+
+	<!-- non-Hone texts -->
 	<book>
 		<id>Addai</id>
 		<name>Doctrine of Addai</name>
@@ -60,10 +122,6 @@
 		<name>Apocalypsis tou hagiou Ioannou</name>
 	</book>
 	<book>
-		<id>ProtJas</id>
-		<name>Protevangelium of James</name>
-	</book>
-	<book>
 		<id>ActsJn</id>
 		<name>Acts of John</name>
 	</book>
@@ -84,10 +142,6 @@
 		<name>Gospel of the Nazareans</name>
 	</book>
 	<book>
-		<id>GNic</id>
-		<name>Gospel of Nicodemus</name>
-	</book>
-	<book>
 		<id>PapEg2</id>
 		<name>Papyrus Egerton 2: Fragments of an Unknown Gospel</name>
 	</book>
@@ -108,10 +162,6 @@
 		<name>Apocalypse of Peter</name>
 	</book>
 	<book>
-		<id>GPet</id>
-		<name>Gospel of Peter</name>
-	</book>
-	<book>
 		<id>PrPet</id>
 		<name>Preaching of Peter</name>
 	</book>
@@ -232,10 +282,6 @@
 		<name>Gospel of Mani</name>
 	</book>
 	<book>
-		<id>InfThomas</id>
-		<name>Infancy Gospel of Thomas</name>
-	</book>
-	<book>
 		<id>ArabicInfG</id>
 		<name>Arabic Infancy Gospel</name>
 	</book>
@@ -252,10 +298,6 @@
 		<name>Life of John according to Serapion</name>
 	</book>
 	<book>
-		<id>Abgar</id>
-		<name>Abgar Legend</name>
-	</book>
-	<book>
 		<id>ChrDescent</id>
 		<name>Christ's Descent into Hell</name>
 	</book>
@@ -269,10 +311,6 @@
 		<name>Teaching of Peter</name>
 	</book>
 	<book>
-		<id>CorPaulSen</id>
-		<name>Correspondence between Paul and Seneca</name>
-	</book>
-	<book>
 		<id>PseudTit</id>
 		<name>Epistle of Pseudo-Titus</name>
 	</book>
@@ -305,10 +343,6 @@
 		<name>History of Joseph the Carpenter</name>
 	</book>
 	<book>
-		<id>GBirthMary</id>
-		<name>Gospel of the Birth of Mary</name>
-	</book>
-	<book>
 		<id>LibInfSalv</id>
 		<name>Liber de Infantia Salvatoris</name>
 	</book>
@@ -345,10 +379,6 @@
 		<name>Narrative of Joseph of Arimathea</name>
 	</book>
 	<book>
-		<id>LetPilHerod</id>
-		<name>Letters of Pilate and Herod</name>
-	</book>
-	<book>
 		<id>LetTibPil</id>
 		<name>Letter of Tiberius to Pilate</name>
 	</book>
@@ -496,17 +526,5 @@
 		<id>AsVirgin</id>
 		<name>Assumption of the Virgin</name>
 	</book>
-	<book>
-		<id>1Infancy</id>
-		<name>I Infancy Gospel</name>
-	</book>
-	<book>
-		<id>2Infancy</id>
-		<name>II Infancy Gospel</name>
-	</book>
-	<book>
-		<id>ActsPaulThecla</id>
-		<name>Acts of Paul and Thecla</name>
-	</book>
 
 </collection>
diff --git a/versification/otp.xml b/versification/otp.xml
index 5c90874..d8968ae 100644
--- a/versification/otp.xml
+++ b/versification/otp.xml
@@ -23,6 +23,7 @@
 	</book>
 	<book>
 		<id>LAE</id>
+		<abbr>Ada</abbr>
 		<name>Life of Adam and Eve</name>
 	</book>
 	<book>
@@ -310,50 +311,62 @@
 	</book>
 	<book>
 		<id>TReu</id>
+		<abbr>12R</abbr>
 		<name>Testament of Reuben</name>
 	</book>
 	<book>
 		<id>TSim</id>
+		<abbr>12S</abbr>
 		<name>Testament of Simeon</name>
 	</book>
 	<book>
 		<id>TLevi</id>
+		<abbr>12L</abbr>
 		<name>Testament of Levi</name>
 	</book>
 	<book>
 		<id>TJud</id>
+		<abbr>12J</abbr>
 		<name>Testament of Judah</name>
 	</book>
 	<book>
 		<id>TIss</id>
+		<abbr>12I</abbr>
 		<name>Testament of Issachar</name>
 	</book>
 	<book>
 		<id>TZeb</id>
+		<abbr>12Z</abbr>
 		<name>Testament of Zebulon</name>
 	</book>
 	<book>
 		<id>TDan</id>
+		<abbr>12D</abbr>
 		<name>Testament of Dan</name>
 	</book>
 	<book>
 		<id>TNaph</id>
+		<abbr>12N</abbr>
 		<name>Testament of Naphtali</name>
 	</book>
 	<book>
 		<id>TGad</id>
+		<abbr>12G</abbr>
 		<name>Testament of Gad</name>
 	</book>
 	<book>
 		<id>TAsh</id>
+		<abbr>12A</abbr>
 		<name>Testament of Asher</name>
 	</book>
 	<book>
 		<id>TJos</id>
+		<abbr>12O</abbr>
 		<name>Testament of Joseph</name>
 	</book>
 	<book>
 		<id>TBenj</id>
+		<abbr>12B</abbr>
 		<name>Testament of Benjamin</name>
 	</book>
 	<book>
diff --git a/versification/v11nsys.pl b/versification/v11nsys.pl
index 0b672f9..1bc4f9f 100644
--- a/versification/v11nsys.pl
+++ b/versification/v11nsys.pl
@@ -50,6 +50,8 @@ foreach $mapfile (@canons) {
     while (<MAP>) {

 	$line = $_;

 	

+	$line =~ s/<!\-\-.+?\-\->//g;

+

 	if ($line =~ /<id>(.+?)<\/id>/) {

 	    $id = $1;

 	    $osis{lc($id)} = $id;