[sword-svn] r168 - trunk/versification
chrislit at crosswire.org
chrislit at crosswire.org
Fri Mar 13 19:31:00 MST 2009
Author: chrislit
Date: 2009-03-13 19:31:00 -0700 (Fri, 13 Mar 2009)
New Revision: 168
Modified:
trunk/versification/af.xml
trunk/versification/bible.xml
trunk/versification/otp.xml
trunk/versification/v11nsys.pl
Log:
made book ID identification case insensitive
Modified: trunk/versification/af.xml
===================================================================
--- trunk/versification/af.xml 2009-03-12 22:14:56 UTC (rev 167)
+++ trunk/versification/af.xml 2009-03-14 02:31:00 UTC (rev 168)
@@ -6,7 +6,7 @@
<book>
<id>Barn</id>
<abbr>Brn</abbr>
- <name>Epistle of Barnabas</name>
+ <name>Barnabas</name>
</book>
<book>
<id>1Clem</id>
@@ -46,44 +46,37 @@
<book>
<id>IgnMagn</id>
<abbr>IMg</abbr>
- <abbr>Img</abbr>
- <name>Epistle of Ignatius to the Magnesians</name>
+ <name>Ignatius to the Magnesians</name>
</book>
<book>
<id>IgnPhld</id>
<abbr>IPh</abbr>
- <abbr>Iph</abbr>
- <name>Epistle of Ignatius to the Philadephians</name>
+ <name>Ignatius to the Philadephians</name>
</book>
<book>
<id>IgnPol</id>
<abbr>IPo</abbr>
- <abbr>Ipo</abbr>
- <name>Epistle of Ignatius to Polycarp</name>
+ <name>Ignatius to Polycarp</name>
</book>
<book>
<id>IgnRom</id>
<abbr>IRo</abbr>
- <abbr>Iro</abbr>
- <name>Epistle of Ignatius to the Romans</name>
+ <name>Ignatius to the Romans</name>
</book>
<book>
<id>IgnSmyrn</id>
<abbr>ISm</abbr>
- <abbr>Ism</abbr>
- <name>Epistle of Ignatius to the Smyrnaeans</name>
+ <name>Ignatius to the Smyrnaeans</name>
</book>
<book>
<id>IgnTrall</id>
<abbr>ITr</abbr>
- <abbr>Itr</abbr>
- <name>Epistle of Ignatius to the Trallians</name>
+ <name>Ignatius to the Trallians</name>
</book>
<book>
<id>IgnEph</id>
<abbr>IEp</abbr>
- <abbr>Iep</abbr>
- <name>Epistle of Ignatius to the Ephesians</name>
+ <name>Ignatius to the Ephesians</name>
</book>
<book>
<id>MartPol</id>
@@ -93,6 +86,45 @@
<book>
<id>PolPhil</id>
<abbr>Pol</abbr>
- <name>Epistle of Polycarp to the Philippians</name>
+ <name>Polycarp to the Philippians</name>
</book>
+
+ <!-- long versions -->
+
+ <book>
+ <id>IgnMagnLg</id>
+ <abbr>IMgl</abbr>
+ <name>Ignatius to the Magnesians (Longer)</name>
+ </book>
+ <book>
+ <id>IgnPhldLg</id>
+ <abbr>IPl</abbr>
+ <name>Ignatius to the Philadephians (Longer)</name>
+ </book>
+ <book>
+ <id>IgnPolLg</id>
+ <abbr>IPc</abbr>
+ <name>Ignatius to Polycarp (Longer)</name>
+ </book>
+ <book>
+ <id>IgnRomLg</id>
+ <abbr>IRl</abbr>
+ <name>Ignatius to the Romans (Longer)</name>
+ </book>
+ <book>
+ <id>IgnSmyrnLg</id>
+ <abbr>ISl</abbr>
+ <name>Ignatius to the Smyrnaeans (Longer)</name>
+ </book>
+ <book>
+ <id>IgnTrallLg</id>
+ <abbr>ITl</abbr>
+ <name>Ignatius to the Trallians (Longer)</name>
+ </book>
+ <book>
+ <id>IgnEphLg</id>
+ <abbr>IEl</abbr>
+ <name>Ignatius to the Ephesians (Longer)</name>
+ </book>
+
</collection>
Modified: trunk/versification/bible.xml
===================================================================
--- trunk/versification/bible.xml 2009-03-12 22:14:56 UTC (rev 167)
+++ trunk/versification/bible.xml 2009-03-14 02:31:00 UTC (rev 168)
@@ -308,7 +308,6 @@
<book>
<id>Jude</id>
<abbr>Jud</abbr>
- <abbr>JUD</abbr>
<name>Jude</name>
</book>
<book>
@@ -392,8 +391,8 @@
</book>
<book>
<id>AddPs</id>
- <id>Psx</id>
- <name>Additional Psalm(s)</name>
+ <abbr>Psx</abbr>
+ <name>Additional Psalm</name>
</book>
<book>
<id>EsthGr</id>
@@ -434,12 +433,10 @@
</book>
<book>
<id>Sus</id>
- <abbr>SUS</abbr>
<name>Susanna</name>
</book>
<book>
<id>Bel</id>
- <abbr>BEL</abbr>
<name>Bel and the Dragon</name>
</book>
<book>
@@ -497,7 +494,6 @@
<book>
<id>SirP</id>
<abbr>Sip</abbr>
- <abbr>SIP</abbr>
<name>Sirach (Prologue)</name>
</book>
</collection>
Modified: trunk/versification/otp.xml
===================================================================
--- trunk/versification/otp.xml 2009-03-12 22:14:56 UTC (rev 167)
+++ trunk/versification/otp.xml 2009-03-14 02:31:00 UTC (rev 168)
@@ -51,16 +51,19 @@
</book>
<book>
<id>2Bar</id>
+ <abbr>2Ba</abbr>
<name>II Baruch</name>
<name>Syriac Apocalypse of Baruch</name>
</book>
<book>
<id>3Bar</id>
+ <abbr>3Ba</abbr>
<name>III Baruch</name>
<name>Greek Apocalypse of Baruch</name>
</book>
<book>
<id>4Bar</id>
+ <abbr>4Ba</abbr>
<name>IV Baruch</name>
<name>Paraleipomena Jeremiou</name>
</book>
@@ -94,6 +97,7 @@
</book>
<book>
<id>2En</id>
+ <abbr>2En</abbr>
<name>II Enoch</name>
<name>Slavonic Apocalypse of Enoch</name>
</book>
@@ -216,6 +220,7 @@
</book>
<book>
<id>5Mac</id>
+ <abbr>5Ma</abbr>
<name>V Maccabees</name>
</book>
<book>
Modified: trunk/versification/v11nsys.pl
===================================================================
--- trunk/versification/v11nsys.pl 2009-03-12 22:14:56 UTC (rev 167)
+++ trunk/versification/v11nsys.pl 2009-03-14 02:31:00 UTC (rev 168)
@@ -16,17 +16,17 @@
sub buildBooks {
- if ($lastBook ne "" && $osis{$lastBook} eq "") {
+ if ($lastBook ne "" && $osis{lc($lastBook)} eq "") {
print "ERROR: Unknown book abbreviation: $lastBook in $v11n\n";
}
- if ($osis{$lastBook} eq "Matt") {
+ if ($osis{lc($lastBook)} eq "Matt") {
$otnt = 1;
}
if ($otnt == 0) {
- $otbooks .= "\t{\"$idmap{$osis{$lastBook}}\", \"$osis{$lastBook}\", \"$osis{$lastBook}\", $cCount},\n";
+ $otbooks .= "\t{\"$idmap{$osis{lc($lastBook)}}\", \"$osis{lc($lastBook)}\", \"$osis{lc($lastBook)}\", $cCount},\n";
}
else {
- $ntbooks .= "\t{\"$idmap{$osis{$lastBook}}\", \"$osis{$lastBook}\", \"$osis{$lastBook}\", $cCount},\n";
+ $ntbooks .= "\t{\"$idmap{$osis{lc($lastBook)}}\", \"$osis{lc($lastBook)}\", \"$osis{lc($lastBook)}\", $cCount},\n";
}
}
@@ -52,10 +52,10 @@
if ($line =~ /<id>(.+?)<\/id>/) {
$id = $1;
- $osis{$id} = $id;
+ $osis{lc($id)} = $id;
}
elsif ($line =~ /<abbr>(.+?)<\/abbr>/) {
- $osis{$1} = $id;
+ $osis{lc($1)} = $id;
}
elsif ($line =~ /<name>(.+?)<\/name>/) {
$name = $1;
@@ -159,7 +159,7 @@
if ($thisBook ne $lastBook) {
$bCount++;
- $vm .= "\n\t// $idmap{$osis{$thisBook}}\n\t";
+ $vm .= "\n\t// $idmap{$osis{lc($thisBook)}}\n\t";
if ($lastBook ne "") {
buildBooks{};
}
More information about the sword-cvs
mailing list