[sword-svn] r174 - trunk/versification

[chrislit at crosswire.org]

Author: chrislit
Date: 2009-03-14 04:28:07 -0700 (Sat, 14 Mar 2009)
New Revision: 174

Modified:
   trunk/versification/canon.nta.xml
   trunk/versification/canon.otp.xml
   trunk/versification/v11nsys.pl
Log:
added more alternate abbreviations
fixed a major bug in the abbrevs generation logic

everything looks good now (though IMP parsing remains untested), so it's time to start analyzing v11n systems to determine which are actually important and should be integrated into Sword

Modified: trunk/versification/canon.nta.xml
===================================================================
--- trunk/versification/canon.nta.xml	2009-03-14 09:58:38 UTC (rev 173)
+++ trunk/versification/canon.nta.xml	2009-03-14 11:28:07 UTC (rev 174)
@@ -392,6 +392,7 @@
 	</book>
 	<book>
 		<id>NarJosAr</id>
+		<abbr>J22</abbr>
 		<name>Narrative of Joseph of Arimathea</name>
 	</book>
 	<book>
@@ -440,6 +441,7 @@
 	</book>
 	<book>
 		<id>ActsPetAndrew</id>
+		<abbr>J44</abbr>
 		<name>Acts of Peter and Andrew</name>
 	</book>
 	<book>
@@ -448,6 +450,7 @@
 	</book>
 	<book>
 		<id>ActsAndrewMatthias</id>
+		<abbr>J43</abbr>
 		<name>Acts of Andrew and Matthias</name>
 	</book>
 	<book>

Modified: trunk/versification/canon.otp.xml
===================================================================
--- trunk/versification/canon.otp.xml	2009-03-14 09:58:38 UTC (rev 173)
+++ trunk/versification/canon.otp.xml	2009-03-14 11:28:07 UTC (rev 174)
@@ -188,6 +188,7 @@
 	</book>
 	<book>
 		<id>MartIs</id>
+		<abbr>MrI</abbr>
 		<name>Martyrdom of Isaiah</name>
 	</book>
 	<book>
@@ -251,6 +252,7 @@
 	</book>
 	<book>
 		<id>AsMos</id>
+		<abbr>AsM</abbr>
 		<name>Assumption of Moses</name>
 	</book>
 	<book>
@@ -307,6 +309,7 @@
 	</book>
 	<book>
 		<id>SibOr</id>
+		<abbr>Sib</abbr>
 		<name>Sibylline Oracles</name>
 	</book>
 	<book>

Modified: trunk/versification/v11nsys.pl
===================================================================
--- trunk/versification/v11nsys.pl	2009-03-14 09:58:38 UTC (rev 173)
+++ trunk/versification/v11nsys.pl	2009-03-14 11:28:07 UTC (rev 174)
@@ -188,7 +188,7 @@
 	    if ($thisBook ne $lastBook) {
 		$bCount++;
 		$vm .= "\n\t// $idmap{$osis{lc($thisBook)}}\n\t";
-		$abbrevsList .= $abbrevs{lc($thisBook)};
+		$abbrevsList .= $abbrevs{lc($osis{lc($thisBook)})};
 		
 		if ($lastBook ne "") {
 		    buildBooksArrays{};