finished integrating all canon.h book abbreviations (& correlates in other collections)

added ability to generate v11n systems from an IMP file


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

1 files changed, 180 insertions, 24 deletions

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>