[sword-svn] r180 - trunk/versification
chrislit at crosswire.org
chrislit at crosswire.org
Sun Mar 15 23:24:07 MST 2009
Author: chrislit
Date: 2009-03-15 23:24:07 -0700 (Sun, 15 Mar 2009)
New Revision: 180
Modified:
trunk/versification/canon.af.xml
trunk/versification/canon.bible.xml
trunk/versification/canon.nta.xml
trunk/versification/canon.xsd
Log:
added Westminster book abbrevs
added alternate mode information to mapping files (also needed to parse Westminster style verse refs)
Modified: trunk/versification/canon.af.xml
===================================================================
--- trunk/versification/canon.af.xml 2009-03-16 03:10:56 UTC (rev 179)
+++ trunk/versification/canon.af.xml 2009-03-16 06:24:07 UTC (rev 180)
@@ -6,7 +6,7 @@
<book>
<id>Barn</id>
<abbr>Brn</abbr>
- <!-- used by OLB, but overlaps with Baruch abbrev <abbr>Bar</abbr> -->
+ <abbr mode="olb">Bar</abbr>
<name>Barnabas</name>
</book>
<book>
@@ -65,19 +65,19 @@
<book>
<id>IgnPhld</id>
<abbr>IPh</abbr>
- <!-- used by OLB, but overlaps with Philippians abbrev <abbr>Phi</abbr> -->
+ <abbr mode="olb">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> -->
+ <abbr mode="olb">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> -->
+ <abbr mode="olb">Rom</abbr>
<name>Ignatius to the Romans</name>
</book>
<book>
@@ -95,7 +95,7 @@
<book>
<id>IgnEph</id>
<abbr>IEp</abbr>
- <!-- used by OLB, but overlaps with Ephesians abbrev <abbr>Eph</abbr> -->
+ <!-- used by OLB, but overlaps with Ephesians abbrev <abbr mode="olb">Eph</abbr> -->
<name>Ignatius to the Ephesians</name>
</book>
<book>
@@ -106,7 +106,7 @@
<book>
<id>PolPhil</id>
<abbr>Pol</abbr>
- <!-- used by OLB, but overlaps with Philippians abbrev <abbr>Php</abbr> -->
+ <!-- used by OLB, but overlaps with Philippians abbrev <abbr mode="olb">Php</abbr> -->
<name>Polycarp to the Philippians</name>
</book>
<book>
Modified: trunk/versification/canon.bible.xml
===================================================================
--- trunk/versification/canon.bible.xml 2009-03-16 03:10:56 UTC (rev 179)
+++ trunk/versification/canon.bible.xml 2009-03-16 06:24:07 UTC (rev 180)
@@ -21,6 +21,7 @@
<id>Lev</id>
<abbr>Le</abbr>
<abbr>Levit</abbr>
+ <abbr>Lv</abbr>
<name>Leviticus</name>
</book>
<book>
@@ -44,6 +45,7 @@
<book>
<id>Josh</id>
<abbr>Jos</abbr>
+ <abbr>Js</abbr>
<name>Joshua</name>
<name>J</name>
</book>
@@ -52,7 +54,7 @@
<abbr>Jdg</abbr>
<abbr>Ju</abbr>
<abbr>Jd</abbr>
- <!-- used by OLB, CCEL but overlaps with Jude abbrev <abbr>Jud</abbr> -->
+ <abbr mode="olb">Jud</abbr>
<name>Judges</name>
<name>Jdgs</name>
</book>
@@ -65,6 +67,7 @@
<book>
<id>1Sam</id>
<abbr>1Sa</abbr>
+ <abbr>1S</abbr>
<name>I Samuel</name>
<name>ISamuel</name>
<name>1 Samuel</name>
@@ -81,6 +84,7 @@
<book>
<id>2Sam</id>
<abbr>2Sa</abbr>
+ <abbr>2S</abbr>
<name>II Samuel</name>
<name>IISamuel</name>
<name>2 Samuel</name>
@@ -100,6 +104,7 @@
<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 +134,9 @@
<id>2Kgs</id>
<abbr>2Ki</abbr>
<abbr>2King</abbr>
+ <abbr>4Ki</abbr>
+ <abbr>4King</abbr>
+ <abbr>2K</abbr>
<name>II Kings</name>
<name>IIKings</name>
<name>2 Kings</name>
@@ -159,7 +167,7 @@
<abbr>1Ch</abbr>
<abbr>1Chron</abbr>
<abbr>1Chro</abbr>
- <abbr>1Ch</abbr>
+ <abbr mode="westminster">1C</abbr>
<abbr>1Pa</abbr>
<abbr>1Par</abbr>
<abbr>1Para</abbr>
@@ -179,7 +187,7 @@
<abbr>2Ch</abbr>
<abbr>2Chron</abbr>
<abbr>2Chro</abbr>
- <abbr>2Ch</abbr>
+ <abbr mode="westminster">2C</abbr>
<abbr>2Pa</abbr>
<abbr>2Par</abbr>
<abbr>2Para</abbr>
@@ -198,6 +206,7 @@
<id>Ezra</id>
<abbr>Ezr</abbr>
<abbr>Ez</abbr>
+ <abbr>Er</abbr>
<name>Ezra</name>
</book>
<book>
@@ -216,6 +225,7 @@
<book>
<id>Job</id>
<abbr>Jo</abbr>
+ <abbr>Jb</abbr>
<name>Job</name>
</book>
<book>
@@ -253,6 +263,7 @@
<abbr>Canticle</abbr>
<abbr>Canticles</abbr>
<abbr>Sol. Song</abbr>
+ <abbr>Ca</abbr>
<name>Song of Solomon</name>
<name>Canticle of Canticles</name>
<name>Sng</name>
@@ -276,11 +287,13 @@
<abbr>La</abbr>
<abbr>Lament</abbr>
<abbr>Lamen</abbr>
+ <abbr>Lm</abbr>
<name>Lamentations</name>
</book>
<book>
<id>Ezek</id>
<abbr>Eze</abbr>
+ <abbr>Ek</abbr>
<name>Ezekiel</name>
<name>Ezk</name>
</book>
@@ -298,6 +311,7 @@
<book>
<id>Joel</id>
<abbr>Joe</abbr>
+ <abbr>Jl</abbr>
<name>Joel</name>
<name>Jol</name>
</book>
@@ -317,6 +331,7 @@
<id>Jonah</id>
<abbr>Jon</abbr>
<abbr>Jona</abbr>
+ <abbr mode="westminster">Jn</abbr>
<name>Jonah</name>
</book>
<book>
@@ -334,28 +349,33 @@
<id>Hab</id>
<abbr>Habak</abbr>
<abbr>Ha</abbr>
+ <abbr>Hb</abbr>
<name>Habakkuk</name>
</book>
<book>
<id>Zeph</id>
<abbr>Zep</abbr>
+ <abbr>Zp</abbr>
<name>Zephaniah</name>
</book>
<book>
<id>Hag</id>
<abbr>Hagg</abbr>
<abbr>Ha</abbr>
+ <abbr>Hg</abbr>
<name>Haggai</name>
</book>
<book>
<id>Zech</id>
<abbr>Zec</abbr>
+ <abbr>Zc</abbr>
<name>Zechariah</name>
</book>
<book>
<id>Mal</id>
<abbr>Malach</abbr>
<abbr>Malac</abbr>
+ <abbr mode="westminster">Ma</abbr>
<name>Malachi</name>
</book>
<!-- New Testament -->
Modified: trunk/versification/canon.nta.xml
===================================================================
--- trunk/versification/canon.nta.xml 2009-03-16 03:10:56 UTC (rev 179)
+++ trunk/versification/canon.nta.xml 2009-03-16 06:24:07 UTC (rev 180)
@@ -12,7 +12,7 @@
</book>
<book>
<id>ProtJas</id>
- <!-- used by OLB, but overlaps with Proverbs abbrev <abbr>Pro</abbr> -->
+ <abbr mode="olb">Pro</abbr>
<abbr>PrJ</abbr>
<name>Protevangelium of James</name>
</book>
Modified: trunk/versification/canon.xsd
===================================================================
--- trunk/versification/canon.xsd 2009-03-16 03:10:56 UTC (rev 179)
+++ trunk/versification/canon.xsd 2009-03-16 06:24:07 UTC (rev 180)
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:simpleType name="ST_abbr">
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
<xs:element name="name">
<xs:simpleType>
<xs:restriction base="xs:string"/>
@@ -27,8 +30,19 @@
</xs:complexType>
</xs:element>
<xs:element name="abbr">
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="ST_abbr">
+ <xs:attribute name="mode">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="olb"/>
+ <xs:enumeration value="westminster"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
</xs:element>
</xs:schema>
More information about the sword-cvs
mailing list