added some additional abbreviations to generally favor more canonical books over less

corrected some errors in validation against the schema


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

1 files changed, 38 insertions, 21 deletions

diff --git a/versification/canon.bible.xml b/versification/canon.bible.xml
index e29a555..4ffbfd2 100644
--- a/versification/canon.bible.xml
+++ b/versification/canon.bible.xml
@@ -7,30 +7,31 @@
 		<abbr>Ge</abbr>
 		<abbr>Gene</abbr>
 		<abbr>Genes</abbr>
-		<abbr>Gn</abbr>
 		<name>Genesis</name>
 		<name>G</name>
+		<name>Gn</name>
 	</book>
 	<book>
 		<id>Exod</id>
 		<abbr>Exo</abbr>
 		<abbr>Ex</abbr>
 		<name>Exodus</name>
+		<name>E</name>
 	</book>
 	<book>
 		<id>Lev</id>
-		<abbr>Le</abbr>
 		<abbr>Levit</abbr>
-		<abbr>Lv</abbr>
 		<name>Leviticus</name>
+		<name>Le</name>
+		<name>Lv</name>
 	</book>
 	<book>
 		<id>Num</id>
 		<abbr>Nu</abbr>
 		<abbr>Numb</abbr>
-		<abbr>Nm</abbr>
 		<name>Numbers</name>
 		<name>N</name>
+		<name>Nm</name>
 	</book>
 	<book>
 		<id>Deut</id>
@@ -38,25 +39,24 @@
 		<abbr>De</abbr>
 		<abbr>Deuter</abbr>
 		<abbr>De</abbr>
-		<abbr>Dt</abbr>
 		<name>Deuteronomy</name>
-		<name>D</name>
+		<name>D</name>	
+		<name>Dt</name>
 	</book>
 	<book>
 		<id>Josh</id>
 		<abbr>Jos</abbr>
-		<abbr>Js</abbr>
 		<name>Joshua</name>
 		<name>J</name>
+		<name>Js</name>
 	</book>
 	<book>
 		<id>Judg</id>
 		<abbr>Jdg</abbr>
-		<abbr>Ju</abbr>
-		<abbr>Jd</abbr>
 		<abbr mode="olb">Jud</abbr>
 		<name>Judges</name>
 		<name>Jdgs</name>
+		<name>Jd</name>
 	</book>
 	<book>
 		<id>Ruth</id>
@@ -104,7 +104,6 @@
 		<abbr>1King</abbr>
 		<abbr>3Ki</abbr>
 		<abbr>3King</abbr>
-		<abbr>1K</abbr>
 		<name>I Kings</name>
 		<name>IKings</name>
 		<name>1 Kings</name>
@@ -129,6 +128,10 @@
 		<name>IIIKgs</name>
 		<name>3 Kgs</name>
 		<name>3Kgs</name>
+		<name>I K</name>
+		<name>IK</name>
+		<name>1 K</name>
+		<name>1K</name>
 	</book>
 	<book>
 		<id>2Kgs</id>
@@ -136,7 +139,6 @@
 		<abbr>2King</abbr>
 		<abbr>4Ki</abbr>
 		<abbr>4King</abbr>
-		<abbr>2K</abbr>
 		<name>II Kings</name>
 		<name>IIKings</name>
 		<name>2 Kings</name>
@@ -161,6 +163,10 @@
 		<name>IVKgs</name>
 		<name>4 Kgs</name>
 		<name>4Kgs</name>
+		<name>II K</name>
+		<name>IIK</name>
+		<name>2 K</name>
+		<name>2K</name>
 	</book>
 	<book>
 		<id>1Chr</id>
@@ -218,14 +224,14 @@
 	<book>
 		<id>Esth</id>
 		<abbr>Est</abbr>
-		<abbr>Es</abbr>
 		<name>Esther</name>
 		<name>Ester</name>
+		<name>Es</name>
 	</book>
 	<book>
 		<id>Job</id>
-		<abbr>Jb</abbr>
 		<name>Job</name>
+		<name>Jb</name>
 	</book>
 	<book>
 		<id>Ps</id>
@@ -235,12 +241,13 @@
 		<name>P</name>
 		<name>Psm</name>
 		<name>Pss</name>
+		<name>Psalm</name>
 	</book>
 	<book>
 		<id>Prov</id>
 		<abbr>Pro</abbr>
-		<abbr>Pr</abbr>
 		<name>Proverbs</name>
+		<name>Pr</name>
 	</book>
 	<book>
 		<id>Eccl</id>
@@ -268,11 +275,13 @@
 		<name>Sng</name>
 		<name>Solomon</name>
 		<name>Song of Songs</name>
+		<name>S</name>
 	</book>
 	<book>
 		<id>Isa</id>
 		<abbr>Is</abbr>
 		<name>Isaiah</name>
+		<name>I</name>
 	</book>
 	<book>
 		<id>Jer</id>
@@ -292,9 +301,9 @@
 	<book>
 		<id>Ezek</id>
 		<abbr>Eze</abbr>
-		<abbr>Ek</abbr>
 		<name>Ezekiel</name>
 		<name>Ezk</name>
+		<name>Ek</name>
 	</book>
 	<book>
 		<id>Dan</id>
@@ -464,7 +473,6 @@
 		<abbr>Ephes</abbr>
 		<abbr>Ep</abbr>
 		<name>Ephesians</name>
-		<name>E</name>
 	</book>
 	<book>
 		<id>Phil</id>
@@ -526,6 +534,7 @@
 		<abbr>Tit</abbr>
 		<abbr>Titu</abbr>
 		<name>Titus</name>
+		<name>T</name>
 	</book>
 	<book>
 		<id>Phlm</id>
@@ -621,6 +630,7 @@
 		<id>Jude</id>
 		<abbr>Jud</abbr>
 		<name>Jude</name>
+		<name>Ju</name>
 	</book>
 	<book>
 		<id>Rev</id>
@@ -630,8 +640,8 @@
 		<abbr>Apocal</abbr>
 		<abbr>Apoc</abbr>
 		<abbr>Ap</abbr>
+		<abbr>Apocalypse of St. John</abbr>
 		<name>Revelation of John</name>
-		<name>Apocalypse of St. John</name>
 		<name>Apocalypse of John</name>
 	</book>
 	<!-- Catholic Deuterocanon -->
@@ -640,6 +650,7 @@
 		<abbr>To</abbr>
 		<name>Tobit</name>
 		<name>Tbt</name>
+		<name>Tb</name>
 	</book>
 	<book>
 		<id>Jdt</id>
@@ -656,12 +667,12 @@
 	</book>
 	<book>
 		<id>Sir</id>
-		<abbr>Si</abbr>
 		<name>Sirach</name>
 		<name>Ecclesiasticus</name>
 		<name>Wisdom of Jesus Son of Sirach</name>
 		<name>Wisdom of Ben Sira</name>
 		<name>Ecclus</name>
+		<name>Si</name>
 	</book>
 	<book>
 		<id>Bar</id>
@@ -694,6 +705,10 @@
 		<name>3Ezra</name>
 		<name>Esdras A</name>
 		<name>EsdrasA</name>
+		<name>I E</name>
+		<name>IE</name>
+		<name>1 E</name>
+		<name>1E</name>
 	</book>
 	<book>
 		<id>2Esd</id>
@@ -710,6 +725,10 @@
 		<name>4Ezra</name>
 		<name>Esdras B</name>
 		<name>EsdrasB</name>
+		<name>II E</name>
+		<name>IIE</name>
+		<name>2 E</name>
+		<name>2E</name>
 	</book>
 	<book>
 		<id>1Macc</id>
@@ -775,8 +794,6 @@
 		<name>5ApocSyrPss</name>
 		<name>Five Apocryphal Syriac Psalms</name>
 	</book>
-
-	</book>
 	<book>
 		<id>EsthGr</id>
 		<name>Esther (Greek)</name>
@@ -831,8 +848,8 @@
 	</book>
 	<book>
 		<id>Jub</id>
+		<abbr>Lesser Genesis</abbr>
 		<name>Jubilees</name>
-		<name>Lesser Genesis</name>
 	</book>
 	<book>
 		<id>1Meq</id>