[sword-svn] r165 - trunk/versification
chrislit at crosswire.org
chrislit at crosswire.org
Thu Mar 12 05:26:01 MST 2009
Author: chrislit
Date: 2009-03-12 05:26:00 -0700 (Thu, 12 Mar 2009)
New Revision: 165
Modified:
trunk/versification/Bible.LXX.xml
trunk/versification/Bible.NRSVA.xml
trunk/versification/Bible.Vul.xml
trunk/versification/bible.xml
trunk/versification/v11nsys.pl
Log:
corrected/reassigned some of the CCEL source data
added mappings for alternate abbrevs
Modified: trunk/versification/Bible.LXX.xml
===================================================================
--- trunk/versification/Bible.LXX.xml 2009-03-12 11:10:36 UTC (rev 164)
+++ trunk/versification/Bible.LXX.xml 2009-03-12 12:26:00 UTC (rev 165)
@@ -32063,7 +32063,7 @@
<map from="Neh.11" to="2Esd.21"/>
<map from="Neh.12" to="2Esd.22"/>
<map from="Neh.13" to="2Esd.23"/>
- <map from="GrEsth" to="Esth"/>
+ <map from="EsthGr" to="Esth"/>
<map from="Job.41.1" to="Job.40.25"/>
<map from="Job.41.2" to="Job.40.26"/>
<map from="Job.41.3" to="Job.40.27"/>
@@ -34178,7 +34178,7 @@
<map from="2Esd.21" to="Neh.11"/>
<map from="2Esd.22" to="Neh.12"/>
<map from="2Esd.23" to="Neh.13"/>
- <map from="Esth" to="GrEsth"/>
+ <map from="Esth" to="EsthGr"/>
<map from="Job.40.25" to="Job.41.1"/>
<map from="Job.40.26" to="Job.41.2"/>
<map from="Job.40.27" to="Job.41.3"/>
Modified: trunk/versification/Bible.NRSVA.xml
===================================================================
--- trunk/versification/Bible.NRSVA.xml 2009-03-12 11:10:36 UTC (rev 164)
+++ trunk/versification/Bible.NRSVA.xml 2009-03-12 12:26:00 UTC (rev 165)
@@ -23754,277 +23754,277 @@
<osisID code="Jdt.16.23"/>
<osisID code="Jdt.16.24"/>
<osisID code="Jdt.16.25"/>
- <osisID code="GrEsth.11.2"/>
- <osisID code="GrEsth.11.3"/>
- <osisID code="GrEsth.11.4"/>
- <osisID code="GrEsth.11.5"/>
- <osisID code="GrEsth.11.6"/>
- <osisID code="GrEsth.11.7"/>
- <osisID code="GrEsth.11.8"/>
- <osisID code="GrEsth.11.9"/>
- <osisID code="GrEsth.11.10"/>
- <osisID code="GrEsth.11.11"/>
- <osisID code="GrEsth.11.12"/>
- <osisID code="GrEsth.12.1"/>
- <osisID code="GrEsth.12.2"/>
- <osisID code="GrEsth.12.3"/>
- <osisID code="GrEsth.12.4"/>
- <osisID code="GrEsth.12.5"/>
- <osisID code="GrEsth.12.6"/>
- <osisID code="GrEsth.1.1"/>
- <osisID code="GrEsth.1.2"/>
- <osisID code="GrEsth.1.3"/>
- <osisID code="GrEsth.1.4"/>
- <osisID code="GrEsth.1.5"/>
- <osisID code="GrEsth.1.6"/>
- <osisID code="GrEsth.1.7"/>
- <osisID code="GrEsth.1.8"/>
- <osisID code="GrEsth.1.9"/>
- <osisID code="GrEsth.1.10"/>
- <osisID code="GrEsth.1.11"/>
- <osisID code="GrEsth.1.12"/>
- <osisID code="GrEsth.1.13"/>
- <osisID code="GrEsth.1.14"/>
- <osisID code="GrEsth.1.15"/>
- <osisID code="GrEsth.1.16"/>
- <osisID code="GrEsth.1.17"/>
- <osisID code="GrEsth.1.18"/>
- <osisID code="GrEsth.1.19"/>
- <osisID code="GrEsth.1.20"/>
- <osisID code="GrEsth.1.21"/>
- <osisID code="GrEsth.1.22"/>
- <osisID code="GrEsth.2.1"/>
- <osisID code="GrEsth.2.2"/>
- <osisID code="GrEsth.2.3"/>
- <osisID code="GrEsth.2.4"/>
- <osisID code="GrEsth.2.5"/>
- <osisID code="GrEsth.2.6"/>
- <osisID code="GrEsth.2.7"/>
- <osisID code="GrEsth.2.8"/>
- <osisID code="GrEsth.2.9"/>
- <osisID code="GrEsth.2.10"/>
- <osisID code="GrEsth.2.11"/>
- <osisID code="GrEsth.2.12"/>
- <osisID code="GrEsth.2.13"/>
- <osisID code="GrEsth.2.14"/>
- <osisID code="GrEsth.2.15"/>
- <osisID code="GrEsth.2.16"/>
- <osisID code="GrEsth.2.17"/>
- <osisID code="GrEsth.2.18"/>
- <osisID code="GrEsth.2.19"/>
- <osisID code="GrEsth.2.20"/>
- <osisID code="GrEsth.2.21"/>
- <osisID code="GrEsth.2.22"/>
- <osisID code="GrEsth.2.23"/>
- <osisID code="GrEsth.3.1"/>
- <osisID code="GrEsth.3.2"/>
- <osisID code="GrEsth.3.3"/>
- <osisID code="GrEsth.3.4"/>
- <osisID code="GrEsth.3.5"/>
- <osisID code="GrEsth.3.6"/>
- <osisID code="GrEsth.3.7"/>
- <osisID code="GrEsth.3.8"/>
- <osisID code="GrEsth.3.9"/>
- <osisID code="GrEsth.3.10"/>
- <osisID code="GrEsth.3.11"/>
- <osisID code="GrEsth.3.12"/>
- <osisID code="GrEsth.3.13"/>
- <osisID code="GrEsth.13.1"/>
- <osisID code="GrEsth.13.2"/>
- <osisID code="GrEsth.13.3"/>
- <osisID code="GrEsth.13.4"/>
- <osisID code="GrEsth.13.5"/>
- <osisID code="GrEsth.13.6"/>
- <osisID code="GrEsth.13.7"/>
- <osisID code="GrEsth.3.14"/>
- <osisID code="GrEsth.3.15"/>
- <osisID code="GrEsth.4.1"/>
- <osisID code="GrEsth.4.2"/>
- <osisID code="GrEsth.4.3"/>
- <osisID code="GrEsth.4.4"/>
- <osisID code="GrEsth.4.5"/>
- <osisID code="GrEsth.4.6"/>
- <osisID code="GrEsth.4.7"/>
- <osisID code="GrEsth.4.8"/>
- <osisID code="GrEsth.4.9"/>
- <osisID code="GrEsth.4.10"/>
- <osisID code="GrEsth.4.11"/>
- <osisID code="GrEsth.4.12"/>
- <osisID code="GrEsth.4.13"/>
- <osisID code="GrEsth.4.14"/>
- <osisID code="GrEsth.4.15"/>
- <osisID code="GrEsth.4.16"/>
- <osisID code="GrEsth.4.17"/>
- <osisID code="GrEsth.13.8"/>
- <osisID code="GrEsth.13.9"/>
- <osisID code="GrEsth.13.10"/>
- <osisID code="GrEsth.13.11"/>
- <osisID code="GrEsth.13.12"/>
- <osisID code="GrEsth.13.13"/>
- <osisID code="GrEsth.13.14"/>
- <osisID code="GrEsth.13.15"/>
- <osisID code="GrEsth.13.16"/>
- <osisID code="GrEsth.13.17"/>
- <osisID code="GrEsth.13.18"/>
- <osisID code="GrEsth.14.1"/>
- <osisID code="GrEsth.14.2"/>
- <osisID code="GrEsth.14.3"/>
- <osisID code="GrEsth.14.4"/>
- <osisID code="GrEsth.14.5"/>
- <osisID code="GrEsth.14.6"/>
- <osisID code="GrEsth.14.7"/>
- <osisID code="GrEsth.14.8"/>
- <osisID code="GrEsth.14.9"/>
- <osisID code="GrEsth.14.10"/>
- <osisID code="GrEsth.14.11"/>
- <osisID code="GrEsth.14.12"/>
- <osisID code="GrEsth.14.13"/>
- <osisID code="GrEsth.14.14"/>
- <osisID code="GrEsth.14.15"/>
- <osisID code="GrEsth.14.16"/>
- <osisID code="GrEsth.14.17"/>
- <osisID code="GrEsth.14.18"/>
- <osisID code="GrEsth.14.19"/>
- <osisID code="GrEsth.15.1"/>
- <osisID code="GrEsth.15.2"/>
- <osisID code="GrEsth.15.3"/>
- <osisID code="GrEsth.15.4"/>
- <osisID code="GrEsth.15.5"/>
- <osisID code="GrEsth.15.6"/>
- <osisID code="GrEsth.15.7"/>
- <osisID code="GrEsth.15.8"/>
- <osisID code="GrEsth.15.9"/>
- <osisID code="GrEsth.15.10"/>
- <osisID code="GrEsth.15.11"/>
- <osisID code="GrEsth.15.12"/>
- <osisID code="GrEsth.15.13"/>
- <osisID code="GrEsth.15.14"/>
- <osisID code="GrEsth.15.15"/>
- <osisID code="GrEsth.15.16"/>
- <osisID code="GrEsth.5.3"/>
- <osisID code="GrEsth.5.4"/>
- <osisID code="GrEsth.5.5"/>
- <osisID code="GrEsth.5.6"/>
- <osisID code="GrEsth.5.7"/>
- <osisID code="GrEsth.5.8"/>
- <osisID code="GrEsth.5.9"/>
- <osisID code="GrEsth.5.10"/>
- <osisID code="GrEsth.5.11"/>
- <osisID code="GrEsth.5.12"/>
- <osisID code="GrEsth.5.13"/>
- <osisID code="GrEsth.5.14"/>
- <osisID code="GrEsth.6.1"/>
- <osisID code="GrEsth.6.2"/>
- <osisID code="GrEsth.6.3"/>
- <osisID code="GrEsth.6.4"/>
- <osisID code="GrEsth.6.5"/>
- <osisID code="GrEsth.6.6"/>
- <osisID code="GrEsth.6.7"/>
- <osisID code="GrEsth.6.8"/>
- <osisID code="GrEsth.6.9"/>
- <osisID code="GrEsth.6.10"/>
- <osisID code="GrEsth.6.11"/>
- <osisID code="GrEsth.6.12"/>
- <osisID code="GrEsth.6.13"/>
- <osisID code="GrEsth.6.14"/>
- <osisID code="GrEsth.7.1"/>
- <osisID code="GrEsth.7.2"/>
- <osisID code="GrEsth.7.3"/>
- <osisID code="GrEsth.7.4"/>
- <osisID code="GrEsth.7.5"/>
- <osisID code="GrEsth.7.6"/>
- <osisID code="GrEsth.7.7"/>
- <osisID code="GrEsth.7.8"/>
- <osisID code="GrEsth.7.9"/>
- <osisID code="GrEsth.7.10"/>
- <osisID code="GrEsth.8.1"/>
- <osisID code="GrEsth.8.2"/>
- <osisID code="GrEsth.8.3"/>
- <osisID code="GrEsth.8.4"/>
- <osisID code="GrEsth.8.5"/>
- <osisID code="GrEsth.8.6"/>
- <osisID code="GrEsth.8.7"/>
- <osisID code="GrEsth.8.8"/>
- <osisID code="GrEsth.8.9"/>
- <osisID code="GrEsth.8.10"/>
- <osisID code="GrEsth.8.11"/>
- <osisID code="GrEsth.8.12"/>
- <osisID code="GrEsth.16.1"/>
- <osisID code="GrEsth.16.2"/>
- <osisID code="GrEsth.16.3"/>
- <osisID code="GrEsth.16.4"/>
- <osisID code="GrEsth.16.5"/>
- <osisID code="GrEsth.16.6"/>
- <osisID code="GrEsth.16.7"/>
- <osisID code="GrEsth.16.8"/>
- <osisID code="GrEsth.16.9"/>
- <osisID code="GrEsth.16.10"/>
- <osisID code="GrEsth.16.11"/>
- <osisID code="GrEsth.16.12"/>
- <osisID code="GrEsth.16.13"/>
- <osisID code="GrEsth.16.14"/>
- <osisID code="GrEsth.16.15"/>
- <osisID code="GrEsth.16.16"/>
- <osisID code="GrEsth.16.17"/>
- <osisID code="GrEsth.16.18"/>
- <osisID code="GrEsth.16.19"/>
- <osisID code="GrEsth.16.20"/>
- <osisID code="GrEsth.16.21"/>
- <osisID code="GrEsth.16.22"/>
- <osisID code="GrEsth.16.23"/>
- <osisID code="GrEsth.16.24"/>
- <osisID code="GrEsth.8.13"/>
- <osisID code="GrEsth.8.14"/>
- <osisID code="GrEsth.8.15"/>
- <osisID code="GrEsth.8.16"/>
- <osisID code="GrEsth.8.17"/>
- <osisID code="GrEsth.8.17"/>
- <osisID code="GrEsth.9.1"/>
- <osisID code="GrEsth.9.2"/>
- <osisID code="GrEsth.9.3"/>
- <osisID code="GrEsth.9.4"/>
- <osisID code="GrEsth.9.5"/>
- <osisID code="GrEsth.9.6"/>
- <osisID code="GrEsth.9.7"/>
- <osisID code="GrEsth.9.8"/>
- <osisID code="GrEsth.9.9"/>
- <osisID code="GrEsth.9.10"/>
- <osisID code="GrEsth.9.11"/>
- <osisID code="GrEsth.9.12"/>
- <osisID code="GrEsth.9.13"/>
- <osisID code="GrEsth.9.14"/>
- <osisID code="GrEsth.9.15"/>
- <osisID code="GrEsth.9.16"/>
- <osisID code="GrEsth.9.17"/>
- <osisID code="GrEsth.9.18"/>
- <osisID code="GrEsth.9.19"/>
- <osisID code="GrEsth.9.20"/>
- <osisID code="GrEsth.9.21"/>
- <osisID code="GrEsth.9.22"/>
- <osisID code="GrEsth.9.23"/>
- <osisID code="GrEsth.9.24"/>
- <osisID code="GrEsth.9.25"/>
- <osisID code="GrEsth.9.26"/>
- <osisID code="GrEsth.9.27"/>
- <osisID code="GrEsth.9.28"/>
- <osisID code="GrEsth.9.29"/>
- <osisID code="GrEsth.9.30"/>
- <osisID code="GrEsth.9.31"/>
- <osisID code="GrEsth.9.32"/>
- <osisID code="GrEsth.10.1"/>
- <osisID code="GrEsth.10.2"/>
- <osisID code="GrEsth.10.3"/>
- <osisID code="GrEsth.10.4"/>
- <osisID code="GrEsth.10.5"/>
- <osisID code="GrEsth.10.6"/>
- <osisID code="GrEsth.10.7"/>
- <osisID code="GrEsth.10.8"/>
- <osisID code="GrEsth.10.9"/>
- <osisID code="GrEsth.10.10"/>
- <osisID code="GrEsth.10.11"/>
- <osisID code="GrEsth.10.12"/>
- <osisID code="GrEsth.10.13"/>
- <osisID code="GrEsth.11.1"/>
+ <osisID code="EsthGr.11.2"/>
+ <osisID code="EsthGr.11.3"/>
+ <osisID code="EsthGr.11.4"/>
+ <osisID code="EsthGr.11.5"/>
+ <osisID code="EsthGr.11.6"/>
+ <osisID code="EsthGr.11.7"/>
+ <osisID code="EsthGr.11.8"/>
+ <osisID code="EsthGr.11.9"/>
+ <osisID code="EsthGr.11.10"/>
+ <osisID code="EsthGr.11.11"/>
+ <osisID code="EsthGr.11.12"/>
+ <osisID code="EsthGr.12.1"/>
+ <osisID code="EsthGr.12.2"/>
+ <osisID code="EsthGr.12.3"/>
+ <osisID code="EsthGr.12.4"/>
+ <osisID code="EsthGr.12.5"/>
+ <osisID code="EsthGr.12.6"/>
+ <osisID code="EsthGr.1.1"/>
+ <osisID code="EsthGr.1.2"/>
+ <osisID code="EsthGr.1.3"/>
+ <osisID code="EsthGr.1.4"/>
+ <osisID code="EsthGr.1.5"/>
+ <osisID code="EsthGr.1.6"/>
+ <osisID code="EsthGr.1.7"/>
+ <osisID code="EsthGr.1.8"/>
+ <osisID code="EsthGr.1.9"/>
+ <osisID code="EsthGr.1.10"/>
+ <osisID code="EsthGr.1.11"/>
+ <osisID code="EsthGr.1.12"/>
+ <osisID code="EsthGr.1.13"/>
+ <osisID code="EsthGr.1.14"/>
+ <osisID code="EsthGr.1.15"/>
+ <osisID code="EsthGr.1.16"/>
+ <osisID code="EsthGr.1.17"/>
+ <osisID code="EsthGr.1.18"/>
+ <osisID code="EsthGr.1.19"/>
+ <osisID code="EsthGr.1.20"/>
+ <osisID code="EsthGr.1.21"/>
+ <osisID code="EsthGr.1.22"/>
+ <osisID code="EsthGr.2.1"/>
+ <osisID code="EsthGr.2.2"/>
+ <osisID code="EsthGr.2.3"/>
+ <osisID code="EsthGr.2.4"/>
+ <osisID code="EsthGr.2.5"/>
+ <osisID code="EsthGr.2.6"/>
+ <osisID code="EsthGr.2.7"/>
+ <osisID code="EsthGr.2.8"/>
+ <osisID code="EsthGr.2.9"/>
+ <osisID code="EsthGr.2.10"/>
+ <osisID code="EsthGr.2.11"/>
+ <osisID code="EsthGr.2.12"/>
+ <osisID code="EsthGr.2.13"/>
+ <osisID code="EsthGr.2.14"/>
+ <osisID code="EsthGr.2.15"/>
+ <osisID code="EsthGr.2.16"/>
+ <osisID code="EsthGr.2.17"/>
+ <osisID code="EsthGr.2.18"/>
+ <osisID code="EsthGr.2.19"/>
+ <osisID code="EsthGr.2.20"/>
+ <osisID code="EsthGr.2.21"/>
+ <osisID code="EsthGr.2.22"/>
+ <osisID code="EsthGr.2.23"/>
+ <osisID code="EsthGr.3.1"/>
+ <osisID code="EsthGr.3.2"/>
+ <osisID code="EsthGr.3.3"/>
+ <osisID code="EsthGr.3.4"/>
+ <osisID code="EsthGr.3.5"/>
+ <osisID code="EsthGr.3.6"/>
+ <osisID code="EsthGr.3.7"/>
+ <osisID code="EsthGr.3.8"/>
+ <osisID code="EsthGr.3.9"/>
+ <osisID code="EsthGr.3.10"/>
+ <osisID code="EsthGr.3.11"/>
+ <osisID code="EsthGr.3.12"/>
+ <osisID code="EsthGr.3.13"/>
+ <osisID code="EsthGr.13.1"/>
+ <osisID code="EsthGr.13.2"/>
+ <osisID code="EsthGr.13.3"/>
+ <osisID code="EsthGr.13.4"/>
+ <osisID code="EsthGr.13.5"/>
+ <osisID code="EsthGr.13.6"/>
+ <osisID code="EsthGr.13.7"/>
+ <osisID code="EsthGr.3.14"/>
+ <osisID code="EsthGr.3.15"/>
+ <osisID code="EsthGr.4.1"/>
+ <osisID code="EsthGr.4.2"/>
+ <osisID code="EsthGr.4.3"/>
+ <osisID code="EsthGr.4.4"/>
+ <osisID code="EsthGr.4.5"/>
+ <osisID code="EsthGr.4.6"/>
+ <osisID code="EsthGr.4.7"/>
+ <osisID code="EsthGr.4.8"/>
+ <osisID code="EsthGr.4.9"/>
+ <osisID code="EsthGr.4.10"/>
+ <osisID code="EsthGr.4.11"/>
+ <osisID code="EsthGr.4.12"/>
+ <osisID code="EsthGr.4.13"/>
+ <osisID code="EsthGr.4.14"/>
+ <osisID code="EsthGr.4.15"/>
+ <osisID code="EsthGr.4.16"/>
+ <osisID code="EsthGr.4.17"/>
+ <osisID code="EsthGr.13.8"/>
+ <osisID code="EsthGr.13.9"/>
+ <osisID code="EsthGr.13.10"/>
+ <osisID code="EsthGr.13.11"/>
+ <osisID code="EsthGr.13.12"/>
+ <osisID code="EsthGr.13.13"/>
+ <osisID code="EsthGr.13.14"/>
+ <osisID code="EsthGr.13.15"/>
+ <osisID code="EsthGr.13.16"/>
+ <osisID code="EsthGr.13.17"/>
+ <osisID code="EsthGr.13.18"/>
+ <osisID code="EsthGr.14.1"/>
+ <osisID code="EsthGr.14.2"/>
+ <osisID code="EsthGr.14.3"/>
+ <osisID code="EsthGr.14.4"/>
+ <osisID code="EsthGr.14.5"/>
+ <osisID code="EsthGr.14.6"/>
+ <osisID code="EsthGr.14.7"/>
+ <osisID code="EsthGr.14.8"/>
+ <osisID code="EsthGr.14.9"/>
+ <osisID code="EsthGr.14.10"/>
+ <osisID code="EsthGr.14.11"/>
+ <osisID code="EsthGr.14.12"/>
+ <osisID code="EsthGr.14.13"/>
+ <osisID code="EsthGr.14.14"/>
+ <osisID code="EsthGr.14.15"/>
+ <osisID code="EsthGr.14.16"/>
+ <osisID code="EsthGr.14.17"/>
+ <osisID code="EsthGr.14.18"/>
+ <osisID code="EsthGr.14.19"/>
+ <osisID code="EsthGr.15.1"/>
+ <osisID code="EsthGr.15.2"/>
+ <osisID code="EsthGr.15.3"/>
+ <osisID code="EsthGr.15.4"/>
+ <osisID code="EsthGr.15.5"/>
+ <osisID code="EsthGr.15.6"/>
+ <osisID code="EsthGr.15.7"/>
+ <osisID code="EsthGr.15.8"/>
+ <osisID code="EsthGr.15.9"/>
+ <osisID code="EsthGr.15.10"/>
+ <osisID code="EsthGr.15.11"/>
+ <osisID code="EsthGr.15.12"/>
+ <osisID code="EsthGr.15.13"/>
+ <osisID code="EsthGr.15.14"/>
+ <osisID code="EsthGr.15.15"/>
+ <osisID code="EsthGr.15.16"/>
+ <osisID code="EsthGr.5.3"/>
+ <osisID code="EsthGr.5.4"/>
+ <osisID code="EsthGr.5.5"/>
+ <osisID code="EsthGr.5.6"/>
+ <osisID code="EsthGr.5.7"/>
+ <osisID code="EsthGr.5.8"/>
+ <osisID code="EsthGr.5.9"/>
+ <osisID code="EsthGr.5.10"/>
+ <osisID code="EsthGr.5.11"/>
+ <osisID code="EsthGr.5.12"/>
+ <osisID code="EsthGr.5.13"/>
+ <osisID code="EsthGr.5.14"/>
+ <osisID code="EsthGr.6.1"/>
+ <osisID code="EsthGr.6.2"/>
+ <osisID code="EsthGr.6.3"/>
+ <osisID code="EsthGr.6.4"/>
+ <osisID code="EsthGr.6.5"/>
+ <osisID code="EsthGr.6.6"/>
+ <osisID code="EsthGr.6.7"/>
+ <osisID code="EsthGr.6.8"/>
+ <osisID code="EsthGr.6.9"/>
+ <osisID code="EsthGr.6.10"/>
+ <osisID code="EsthGr.6.11"/>
+ <osisID code="EsthGr.6.12"/>
+ <osisID code="EsthGr.6.13"/>
+ <osisID code="EsthGr.6.14"/>
+ <osisID code="EsthGr.7.1"/>
+ <osisID code="EsthGr.7.2"/>
+ <osisID code="EsthGr.7.3"/>
+ <osisID code="EsthGr.7.4"/>
+ <osisID code="EsthGr.7.5"/>
+ <osisID code="EsthGr.7.6"/>
+ <osisID code="EsthGr.7.7"/>
+ <osisID code="EsthGr.7.8"/>
+ <osisID code="EsthGr.7.9"/>
+ <osisID code="EsthGr.7.10"/>
+ <osisID code="EsthGr.8.1"/>
+ <osisID code="EsthGr.8.2"/>
+ <osisID code="EsthGr.8.3"/>
+ <osisID code="EsthGr.8.4"/>
+ <osisID code="EsthGr.8.5"/>
+ <osisID code="EsthGr.8.6"/>
+ <osisID code="EsthGr.8.7"/>
+ <osisID code="EsthGr.8.8"/>
+ <osisID code="EsthGr.8.9"/>
+ <osisID code="EsthGr.8.10"/>
+ <osisID code="EsthGr.8.11"/>
+ <osisID code="EsthGr.8.12"/>
+ <osisID code="EsthGr.16.1"/>
+ <osisID code="EsthGr.16.2"/>
+ <osisID code="EsthGr.16.3"/>
+ <osisID code="EsthGr.16.4"/>
+ <osisID code="EsthGr.16.5"/>
+ <osisID code="EsthGr.16.6"/>
+ <osisID code="EsthGr.16.7"/>
+ <osisID code="EsthGr.16.8"/>
+ <osisID code="EsthGr.16.9"/>
+ <osisID code="EsthGr.16.10"/>
+ <osisID code="EsthGr.16.11"/>
+ <osisID code="EsthGr.16.12"/>
+ <osisID code="EsthGr.16.13"/>
+ <osisID code="EsthGr.16.14"/>
+ <osisID code="EsthGr.16.15"/>
+ <osisID code="EsthGr.16.16"/>
+ <osisID code="EsthGr.16.17"/>
+ <osisID code="EsthGr.16.18"/>
+ <osisID code="EsthGr.16.19"/>
+ <osisID code="EsthGr.16.20"/>
+ <osisID code="EsthGr.16.21"/>
+ <osisID code="EsthGr.16.22"/>
+ <osisID code="EsthGr.16.23"/>
+ <osisID code="EsthGr.16.24"/>
+ <osisID code="EsthGr.8.13"/>
+ <osisID code="EsthGr.8.14"/>
+ <osisID code="EsthGr.8.15"/>
+ <osisID code="EsthGr.8.16"/>
+ <osisID code="EsthGr.8.17"/>
+ <osisID code="EsthGr.8.17"/>
+ <osisID code="EsthGr.9.1"/>
+ <osisID code="EsthGr.9.2"/>
+ <osisID code="EsthGr.9.3"/>
+ <osisID code="EsthGr.9.4"/>
+ <osisID code="EsthGr.9.5"/>
+ <osisID code="EsthGr.9.6"/>
+ <osisID code="EsthGr.9.7"/>
+ <osisID code="EsthGr.9.8"/>
+ <osisID code="EsthGr.9.9"/>
+ <osisID code="EsthGr.9.10"/>
+ <osisID code="EsthGr.9.11"/>
+ <osisID code="EsthGr.9.12"/>
+ <osisID code="EsthGr.9.13"/>
+ <osisID code="EsthGr.9.14"/>
+ <osisID code="EsthGr.9.15"/>
+ <osisID code="EsthGr.9.16"/>
+ <osisID code="EsthGr.9.17"/>
+ <osisID code="EsthGr.9.18"/>
+ <osisID code="EsthGr.9.19"/>
+ <osisID code="EsthGr.9.20"/>
+ <osisID code="EsthGr.9.21"/>
+ <osisID code="EsthGr.9.22"/>
+ <osisID code="EsthGr.9.23"/>
+ <osisID code="EsthGr.9.24"/>
+ <osisID code="EsthGr.9.25"/>
+ <osisID code="EsthGr.9.26"/>
+ <osisID code="EsthGr.9.27"/>
+ <osisID code="EsthGr.9.28"/>
+ <osisID code="EsthGr.9.29"/>
+ <osisID code="EsthGr.9.30"/>
+ <osisID code="EsthGr.9.31"/>
+ <osisID code="EsthGr.9.32"/>
+ <osisID code="EsthGr.10.1"/>
+ <osisID code="EsthGr.10.2"/>
+ <osisID code="EsthGr.10.3"/>
+ <osisID code="EsthGr.10.4"/>
+ <osisID code="EsthGr.10.5"/>
+ <osisID code="EsthGr.10.6"/>
+ <osisID code="EsthGr.10.7"/>
+ <osisID code="EsthGr.10.8"/>
+ <osisID code="EsthGr.10.9"/>
+ <osisID code="EsthGr.10.10"/>
+ <osisID code="EsthGr.10.11"/>
+ <osisID code="EsthGr.10.12"/>
+ <osisID code="EsthGr.10.13"/>
+ <osisID code="EsthGr.11.1"/>
<osisID code="Wis.1.1"/>
<osisID code="Wis.1.2"/>
<osisID code="Wis.1.3"/>
Modified: trunk/versification/Bible.Vul.xml
===================================================================
--- trunk/versification/Bible.Vul.xml 2009-03-12 11:10:36 UTC (rev 164)
+++ trunk/versification/Bible.Vul.xml 2009-03-12 12:26:00 UTC (rev 165)
@@ -7,7 +7,7 @@
This version uses the Hebrew numbering for the Psalms. Use
Bible.Vul.LXX for the LXX numbering.
- Bible.Vul:Esth is mapped to Bible:GrEsth.
+ Bible.Vul:Esth is mapped to Bible:EsthGr.
Should we add 3Esd, 4Esd, and Ps151? Map 2Esd to Ezra/Neh?
==================================================================-->
@@ -37400,7 +37400,7 @@
<map from="Neh.12.44" to="Neh.12.45"/>
<map from="Neh.12.45" to="Neh.12.46"/>
<map from="Neh.12.46" to="Neh.12.47"/>
- <map from="Esth" to="GrEsth"/>
+ <map from="Esth" to="EsthGr"/>
<map from="Job.16.5" to="Job.16.4"/>
<map from="Job.16.6" to="Job.16.5"/>
<map from="Job.16.7" to="Job.16.6"/>
@@ -39708,7 +39708,7 @@
<map from="Neh.12.45" to="Neh.12.44"/>
<map from="Neh.12.46" to="Neh.12.45"/>
<map from="Neh.12.47" to="Neh.12.46"/>
- <map from="GrEsth" to="Esth"/>
+ <map from="EsthGr" to="Esth"/>
<map from="Job.16.4" to="Job.16.5"/>
<map from="Job.16.5" to="Job.16.6"/>
<map from="Job.16.6" to="Job.16.7"/>
Modified: trunk/versification/bible.xml
===================================================================
--- trunk/versification/bible.xml 2009-03-12 11:10:36 UTC (rev 164)
+++ trunk/versification/bible.xml 2009-03-12 12:26:00 UTC (rev 165)
@@ -8,6 +8,7 @@
</book>
<book>
<id>Exod</id>
+ <abbr>Exo</abbr>
<name>Exodus</name>
</book>
<book>
@@ -20,46 +21,57 @@
</book>
<book>
<id>Deut</id>
+ <abbr>Deu</abbr>
<name>Deuteronomy</name>
</book>
<book>
<id>Josh</id>
+ <abbr>Jos</abbr>
<name>Joshua</name>
</book>
<book>
<id>Judg</id>
+ <abbr>Jdg</abbr>
<name>Judges</name>
</book>
<book>
<id>Ruth</id>
+ <abbr>Rut</abbr>
<name>Ruth</name>
</book>
<book>
<id>1Sam</id>
+ <abbr>1Sa</abbr>
<name>I Samuel</name>
</book>
<book>
<id>2Sam</id>
+ <abbr>2Sa</abbr>
<name>II Samuel</name>
</book>
<book>
<id>1Kgs</id>
+ <abbr>1Ki</abbr>
<name>I Kings</name>
</book>
<book>
<id>2Kgs</id>
+ <abbr>2Ki</abbr>
<name>II Kings</name>
</book>
<book>
<id>1Chr</id>
+ <abbr>1Ch</abbr>
<name>I Chronicles</name>
</book>
<book>
<id>2Chr</id>
+ <abbr>2Ch</abbr>
<name>II Chronicles</name>
</book>
<book>
<id>Ezra</id>
+ <abbr>Ezr</abbr>
<name>Ezra</name>
</book>
<book>
@@ -68,6 +80,7 @@
</book>
<book>
<id>Esth</id>
+ <abbr>Est</abbr>
<name>Esther</name>
</book>
<book>
@@ -76,19 +89,23 @@
</book>
<book>
<id>Ps</id>
+ <abbr>Psa</abbr>
<name>Psalms</name>
</book>
<book>
<id>Prov</id>
+ <abbr>Pro</abbr>
<name>Proverbs</name>
</book>
<book>
<id>Eccl</id>
+ <abbr>Ecc</abbr>
<name>Ecclesiastes</name>
<name>Qohelot</name>
</book>
<book>
<id>Song</id>
+ <abbr>Sol</abbr>
<name>Song of Solomon</name>
<name>Canticle of Canticles</name>
</book>
@@ -106,6 +123,7 @@
</book>
<book>
<id>Ezek</id>
+ <abbr>Eze</abbr>
<name>Ezekiel</name>
</book>
<book>
@@ -118,18 +136,22 @@
</book>
<book>
<id>Joel</id>
+ <abbr>Joe</abbr>
<name>Joel</name>
</book>
<book>
<id>Amos</id>
+ <abbr>Amo</abbr>
<name>Amos</name>
</book>
<book>
<id>Obad</id>
+ <abbr>Oba</abbr>
<name>Obadiah</name>
</book>
<book>
<id>Jonah</id>
+ <abbr>Jon</abbr>
<name>Jonah</name>
</book>
<book>
@@ -146,6 +168,7 @@
</book>
<book>
<id>Zeph</id>
+ <abbr>Zep</abbr>
<name>Zephaniah</name>
</book>
<book>
@@ -154,6 +177,7 @@
</book>
<book>
<id>Zech</id>
+ <abbr>Zec</abbr>
<name>Zechariah</name>
</book>
<book>
@@ -163,22 +187,27 @@
<!-- New Testament -->
<book>
<id>Matt</id>
+ <abbr>Mat</abbr>
<name>Matthew</name>
</book>
<book>
<id>Mark</id>
+ <abbr>Mar</abbr>
<name>Mark</name>
</book>
<book>
<id>Luke</id>
+ <abbr>Luk</abbr>
<name>Luke</name>
</book>
<book>
<id>John</id>
+ <abbr>Joh</abbr>
<name>John</name>
</book>
<book>
<id>Acts</id>
+ <abbr>Act</abbr>
<name>Acts</name>
</book>
<book>
@@ -187,10 +216,12 @@
</book>
<book>
<id>1Cor</id>
+ <abbr>1Co</abbr>
<name>I Corinthians</name>
</book>
<book>
<id>2Cor</id>
+ <abbr>2Co</abbr>
<name>II Corinthians</name>
</book>
<book>
@@ -203,6 +234,7 @@
</book>
<book>
<id>Phil</id>
+ <abbr>Phi</abbr>
<name>Philippians</name>
</book>
<book>
@@ -211,26 +243,32 @@
</book>
<book>
<id>1Thess</id>
+ <abbr>1Th</abbr>
<name>I Thessalonians</name>
</book>
<book>
<id>2Thess</id>
+ <abbr>2Th</abbr>
<name>II Thessalonians</name>
</book>
<book>
<id>1Tim</id>
+ <abbr>1Ti</abbr>
<name>I Timothy</name>
</book>
<book>
<id>2Tim</id>
+ <abbr>2Ti</abbr>
<name>II Timothy</name>
</book>
<book>
<id>Titus</id>
+ <abbr>Tit</abbr>
<name>Titus</name>
</book>
<book>
<id>Phlm</id>
+ <abbr>Phm</abbr>
<name>Philemon</name>
</book>
<book>
@@ -239,30 +277,37 @@
</book>
<book>
<id>Jas</id>
+ <abbr>Jam</abbr>
<name>James</name>
</book>
<book>
<id>1Pet</id>
+ <abbr>1Pe</abbr>
<name>I Peter</name>
</book>
<book>
<id>2Pet</id>
+ <abbr>2Pe</abbr>
<name>II Peter</name>
</book>
<book>
<id>1John</id>
+ <abbr>1Jo</abbr>
<name>I John</name>
</book>
<book>
<id>2John</id>
+ <abbr>2Jo</abbr>
<name>II John</name>
</book>
<book>
<id>3John</id>
+ <abbr>3Jo</abbr>
<name>III John</name>
</book>
<book>
<id>Jude</id>
+ <abbr>Jud</abbr>
<name>Jude</name>
</book>
<book>
@@ -295,43 +340,52 @@
</book>
<book>
<id>EpJer</id>
+ <abbr>Epj</abbr>
<name>Epistle of Jeremiah</name>
</book>
<book>
<id>1Esd</id>
+ <abbr>1Es</abbr>
<name>I Esdras</name>
<name>III Ezra</name>
<name>Esdras A</name>
</book>
<book>
<id>2Esd</id>
+ <abbr>2Es</abbr>
<name>II Esdras</name>
<name>IV Ezra</name>
<name>Esdras B</name>
</book>
<book>
<id>1Macc</id>
+ <abbr>1Ma</abbr>
<name>I Maccabees</name>
</book>
<book>
<id>2Macc</id>
+ <abbr>2Ma</abbr>
<name>II Maccabees</name>
</book>
<!-- LXX -->
<book>
<id>3Macc</id>
+ <abbr>3Ma</abbr>
<name>III Maccabees</name>
</book>
<book>
<id>4Macc</id>
+ <abbr>4Ma</abbr>
<name>IV Maccabees</name>
</book>
<book>
<id>Odes</id>
+ <abbr>Ode</abbr>
<name>Odes</name>
</book>
<book>
<id>PssSol</id>
+ <abbr>Pss</abbr>
<name>Psalms of Solomon</name>
</book>
<book>
@@ -339,13 +393,19 @@
<name>Additional Psalm(s)</name>
</book>
<book>
- <id>GrEsth</id>
+ <id>EsthGr</id>
+ <abbr>Esg</abbr>
<name>Esther (Greek)</name>
</book>
-
+ <book>
+ <id>DanGr</id>
+ <abbr>Dng</abbr>
+ <name>Daniel (Greek)</name>
+ </book>
<!-- Vulgate -->
<book>
<id>EpLao</id>
+ <abbr>Lao</abbr>
<name>Laodiceans</name>
</book>
<!--Ethiopian Orthodox Canon -->
@@ -383,38 +443,52 @@
<!-- LXX variants -->
<book>
<id>JoshA</id>
+ <abbr>Jsa</abbr>
<name>Joshua (Codex Alexandrinus)</name>
</book>
<book>
<id>JoshB</id>
+ <abbr>Jsb</abbr>
<name>Joshua (Codex Vaticanus)</name>
</book>
<book>
<id>JudgA</id>
+ <abbr>Jda</abbr>
<name>Joshua (Codex Alexandrinus)</name>
</book>
<book>
<id>JudgB</id>
+ <abbr>Jdb</abbr>
<name>Joshua (Codex Vaticanus)</name>
</book>
<book>
<id>TobBA</id>
+ <abbr>Tba</abbr>
<name>Tobit (Codices Vaticanus Alexandrinusque)</name>
</book>
<book>
<id>TobS</id>
+ <abbr>Tbs</abbr>
<name>Tobit (Codex Sinaiticus)</name>
</book>
<book>
<id>DanTheo</id>
+ <abbr>Dat</abbr>
<name>Daniel (Theodotion)</name>
</book>
<book>
<id>SusTheo</id>
+ <abbr>Sut</abbr>
<name>Susanna (Theodotion)</name>
</book>
<book>
<id>BelTheo</id>
+ <abbr>Bet</abbr>
<name>Bel and the Dragon (Theodotion)</name>
</book>
+ <book>
+ <id>SirP</id>
+ <abbr>Sip</abbr>
+ <name>Sirach (Prologue)</name>
+ </book>
</collection>
Modified: trunk/versification/v11nsys.pl
===================================================================
--- trunk/versification/v11nsys.pl 2009-03-12 11:10:36 UTC (rev 164)
+++ trunk/versification/v11nsys.pl 2009-03-12 12:26:00 UTC (rev 165)
@@ -1,23 +1,32 @@
#!/usr/bin/perl
-sub cleanupLine {
- # here we'll do some cleanup of our input, mostly to regularlize input
- $ret = @_[0];
+###############################################################################
+#
+# When run without any arguments, this script reads the CCEL files:
+# Bible.*.xml.
+#
+# Otherwise, supply the script with a list (or wildcard) of VPL files and it
+# will attempt to create a v11n system definition on that basis.
+#
+# If the --nosis switch is added as the first argument, the script will
+# interpret book abbreviations rather than simply assume that they are OSIS
+# abbreviations.
+#
+###############################################################################
- $ret =~ s/>Pss\./>Ps\//g;
- return $ret;
-}
-
sub buildBooks {
- if ($lastBook eq "Matt") {
+ if ($lastBook ne "" && $osis{$lastBook} eq "") {
+ print "ERROR: Unknown book abbreviation: $lastBook in $v11n\n";
+ }
+ if ($osis{$lastBook} eq "Matt") {
$otnt = 1;
}
if ($otnt == 0) {
- $otbooks .= "\t{\"$idmap{$lastBook}\", \"$lastBook\", \"$lastBook\", $cCount},\n";
+ $otbooks .= "\t{\"$idmap{$osis{$lastBook}}\", \"$osis{$lastBook}\", \"$osis{$lastBook}\", $cCount},\n";
}
else {
- $ntbooks .= "\t{\"$idmap{$lastBook}\", \"$lastBook\", \"$lastBook\", $cCount},\n";
+ $ntbooks .= "\t{\"$idmap{$osis{$lastBook}}\", \"$osis{$lastBook}\", \"$osis{$lastBook}\", $cCount},\n";
}
}
@@ -39,13 +48,17 @@
open MAP, "$mapfile";
while (<MAP>) {
$line = $_;
-
+
if ($line =~ /<id>(.+?)<\/id>/) {
$id = $1;
+ $osis{$id} = $id;
}
+ elsif ($line =~ /<abbr>(.+?)<\/abbr>/) {
+ $osis{$1} = $id;
+ }
elsif ($line =~ /<name>(.+?)<\/name>/) {
$name = $1;
-
+
if ($idmap{$id} eq "") {
$idmap{$id} = $name;
}
@@ -58,10 +71,17 @@
close (MAP);
}
+$bwMode = false;
+
if (@ARGV[0] ne "") {
$n = 0;
while (@ARGV[$n] ne "") {
- push @srcfiles, @ARGV[$n];
+ if ($n == 0 && @ARGV[0] eq "--nosis") {
+ $bwMode = true;
+ }
+ else {
+ push @srcfiles, @ARGV[$n];
+ }
$n++;
}
$vplStyle = true;
@@ -90,7 +110,7 @@
open INF, $infile;
open OUTF, ">$outfile";
- print OUTF "/******************************************************************************\n * $outfile.h - Versification data for the $v11n system\n *\n * Copyright 1998-2005 CrossWire Bible Society (http://www.crosswire.org)\n * CrossWire Bible Society\n * P. O. Box 2528\n * Tempe, AZ 85280-2528\n *\n * This program is free software; you can redistribute it and/or modify it\n * under the terms of the GNU General Public License as published by the\n * Free Software Foundation version 2.\n *\n * This program is distributed in the hope that it will be useful, but\n * WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * General Public License for more details.\n *\n * \n * This file is based on data from SIL, further processed by CCEL.\n */\n";
+ print OUTF "/******************************************************************************\n * $outfile.h - Versification data for the $v11n system\n *\n * Copyright 1998-2005 CrossWire Bible Society (http://www.crosswire.org)\n * CrossWire Bible Society\n * P. O. Box 2528\n * Tempe, AZ 85280-2528\n *\n * This program is free software; you can redistribute it and/or modify it\n * under the terms of the GNU General Public License as published by the\n * Free Software Foundation version 2.\n *\n * This program is distributed in the hope that it will be useful, but\n * WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * General Public License for more details.\n *\n";
print OUTF "\n#ifndef V11N" . uc($v11n) . "_H\n#define V11N" . uc($v11n) . "_H\n\nSWORD_NAMESPACE_START\n\n";
$thisBook = "";
@@ -110,9 +130,7 @@
while (<INF>) {
$line = $_;
-
- $line = cleanupLine($line);
-
+
$osisID = "";
if ($line =~ /<osisID.+?code=\"(.+?)\"\/>/) {
@@ -140,7 +158,7 @@
if ($thisBook ne $lastBook) {
$bCount++;
- $vm .= "\n\t// $idmap{$thisBook}\n\t";
+ $vm .= "\n\t// $idmap{$osis{$thisBook}}\n\t";
if ($lastBook ne "") {
buildBooks{};
}
More information about the sword-cvs
mailing list