[sword-svn] r438 - in trunk: modules/perlconverters modules/python versification versification/lxx_v11ns
chrislit at crosswire.org
chrislit at crosswire.org
Tue Jul 23 08:52:52 MST 2013
Author: chrislit
Date: 2013-07-23 08:52:52 -0700 (Tue, 23 Jul 2013)
New Revision: 438
Modified:
trunk/modules/perlconverters/gbf2osis.pl
trunk/modules/perlconverters/imp2osis.pl
trunk/modules/perlconverters/mdb2osis.pl
trunk/modules/perlconverters/unb2osis.pl
trunk/modules/perlconverters/usfm2osis.pl
trunk/modules/perlconverters/zef2osis.pl
trunk/modules/python/lorem.py
trunk/modules/python/usfm2osis.py
trunk/modules/python/usfmtags.py
trunk/versification/av11n.py
trunk/versification/canon.af.xml
trunk/versification/canon.bible.xml
trunk/versification/canon.classical.xml
trunk/versification/canon.lds.xml
trunk/versification/canon.naghammadi.xml
trunk/versification/canon.nta.xml
trunk/versification/canon.otp.xml
trunk/versification/canon.qumran.xml
trunk/versification/canon.xsd
trunk/versification/lxx_v11ns/canon_brenton.h
trunk/versification/lxx_v11ns/canon_charles.h
trunk/versification/lxx_v11ns/canon_charlesworth.h
trunk/versification/lxx_v11ns/canon_nets.h
trunk/versification/lxx_v11ns/canon_ottley.h
trunk/versification/lxx_v11ns/canon_rahlfs.h
trunk/versification/lxx_v11ns/canon_saas.h
trunk/versification/lxx_v11ns/canon_swete.h
trunk/versification/lxx_v11ns/canon_thomson.h
trunk/versification/makeabbrevs.pl
trunk/versification/v11n_check.py
trunk/versification/v11nexport.pl
trunk/versification/v11nsys.pl
Log:
set various svn properties
Modified: trunk/modules/perlconverters/gbf2osis.pl
===================================================================
--- trunk/modules/perlconverters/gbf2osis.pl 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/modules/perlconverters/gbf2osis.pl 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,256 +1,256 @@
-#!/usr/bin/perl
-
-## Licensed under the standard BSD license:
-
-# Copyright (c) 2005-2007 CrossWire Bible Society <http://www.crosswire.org/>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of the CrossWire Bible Society nor the names of
-# its contributors may be used to endorse or promote products
-# derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-## For general inquiries, comments, suggestions, bug reports, etc. email:
-## sword-support at crosswire.org
-
-#########################################################################
-
-$version = "1.5.1";
-$osisVersion = "2.1.1";
-
-$date = '$Date$';
-$rev = '$Rev$';
-
-$date =~ s/^.+?(\d{4}-\d{2}-\d{2}).+/$1/;
-$rev =~ s/^.+?(\d+).+/$1/g;
-
-%OSISbook = ("Genesis" => "Gen", "Ge" => "Gen", "Gn" => "Gen", "Exodus" => "Exod", "Ex" => "Exod", "Leviticus" => "Lev", "Lev" => "Lev", "Lv" => "Lev", "Numbers" => "Num", "Nu" => "Num", "Deuteronomy" => "Deut", "De" => "Deut", "Dt" => "Deut", "Joshua" => "Josh", "Jos" => "Josh", "Judges" => "Judg", "Judg" => "Judg", "Jdg" => "Judg", "Ruth" => "Ruth", "Ru" => "Ruth", "1 Samuel" => "1Sam", "1 Sa" => "1Sam", "1Sa" => "1Sam", "2 Samuel" => "2Sam", "2 Sa" => "2Sam", "2Sa" => "2Sam", "1 Kings" => "1Kgs", "1 Ki" => "1Kgs", "1Ki" => "1Kgs", "2 Kings" => "2Kgs", "2 Ki" => "2Kgs", "2Ki" => "2Kgs", "1 Chronicles" => "1Chr", "1 Ch" => "1Chr", "1Ch" => "1Chr", "2 Chronicles" => "2Chr", "2 Ch" => "2Chr", "2Ch" => "2Chr", "Ezra" => "Ezra", "Ezr" => "Ezra", "Nehemiah" => "Neh", "Ne" => "Neh", "Esther" => "Esth", "Es" => "Esth", "Job" => "Job", "Psalms" => "Ps", "Psalm" => "Ps", "Ps" => "Ps", "Proverbs" => "Prov", "Pr" => "Prov", "Ecclesiastes" => "Eccl", "Ec" => "Eccl", "Song" => "Song", "SS" => "Song", "Isaiah" => "Isa", "Isa" => "Isa", "Jeremiah" => "Jer", "Je" => "Jer", "Lamentations" => "Lam", "La" => "Lam", "Ezekiel" => "Ezek", "Eze" => "Ezek", "Daniel" => "Dan", "Da" => "Dan", "Hosea" => "Hos", "Ho" => "Hos", "Joel" => "Joel", "Joe" => "Joel", "Amos" => "Amos", "Am" => "Amos", "Obadiah" => "Obad", "Ob" => "Obad", "Jonah" => "Jonah", "Jon" => "Jonah", "Micah" => "Mic", "Mi" => "Mic", "Nahum" => "Nah", "Na" => "Nah", "Habakkuk" => "Hab", "Hab" => "Hab", "Zephaniah" => "Zeph", "Zep" => "Zeph", "Haggai" => "Hag", "Hag" => "Hag", "Zechariah" => "Zech", "Zec" => "Zech", "Malachi" => "Mal", "Mal" => "Mal", "Tobit" => "Tob", "Tob" => "Tob", "Judith" => "Jdt", "Judi" => "Jdt", "Jdt" => "Jdt", "GrkEs" => "AddEsth", "GR" => "AddEsth", "Baruch" => "Bar", "Bar" => "Bar", "Letter" => "EpJer", "Let" => "EpJer", "DNT" => "AddDan", "AddDan" => "AddDan", "Matthew" => "Matt", "Mat" => "Matt", "Mt" => "Matt", "Mark" => "Mark", "Mar" => "Mark", "Mk" => "Mark", "Luke" => "Luke", "Lu" => "Luke", "Lk" => "Luke", "John" => "John", "Joh" => "John", "Acts" => "Acts", "Ac" => "Acts", "Romans" => "Rom", "Ro" => "Rom", "Rm" => "Rom", "1 Corinthians" => "1Cor", "1 Co" => "1Cor", "1Co" => "1Cor", "2 Corinthians" => "2Cor", "2 Co" => "2Cor", "2Co" => "2Cor", "Galatians" => "Gal", "Ga" => "Gal", "Ephesians" => "Eph", "Ep" => "Eph", "Philippians" => "Phil", "Phili" => "Phil", "Php" => "Phil", "Colossians" => "Col", "Col" => "Col", "1 Thessalonians" => "1Thess", "1 Th" => "1Thess", "1Th" => "1Thess", "2 Thessalonians" => "2Thess", "2 Th" => "2Thess", "2Th" => "2Thess", "1 Timothy" => "1Tim", "1 Ti" => "1Tim", "1Ti" => "1Tim", "2 Timothy" => "2Tim", "2 Ti" => "2Tim", "2Ti" => "2Tim", "Titus" => "Tit", "Tit" => "Tit", "Philemon" => "Phlm", "Phile" => "Phlm", "Phm" => "Phlm", "Hebrews" => "Heb", "Heb" => "Heb", "He" => "Heb", "James" => "Jas", "Ja" => "Jas", "1 Peter" => "1Pet", "1 Pe" => "1Pet", "1Pe" => "1Pet", "2 Peter" => "2Pet", "2 Pe" => "2Pet", "2Pe" => "2Pet", "1 John" => "1John", "1 Jo" => "1John", "1Jo" => "1John", "2 John" => "2John", "2 Jo" => "2John", "2Jo" => "2John", "3 John" => "3John", "3 Jo" => "3John", "3Jo" => "3John", "Jude" => "Jude", "Revelation" => "Rev", "Re" => "Rev");
-
-if (scalar(@ARGV) < 1) {
- print "gbf2osis.pl -- GBF to OSIS $osisVersion converter version $version\nRevision $rev ($date)\nSyntax: gbf2osis.pl [web|hnv]\n";
- exit (-1);
-}
-
-$work = @ARGV[0];
-
-($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)=localtime(time);
-$year += 1900;
-$date = sprintf("%04d\-%02d\-%02d", $year, $mon, $mday);
-
-open (INF, "$work.gbf");
-$work = uc($work);
-$osisWork = "Bible.en.$work.$year";
-open (OUTF, ">$osisWork.osis.xml");
-
-while (<INF>) {
- $line = $_;
-
- $line =~ s/[\r\n]+//g;
- if ($line =~ /^</) {
- $bible .= "$line";
- }
- else {
- $bible .= " $line";
- }
- $bible .= "@";
-}
-
-sub chapterdivs {
- $chcontents = @_[0];
- $vs = 0;
-
- $chcontents =~ s/(<CM>|[\#\@])*$//;
- $chcontents = "<chapter osisID=\"" . $bk . "." . ++$ch . "\">\#<p>$chcontents<\/p><\/chapter>\#";
- $chcontents =~ s/<SV[^>]+>(.+?)(?=<SV|<\/chapter)/"<verse sID=\"" . $bk . "." . $ch . "." . ++$vs . "\" osisID=\"" . $bk . "." . $ch . "." . $vs . "\"\/>$1<verse eID=\"" . $bk . "." . $ch . "." . $vs . "\"\/>\#"/eg;
-
- return $chcontents;
-}
-
-sub bookdivs {
- $bk = @_[0];
- $bkcontents = @_[1];
- $ch = 0;
-
- $bk = $OSISbook{$bk};
-
- $bkcontents =~ s/(<CM>|[\#\@])*$//;
- $bkcontents = "<div type=\"book\" osisID=\"" . $bk . "\">\#$bkcontents<\/div>\#";
- $bkcontents =~ s/<SC[^>]+>(.+?)(?=<SC|<\/div)/chapterdivs($1)/eg;
-
- return $bkcontents;
-}
-
-
-sub poetrychunk {
- $poetrycontents = @_[0];
-
- $poetrycontents =~ s/((<CM>\@?)?<SC[^>]+?>)/<Pp>$1<PP>/g;
- $poetrycontents = "<PP>$poetrycontents<Pp>";
-
- return $poetrycontents;
-}
-
-sub poetry {
- $poetrycontents = @_[0];
-
- $poetrycontents =~ s/^(<CM>)+//;
- $poetrycontents =~ s/(<CM>)+$//;
-
- $poetrycontents = "<lg><l>" . $poetrycontents . "<\/l><\/lg>\#";
- $poetrycontents =~ s/<CL>/<\/l>\#<l>/g;
-
- if ($poetrycontents =~ /<CM>/) {
-# $poetrycontents =~ s/<lg>/<lg><lg>/;
-# $poetrycontents =~ s/<\/lg>/<\/lg><\/lg>/;
- $poetrycontents = "<lg>$poetrycontents<\/lg>";
- $poetrycontents =~ s/<CM>/<\/l><\/lg>\#<lg><l>/g;
- }
-
- return $poetrycontents;
-}
-
-sub buildheader {
- $type = @_[0];
- $contents = @_[1];
-
- if ($type eq "1") {
- $Htitle = $contents;
- }
- elsif ($type eq "4") {
- $Hcopyright = $contents;
- }
- elsif ($type eq "C") {
- $Hcreator = $contents;
- }
-
- return "";
-}
-
-
-
-#construct header
-$bible =~ s/<H(1|2|3|4|T|E|S|U|V|C|A|L|P)>(.+?)(?=<)/buildheader($1,$2)/eg;
-$header = "<header>\#<revisionDesc><date>$date<\/date><p>Initial conversion from GBF using gbf2osis.pl.<\/p><\/revisionDesc>\#<work osisWork=\"$osisWork\">\#<\/work>\#<\/header>\#";
-if ($Htitle ne "") {$header =~ s/<\/work>/<title>$Htitle<\/title>\#<\/work>/g;}
-if ($Hcreator ne "") {$header =~ s/<\/work>/<creator>$Hcreator<\/creator>\#<\/work>/g;}
-if ($Hcopyright ne "") {$header =~ s/<\/work>/<rights>$Hcopyright<\/rights>\#<\/work>/g;}
-$header = "<\?xml version=\"1.0\" encoding=\"UTF-8\"?>\#<osis xmlns=\"http:\/\/www.bibletechnologies.net\/2003\/OSIS\/namespace\" xmlns:xsi=\"http:\/\/www.w3.org\/2001\/XMLSchema-instance\" xsi:schemaLocation=\"http:\/\/www.bibletechnologies.net\/2003\/OSIS\/namespace http:\/\/www.bibletechnologies.net\/osisCore.$osisVersion.xsd\">\#<osisText osisRefWork=\"Bible\" xml:lang=\"en\" osisIDWork=\"$osisWork\">\#$header";
-
-
-$bible =~ s/<H0[\d][\d]>.+<BO>/<BO>/;
-
-#early reformatting
-$bible =~ s/<PP><CM>\@<SC60><SV1>/<CM>\@<SC60><PP><SV1>/;
-$bible =~ s/<PP>(.+?)<Pp>/poetrychunk($1)/eg;
-
-
-#deal with body
-$bible =~ s/<B[OAN]>(.+?)(?=<B|<ZZ)/<div type="bookGroup" canonical="true">\#$1<\/div>\#/g;
-
-$bk = 0;
-$bible =~ s/(<CM>[\@\#]*)+<SB/\#<SB/g;
-$bible =~ s/<SB([^>]+)>(.+?)(?=<SB|<\/div)/bookdivs($1,$2)/eg;
-$bible =~ s/<RB>(.+?)<RF>(.+?)<Rf>/$1<note><catchWord>$1<\/catchWord> $2<\/note>/g;
-$bible =~ s/<RF>(.+?)<Rf>/<note>$1<\/note>/g;
-
-
-$bible =~ s/<TC>(.+?)<Tc>//g;
-$bible =~ s/<TN>(.+?)<Tn>//g;
-$bible =~ s/<TT>(.+?)(<CM>[\#\@]*)<Tt>/<title>$1<\/title>\#/g;
-$bible =~ s/<TB>(.+?)(<CM>[\#\@]*)<Tb>/<title>$1<\/title>\#/g;
-$bible =~ s/<TH>(.+?)(<CM>[\#\@]*)<Th>/<title type="psalm">$1<\/title>\#/g;
-$bible =~ s/<TS>(.+?)(<CM>|[\#\@])*<Ts>/<speaker>$1<\/speaker>\#/g;
-
-$bible =~ s/<PP>(.+?)<Pp>/poetry($1)/eg;
-$bible =~ s/<CL>/<lb\/>/g;
-
-$bible =~ s/<FI>(.+?)<Fi>/<hi type=\"italic\">$1<\/hi>/g;
-
-$bible =~ s/<CM>/<\/p>\#<p>/g;
-
-$bible =~ s/<JR>([^<]+?)<\/lg>/<l type=\"selah\">$1<\/l><\/lg>/g;
-$bible =~ s/<JL>//g;
-
-$qn = 0;
-
-$bible =~ s/<FR>“(.+?)”?<Fr>/"<q marker=\"“\" level=\"1\" sID=\"q." . ++$qn . "\" who=\"Jesus\"\/>$1<q marker=\"”\" eID=\"q." . $qn . "\"\/>"/eg;
-$bible =~ s/<FR>‘(.+?)’?<Fr>/"<q marker=\"‘\" level=\"2\" sID=\"q2." . ++$qn . "\" who=\"Jesus\"\/>$1<q marker=\"’\" eID=\"q2." . $qn . "\"\/>"/eg;
-
-$bible =~ s/“(.+?)”/"<q marker=\"“\" level=\"1\" sID=\"q." . ++$qn . "\"\/>$1<q marker=\"”\" eID=\"q." . $qn . "\"\/>"/eg;
-$bible =~ s/‘(.+?)’/"<q marker=\"“\" level=\"2\" sID=\"q2." . ++$qn . "\"\/>$1<q marker=\"’\" eID=\"q2." . $qn . "\"\/>"/eg;
-
-$bible =~ s/(\w+)<WTP>/<w morph="pl">$1<\/w>/g;
-$bible =~ s/(\w+)<WTf>/<w morph="2">$1<\/w>/g;
-
-$bible =~ s/(<\/p>\#<p>)\@?(<verse eID[^>]+>)\#?/$2$1/g;
-$bible =~ s/(<\/p>)(<verse eID[^>]+>)/$2$1/g;
-$bible =~ s/<l> +/<l>/g;
-$bible =~ s/<p> +/<p>/g;
-$bible =~ s/<l>\@?<JR>/<l type=\"selah\">/g;
-
-$bible =~ s/<ZZ>/<\/osisText>\#<\/osis>\#/g;
-$bible = $header . $bible;
-
-$bible =~ s/\@//g;
-$bible =~ s/\s*\#+\s*/\#/g;
-
-# cleanups
-
-sub nukelongcw {
- $cw = @_[0];
- if ($cw =~ /<verse /) {return "";}
- else {return $cw};
-}
-
-$bible =~ s/<lg><l><\/l><\/lg>\#//g;
-$bible =~ s/<p><\/p>\#//g;
-
-$bible =~ s/<lg><lg><l>(<title type=\"psalm\">[^<]+<\/title>)\#<\/l><\/lg>/$1<lg>\#/g;
-$bible =~ s/<lg><l>(<title type=\"psalm\">[^<]+<\/title>)\#<\/l><\/lg>/<\/lg>\#$1<lg>\#/g;
-$bible =~ s/(<catchWord>[^<]+)<\/l>\#<l>([^<]+<\/catchWord>)/$1<lb\/>$2/g;
-$bible =~ s/(<catchWord>.+?<\/catchWord> *)/nukelongcw($1)/eg; # nuke overly long (multi-verse) catchWords
-#$bible =~ s/(<\/p>\#<\/chapter>\#<chapter osisID=\"[^\"]+\">\#<p>)(<\/l><\/lg>)\#(<lg><l>)/$2<\/lg>$1<lg>$3/g;
-
-
-
-
-
-$bible =~ s/\#/\n/g;
-
-
-# encoding stuff
-use encoding 'latin1';
- utf8::encode($bible);
-
-$bible =~ s/“/“/g;
-$bible =~ s/”/â€/g;
-$bible =~ s/‘/‘/g;
-$bible =~ s/’/’/g;
-$bible =~ s/\&/\&/g;
-
-
-print OUTF "$bible";
-
-close (INF);
+#!/usr/bin/perl
+
+## Licensed under the standard BSD license:
+
+# Copyright (c) 2005-2007 CrossWire Bible Society <http://www.crosswire.org/>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of the CrossWire Bible Society nor the names of
+# its contributors may be used to endorse or promote products
+# derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## For general inquiries, comments, suggestions, bug reports, etc. email:
+## sword-support at crosswire.org
+
+#########################################################################
+
+$version = "1.5.1";
+$osisVersion = "2.1.1";
+
+$date = '$Date$';
+$rev = '$Rev$';
+
+$date =~ s/^.+?(\d{4}-\d{2}-\d{2}).+/$1/;
+$rev =~ s/^.+?(\d+).+/$1/g;
+
+%OSISbook = ("Genesis" => "Gen", "Ge" => "Gen", "Gn" => "Gen", "Exodus" => "Exod", "Ex" => "Exod", "Leviticus" => "Lev", "Lev" => "Lev", "Lv" => "Lev", "Numbers" => "Num", "Nu" => "Num", "Deuteronomy" => "Deut", "De" => "Deut", "Dt" => "Deut", "Joshua" => "Josh", "Jos" => "Josh", "Judges" => "Judg", "Judg" => "Judg", "Jdg" => "Judg", "Ruth" => "Ruth", "Ru" => "Ruth", "1 Samuel" => "1Sam", "1 Sa" => "1Sam", "1Sa" => "1Sam", "2 Samuel" => "2Sam", "2 Sa" => "2Sam", "2Sa" => "2Sam", "1 Kings" => "1Kgs", "1 Ki" => "1Kgs", "1Ki" => "1Kgs", "2 Kings" => "2Kgs", "2 Ki" => "2Kgs", "2Ki" => "2Kgs", "1 Chronicles" => "1Chr", "1 Ch" => "1Chr", "1Ch" => "1Chr", "2 Chronicles" => "2Chr", "2 Ch" => "2Chr", "2Ch" => "2Chr", "Ezra" => "Ezra", "Ezr" => "Ezra", "Nehemiah" => "Neh", "Ne" => "Neh", "Esther" => "Esth", "Es" => "Esth", "Job" => "Job", "Psalms" => "Ps", "Psalm" => "Ps", "Ps" => "Ps", "Proverbs" => "Prov", "Pr" => "Prov", "Ecclesiastes" => "Eccl", "Ec" => "Eccl", "Song" => "Song", "SS" => "Song", "Isaiah" => "Isa", "Isa" => "Isa", "Jeremiah" => "Jer", "Je" => "Jer", "Lamentations" => "Lam", "La" => "Lam", "Ezekiel" => "Ezek", "Eze" => "Ezek", "Daniel" => "Dan", "Da" => "Dan", "Hosea" => "Hos", "Ho" => "Hos", "Joel" => "Joel", "Joe" => "Joel", "Amos" => "Amos", "Am" => "Amos", "Obadiah" => "Obad", "Ob" => "Obad", "Jonah" => "Jonah", "Jon" => "Jonah", "Micah" => "Mic", "Mi" => "Mic", "Nahum" => "Nah", "Na" => "Nah", "Habakkuk" => "Hab", "Hab" => "Hab", "Zephaniah" => "Zeph", "Zep" => "Zeph", "Haggai" => "Hag", "Hag" => "Hag", "Zechariah" => "Zech", "Zec" => "Zech", "Malachi" => "Mal", "Mal" => "Mal", "Tobit" => "Tob", "Tob" => "Tob", "Judith" => "Jdt", "Judi" => "Jdt", "Jdt" => "Jdt", "GrkEs" => "AddEsth", "GR" => "AddEsth", "Baruch" => "Bar", "Bar" => "Bar", "Letter" => "EpJer", "Let" => "EpJer", "DNT" => "AddDan", "AddDan" => "AddDan", "Matthew" => "Matt", "Mat" => "Matt", "Mt" => "Matt", "Mark" => "Mark", "Mar" => "Mark", "Mk" => "Mark", "Luke" => "Luke", "Lu" => "Luke", "Lk" => "Luke", "John" => "John", "Joh" => "John", "Acts" => "Acts", "Ac" => "Acts", "Romans" => "Rom", "Ro" => "Rom", "Rm" => "Rom", "1 Corinthians" => "1Cor", "1 Co" => "1Cor", "1Co" => "1Cor", "2 Corinthians" => "2Cor", "2 Co" => "2Cor", "2Co" => "2Cor", "Galatians" => "Gal", "Ga" => "Gal", "Ephesians" => "Eph", "Ep" => "Eph", "Philippians" => "Phil", "Phili" => "Phil", "Php" => "Phil", "Colossians" => "Col", "Col" => "Col", "1 Thessalonians" => "1Thess", "1 Th" => "1Thess", "1Th" => "1Thess", "2 Thessalonians" => "2Thess", "2 Th" => "2Thess", "2Th" => "2Thess", "1 Timothy" => "1Tim", "1 Ti" => "1Tim", "1Ti" => "1Tim", "2 Timothy" => "2Tim", "2 Ti" => "2Tim", "2Ti" => "2Tim", "Titus" => "Tit", "Tit" => "Tit", "Philemon" => "Phlm", "Phile" => "Phlm", "Phm" => "Phlm", "Hebrews" => "Heb", "Heb" => "Heb", "He" => "Heb", "James" => "Jas", "Ja" => "Jas", "1 Peter" => "1Pet", "1 Pe" => "1Pet", "1Pe" => "1Pet", "2 Peter" => "2Pet", "2 Pe" => "2Pet", "2Pe" => "2Pet", "1 John" => "1John", "1 Jo" => "1John", "1Jo" => "1John", "2 John" => "2John", "2 Jo" => "2John", "2Jo" => "2John", "3 John" => "3John", "3 Jo" => "3John", "3Jo" => "3John", "Jude" => "Jude", "Revelation" => "Rev", "Re" => "Rev");
+
+if (scalar(@ARGV) < 1) {
+ print "gbf2osis.pl -- GBF to OSIS $osisVersion converter version $version\nRevision $rev ($date)\nSyntax: gbf2osis.pl [web|hnv]\n";
+ exit (-1);
+}
+
+$work = @ARGV[0];
+
+($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)=localtime(time);
+$year += 1900;
+$date = sprintf("%04d\-%02d\-%02d", $year, $mon, $mday);
+
+open (INF, "$work.gbf");
+$work = uc($work);
+$osisWork = "Bible.en.$work.$year";
+open (OUTF, ">$osisWork.osis.xml");
+
+while (<INF>) {
+ $line = $_;
+
+ $line =~ s/[\r\n]+//g;
+ if ($line =~ /^</) {
+ $bible .= "$line";
+ }
+ else {
+ $bible .= " $line";
+ }
+ $bible .= "@";
+}
+
+sub chapterdivs {
+ $chcontents = @_[0];
+ $vs = 0;
+
+ $chcontents =~ s/(<CM>|[\#\@])*$//;
+ $chcontents = "<chapter osisID=\"" . $bk . "." . ++$ch . "\">\#<p>$chcontents<\/p><\/chapter>\#";
+ $chcontents =~ s/<SV[^>]+>(.+?)(?=<SV|<\/chapter)/"<verse sID=\"" . $bk . "." . $ch . "." . ++$vs . "\" osisID=\"" . $bk . "." . $ch . "." . $vs . "\"\/>$1<verse eID=\"" . $bk . "." . $ch . "." . $vs . "\"\/>\#"/eg;
+
+ return $chcontents;
+}
+
+sub bookdivs {
+ $bk = @_[0];
+ $bkcontents = @_[1];
+ $ch = 0;
+
+ $bk = $OSISbook{$bk};
+
+ $bkcontents =~ s/(<CM>|[\#\@])*$//;
+ $bkcontents = "<div type=\"book\" osisID=\"" . $bk . "\">\#$bkcontents<\/div>\#";
+ $bkcontents =~ s/<SC[^>]+>(.+?)(?=<SC|<\/div)/chapterdivs($1)/eg;
+
+ return $bkcontents;
+}
+
+
+sub poetrychunk {
+ $poetrycontents = @_[0];
+
+ $poetrycontents =~ s/((<CM>\@?)?<SC[^>]+?>)/<Pp>$1<PP>/g;
+ $poetrycontents = "<PP>$poetrycontents<Pp>";
+
+ return $poetrycontents;
+}
+
+sub poetry {
+ $poetrycontents = @_[0];
+
+ $poetrycontents =~ s/^(<CM>)+//;
+ $poetrycontents =~ s/(<CM>)+$//;
+
+ $poetrycontents = "<lg><l>" . $poetrycontents . "<\/l><\/lg>\#";
+ $poetrycontents =~ s/<CL>/<\/l>\#<l>/g;
+
+ if ($poetrycontents =~ /<CM>/) {
+# $poetrycontents =~ s/<lg>/<lg><lg>/;
+# $poetrycontents =~ s/<\/lg>/<\/lg><\/lg>/;
+ $poetrycontents = "<lg>$poetrycontents<\/lg>";
+ $poetrycontents =~ s/<CM>/<\/l><\/lg>\#<lg><l>/g;
+ }
+
+ return $poetrycontents;
+}
+
+sub buildheader {
+ $type = @_[0];
+ $contents = @_[1];
+
+ if ($type eq "1") {
+ $Htitle = $contents;
+ }
+ elsif ($type eq "4") {
+ $Hcopyright = $contents;
+ }
+ elsif ($type eq "C") {
+ $Hcreator = $contents;
+ }
+
+ return "";
+}
+
+
+
+#construct header
+$bible =~ s/<H(1|2|3|4|T|E|S|U|V|C|A|L|P)>(.+?)(?=<)/buildheader($1,$2)/eg;
+$header = "<header>\#<revisionDesc><date>$date<\/date><p>Initial conversion from GBF using gbf2osis.pl.<\/p><\/revisionDesc>\#<work osisWork=\"$osisWork\">\#<\/work>\#<\/header>\#";
+if ($Htitle ne "") {$header =~ s/<\/work>/<title>$Htitle<\/title>\#<\/work>/g;}
+if ($Hcreator ne "") {$header =~ s/<\/work>/<creator>$Hcreator<\/creator>\#<\/work>/g;}
+if ($Hcopyright ne "") {$header =~ s/<\/work>/<rights>$Hcopyright<\/rights>\#<\/work>/g;}
+$header = "<\?xml version=\"1.0\" encoding=\"UTF-8\"?>\#<osis xmlns=\"http:\/\/www.bibletechnologies.net\/2003\/OSIS\/namespace\" xmlns:xsi=\"http:\/\/www.w3.org\/2001\/XMLSchema-instance\" xsi:schemaLocation=\"http:\/\/www.bibletechnologies.net\/2003\/OSIS\/namespace http:\/\/www.bibletechnologies.net\/osisCore.$osisVersion.xsd\">\#<osisText osisRefWork=\"Bible\" xml:lang=\"en\" osisIDWork=\"$osisWork\">\#$header";
+
+
+$bible =~ s/<H0[\d][\d]>.+<BO>/<BO>/;
+
+#early reformatting
+$bible =~ s/<PP><CM>\@<SC60><SV1>/<CM>\@<SC60><PP><SV1>/;
+$bible =~ s/<PP>(.+?)<Pp>/poetrychunk($1)/eg;
+
+
+#deal with body
+$bible =~ s/<B[OAN]>(.+?)(?=<B|<ZZ)/<div type="bookGroup" canonical="true">\#$1<\/div>\#/g;
+
+$bk = 0;
+$bible =~ s/(<CM>[\@\#]*)+<SB/\#<SB/g;
+$bible =~ s/<SB([^>]+)>(.+?)(?=<SB|<\/div)/bookdivs($1,$2)/eg;
+$bible =~ s/<RB>(.+?)<RF>(.+?)<Rf>/$1<note><catchWord>$1<\/catchWord> $2<\/note>/g;
+$bible =~ s/<RF>(.+?)<Rf>/<note>$1<\/note>/g;
+
+
+$bible =~ s/<TC>(.+?)<Tc>//g;
+$bible =~ s/<TN>(.+?)<Tn>//g;
+$bible =~ s/<TT>(.+?)(<CM>[\#\@]*)<Tt>/<title>$1<\/title>\#/g;
+$bible =~ s/<TB>(.+?)(<CM>[\#\@]*)<Tb>/<title>$1<\/title>\#/g;
+$bible =~ s/<TH>(.+?)(<CM>[\#\@]*)<Th>/<title type="psalm">$1<\/title>\#/g;
+$bible =~ s/<TS>(.+?)(<CM>|[\#\@])*<Ts>/<speaker>$1<\/speaker>\#/g;
+
+$bible =~ s/<PP>(.+?)<Pp>/poetry($1)/eg;
+$bible =~ s/<CL>/<lb\/>/g;
+
+$bible =~ s/<FI>(.+?)<Fi>/<hi type=\"italic\">$1<\/hi>/g;
+
+$bible =~ s/<CM>/<\/p>\#<p>/g;
+
+$bible =~ s/<JR>([^<]+?)<\/lg>/<l type=\"selah\">$1<\/l><\/lg>/g;
+$bible =~ s/<JL>//g;
+
+$qn = 0;
+
+$bible =~ s/<FR>“(.+?)”?<Fr>/"<q marker=\"“\" level=\"1\" sID=\"q." . ++$qn . "\" who=\"Jesus\"\/>$1<q marker=\"”\" eID=\"q." . $qn . "\"\/>"/eg;
+$bible =~ s/<FR>‘(.+?)’?<Fr>/"<q marker=\"‘\" level=\"2\" sID=\"q2." . ++$qn . "\" who=\"Jesus\"\/>$1<q marker=\"’\" eID=\"q2." . $qn . "\"\/>"/eg;
+
+$bible =~ s/“(.+?)”/"<q marker=\"“\" level=\"1\" sID=\"q." . ++$qn . "\"\/>$1<q marker=\"”\" eID=\"q." . $qn . "\"\/>"/eg;
+$bible =~ s/‘(.+?)’/"<q marker=\"“\" level=\"2\" sID=\"q2." . ++$qn . "\"\/>$1<q marker=\"’\" eID=\"q2." . $qn . "\"\/>"/eg;
+
+$bible =~ s/(\w+)<WTP>/<w morph="pl">$1<\/w>/g;
+$bible =~ s/(\w+)<WTf>/<w morph="2">$1<\/w>/g;
+
+$bible =~ s/(<\/p>\#<p>)\@?(<verse eID[^>]+>)\#?/$2$1/g;
+$bible =~ s/(<\/p>)(<verse eID[^>]+>)/$2$1/g;
+$bible =~ s/<l> +/<l>/g;
+$bible =~ s/<p> +/<p>/g;
+$bible =~ s/<l>\@?<JR>/<l type=\"selah\">/g;
+
+$bible =~ s/<ZZ>/<\/osisText>\#<\/osis>\#/g;
+$bible = $header . $bible;
+
+$bible =~ s/\@//g;
+$bible =~ s/\s*\#+\s*/\#/g;
+
+# cleanups
+
+sub nukelongcw {
+ $cw = @_[0];
+ if ($cw =~ /<verse /) {return "";}
+ else {return $cw};
+}
+
+$bible =~ s/<lg><l><\/l><\/lg>\#//g;
+$bible =~ s/<p><\/p>\#//g;
+
+$bible =~ s/<lg><lg><l>(<title type=\"psalm\">[^<]+<\/title>)\#<\/l><\/lg>/$1<lg>\#/g;
+$bible =~ s/<lg><l>(<title type=\"psalm\">[^<]+<\/title>)\#<\/l><\/lg>/<\/lg>\#$1<lg>\#/g;
+$bible =~ s/(<catchWord>[^<]+)<\/l>\#<l>([^<]+<\/catchWord>)/$1<lb\/>$2/g;
+$bible =~ s/(<catchWord>.+?<\/catchWord> *)/nukelongcw($1)/eg; # nuke overly long (multi-verse) catchWords
+#$bible =~ s/(<\/p>\#<\/chapter>\#<chapter osisID=\"[^\"]+\">\#<p>)(<\/l><\/lg>)\#(<lg><l>)/$2<\/lg>$1<lg>$3/g;
+
+
+
+
+
+$bible =~ s/\#/\n/g;
+
+
+# encoding stuff
+use encoding 'latin1';
+ utf8::encode($bible);
+
+$bible =~ s/“/“/g;
+$bible =~ s/”/â€/g;
+$bible =~ s/‘/‘/g;
+$bible =~ s/’/’/g;
+$bible =~ s/\&/\&/g;
+
+
+print OUTF "$bible";
+
+close (INF);
Property changes on: trunk/modules/perlconverters/gbf2osis.pl
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/modules/perlconverters/imp2osis.pl
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/modules/perlconverters/mdb2osis.pl
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Modified: trunk/modules/perlconverters/unb2osis.pl
===================================================================
--- trunk/modules/perlconverters/unb2osis.pl 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/modules/perlconverters/unb2osis.pl 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,162 +1,162 @@
-#!/usr/bin/perl
-
-## Unbound Bible database to OSIS (2.1.1) converter
-
-## Licensed under the standard BSD license:
-
-# Copyright (c) 2007 CrossWire Bible Society <http://www.crosswire.org/>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# * Neither the name of the CrossWire Bible Society nor the names of
-# its contributors may be used to endorse or promote products
-# derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-## For general inquiries, comments, suggestions, bug reports, etc. email:
-## sword-support at crosswire.org
-
-#########################################################################
-
-$version = "1.0.1";
-$osisVersion = "2.1.1";
-
-$date = '$Date$';
-$rev = '$Rev$';
-
-$date =~ s/^.+?(\d{4}-\d{2}-\d{2}).+/$1/;
-$rev =~ s/^.+?(\d+).+/$1/g;
-
- at OSISbook = (
-#OT
- "Gen", "Exod", "Lev", "Num", "Deut", "Josh", "Judg", "Ruth", "1Sam", "2Sam", "1Kgs", "2Kgs", "1Chr", "2Chr", "Ezra", "Neh", "Esth", "Job", "Ps", "Prov", "Eccl", "Song", "Isa", "Jer", "Lam", "Ezek", "Dan", "Hos", "Joel", "Amos", "Obad", "Jonah", "Mic", "Nah", "Hab", "Zeph", "Hag", "Zech", "Mal",
-
-#NT
-"Matt", "Mark", "Luke", "John", "Acts", "Rom", "1Cor", "2Cor", "Gal", "Eph", "Phil", "Col", "1Thess", "2Thess", "1Tim", "2Tim", "Titus", "Phlm", "Heb", "Jas", "1Pet", "2Pet", "1John", "2John", "3John", "Jude", "Rev",
-
-#Apocrypha
-"Tob", "Jdt", "AddEsth", "Wis", "Sir", "Bar", "EpJer", "PrAzar", "Sus", "Bel", "1Macc", "2Macc", "3Macc", "4Macc", "1Esd", "2Esd", "PrMan", "Ps151", "PssSol", "Odes"
-);
-
-if (scalar(@ARGV) < 2) {
- print "unb2osis.pl -- Unbound Bible format to OSIS $osisVersion converter version $version\nRevision $rev ($date)\nSyntax: unb2osis.pl <osisWork> <input filename> [-o OSIS-file]\n";
- exit (-1);
-}
-
-$osisWork = $ARGV[0];
-
-if ($ARGV[2] eq "-o") {
- $outputFilename = "$ARGV[3];"
-}
-else {
- $outputFilename = "$osisWork.osis.xml";
-}
-open (OUTF, ">$outputFilename") or die "Could not open file $ARGV[2] for writing.";
-
-print OUTF "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osis xmlns=\"http://www.bibletechnologies.net/2003/OSIS/namespace\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace http://www.bibletechnologies.net/osisCore.$osisVersion.xsd\">\n<osisText osisRefWork=\"Bible\" xml:lang=\"en\" osisIDWork=\"$osisWork\">\n<header>\n<work osisWork=\"$osisWork\"\/>\n<\/header>\n";
-
-open (INF, $ARGV[1]);
- at data = <INF>;
-close (INF);
-
-$book = "";
-$chap = "";
-$vers = "";
-
-$i = 10;
-
-foreach $line (@data) {
- if ($line =~ /^\#/) {
- $line = "";
- }
- elsif ($line =~ /\d+[ONAona]\t\d+\t\d+\t(\d+)[ONAona]\t(\d+)\t(\d+)\t(.*\t)(\d+)\t(.+)/) {
- $line = sprintf("%08d\t$1\t$2\t$3\t$4$6", $5);
- }
- elsif ($line =~ /(\d+)[ONAona]\t(\d+)\t(\d+)\t(.*\t)(\d+)\t(.+)/) {
- $line = sprintf("%08d\t$1\t$2\t$3\t$4$6", $5);
- }
- elsif ($line =~ /(\d+)[ONAona]\t(\d+)\t(\d+)\t(.+)/) {
- $line = sprintf("%08d\t$1\t$2\t$3\t\t$4", $i+10);
- }
- else {
- print "Error on line: $line\n";
- }
-}
-
- at data = sort @data;
-#print @data;
-
-foreach $line (@data) {
- if ($line =~ /(\d+)\t(\d+)\t(\d+)\t(\d+)\t(.*\t)(.+)/) {
-
- $ord = $1;
-
- $nBook = $2;
- $nChap = $3;
- $vers = $4;
- $sub = $5;
-
- $text = $6;
-
- $sub =~ s/\s*//g;
- if ($sub ne "") {
- $vers = "$vers!$sub";
- }
-
- $oBook = @OSISbook[$nBook-1];
- if ($oBook eq "") {
- print "Error unknown book: $book\n";
- }
-
- $text =~ s/\s*$//g;
-
- if ($book ne $nBook) {
- if ($book ne "") {
- print OUTF "<\/chapter>\n";
- $chap = "";
- print OUTF "<\/div>\n";
- }
- print OUTF "<div type=\"book\" osisID=\"$oBook\">\n";
- }
-
- if ($chap ne $nChap) {
- if ($chap ne "") {
- print OUTF "<\/chapter>\n";
- }
- print OUTF "<chapter osisID=\"$oBook.$nChap\">\n";
- }
-
- print OUTF "<verse osisID=\"$oBook.$nChap.$vers\">$text<\/verse>\n";
-
- $book = $nBook;
- $chap = $nChap;
- }
-}
-
-print OUTF "<\/chapter>\n";
-print OUTF "<\/div>\n";
-print OUTF "<\/osisText>\n";
-print OUTF "<\/osis>\n";
-
-close (OUTF);
+#!/usr/bin/perl
+
+## Unbound Bible database to OSIS (2.1.1) converter
+
+## Licensed under the standard BSD license:
+
+# Copyright (c) 2007 CrossWire Bible Society <http://www.crosswire.org/>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of the CrossWire Bible Society nor the names of
+# its contributors may be used to endorse or promote products
+# derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## For general inquiries, comments, suggestions, bug reports, etc. email:
+## sword-support at crosswire.org
+
+#########################################################################
+
+$version = "1.0.1";
+$osisVersion = "2.1.1";
+
+$date = '$Date$';
+$rev = '$Rev$';
+
+$date =~ s/^.+?(\d{4}-\d{2}-\d{2}).+/$1/;
+$rev =~ s/^.+?(\d+).+/$1/g;
+
+ at OSISbook = (
+#OT
+ "Gen", "Exod", "Lev", "Num", "Deut", "Josh", "Judg", "Ruth", "1Sam", "2Sam", "1Kgs", "2Kgs", "1Chr", "2Chr", "Ezra", "Neh", "Esth", "Job", "Ps", "Prov", "Eccl", "Song", "Isa", "Jer", "Lam", "Ezek", "Dan", "Hos", "Joel", "Amos", "Obad", "Jonah", "Mic", "Nah", "Hab", "Zeph", "Hag", "Zech", "Mal",
+
+#NT
+"Matt", "Mark", "Luke", "John", "Acts", "Rom", "1Cor", "2Cor", "Gal", "Eph", "Phil", "Col", "1Thess", "2Thess", "1Tim", "2Tim", "Titus", "Phlm", "Heb", "Jas", "1Pet", "2Pet", "1John", "2John", "3John", "Jude", "Rev",
+
+#Apocrypha
+"Tob", "Jdt", "AddEsth", "Wis", "Sir", "Bar", "EpJer", "PrAzar", "Sus", "Bel", "1Macc", "2Macc", "3Macc", "4Macc", "1Esd", "2Esd", "PrMan", "Ps151", "PssSol", "Odes"
+);
+
+if (scalar(@ARGV) < 2) {
+ print "unb2osis.pl -- Unbound Bible format to OSIS $osisVersion converter version $version\nRevision $rev ($date)\nSyntax: unb2osis.pl <osisWork> <input filename> [-o OSIS-file]\n";
+ exit (-1);
+}
+
+$osisWork = $ARGV[0];
+
+if ($ARGV[2] eq "-o") {
+ $outputFilename = "$ARGV[3];"
+}
+else {
+ $outputFilename = "$osisWork.osis.xml";
+}
+open (OUTF, ">$outputFilename") or die "Could not open file $ARGV[2] for writing.";
+
+print OUTF "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osis xmlns=\"http://www.bibletechnologies.net/2003/OSIS/namespace\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace http://www.bibletechnologies.net/osisCore.$osisVersion.xsd\">\n<osisText osisRefWork=\"Bible\" xml:lang=\"en\" osisIDWork=\"$osisWork\">\n<header>\n<work osisWork=\"$osisWork\"\/>\n<\/header>\n";
+
+open (INF, $ARGV[1]);
+ at data = <INF>;
+close (INF);
+
+$book = "";
+$chap = "";
+$vers = "";
+
+$i = 10;
+
+foreach $line (@data) {
+ if ($line =~ /^\#/) {
+ $line = "";
+ }
+ elsif ($line =~ /\d+[ONAona]\t\d+\t\d+\t(\d+)[ONAona]\t(\d+)\t(\d+)\t(.*\t)(\d+)\t(.+)/) {
+ $line = sprintf("%08d\t$1\t$2\t$3\t$4$6", $5);
+ }
+ elsif ($line =~ /(\d+)[ONAona]\t(\d+)\t(\d+)\t(.*\t)(\d+)\t(.+)/) {
+ $line = sprintf("%08d\t$1\t$2\t$3\t$4$6", $5);
+ }
+ elsif ($line =~ /(\d+)[ONAona]\t(\d+)\t(\d+)\t(.+)/) {
+ $line = sprintf("%08d\t$1\t$2\t$3\t\t$4", $i+10);
+ }
+ else {
+ print "Error on line: $line\n";
+ }
+}
+
+ at data = sort @data;
+#print @data;
+
+foreach $line (@data) {
+ if ($line =~ /(\d+)\t(\d+)\t(\d+)\t(\d+)\t(.*\t)(.+)/) {
+
+ $ord = $1;
+
+ $nBook = $2;
+ $nChap = $3;
+ $vers = $4;
+ $sub = $5;
+
+ $text = $6;
+
+ $sub =~ s/\s*//g;
+ if ($sub ne "") {
+ $vers = "$vers!$sub";
+ }
+
+ $oBook = @OSISbook[$nBook-1];
+ if ($oBook eq "") {
+ print "Error unknown book: $book\n";
+ }
+
+ $text =~ s/\s*$//g;
+
+ if ($book ne $nBook) {
+ if ($book ne "") {
+ print OUTF "<\/chapter>\n";
+ $chap = "";
+ print OUTF "<\/div>\n";
+ }
+ print OUTF "<div type=\"book\" osisID=\"$oBook\">\n";
+ }
+
+ if ($chap ne $nChap) {
+ if ($chap ne "") {
+ print OUTF "<\/chapter>\n";
+ }
+ print OUTF "<chapter osisID=\"$oBook.$nChap\">\n";
+ }
+
+ print OUTF "<verse osisID=\"$oBook.$nChap.$vers\">$text<\/verse>\n";
+
+ $book = $nBook;
+ $chap = $nChap;
+ }
+}
+
+print OUTF "<\/chapter>\n";
+print OUTF "<\/div>\n";
+print OUTF "<\/osisText>\n";
+print OUTF "<\/osis>\n";
+
+close (OUTF);
Property changes on: trunk/modules/perlconverters/unb2osis.pl
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/modules/perlconverters/usfm2osis.pl
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/modules/perlconverters/zef2osis.pl
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/modules/python/lorem.py
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: trunk/modules/python/usfm2osis.py
___________________________________________________________________
Modified: svn:keywords
- Date Rev Id
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: trunk/modules/python/usfmtags.py
___________________________________________________________________
Modified: svn:keywords
- Date Rev Id
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: trunk/versification/av11n.py
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/versification/canon.af.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/versification/canon.bible.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/versification/canon.classical.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/versification/canon.lds.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/versification/canon.naghammadi.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/versification/canon.nta.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/versification/canon.otp.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/versification/canon.qumran.xml
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/versification/canon.xsd
===================================================================
--- trunk/versification/canon.xsd 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/canon.xsd 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,45 +1,45 @@
-<?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"/>
- </xs:simpleType>
- </xs:element>
- <xs:element name="id">
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
- </xs:element>
- <xs:element name="collection">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="book" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="book">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="id"/>
- <xs:element ref="abbr" minOccurs="0" maxOccurs="unbounded"/>
- <xs:element ref="name" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="abbr">
- <xs:complexType>
- <xs:simpleContent>
- <xs:extension base="ST_abbr">
- <xs:attribute name="mode">
- <xs:simpleType>
- <xs:restriction base="xs:string"/>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
- </xs:element>
-</xs:schema>
+<?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"/>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="id">
+ <xs:simpleType>
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="collection">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="book" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="book">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="id"/>
+ <xs:element ref="abbr" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="name" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="abbr">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="ST_abbr">
+ <xs:attribute name="mode">
+ <xs:simpleType>
+ <xs:restriction base="xs:string"/>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Property changes on: trunk/versification/canon.xsd
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/versification/lxx_v11ns/canon_brenton.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: trunk/versification/lxx_v11ns/canon_charles.h
===================================================================
--- trunk/versification/lxx_v11ns/canon_charles.h 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/lxx_v11ns/canon_charles.h 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,322 +1,322 @@
-/******************************************************************************
- *
- * canon_charles.h - Versification data for the Charles system
- *
- * $Id: canon_charles.h 2910 2013-07-18 10:23:23Z chrislit $
- *
- * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
- * CrossWire Bible Society
- * P. O. Box 2528
- * Tempe, AZ 85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#ifndef CANON_CHARLES_H
-#define CANON_CHARLES_H
-
-SWORD_NAMESPACE_START
-
-
-// Versification system: Charles
-// Book order: 1Esd 1Macc 2Macc 3Macc Tob Jdt Sir Wis Bar EpJer PrMan PrAzar Sus Bel Esth ... 1En ... PssSol 4Macc
-
-// Source: http://archive.org/details/apocryphapseudep00char
-// http://archive.org/details/apocryphapseudep02charuoft
-
-
-/******************************************************************************
- * [on]tbooks_charles - initialize static instance for all canonical
- * text names and chapmax
- */
-struct sbook otbooks_charles[] = {
- {"Genesis", "Gen", "Gen", 50},
- {"Exodus", "Exod", "Exod", 40},
- {"Leviticus", "Lev", "Lev", 27},
- {"Numbers", "Num", "Num", 36},
- {"Deuteronomy", "Deut", "Deut", 34},
- {"Joshua", "Josh", "Josh", 24},
- {"Judges", "Judg", "Judg", 21},
- {"Ruth", "Ruth", "Ruth", 4},
- {"I Samuel", "1Sam", "1Sam", 31},
- {"II Samuel", "2Sam", "2Sam", 24},
- {"I Kings", "1Kgs", "1Kgs", 22},
- {"II Kings", "2Kgs", "2Kgs", 25},
- {"I Chronicles", "1Chr", "1Chr", 29},
- {"II Chronicles", "2Chr", "2Chr", 36},
- {"I Esdras", "1Esd", "1Esd", 9},
- {"Ezra", "Ezra", "Ezra", 10},
- {"Nehemiah", "Neh", "Neh", 13},
- {"Esther", "Esth", "Esth", 16},
- {"Judith", "Jdt", "Jdt", 16},
- {"Tobit", "Tob", "Tob", 14},
- {"I Maccabees", "1Macc", "1Macc", 16},
- {"II Maccabees", "2Macc", "2Macc", 15},
- {"III Maccabees", "3Macc", "3Macc", 7},
- {"IV Maccabees", "4Macc", "4Macc", 18},
- {"Psalms", "Ps", "Ps", 151},
- {"Prayer of Manasses", "PrMan", "PrMan", 1},
- {"Proverbs", "Prov", "Prov", 31},
- {"Ecclesiastes", "Eccl", "Eccl", 12},
- {"Song of Solomon", "Song", "Song", 8},
- {"Job", "Job", "Job", 42},
- {"Wisdom", "Wis", "Wis", 19},
- {"Sirach", "Sir", "Sir", 51},
- {"Psalms of Solomon", "PssSol", "PssSol", 18},
- {"Hosea", "Hos", "Hos", 14},
- {"Amos", "Amos", "Amos", 9},
- {"Micah", "Mic", "Mic", 7},
- {"Joel", "Joel", "Joel", 4},
- {"Obadiah", "Obad", "Obad", 1},
- {"Jonah", "Jonah", "Jonah", 4},
- {"Nahum", "Nah", "Nah", 3},
- {"Habakkuk", "Hab", "Hab", 3},
- {"Zephaniah", "Zeph", "Zeph", 3},
- {"Haggai", "Hag", "Hag", 2},
- {"Zechariah", "Zech", "Zech", 14},
- {"Malachi", "Mal", "Mal", 4},
- {"Isaiah", "Isa", "Isa", 66},
- {"Jeremiah", "Jer", "Jer", 52},
- {"Baruch", "Bar", "Bar", 5},
- {"Lamentations", "Lam", "Lam", 5},
- {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
- {"Ezekiel", "Ezek", "Ezek", 48},
- {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
- {"Susanna", "Sus", "Sus", 1},
- {"Daniel", "Dan", "Dan", 12},
- {"Bel and the Dragon", "Bel", "Bel", 1},
- {"I Enoch", "1En", "1En", 108},
- {"Odes", "Odes", "Odes", 14},
- {"", "", "", 0}
-};
-
-/******************************************************************************
- * Maximum verses per chapter
- */
-
-int vm_charles[] = {
- // Genesis
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Exodus
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Leviticus
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,
- // Numbers
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Deuteronomy
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Joshua
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Judges
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Ruth
- 0, 0, 0, 0,
- // I Samuel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // II Samuel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // I Kings
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // II Kings
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,
- // I Chronicles
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // II Chronicles
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // I Esdras
- 58, 30, 24, 63, 73, 34, 15, 96, 55,
- // Ezra
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Nehemiah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0,
- // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 13,
- 12/17, 6/7, 18/30, 19/16, 19/24, 24/11,
- // Judith
- 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
- 23, 20, 20, 19, 13, 25,
- // Tobit
- 22, 14, 17, 21, 22, 18, 17, 21, 6, 13,
- 18, 22, 18, 15,
- // I Maccabees
- 64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
- 74, 53, 53, 49, 41, 24,
- // II Maccabees
- 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
- 38, 45, 26, 46, 39,
- // III Maccabees
- 29, 33, 30, 21, 51, 41, 23,
- // IV Maccabees
- 35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
- 27, 20, 27, 20, 32, 25, 24, 24,
- // Psalms
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Prayer of Manasses
- 15,
- // Proverbs
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Ecclesiastes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Song of Solomon
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Job
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Wisdom
- 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
- 26, 27, 19, 31, 19, 29, 21, 25, 22,
- // Sirach
- 30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
- 34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
- 28, 27, 27, 34, 26, 29, 30, 26, 28, 25,
- 31, 24, 31, 26, 20, 26, 31, 34, 35, 30,
- 22, 25, 33, 23, 26, 20, 24, 25, 16, 29,
- 30,
- // Psalms of Solomon
- 8, 41, 16, 29, 21, 9, 9, 40, 19, 8,
- 9, 7, 11, 7, 15, 15, 51, 14,
- // Hosea
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Amos
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Micah
- 0, 0, 0, 0, 0, 0, 0,
- // Joel
- 0, 0, 0, 0,
- // Obadiah
- 0,
- // Jonah
- 0, 0, 0, 0,
- // Nahum
- 0, 0, 0,
- // Habakkuk
- 0, 0, 0,
- // Zephaniah
- 0, 0, 0,
- // Haggai
- 0, 0,
- // Zechariah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Malachi
- 0, 0, 0, 0,
- // Isaiah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Jeremiah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Baruch
- 22, 35, 37, 37, 9,
- // Lamentations
- 0, 0, 0, 0, 0,
- // Epistle of Jeremiah
- 73,
- // Ezekiel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Prayer of Azariah
- 68,
- // Susanna
- 64,
- // Daniel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Bel and the Dragon
- 42,
- // I Enoch
- // I Enoch
- 9, 3, 1, 1, 9, 8, 6, 4, 11, 22,
- 2, 6, 10, 25, 12, 4, 8, 16, 3, 8,
- 10, 14, 4, 6, 7, 6, 5, 3, 2, 3,
- 3, 6, 4, 3, 1, 4, 5, 6, 14, 10,
- 9, 3, 4, 1, 6, 8, 4, 10, 4, 5,
- 5, 9, 7, 10, 4, 8, 3, 6, 3, 24,
- 13, 16, 12, 2, 12, 3, 13, 5, 29, 4,
- 17, 37, 8, 17, 9, 14, 8, 17, 6, 8,
- 10, 20, 11, 6, 10, 6, 4, 3, 77, 42,
- 19, 17, 14, 11, 7, 8, 10, 16, 16, 13,
- 9, 11, 15, 13, 2, 19, 3, 15,
- // Odes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
-};
-
-SWORD_NAMESPACE_END
-#endif
+/******************************************************************************
+ *
+ * canon_charles.h - Versification data for the Charles system
+ *
+ * $Id$
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef CANON_CHARLES_H
+#define CANON_CHARLES_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Charles
+// Book order: 1Esd 1Macc 2Macc 3Macc Tob Jdt Sir Wis Bar EpJer PrMan PrAzar Sus Bel Esth ... 1En ... PssSol 4Macc
+
+// Source: http://archive.org/details/apocryphapseudep00char
+// http://archive.org/details/apocryphapseudep02charuoft
+
+
+/******************************************************************************
+ * [on]tbooks_charles - initialize static instance for all canonical
+ * text names and chapmax
+ */
+struct sbook otbooks_charles[] = {
+ {"Genesis", "Gen", "Gen", 50},
+ {"Exodus", "Exod", "Exod", 40},
+ {"Leviticus", "Lev", "Lev", 27},
+ {"Numbers", "Num", "Num", 36},
+ {"Deuteronomy", "Deut", "Deut", 34},
+ {"Joshua", "Josh", "Josh", 24},
+ {"Judges", "Judg", "Judg", 21},
+ {"Ruth", "Ruth", "Ruth", 4},
+ {"I Samuel", "1Sam", "1Sam", 31},
+ {"II Samuel", "2Sam", "2Sam", 24},
+ {"I Kings", "1Kgs", "1Kgs", 22},
+ {"II Kings", "2Kgs", "2Kgs", 25},
+ {"I Chronicles", "1Chr", "1Chr", 29},
+ {"II Chronicles", "2Chr", "2Chr", 36},
+ {"I Esdras", "1Esd", "1Esd", 9},
+ {"Ezra", "Ezra", "Ezra", 10},
+ {"Nehemiah", "Neh", "Neh", 13},
+ {"Esther", "Esth", "Esth", 16},
+ {"Judith", "Jdt", "Jdt", 16},
+ {"Tobit", "Tob", "Tob", 14},
+ {"I Maccabees", "1Macc", "1Macc", 16},
+ {"II Maccabees", "2Macc", "2Macc", 15},
+ {"III Maccabees", "3Macc", "3Macc", 7},
+ {"IV Maccabees", "4Macc", "4Macc", 18},
+ {"Psalms", "Ps", "Ps", 151},
+ {"Prayer of Manasses", "PrMan", "PrMan", 1},
+ {"Proverbs", "Prov", "Prov", 31},
+ {"Ecclesiastes", "Eccl", "Eccl", 12},
+ {"Song of Solomon", "Song", "Song", 8},
+ {"Job", "Job", "Job", 42},
+ {"Wisdom", "Wis", "Wis", 19},
+ {"Sirach", "Sir", "Sir", 51},
+ {"Psalms of Solomon", "PssSol", "PssSol", 18},
+ {"Hosea", "Hos", "Hos", 14},
+ {"Amos", "Amos", "Amos", 9},
+ {"Micah", "Mic", "Mic", 7},
+ {"Joel", "Joel", "Joel", 4},
+ {"Obadiah", "Obad", "Obad", 1},
+ {"Jonah", "Jonah", "Jonah", 4},
+ {"Nahum", "Nah", "Nah", 3},
+ {"Habakkuk", "Hab", "Hab", 3},
+ {"Zephaniah", "Zeph", "Zeph", 3},
+ {"Haggai", "Hag", "Hag", 2},
+ {"Zechariah", "Zech", "Zech", 14},
+ {"Malachi", "Mal", "Mal", 4},
+ {"Isaiah", "Isa", "Isa", 66},
+ {"Jeremiah", "Jer", "Jer", 52},
+ {"Baruch", "Bar", "Bar", 5},
+ {"Lamentations", "Lam", "Lam", 5},
+ {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+ {"Ezekiel", "Ezek", "Ezek", 48},
+ {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+ {"Susanna", "Sus", "Sus", 1},
+ {"Daniel", "Dan", "Dan", 12},
+ {"Bel and the Dragon", "Bel", "Bel", 1},
+ {"I Enoch", "1En", "1En", 108},
+ {"Odes", "Odes", "Odes", 14},
+ {"", "", "", 0}
+};
+
+/******************************************************************************
+ * Maximum verses per chapter
+ */
+
+int vm_charles[] = {
+ // Genesis
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Exodus
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Leviticus
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,
+ // Numbers
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Deuteronomy
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Joshua
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Judges
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Ruth
+ 0, 0, 0, 0,
+ // I Samuel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // II Samuel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // I Kings
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // II Kings
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,
+ // I Chronicles
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // II Chronicles
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // I Esdras
+ 58, 30, 24, 63, 73, 34, 15, 96, 55,
+ // Ezra
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Nehemiah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,
+ // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 13,
+ 12/17, 6/7, 18/30, 19/16, 19/24, 24/11,
+ // Judith
+ 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+ 23, 20, 20, 19, 13, 25,
+ // Tobit
+ 22, 14, 17, 21, 22, 18, 17, 21, 6, 13,
+ 18, 22, 18, 15,
+ // I Maccabees
+ 64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+ 74, 53, 53, 49, 41, 24,
+ // II Maccabees
+ 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+ 38, 45, 26, 46, 39,
+ // III Maccabees
+ 29, 33, 30, 21, 51, 41, 23,
+ // IV Maccabees
+ 35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
+ 27, 20, 27, 20, 32, 25, 24, 24,
+ // Psalms
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Prayer of Manasses
+ 15,
+ // Proverbs
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Ecclesiastes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Song of Solomon
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Job
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Wisdom
+ 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+ 26, 27, 19, 31, 19, 29, 21, 25, 22,
+ // Sirach
+ 30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+ 34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
+ 28, 27, 27, 34, 26, 29, 30, 26, 28, 25,
+ 31, 24, 31, 26, 20, 26, 31, 34, 35, 30,
+ 22, 25, 33, 23, 26, 20, 24, 25, 16, 29,
+ 30,
+ // Psalms of Solomon
+ 8, 41, 16, 29, 21, 9, 9, 40, 19, 8,
+ 9, 7, 11, 7, 15, 15, 51, 14,
+ // Hosea
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Amos
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Micah
+ 0, 0, 0, 0, 0, 0, 0,
+ // Joel
+ 0, 0, 0, 0,
+ // Obadiah
+ 0,
+ // Jonah
+ 0, 0, 0, 0,
+ // Nahum
+ 0, 0, 0,
+ // Habakkuk
+ 0, 0, 0,
+ // Zephaniah
+ 0, 0, 0,
+ // Haggai
+ 0, 0,
+ // Zechariah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Malachi
+ 0, 0, 0, 0,
+ // Isaiah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Jeremiah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Baruch
+ 22, 35, 37, 37, 9,
+ // Lamentations
+ 0, 0, 0, 0, 0,
+ // Epistle of Jeremiah
+ 73,
+ // Ezekiel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Prayer of Azariah
+ 68,
+ // Susanna
+ 64,
+ // Daniel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Bel and the Dragon
+ 42,
+ // I Enoch
+ // I Enoch
+ 9, 3, 1, 1, 9, 8, 6, 4, 11, 22,
+ 2, 6, 10, 25, 12, 4, 8, 16, 3, 8,
+ 10, 14, 4, 6, 7, 6, 5, 3, 2, 3,
+ 3, 6, 4, 3, 1, 4, 5, 6, 14, 10,
+ 9, 3, 4, 1, 6, 8, 4, 10, 4, 5,
+ 5, 9, 7, 10, 4, 8, 3, 6, 3, 24,
+ 13, 16, 12, 2, 12, 3, 13, 5, 29, 4,
+ 17, 37, 8, 17, 9, 14, 8, 17, 6, 8,
+ 10, 20, 11, 6, 10, 6, 4, 3, 77, 42,
+ 19, 17, 14, 11, 7, 8, 10, 16, 16, 13,
+ 9, 11, 15, 13, 2, 19, 3, 15,
+ // Odes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+};
+
+SWORD_NAMESPACE_END
+#endif
Property changes on: trunk/versification/lxx_v11ns/canon_charles.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: trunk/versification/lxx_v11ns/canon_charlesworth.h
===================================================================
--- trunk/versification/lxx_v11ns/canon_charlesworth.h 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/lxx_v11ns/canon_charlesworth.h 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,319 +1,319 @@
-/******************************************************************************
- *
- * canon_charlesworth.h - Versification data for the Charlesworth system
- *
- * $Id: canon_charlesworth.h 2910 2013-07-18 10:23:23Z chrislit $
- *
- * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
- * CrossWire Bible Society
- * P. O. Box 2528
- * Tempe, AZ 85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#ifndef CANON_CHARLESWORTH_H
-#define CANON_CHARLESWORTH_H
-
-SWORD_NAMESPACE_START
-
-
-// Versification system: Charlesworth
-// Book order: 1En ... 3Macc 4Macc ... PrMan PssSol
-
-// Source: http://www.amazon.com/Old-Testament-Pseudepigrapha-set/dp/1598564897/ref=sr_1_1?s=books&ie=UTF8&qid=1374586905&sr=1-1
-
-/******************************************************************************
- * [on]tbooks_charlesworth - initialize static instance for all canonical
- * text names and chapmax
- */
-struct sbook otbooks_charlesworth[] = {
- {"Genesis", "Gen", "Gen", 50},
- {"Exodus", "Exod", "Exod", 40},
- {"Leviticus", "Lev", "Lev", 27},
- {"Numbers", "Num", "Num", 36},
- {"Deuteronomy", "Deut", "Deut", 34},
- {"Joshua", "Josh", "Josh", 24},
- {"Judges", "Judg", "Judg", 21},
- {"Ruth", "Ruth", "Ruth", 4},
- {"I Samuel", "1Sam", "1Sam", 31},
- {"II Samuel", "2Sam", "2Sam", 24},
- {"I Kings", "1Kgs", "1Kgs", 22},
- {"II Kings", "2Kgs", "2Kgs", 25},
- {"I Chronicles", "1Chr", "1Chr", 29},
- {"II Chronicles", "2Chr", "2Chr", 36},
- {"I Esdras", "1Esd", "1Esd", 9},
- {"Ezra", "Ezra", "Ezra", 10},
- {"Nehemiah", "Neh", "Neh", 13},
- {"Esther", "Esth", "Esth", 16},
- {"Judith", "Jdt", "Jdt", 16},
- {"Tobit", "Tob", "Tob", 14},
- {"I Maccabees", "1Macc", "1Macc", 16},
- {"II Maccabees", "2Macc", "2Macc", 15},
- {"III Maccabees", "3Macc", "3Macc", 7},
- {"IV Maccabees", "4Macc", "4Macc", 18},
- {"Psalms", "Ps", "Ps", 151},
- {"Prayer of Manasses", "PrMan", "PrMan", 1},
- {"Proverbs", "Prov", "Prov", 31},
- {"Ecclesiastes", "Eccl", "Eccl", 12},
- {"Song of Solomon", "Song", "Song", 8},
- {"Job", "Job", "Job", 42},
- {"Wisdom", "Wis", "Wis", 19},
- {"Sirach", "Sir", "Sir", 51},
- {"Psalms of Solomon", "PssSol", "PssSol", 18},
- {"Hosea", "Hos", "Hos", 14},
- {"Amos", "Amos", "Amos", 9},
- {"Micah", "Mic", "Mic", 7},
- {"Joel", "Joel", "Joel", 4},
- {"Obadiah", "Obad", "Obad", 1},
- {"Jonah", "Jonah", "Jonah", 4},
- {"Nahum", "Nah", "Nah", 3},
- {"Habakkuk", "Hab", "Hab", 3},
- {"Zephaniah", "Zeph", "Zeph", 3},
- {"Haggai", "Hag", "Hag", 2},
- {"Zechariah", "Zech", "Zech", 14},
- {"Malachi", "Mal", "Mal", 4},
- {"Isaiah", "Isa", "Isa", 66},
- {"Jeremiah", "Jer", "Jer", 52},
- {"Baruch", "Bar", "Bar", 5},
- {"Lamentations", "Lam", "Lam", 5},
- {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
- {"Ezekiel", "Ezek", "Ezek", 48},
- {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
- {"Susanna", "Sus", "Sus", 1},
- {"Daniel", "Dan", "Dan", 12},
- {"Bel and the Dragon", "Bel", "Bel", 1},
- {"I Enoch", "1En", "1En", 108},
- {"Odes", "Odes", "Odes", 14},
- {"", "", "", 0}
-};
-
-/******************************************************************************
- * Maximum verses per chapter
- */
-
-int vm_charlesworth[] = {
- // Genesis
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Exodus
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Leviticus
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,
- // Numbers
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Deuteronomy
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Joshua
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Judges
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Ruth
- 0, 0, 0, 0,
- // I Samuel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // II Samuel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // I Kings
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // II Kings
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,
- // I Chronicles
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // II Chronicles
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // I Esdras
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Ezra
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Nehemiah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0,
- // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Judith
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Tobit
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // I Maccabees
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // II Maccabees
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,
- // III Maccabees
- 29, 33, 30, 21, 51, 41, 23,
- // IV Maccabees
- 35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
- 27, 19, 27, 20, 31, 25, 24, 23,
- // Psalms
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Prayer of Manasses
- 15,
- // Proverbs
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Ecclesiastes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Song of Solomon
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Job
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Wisdom
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Sirach
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Psalms of Solomon
- 8, 37, 12, 25, 19, 6, 10, 34, 11, 8,
- 9, 6, 12, 10, 13, 15, 46, 12,
- // Hosea
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Amos
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Micah
- 0, 0, 0, 0, 0, 0, 0,
- // Joel
- 0, 0, 0, 0,
- // Obadiah
- 0,
- // Jonah
- 0, 0, 0, 0,
- // Nahum
- 0, 0, 0,
- // Habakkuk
- 0, 0, 0,
- // Zephaniah
- 0, 0, 0,
- // Haggai
- 0, 0,
- // Zechariah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Malachi
- 0, 0, 0, 0,
- // Isaiah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Jeremiah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Baruch
- 0, 0, 0, 0, 0,
- // Lamentations
- 0, 0, 0, 0, 0,
- // Epistle of Jeremiah
- 0,
- // Ezekiel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Prayer of Azariah
- 0,
- // Susanna
- 0,
- // Daniel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Bel and the Dragon
- 0,
- // I Enoch
- 9, 3, 1, 1, 10, 8, 6, 4, 11, 22,
- 2, 6, 10, 25, 12, 3, 8, 16, 3, 7,
- 10, 14, 4, 6, 7, 6, 5, 3, 2, 3,
- 3, 6, 4, 3, 1, 4, 5, 6, 14, 10,
- 9, 3, 4, 1, 6, 8, 4, 10, 4, 5,
- 5, 9, 7, 10, 4, 8, 3, 6, 3, 25,
- 13, 16, 12, 2, 12, 2, 13, 5, 29, 4,
- 17, 37, 8, 17, 9, 14, 9, 17, 6, 8,
- 10, 20, 11, 6, 10, 6, 4, 3, 77, 42,
- 19, 5, 14, 11, 7, 8, 10, 16, 16, 13,
- 9, 11, 15, 13, 2, 19, 3, 15,
- // Odes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
-};
-
-SWORD_NAMESPACE_END
-#endif
+/******************************************************************************
+ *
+ * canon_charlesworth.h - Versification data for the Charlesworth system
+ *
+ * $Id$
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef CANON_CHARLESWORTH_H
+#define CANON_CHARLESWORTH_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Charlesworth
+// Book order: 1En ... 3Macc 4Macc ... PrMan PssSol
+
+// Source: http://www.amazon.com/Old-Testament-Pseudepigrapha-set/dp/1598564897/ref=sr_1_1?s=books&ie=UTF8&qid=1374586905&sr=1-1
+
+/******************************************************************************
+ * [on]tbooks_charlesworth - initialize static instance for all canonical
+ * text names and chapmax
+ */
+struct sbook otbooks_charlesworth[] = {
+ {"Genesis", "Gen", "Gen", 50},
+ {"Exodus", "Exod", "Exod", 40},
+ {"Leviticus", "Lev", "Lev", 27},
+ {"Numbers", "Num", "Num", 36},
+ {"Deuteronomy", "Deut", "Deut", 34},
+ {"Joshua", "Josh", "Josh", 24},
+ {"Judges", "Judg", "Judg", 21},
+ {"Ruth", "Ruth", "Ruth", 4},
+ {"I Samuel", "1Sam", "1Sam", 31},
+ {"II Samuel", "2Sam", "2Sam", 24},
+ {"I Kings", "1Kgs", "1Kgs", 22},
+ {"II Kings", "2Kgs", "2Kgs", 25},
+ {"I Chronicles", "1Chr", "1Chr", 29},
+ {"II Chronicles", "2Chr", "2Chr", 36},
+ {"I Esdras", "1Esd", "1Esd", 9},
+ {"Ezra", "Ezra", "Ezra", 10},
+ {"Nehemiah", "Neh", "Neh", 13},
+ {"Esther", "Esth", "Esth", 16},
+ {"Judith", "Jdt", "Jdt", 16},
+ {"Tobit", "Tob", "Tob", 14},
+ {"I Maccabees", "1Macc", "1Macc", 16},
+ {"II Maccabees", "2Macc", "2Macc", 15},
+ {"III Maccabees", "3Macc", "3Macc", 7},
+ {"IV Maccabees", "4Macc", "4Macc", 18},
+ {"Psalms", "Ps", "Ps", 151},
+ {"Prayer of Manasses", "PrMan", "PrMan", 1},
+ {"Proverbs", "Prov", "Prov", 31},
+ {"Ecclesiastes", "Eccl", "Eccl", 12},
+ {"Song of Solomon", "Song", "Song", 8},
+ {"Job", "Job", "Job", 42},
+ {"Wisdom", "Wis", "Wis", 19},
+ {"Sirach", "Sir", "Sir", 51},
+ {"Psalms of Solomon", "PssSol", "PssSol", 18},
+ {"Hosea", "Hos", "Hos", 14},
+ {"Amos", "Amos", "Amos", 9},
+ {"Micah", "Mic", "Mic", 7},
+ {"Joel", "Joel", "Joel", 4},
+ {"Obadiah", "Obad", "Obad", 1},
+ {"Jonah", "Jonah", "Jonah", 4},
+ {"Nahum", "Nah", "Nah", 3},
+ {"Habakkuk", "Hab", "Hab", 3},
+ {"Zephaniah", "Zeph", "Zeph", 3},
+ {"Haggai", "Hag", "Hag", 2},
+ {"Zechariah", "Zech", "Zech", 14},
+ {"Malachi", "Mal", "Mal", 4},
+ {"Isaiah", "Isa", "Isa", 66},
+ {"Jeremiah", "Jer", "Jer", 52},
+ {"Baruch", "Bar", "Bar", 5},
+ {"Lamentations", "Lam", "Lam", 5},
+ {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+ {"Ezekiel", "Ezek", "Ezek", 48},
+ {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+ {"Susanna", "Sus", "Sus", 1},
+ {"Daniel", "Dan", "Dan", 12},
+ {"Bel and the Dragon", "Bel", "Bel", 1},
+ {"I Enoch", "1En", "1En", 108},
+ {"Odes", "Odes", "Odes", 14},
+ {"", "", "", 0}
+};
+
+/******************************************************************************
+ * Maximum verses per chapter
+ */
+
+int vm_charlesworth[] = {
+ // Genesis
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Exodus
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Leviticus
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,
+ // Numbers
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Deuteronomy
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Joshua
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Judges
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Ruth
+ 0, 0, 0, 0,
+ // I Samuel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // II Samuel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // I Kings
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // II Kings
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,
+ // I Chronicles
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // II Chronicles
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // I Esdras
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Ezra
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Nehemiah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,
+ // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Judith
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Tobit
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // I Maccabees
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // II Maccabees
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,
+ // III Maccabees
+ 29, 33, 30, 21, 51, 41, 23,
+ // IV Maccabees
+ 35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
+ 27, 19, 27, 20, 31, 25, 24, 23,
+ // Psalms
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Prayer of Manasses
+ 15,
+ // Proverbs
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Ecclesiastes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Song of Solomon
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Job
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Wisdom
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Sirach
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Psalms of Solomon
+ 8, 37, 12, 25, 19, 6, 10, 34, 11, 8,
+ 9, 6, 12, 10, 13, 15, 46, 12,
+ // Hosea
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Amos
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Micah
+ 0, 0, 0, 0, 0, 0, 0,
+ // Joel
+ 0, 0, 0, 0,
+ // Obadiah
+ 0,
+ // Jonah
+ 0, 0, 0, 0,
+ // Nahum
+ 0, 0, 0,
+ // Habakkuk
+ 0, 0, 0,
+ // Zephaniah
+ 0, 0, 0,
+ // Haggai
+ 0, 0,
+ // Zechariah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Malachi
+ 0, 0, 0, 0,
+ // Isaiah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Jeremiah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Baruch
+ 0, 0, 0, 0, 0,
+ // Lamentations
+ 0, 0, 0, 0, 0,
+ // Epistle of Jeremiah
+ 0,
+ // Ezekiel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Prayer of Azariah
+ 0,
+ // Susanna
+ 0,
+ // Daniel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Bel and the Dragon
+ 0,
+ // I Enoch
+ 9, 3, 1, 1, 10, 8, 6, 4, 11, 22,
+ 2, 6, 10, 25, 12, 3, 8, 16, 3, 7,
+ 10, 14, 4, 6, 7, 6, 5, 3, 2, 3,
+ 3, 6, 4, 3, 1, 4, 5, 6, 14, 10,
+ 9, 3, 4, 1, 6, 8, 4, 10, 4, 5,
+ 5, 9, 7, 10, 4, 8, 3, 6, 3, 25,
+ 13, 16, 12, 2, 12, 2, 13, 5, 29, 4,
+ 17, 37, 8, 17, 9, 14, 9, 17, 6, 8,
+ 10, 20, 11, 6, 10, 6, 4, 3, 77, 42,
+ 19, 5, 14, 11, 7, 8, 10, 16, 16, 13,
+ 9, 11, 15, 13, 2, 19, 3, 15,
+ // Odes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+};
+
+SWORD_NAMESPACE_END
+#endif
Property changes on: trunk/versification/lxx_v11ns/canon_charlesworth.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: trunk/versification/lxx_v11ns/canon_nets.h
===================================================================
--- trunk/versification/lxx_v11ns/canon_nets.h 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/lxx_v11ns/canon_nets.h 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,324 +1,324 @@
-/******************************************************************************
- *
- * canon_nets.h - Versification data for the NETS system
- *
- * $Id: canon_nets.h 2910 2013-07-18 10:23:23Z chrislit $
- *
- * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
- * CrossWire Bible Society
- * P. O. Box 2528
- * Tempe, AZ 85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#ifndef CANON_NETS_H
-#define CANON_NETS_H
-
-SWORD_NAMESPACE_START
-
-
-// Versification system: NETS
-// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Neh Esth Jdt Tob 1Macc 2Macc 3Macc 4Macc Ps PrMan Prov Eccl Song Job Wis Sir PssSol Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek Sus Dan Bel
-
-// Source: http://ccat.sas.upenn.edu/nets/edition/
-
-/******************************************************************************
- * [on]tbooks_nets - initialize static instance for all canonical
- * text names and chapmax
- */
-struct sbook otbooks_nets[] = {
- {"Genesis", "Gen", "Gen", 50},
- {"Exodus", "Exod", "Exod", 40},
- {"Leviticus", "Lev", "Lev", 27},
- {"Numbers", "Num", "Num", 36},
- {"Deuteronomy", "Deut", "Deut", 34},
- {"Joshua", "Josh", "Josh", 24},
- {"Judges", "Judg", "Judg", 21},
- {"Ruth", "Ruth", "Ruth", 4},
- {"I Samuel", "1Sam", "1Sam", 31},
- {"II Samuel", "2Sam", "2Sam", 24},
- {"I Kings", "1Kgs", "1Kgs", 22},
- {"II Kings", "2Kgs", "2Kgs", 25},
- {"I Chronicles", "1Chr", "1Chr", 29},
- {"II Chronicles", "2Chr", "2Chr", 36},
- {"I Esdras", "1Esd", "1Esd", 9},
- {"Ezra", "Ezra", "Ezra", 10},
- {"Nehemiah", "Neh", "Neh", 13},
- {"Esther", "Esth", "Esth", 16},
- {"Judith", "Jdt", "Jdt", 16},
- {"Tobit", "Tob", "Tob", 14},
- {"I Maccabees", "1Macc", "1Macc", 16},
- {"II Maccabees", "2Macc", "2Macc", 15},
- {"III Maccabees", "3Macc", "3Macc", 7},
- {"IV Maccabees", "4Macc", "4Macc", 18},
- {"Psalms", "Ps", "Ps", 151},
- {"Prayer of Manasses", "PrMan", "PrMan", 1},
- {"Proverbs", "Prov", "Prov", 31},
- {"Ecclesiastes", "Eccl", "Eccl", 12},
- {"Song of Solomon", "Song", "Song", 8},
- {"Job", "Job", "Job", 42},
- {"Wisdom", "Wis", "Wis", 19},
- {"Sirach", "Sir", "Sir", 51},
- {"Psalms of Solomon", "PssSol", "PssSol", 18},
- {"Hosea", "Hos", "Hos", 14},
- {"Amos", "Amos", "Amos", 9},
- {"Micah", "Mic", "Mic", 7},
- {"Joel", "Joel", "Joel", 4},
- {"Obadiah", "Obad", "Obad", 1},
- {"Jonah", "Jonah", "Jonah", 4},
- {"Nahum", "Nah", "Nah", 3},
- {"Habakkuk", "Hab", "Hab", 3},
- {"Zephaniah", "Zeph", "Zeph", 3},
- {"Haggai", "Hag", "Hag", 2},
- {"Zechariah", "Zech", "Zech", 14},
- {"Malachi", "Mal", "Mal", 4},
- {"Isaiah", "Isa", "Isa", 66},
- {"Jeremiah", "Jer", "Jer", 52},
- {"Baruch", "Bar", "Bar", 5},
- {"Lamentations", "Lam", "Lam", 5},
- {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
- {"Ezekiel", "Ezek", "Ezek", 48},
- {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
- {"Susanna", "Sus", "Sus", 1},
- {"Daniel", "Dan", "Dan", 12},
- {"Bel and the Dragon", "Bel", "Bel", 1},
- {"I Enoch", "1En", "1En", 108},
- {"Odes", "Odes", "Odes", 14},
- {"", "", "", 0}
-};
-
-// for ntbooks_nets, use ntbooks
-
-/******************************************************************************
- * Maximum verses per chapter
- */
-
-int vm_nets[] = {
- // Genesis
- 31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
- 32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
- 34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
- 54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
- 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
- // Exodus
- 22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
- 10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
- 37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
- 18, 35, 23, 35, 35, 38, 21, 27, 23, 38,
- // Leviticus
- 17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
- 47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
- 24, 33, 44, 23, 55, 46, 34,
- // Numbers
- 54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
- 35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
- 35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
- 54, 42, 56, 29, 34, 13,
- // Deuteronomy
- 46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
- 32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
- 23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
- 30, 52, 29, 12,
- // Joshua
- 18, 24, 17, 24, 15, 27, 26, 29, 27, 42,
- 23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
- 45, 34, 16, 33,
- // Judges
- 36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
- 40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
- 25,
- // Ruth
- 22, 23, 18, 22,
- // I Samuel
- 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
- 15, 25, 23, 52, 35, 23, 54, 29, 24, 42,
- 16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
- 13,
- // II Samuel
- 27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
- 27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
- 22, 51, 39, 25,
- // I Kings
- 53, 46, 28, 19, 32, 36, 50, 66, 28, 29,
- 43, 33, 34, 31, 34, 34, 24, 46, 21, 29,
- 43, 54,
- // II Kings
- 18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
- 20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
- 26, 20, 37, 20, 30,
- // I Chronicles
- 54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
- 47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
- 30, 19, 32, 31, 31, 32, 34, 21, 30,
- // II Chronicles
- 18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
- 23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
- 20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
- 21, 33, 25, 33, 27, 23,
- // I Esdras
- 55, 25, 23, 63, 70, 33, 15, 92, 55,
- // Ezra
- 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
- // Nehemiah
- 11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
- 36, 47, 31,
- // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
- 22, 23, 15, 17, 14, 14, 10, 17, 31, 3,
- 17, 7, 30, 16, 24, 11,
- // Judith
- 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
- 23, 20, 20, 19, 14, 25,
- // Tobit
- 22, 14, 17, 21, 22, 18, 17, 21, 6, 13,
- 19, 22, 18, 15,
- // I Maccabees
- 64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
- 74, 53, 53, 49, 41, 24,
- // II Maccabees
- 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
- 38, 45, 26, 46, 39,
- // III Maccabees
- 29, 33, 30, 21, 51, 41, 23,
- // IV Maccabees
- 35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
- 27, 19, 27, 20, 32, 25, 24, 24,
- // Psalms
- 6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
- 9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
- 32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
- 11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
- 12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
- 11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
- 13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
- 20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
- 8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
- 16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
- 29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
- 10, 9, 26, 9, 10, 2, 29, 176, 7, 8,
- 9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
- 18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
- 8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
- 7,
- // Prayer of Manasses
- 15,
- // Proverbs
- 33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
- 31, 28, 25, 35, 33, 33, 28, 22, 29, 30,
- 31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
- 31,
- // Ecclesiastes
- 18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
- 10, 14,
- // Song of Solomon
- 17, 17, 11, 16, 16, 12, 14, 14,
- // Job
- 22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
- 20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
- 34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
- 40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
- 26, 17,
- // Wisdom
- 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
- 26, 27, 19, 31, 19, 29, 21, 25, 22,
- // Sirach
- 30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
- 34, 18, 26, 27, 20, 30, 32, 33, 30, 32,
- 28, 27, 28, 34, 26, 29, 30, 26, 28, 25,
- 31, 24, 33, 31, 26, 31, 31, 34, 35, 30,
- 22, 25, 33, 23, 26, 20, 25, 25, 16, 29,
- 30,
- // Psalms of Solomon
- 8, 37, 12, 25, 19, 6, 10, 34, 11, 8,
- 9, 6, 12, 10, 13, 15, 46, 12,
- // Hosea
- 11, 23, 5, 19, 15, 10, 16, 14, 17, 15,
- 12, 14, 15, 10,
- // Amos
- 15, 16, 15, 13, 27, 14, 17, 14, 15,
- // Micah
- 16, 13, 12, 13, 15, 16, 20,
- // Joel
- 20, 32, 21, 0,
- // Obadiah
- 21,
- // Jonah
- 16, 11, 10, 11,
- // Nahum
- 15, 14, 19,
- // Habakkuk
- 17, 20, 19,
- // Zephaniah
- 18, 14, 20,
- // Haggai
- 14, 23,
- // Zechariah
- 21, 13, 10, 13, 11, 15, 14, 23, 17, 12,
- 17, 14, 9, 21,
- // Malachi
- 14, 17, 18, 6,
- // Isaiah
- 31, 21, 26, 6, 30, 13, 25, 22, 21, 34,
- 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
- 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
- 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
- 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
- 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
- 11, 12, 19, 12, 25, 24,
- // Jeremiah
- 19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
- 23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
- 14, 30, 40, 10, 19, 28, 46, 64, 23, 16,
- 44, 24, 24, 18, 17, 32, 24, 40, 44, 13,
- 22, 19, 32, 21, 28, 18, 16, 18, 22, 13,
- 35, 34,
- // Baruch
- 22, 35, 38, 37, 9,
- // Lamentations
- 22, 22, 66, 22, 22,
- // Epistle of Jeremiah
- 72,
- // Ezekiel
- 28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
- 25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
- 32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
- 18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
- 26, 20, 27, 31, 25, 24, 23, 35,
- // Prayer of Azariah
- 0,
- // Susanna
- 64,
- // Daniel
- 21, 49, 100, 34, 31, 28, 28, 27, 27, 21,
- 45, 13,
- // Bel and the Dragon
- 42,
- // I Enoch
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Odes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
-};
-
-
-SWORD_NAMESPACE_END
-
-
-#endif
+/******************************************************************************
+ *
+ * canon_nets.h - Versification data for the NETS system
+ *
+ * $Id$
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef CANON_NETS_H
+#define CANON_NETS_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: NETS
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Neh Esth Jdt Tob 1Macc 2Macc 3Macc 4Macc Ps PrMan Prov Eccl Song Job Wis Sir PssSol Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek Sus Dan Bel
+
+// Source: http://ccat.sas.upenn.edu/nets/edition/
+
+/******************************************************************************
+ * [on]tbooks_nets - initialize static instance for all canonical
+ * text names and chapmax
+ */
+struct sbook otbooks_nets[] = {
+ {"Genesis", "Gen", "Gen", 50},
+ {"Exodus", "Exod", "Exod", 40},
+ {"Leviticus", "Lev", "Lev", 27},
+ {"Numbers", "Num", "Num", 36},
+ {"Deuteronomy", "Deut", "Deut", 34},
+ {"Joshua", "Josh", "Josh", 24},
+ {"Judges", "Judg", "Judg", 21},
+ {"Ruth", "Ruth", "Ruth", 4},
+ {"I Samuel", "1Sam", "1Sam", 31},
+ {"II Samuel", "2Sam", "2Sam", 24},
+ {"I Kings", "1Kgs", "1Kgs", 22},
+ {"II Kings", "2Kgs", "2Kgs", 25},
+ {"I Chronicles", "1Chr", "1Chr", 29},
+ {"II Chronicles", "2Chr", "2Chr", 36},
+ {"I Esdras", "1Esd", "1Esd", 9},
+ {"Ezra", "Ezra", "Ezra", 10},
+ {"Nehemiah", "Neh", "Neh", 13},
+ {"Esther", "Esth", "Esth", 16},
+ {"Judith", "Jdt", "Jdt", 16},
+ {"Tobit", "Tob", "Tob", 14},
+ {"I Maccabees", "1Macc", "1Macc", 16},
+ {"II Maccabees", "2Macc", "2Macc", 15},
+ {"III Maccabees", "3Macc", "3Macc", 7},
+ {"IV Maccabees", "4Macc", "4Macc", 18},
+ {"Psalms", "Ps", "Ps", 151},
+ {"Prayer of Manasses", "PrMan", "PrMan", 1},
+ {"Proverbs", "Prov", "Prov", 31},
+ {"Ecclesiastes", "Eccl", "Eccl", 12},
+ {"Song of Solomon", "Song", "Song", 8},
+ {"Job", "Job", "Job", 42},
+ {"Wisdom", "Wis", "Wis", 19},
+ {"Sirach", "Sir", "Sir", 51},
+ {"Psalms of Solomon", "PssSol", "PssSol", 18},
+ {"Hosea", "Hos", "Hos", 14},
+ {"Amos", "Amos", "Amos", 9},
+ {"Micah", "Mic", "Mic", 7},
+ {"Joel", "Joel", "Joel", 4},
+ {"Obadiah", "Obad", "Obad", 1},
+ {"Jonah", "Jonah", "Jonah", 4},
+ {"Nahum", "Nah", "Nah", 3},
+ {"Habakkuk", "Hab", "Hab", 3},
+ {"Zephaniah", "Zeph", "Zeph", 3},
+ {"Haggai", "Hag", "Hag", 2},
+ {"Zechariah", "Zech", "Zech", 14},
+ {"Malachi", "Mal", "Mal", 4},
+ {"Isaiah", "Isa", "Isa", 66},
+ {"Jeremiah", "Jer", "Jer", 52},
+ {"Baruch", "Bar", "Bar", 5},
+ {"Lamentations", "Lam", "Lam", 5},
+ {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+ {"Ezekiel", "Ezek", "Ezek", 48},
+ {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+ {"Susanna", "Sus", "Sus", 1},
+ {"Daniel", "Dan", "Dan", 12},
+ {"Bel and the Dragon", "Bel", "Bel", 1},
+ {"I Enoch", "1En", "1En", 108},
+ {"Odes", "Odes", "Odes", 14},
+ {"", "", "", 0}
+};
+
+// for ntbooks_nets, use ntbooks
+
+/******************************************************************************
+ * Maximum verses per chapter
+ */
+
+int vm_nets[] = {
+ // Genesis
+ 31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+ 32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+ 34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+ 54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
+ 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+ // Exodus
+ 22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+ 10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+ 37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+ 18, 35, 23, 35, 35, 38, 21, 27, 23, 38,
+ // Leviticus
+ 17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
+ 47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+ 24, 33, 44, 23, 55, 46, 34,
+ // Numbers
+ 54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
+ 35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+ 35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
+ 54, 42, 56, 29, 34, 13,
+ // Deuteronomy
+ 46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+ 32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+ 23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+ 30, 52, 29, 12,
+ // Joshua
+ 18, 24, 17, 24, 15, 27, 26, 29, 27, 42,
+ 23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
+ 45, 34, 16, 33,
+ // Judges
+ 36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+ 40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+ 25,
+ // Ruth
+ 22, 23, 18, 22,
+ // I Samuel
+ 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+ 15, 25, 23, 52, 35, 23, 54, 29, 24, 42,
+ 16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+ 13,
+ // II Samuel
+ 27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+ 27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+ 22, 51, 39, 25,
+ // I Kings
+ 53, 46, 28, 19, 32, 36, 50, 66, 28, 29,
+ 43, 33, 34, 31, 34, 34, 24, 46, 21, 29,
+ 43, 54,
+ // II Kings
+ 18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+ 20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+ 26, 20, 37, 20, 30,
+ // I Chronicles
+ 54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+ 47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+ 30, 19, 32, 31, 31, 32, 34, 21, 30,
+ // II Chronicles
+ 18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+ 23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+ 20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+ 21, 33, 25, 33, 27, 23,
+ // I Esdras
+ 55, 25, 23, 63, 70, 33, 15, 92, 55,
+ // Ezra
+ 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+ // Nehemiah
+ 11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
+ 36, 47, 31,
+ // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+ 22, 23, 15, 17, 14, 14, 10, 17, 31, 3,
+ 17, 7, 30, 16, 24, 11,
+ // Judith
+ 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+ 23, 20, 20, 19, 14, 25,
+ // Tobit
+ 22, 14, 17, 21, 22, 18, 17, 21, 6, 13,
+ 19, 22, 18, 15,
+ // I Maccabees
+ 64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+ 74, 53, 53, 49, 41, 24,
+ // II Maccabees
+ 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+ 38, 45, 26, 46, 39,
+ // III Maccabees
+ 29, 33, 30, 21, 51, 41, 23,
+ // IV Maccabees
+ 35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
+ 27, 19, 27, 20, 32, 25, 24, 24,
+ // Psalms
+ 6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
+ 9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+ 32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+ 11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+ 12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
+ 11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
+ 13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+ 20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+ 8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+ 16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
+ 29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
+ 10, 9, 26, 9, 10, 2, 29, 176, 7, 8,
+ 9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
+ 18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
+ 8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+ 7,
+ // Prayer of Manasses
+ 15,
+ // Proverbs
+ 33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+ 31, 28, 25, 35, 33, 33, 28, 22, 29, 30,
+ 31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+ 31,
+ // Ecclesiastes
+ 18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+ 10, 14,
+ // Song of Solomon
+ 17, 17, 11, 16, 16, 12, 14, 14,
+ // Job
+ 22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+ 20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+ 34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+ 40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+ 26, 17,
+ // Wisdom
+ 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+ 26, 27, 19, 31, 19, 29, 21, 25, 22,
+ // Sirach
+ 30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+ 34, 18, 26, 27, 20, 30, 32, 33, 30, 32,
+ 28, 27, 28, 34, 26, 29, 30, 26, 28, 25,
+ 31, 24, 33, 31, 26, 31, 31, 34, 35, 30,
+ 22, 25, 33, 23, 26, 20, 25, 25, 16, 29,
+ 30,
+ // Psalms of Solomon
+ 8, 37, 12, 25, 19, 6, 10, 34, 11, 8,
+ 9, 6, 12, 10, 13, 15, 46, 12,
+ // Hosea
+ 11, 23, 5, 19, 15, 10, 16, 14, 17, 15,
+ 12, 14, 15, 10,
+ // Amos
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ // Micah
+ 16, 13, 12, 13, 15, 16, 20,
+ // Joel
+ 20, 32, 21, 0,
+ // Obadiah
+ 21,
+ // Jonah
+ 16, 11, 10, 11,
+ // Nahum
+ 15, 14, 19,
+ // Habakkuk
+ 17, 20, 19,
+ // Zephaniah
+ 18, 14, 20,
+ // Haggai
+ 14, 23,
+ // Zechariah
+ 21, 13, 10, 13, 11, 15, 14, 23, 17, 12,
+ 17, 14, 9, 21,
+ // Malachi
+ 14, 17, 18, 6,
+ // Isaiah
+ 31, 21, 26, 6, 30, 13, 25, 22, 21, 34,
+ 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+ 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+ 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+ 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+ 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
+ 11, 12, 19, 12, 25, 24,
+ // Jeremiah
+ 19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
+ 23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+ 14, 30, 40, 10, 19, 28, 46, 64, 23, 16,
+ 44, 24, 24, 18, 17, 32, 24, 40, 44, 13,
+ 22, 19, 32, 21, 28, 18, 16, 18, 22, 13,
+ 35, 34,
+ // Baruch
+ 22, 35, 38, 37, 9,
+ // Lamentations
+ 22, 22, 66, 22, 22,
+ // Epistle of Jeremiah
+ 72,
+ // Ezekiel
+ 28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+ 25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+ 32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+ 18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+ 26, 20, 27, 31, 25, 24, 23, 35,
+ // Prayer of Azariah
+ 0,
+ // Susanna
+ 64,
+ // Daniel
+ 21, 49, 100, 34, 31, 28, 28, 27, 27, 21,
+ 45, 13,
+ // Bel and the Dragon
+ 42,
+ // I Enoch
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Odes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
Property changes on: trunk/versification/lxx_v11ns/canon_nets.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: trunk/versification/lxx_v11ns/canon_ottley.h
===================================================================
--- trunk/versification/lxx_v11ns/canon_ottley.h 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/lxx_v11ns/canon_ottley.h 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,322 +1,322 @@
-/******************************************************************************
- *
- * canon_ottley.h - Versification data for the Ottley system
- *
- * $Id: canon_ottley.h 2910 2013-07-18 10:23:23Z chrislit $
- *
- * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org)
- * CrossWire Bible Society
- * P. O. Box 2528
- * Tempe, AZ 85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#ifndef CANON_OTTLEY_H
-#define CANON_OTTLEY_H
-
-SWORD_NAMESPACE_START
-
-
-// Versification system: Ottley
-// Book order: Isa
-
-// Source: http://books.google.com/books?id=Gs0fAQAAMAAJ
-
-/******************************************************************************
- * [on]tbooks_ottley - initialize static instance for all canonical
- * text names and chapmax
- */
-struct sbook otbooks_ottley[] = {
- {"Genesis", "Gen", "Gen", 50},
- {"Exodus", "Exod", "Exod", 40},
- {"Leviticus", "Lev", "Lev", 27},
- {"Numbers", "Num", "Num", 36},
- {"Deuteronomy", "Deut", "Deut", 34},
- {"Joshua", "Josh", "Josh", 24},
- {"Judges", "Judg", "Judg", 21},
- {"Ruth", "Ruth", "Ruth", 4},
- {"I Samuel", "1Sam", "1Sam", 31},
- {"II Samuel", "2Sam", "2Sam", 24},
- {"I Kings", "1Kgs", "1Kgs", 22},
- {"II Kings", "2Kgs", "2Kgs", 25},
- {"I Chronicles", "1Chr", "1Chr", 29},
- {"II Chronicles", "2Chr", "2Chr", 36},
- {"I Esdras", "1Esd", "1Esd", 9},
- {"Ezra", "Ezra", "Ezra", 10},
- {"Nehemiah", "Neh", "Neh", 13},
- {"Esther", "Esth", "Esth", 16},
- {"Judith", "Jdt", "Jdt", 16},
- {"Tobit", "Tob", "Tob", 14},
- {"I Maccabees", "1Macc", "1Macc", 16},
- {"II Maccabees", "2Macc", "2Macc", 15},
- {"III Maccabees", "3Macc", "3Macc", 7},
- {"IV Maccabees", "4Macc", "4Macc", 18},
- {"Psalms", "Ps", "Ps", 151},
- {"Prayer of Manasses", "PrMan", "PrMan", 1},
- {"Proverbs", "Prov", "Prov", 31},
- {"Ecclesiastes", "Eccl", "Eccl", 12},
- {"Song of Solomon", "Song", "Song", 8},
- {"Job", "Job", "Job", 42},
- {"Wisdom", "Wis", "Wis", 19},
- {"Sirach", "Sir", "Sir", 51},
- {"Psalms of Solomon", "PssSol", "PssSol", 18},
- {"Hosea", "Hos", "Hos", 14},
- {"Amos", "Amos", "Amos", 9},
- {"Micah", "Mic", "Mic", 7},
- {"Joel", "Joel", "Joel", 4},
- {"Obadiah", "Obad", "Obad", 1},
- {"Jonah", "Jonah", "Jonah", 4},
- {"Nahum", "Nah", "Nah", 3},
- {"Habakkuk", "Hab", "Hab", 3},
- {"Zephaniah", "Zeph", "Zeph", 3},
- {"Haggai", "Hag", "Hag", 2},
- {"Zechariah", "Zech", "Zech", 14},
- {"Malachi", "Mal", "Mal", 4},
- {"Isaiah", "Isa", "Isa", 66},
- {"Jeremiah", "Jer", "Jer", 52},
- {"Baruch", "Bar", "Bar", 5},
- {"Lamentations", "Lam", "Lam", 5},
- {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
- {"Ezekiel", "Ezek", "Ezek", 48},
- {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
- {"Susanna", "Sus", "Sus", 1},
- {"Daniel", "Dan", "Dan", 12},
- {"Bel and the Dragon", "Bel", "Bel", 1},
- {"I Enoch", "1En", "1En", 108},
- {"Odes", "Odes", "Odes", 14},
- {"", "", "", 0}
-};
-
-/******************************************************************************
- * Maximum verses per chapter
- */
-
-int vm_ottley[] = {
- // Genesis
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Exodus
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Leviticus
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0,
- // Numbers
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Deuteronomy
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Joshua
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Judges
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Ruth
- 0, 0, 0, 0,
- // I Samuel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // II Samuel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // I Kings
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // II Kings
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,
- // I Chronicles
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // II Chronicles
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // I Esdras
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Ezra
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Nehemiah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0,
- // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Judith
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Tobit
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // I Maccabees
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // II Maccabees
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,
- // III Maccabees
- 0, 0, 0, 0, 0, 0, 0,
- // IV Maccabees
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Psalms
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Prayer of Manasses
- 0,
- // Proverbs
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Ecclesiastes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Song of Solomon
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Job
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Wisdom
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Sirach
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Psalms of Solomon
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Hosea
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Amos
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Micah
- 0, 0, 0, 0, 0, 0, 0,
- // Joel
- 0, 0, 0, 0,
- // Obadiah
- 0,
- // Jonah
- 0, 0, 0, 0,
- // Nahum
- 0, 0, 0,
- // Habakkuk
- 0, 0, 0,
- // Zephaniah
- 0, 0, 0,
- // Haggai
- 0, 0,
- // Zechariah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Malachi
- 0, 0, 0, 0,
- // Isaiah
- 31, 21, 26, 6, 30, 13, 25, 22, 21, 34,
- 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
- 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
- 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
- 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
- 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
- 11, 12, 19, 12, 25, 24,
- // Jeremiah
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Baruch
- 0, 0, 0, 0, 0,
- // Lamentations
- 0, 0, 0, 0, 0,
- // Epistle of Jeremiah
- 0,
- // Ezekiel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Prayer of Azariah
- 0,
- // Susanna
- 0,
- // Daniel
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0,
- // Bel and the Dragon
- 0,
- // I Enoch
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Odes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
-};
-
-SWORD_NAMESPACE_END
-#endif
+/******************************************************************************
+ *
+ * canon_ottley.h - Versification data for the Ottley system
+ *
+ * $Id$
+ *
+ * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef CANON_OTTLEY_H
+#define CANON_OTTLEY_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Ottley
+// Book order: Isa
+
+// Source: http://books.google.com/books?id=Gs0fAQAAMAAJ
+
+/******************************************************************************
+ * [on]tbooks_ottley - initialize static instance for all canonical
+ * text names and chapmax
+ */
+struct sbook otbooks_ottley[] = {
+ {"Genesis", "Gen", "Gen", 50},
+ {"Exodus", "Exod", "Exod", 40},
+ {"Leviticus", "Lev", "Lev", 27},
+ {"Numbers", "Num", "Num", 36},
+ {"Deuteronomy", "Deut", "Deut", 34},
+ {"Joshua", "Josh", "Josh", 24},
+ {"Judges", "Judg", "Judg", 21},
+ {"Ruth", "Ruth", "Ruth", 4},
+ {"I Samuel", "1Sam", "1Sam", 31},
+ {"II Samuel", "2Sam", "2Sam", 24},
+ {"I Kings", "1Kgs", "1Kgs", 22},
+ {"II Kings", "2Kgs", "2Kgs", 25},
+ {"I Chronicles", "1Chr", "1Chr", 29},
+ {"II Chronicles", "2Chr", "2Chr", 36},
+ {"I Esdras", "1Esd", "1Esd", 9},
+ {"Ezra", "Ezra", "Ezra", 10},
+ {"Nehemiah", "Neh", "Neh", 13},
+ {"Esther", "Esth", "Esth", 16},
+ {"Judith", "Jdt", "Jdt", 16},
+ {"Tobit", "Tob", "Tob", 14},
+ {"I Maccabees", "1Macc", "1Macc", 16},
+ {"II Maccabees", "2Macc", "2Macc", 15},
+ {"III Maccabees", "3Macc", "3Macc", 7},
+ {"IV Maccabees", "4Macc", "4Macc", 18},
+ {"Psalms", "Ps", "Ps", 151},
+ {"Prayer of Manasses", "PrMan", "PrMan", 1},
+ {"Proverbs", "Prov", "Prov", 31},
+ {"Ecclesiastes", "Eccl", "Eccl", 12},
+ {"Song of Solomon", "Song", "Song", 8},
+ {"Job", "Job", "Job", 42},
+ {"Wisdom", "Wis", "Wis", 19},
+ {"Sirach", "Sir", "Sir", 51},
+ {"Psalms of Solomon", "PssSol", "PssSol", 18},
+ {"Hosea", "Hos", "Hos", 14},
+ {"Amos", "Amos", "Amos", 9},
+ {"Micah", "Mic", "Mic", 7},
+ {"Joel", "Joel", "Joel", 4},
+ {"Obadiah", "Obad", "Obad", 1},
+ {"Jonah", "Jonah", "Jonah", 4},
+ {"Nahum", "Nah", "Nah", 3},
+ {"Habakkuk", "Hab", "Hab", 3},
+ {"Zephaniah", "Zeph", "Zeph", 3},
+ {"Haggai", "Hag", "Hag", 2},
+ {"Zechariah", "Zech", "Zech", 14},
+ {"Malachi", "Mal", "Mal", 4},
+ {"Isaiah", "Isa", "Isa", 66},
+ {"Jeremiah", "Jer", "Jer", 52},
+ {"Baruch", "Bar", "Bar", 5},
+ {"Lamentations", "Lam", "Lam", 5},
+ {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+ {"Ezekiel", "Ezek", "Ezek", 48},
+ {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+ {"Susanna", "Sus", "Sus", 1},
+ {"Daniel", "Dan", "Dan", 12},
+ {"Bel and the Dragon", "Bel", "Bel", 1},
+ {"I Enoch", "1En", "1En", 108},
+ {"Odes", "Odes", "Odes", 14},
+ {"", "", "", 0}
+};
+
+/******************************************************************************
+ * Maximum verses per chapter
+ */
+
+int vm_ottley[] = {
+ // Genesis
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Exodus
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Leviticus
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,
+ // Numbers
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Deuteronomy
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Joshua
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Judges
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Ruth
+ 0, 0, 0, 0,
+ // I Samuel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // II Samuel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // I Kings
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // II Kings
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,
+ // I Chronicles
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // II Chronicles
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // I Esdras
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Ezra
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Nehemiah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,
+ // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Judith
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Tobit
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // I Maccabees
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // II Maccabees
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,
+ // III Maccabees
+ 0, 0, 0, 0, 0, 0, 0,
+ // IV Maccabees
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Psalms
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Prayer of Manasses
+ 0,
+ // Proverbs
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Ecclesiastes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Song of Solomon
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Job
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Wisdom
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Sirach
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Psalms of Solomon
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Hosea
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Amos
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Micah
+ 0, 0, 0, 0, 0, 0, 0,
+ // Joel
+ 0, 0, 0, 0,
+ // Obadiah
+ 0,
+ // Jonah
+ 0, 0, 0, 0,
+ // Nahum
+ 0, 0, 0,
+ // Habakkuk
+ 0, 0, 0,
+ // Zephaniah
+ 0, 0, 0,
+ // Haggai
+ 0, 0,
+ // Zechariah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Malachi
+ 0, 0, 0, 0,
+ // Isaiah
+ 31, 21, 26, 6, 30, 13, 25, 22, 21, 34,
+ 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+ 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+ 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+ 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+ 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
+ 11, 12, 19, 12, 25, 24,
+ // Jeremiah
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Baruch
+ 0, 0, 0, 0, 0,
+ // Lamentations
+ 0, 0, 0, 0, 0,
+ // Epistle of Jeremiah
+ 0,
+ // Ezekiel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Prayer of Azariah
+ 0,
+ // Susanna
+ 0,
+ // Daniel
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0,
+ // Bel and the Dragon
+ 0,
+ // I Enoch
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Odes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+};
+
+SWORD_NAMESPACE_END
+#endif
Property changes on: trunk/versification/lxx_v11ns/canon_ottley.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: trunk/versification/lxx_v11ns/canon_rahlfs.h
===================================================================
--- trunk/versification/lxx_v11ns/canon_rahlfs.h 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/lxx_v11ns/canon_rahlfs.h 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,325 +1,325 @@
-/******************************************************************************
- *
- * canon_rahlfs.h - Versification data for the Rahlfs system
- *
- * $Id: canon_rahlfs.h 2910 2013-07-18 10:23:23Z chrislit $
- *
- * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org)
- * CrossWire Bible Society
- * P. O. Box 2528
- * Tempe, AZ 85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#ifndef CANON_RAHLFS_H
-#define CANON_RAHLFS_H
-
-SWORD_NAMESPACE_START
-
-
-// Versification system: Rahlfs
-// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Neh Esth Jdt Tob 1Macc 2Macc 3Macc 4Macc Ps PrMan Prov Eccl Song Job Wis Sir PssSol Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek PrAzar Sus Dan Bel
-
-// Source: http://ccat.sas.upenn.edu/gopher/text/religion/biblical/lxxmorph/
-
-
-/******************************************************************************
- * [on]tbooks_rahlfs - initialize static instance for all canonical
- * text names and chapmax
- */
-struct sbook otbooks_rahlfs[] = {
- {"Genesis", "Gen", "Gen", 50},
- {"Exodus", "Exod", "Exod", 40},
- {"Leviticus", "Lev", "Lev", 27},
- {"Numbers", "Num", "Num", 36},
- {"Deuteronomy", "Deut", "Deut", 34},
- {"Joshua", "Josh", "Josh", 24},
- {"Judges", "Judg", "Judg", 21},
- {"Ruth", "Ruth", "Ruth", 4},
- {"I Samuel", "1Sam", "1Sam", 31},
- {"II Samuel", "2Sam", "2Sam", 24},
- {"I Kings", "1Kgs", "1Kgs", 22},
- {"II Kings", "2Kgs", "2Kgs", 25},
- {"I Chronicles", "1Chr", "1Chr", 29},
- {"II Chronicles", "2Chr", "2Chr", 36},
- {"I Esdras", "1Esd", "1Esd", 9},
- {"Ezra", "Ezra", "Ezra", 10},
- {"Nehemiah", "Neh", "Neh", 13},
- {"Esther", "Esth", "Esth", 16},
- {"Judith", "Jdt", "Jdt", 16},
- {"Tobit", "Tob", "Tob", 14},
- {"I Maccabees", "1Macc", "1Macc", 16},
- {"II Maccabees", "2Macc", "2Macc", 15},
- {"III Maccabees", "3Macc", "3Macc", 7},
- {"IV Maccabees", "4Macc", "4Macc", 18},
- {"Psalms", "Ps", "Ps", 151},
- {"Prayer of Manasses", "PrMan", "PrMan", 1},
- {"Proverbs", "Prov", "Prov", 31},
- {"Ecclesiastes", "Eccl", "Eccl", 12},
- {"Song of Solomon", "Song", "Song", 8},
- {"Job", "Job", "Job", 42},
- {"Wisdom", "Wis", "Wis", 19},
- {"Sirach", "Sir", "Sir", 51},
- {"Psalms of Solomon", "PssSol", "PssSol", 18},
- {"Hosea", "Hos", "Hos", 14},
- {"Amos", "Amos", "Amos", 9},
- {"Micah", "Mic", "Mic", 7},
- {"Joel", "Joel", "Joel", 4},
- {"Obadiah", "Obad", "Obad", 1},
- {"Jonah", "Jonah", "Jonah", 4},
- {"Nahum", "Nah", "Nah", 3},
- {"Habakkuk", "Hab", "Hab", 3},
- {"Zephaniah", "Zeph", "Zeph", 3},
- {"Haggai", "Hag", "Hag", 2},
- {"Zechariah", "Zech", "Zech", 14},
- {"Malachi", "Mal", "Mal", 4},
- {"Isaiah", "Isa", "Isa", 66},
- {"Jeremiah", "Jer", "Jer", 52},
- {"Baruch", "Bar", "Bar", 5},
- {"Lamentations", "Lam", "Lam", 5},
- {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
- {"Ezekiel", "Ezek", "Ezek", 48},
- {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
- {"Susanna", "Sus", "Sus", 1},
- {"Daniel", "Dan", "Dan", 12},
- {"Bel and the Dragon", "Bel", "Bel", 1},
- {"I Enoch", "1En", "1En", 108},
- {"Odes", "Odes", "Odes", 14},
- {"", "", "", 0}
-};
-
-// for ntbooks_rahlfs, use ntbooks
-
-/******************************************************************************
- * Maximum verses per chapter
- */
-
-int vm_rahlfs[] = {
- // Genesis
- 31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
- 32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
- 34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
- 54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
- 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
- // Exodus
- 22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
- 10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
- 37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
- 18, 35, 23, 35, 35, 38, 21, 27, 23, 38,
- // Leviticus
- 17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
- 47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
- 24, 33, 44, 23, 55, 46, 34,
- // Numbers
- 54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
- 35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
- 35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
- 54, 42, 56, 29, 34, 13,
- // Deuteronomy
- 46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
- 32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
- 23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
- 30, 52, 29, 12,
- // Joshua
- 18, 24, 17, 24, 15, 27, 26, 29, 27, 42,
- 23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
- 45, 34, 16, 33,
- // Judges
- 36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
- 40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
- 25,
- // Ruth
- 22, 23, 18, 22,
- // I Samuel
- 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
- 15, 25, 23, 52, 35, 23, 54, 29, 24, 42,
- 16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
- 13,
- // II Samuel
- 27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
- 27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
- 22, 51, 39, 25,
- // I Kings
- 53, 46, 28, 19, 32, 36, 50, 66, 28, 29,
- 43, 33, 34, 31, 34, 34, 24, 46, 21, 29,
- 43, 54,
- // II Kings
- 18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
- 20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
- 26, 20, 37, 20, 30,
- // I Chronicles
- 54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
- 47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
- 30, 19, 32, 31, 31, 32, 34, 21, 30,
- // II Chronicles
- 18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
- 23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
- 20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
- 21, 33, 25, 33, 27, 23,
- // I Esdras
- 55, 26, 24, 63, 71, 33, 15, 92, 55,
- // Ezra
- 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
- // Nehemiah
- 11, 20, 37, 17, 19, 19, 73, 18, 37, 40,
- 36, 47, 31,
- // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
- 22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
- 0, 0, 0, 0, 0, 0,
- // Judith
- 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
- 23, 20, 20, 19, 14, 25,
- // Tobit
- 22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
- 19, 22, 18, 15,
- // I Maccabees
- 64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
- 74, 53, 53, 49, 41, 24,
- // II Maccabees
- 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
- 38, 45, 26, 46, 39,
- // III Maccabees
- 29, 33, 30, 21, 51, 41, 23,
- // IV Maccabees
- 35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
- 27, 19, 27, 20, 32, 25, 24, 24,
- // Psalms
- 6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
- 9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
- 32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
- 11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
- 12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
- 11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
- 13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
- 20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
- 8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
- 16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
- 29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
- 10, 9, 26, 9, 10, 2, 29, 176, 7, 8,
- 9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
- 18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
- 8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
- 7,
- // Prayer of Manasses
- 15,
- // Proverbs
- 33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
- 31, 28, 25, 35, 33, 33, 28, 22, 29, 30,
- 31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
- 31,
- // Ecclesiastes
- 18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
- 10, 14,
- // Song of Solomon
- 17, 17, 11, 16, 16, 12, 14, 14,
- // Job
- 22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
- 20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
- 34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
- 40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
- 26, 17,
- // Wisdom
- 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
- 26, 27, 19, 31, 19, 29, 20, 25, 22,
- // Sirach
- 30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
- 34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
- 28, 27, 27, 34, 26, 29, 30, 26, 28, 25,
- 31, 24, 33, 26, 24, 27, 31, 34, 35, 30,
- 27, 25, 33, 23, 26, 20, 25, 25, 16, 29,
- 30,
- // Psalms of Solomon
- 8, 37, 12, 25, 19, 6, 10, 34, 11, 8,
- 9, 6, 12, 10, 13, 15, 46, 12,
- // Hosea
- 9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
- 11, 15, 15, 10,
- // Amos
- 15, 16, 15, 13, 27, 14, 17, 14, 15,
- // Micah
- 16, 13, 12, 14, 14, 16, 20,
- // Joel
- 20, 27, 5, 21,
- // Obadiah
- 21,
- // Jonah
- 16, 11, 10, 11,
- // Nahum
- 14, 14, 19,
- // Habakkuk
- 17, 20, 19,
- // Zephaniah
- 18, 15, 20,
- // Haggai
- 15, 23,
- // Zechariah
- 17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
- 17, 14, 9, 21,
- // Malachi
- 14, 17, 24, 0,
- // Isaiah
- 31, 21, 26, 6, 30, 13, 25, 23, 20, 34,
- 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
- 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
- 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
- 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
- 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
- 11, 12, 19, 11, 25, 24,
- // Jeremiah
- 19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
- 23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
- 14, 30, 40, 10, 20, 28, 46, 64, 7, 33,
- 44, 38, 24, 22, 17, 32, 24, 40, 44, 13,
- 22, 19, 32, 21, 28, 18, 16, 18, 22, 13,
- 35, 34,
- // Baruch
- 22, 35, 38, 37, 9,
- // Lamentations
- 22, 22, 66, 22, 22,
- // Epistle of Jeremiah
- 72,
- // Ezekiel
- 28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
- 25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
- 37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
- 18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
- 26, 20, 27, 31, 25, 24, 23, 35,
- // Prayer of Azariah
- 68,
- // Susanna
- 64,
- // Daniel
- 21, 49, 97, 37, 30, 29, 28, 27, 27, 21,
- 45, 13,
- // Bel and the Dragon
- 42,
- // I Enoch
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Odes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
-};
-
-
-SWORD_NAMESPACE_END
-
-
-#endif
+/******************************************************************************
+ *
+ * canon_rahlfs.h - Versification data for the Rahlfs system
+ *
+ * $Id$
+ *
+ * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef CANON_RAHLFS_H
+#define CANON_RAHLFS_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Rahlfs
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Neh Esth Jdt Tob 1Macc 2Macc 3Macc 4Macc Ps PrMan Prov Eccl Song Job Wis Sir PssSol Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek PrAzar Sus Dan Bel
+
+// Source: http://ccat.sas.upenn.edu/gopher/text/religion/biblical/lxxmorph/
+
+
+/******************************************************************************
+ * [on]tbooks_rahlfs - initialize static instance for all canonical
+ * text names and chapmax
+ */
+struct sbook otbooks_rahlfs[] = {
+ {"Genesis", "Gen", "Gen", 50},
+ {"Exodus", "Exod", "Exod", 40},
+ {"Leviticus", "Lev", "Lev", 27},
+ {"Numbers", "Num", "Num", 36},
+ {"Deuteronomy", "Deut", "Deut", 34},
+ {"Joshua", "Josh", "Josh", 24},
+ {"Judges", "Judg", "Judg", 21},
+ {"Ruth", "Ruth", "Ruth", 4},
+ {"I Samuel", "1Sam", "1Sam", 31},
+ {"II Samuel", "2Sam", "2Sam", 24},
+ {"I Kings", "1Kgs", "1Kgs", 22},
+ {"II Kings", "2Kgs", "2Kgs", 25},
+ {"I Chronicles", "1Chr", "1Chr", 29},
+ {"II Chronicles", "2Chr", "2Chr", 36},
+ {"I Esdras", "1Esd", "1Esd", 9},
+ {"Ezra", "Ezra", "Ezra", 10},
+ {"Nehemiah", "Neh", "Neh", 13},
+ {"Esther", "Esth", "Esth", 16},
+ {"Judith", "Jdt", "Jdt", 16},
+ {"Tobit", "Tob", "Tob", 14},
+ {"I Maccabees", "1Macc", "1Macc", 16},
+ {"II Maccabees", "2Macc", "2Macc", 15},
+ {"III Maccabees", "3Macc", "3Macc", 7},
+ {"IV Maccabees", "4Macc", "4Macc", 18},
+ {"Psalms", "Ps", "Ps", 151},
+ {"Prayer of Manasses", "PrMan", "PrMan", 1},
+ {"Proverbs", "Prov", "Prov", 31},
+ {"Ecclesiastes", "Eccl", "Eccl", 12},
+ {"Song of Solomon", "Song", "Song", 8},
+ {"Job", "Job", "Job", 42},
+ {"Wisdom", "Wis", "Wis", 19},
+ {"Sirach", "Sir", "Sir", 51},
+ {"Psalms of Solomon", "PssSol", "PssSol", 18},
+ {"Hosea", "Hos", "Hos", 14},
+ {"Amos", "Amos", "Amos", 9},
+ {"Micah", "Mic", "Mic", 7},
+ {"Joel", "Joel", "Joel", 4},
+ {"Obadiah", "Obad", "Obad", 1},
+ {"Jonah", "Jonah", "Jonah", 4},
+ {"Nahum", "Nah", "Nah", 3},
+ {"Habakkuk", "Hab", "Hab", 3},
+ {"Zephaniah", "Zeph", "Zeph", 3},
+ {"Haggai", "Hag", "Hag", 2},
+ {"Zechariah", "Zech", "Zech", 14},
+ {"Malachi", "Mal", "Mal", 4},
+ {"Isaiah", "Isa", "Isa", 66},
+ {"Jeremiah", "Jer", "Jer", 52},
+ {"Baruch", "Bar", "Bar", 5},
+ {"Lamentations", "Lam", "Lam", 5},
+ {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+ {"Ezekiel", "Ezek", "Ezek", 48},
+ {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+ {"Susanna", "Sus", "Sus", 1},
+ {"Daniel", "Dan", "Dan", 12},
+ {"Bel and the Dragon", "Bel", "Bel", 1},
+ {"I Enoch", "1En", "1En", 108},
+ {"Odes", "Odes", "Odes", 14},
+ {"", "", "", 0}
+};
+
+// for ntbooks_rahlfs, use ntbooks
+
+/******************************************************************************
+ * Maximum verses per chapter
+ */
+
+int vm_rahlfs[] = {
+ // Genesis
+ 31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+ 32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+ 34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+ 54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
+ 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+ // Exodus
+ 22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+ 10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+ 37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+ 18, 35, 23, 35, 35, 38, 21, 27, 23, 38,
+ // Leviticus
+ 17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
+ 47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+ 24, 33, 44, 23, 55, 46, 34,
+ // Numbers
+ 54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
+ 35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+ 35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
+ 54, 42, 56, 29, 34, 13,
+ // Deuteronomy
+ 46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+ 32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+ 23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+ 30, 52, 29, 12,
+ // Joshua
+ 18, 24, 17, 24, 15, 27, 26, 29, 27, 42,
+ 23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
+ 45, 34, 16, 33,
+ // Judges
+ 36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+ 40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+ 25,
+ // Ruth
+ 22, 23, 18, 22,
+ // I Samuel
+ 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+ 15, 25, 23, 52, 35, 23, 54, 29, 24, 42,
+ 16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+ 13,
+ // II Samuel
+ 27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+ 27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+ 22, 51, 39, 25,
+ // I Kings
+ 53, 46, 28, 19, 32, 36, 50, 66, 28, 29,
+ 43, 33, 34, 31, 34, 34, 24, 46, 21, 29,
+ 43, 54,
+ // II Kings
+ 18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+ 20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+ 26, 20, 37, 20, 30,
+ // I Chronicles
+ 54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+ 47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+ 30, 19, 32, 31, 31, 32, 34, 21, 30,
+ // II Chronicles
+ 18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+ 23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+ 20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+ 21, 33, 25, 33, 27, 23,
+ // I Esdras
+ 55, 26, 24, 63, 71, 33, 15, 92, 55,
+ // Ezra
+ 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+ // Nehemiah
+ 11, 20, 37, 17, 19, 19, 73, 18, 37, 40,
+ 36, 47, 31,
+ // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+ 22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+ 0, 0, 0, 0, 0, 0,
+ // Judith
+ 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+ 23, 20, 20, 19, 14, 25,
+ // Tobit
+ 22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+ 19, 22, 18, 15,
+ // I Maccabees
+ 64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+ 74, 53, 53, 49, 41, 24,
+ // II Maccabees
+ 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+ 38, 45, 26, 46, 39,
+ // III Maccabees
+ 29, 33, 30, 21, 51, 41, 23,
+ // IV Maccabees
+ 35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
+ 27, 19, 27, 20, 32, 25, 24, 24,
+ // Psalms
+ 6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
+ 9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+ 32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+ 11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+ 12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
+ 11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
+ 13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+ 20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+ 8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+ 16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
+ 29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
+ 10, 9, 26, 9, 10, 2, 29, 176, 7, 8,
+ 9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
+ 18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
+ 8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+ 7,
+ // Prayer of Manasses
+ 15,
+ // Proverbs
+ 33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+ 31, 28, 25, 35, 33, 33, 28, 22, 29, 30,
+ 31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+ 31,
+ // Ecclesiastes
+ 18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+ 10, 14,
+ // Song of Solomon
+ 17, 17, 11, 16, 16, 12, 14, 14,
+ // Job
+ 22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+ 20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+ 34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+ 40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+ 26, 17,
+ // Wisdom
+ 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+ 26, 27, 19, 31, 19, 29, 20, 25, 22,
+ // Sirach
+ 30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+ 34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
+ 28, 27, 27, 34, 26, 29, 30, 26, 28, 25,
+ 31, 24, 33, 26, 24, 27, 31, 34, 35, 30,
+ 27, 25, 33, 23, 26, 20, 25, 25, 16, 29,
+ 30,
+ // Psalms of Solomon
+ 8, 37, 12, 25, 19, 6, 10, 34, 11, 8,
+ 9, 6, 12, 10, 13, 15, 46, 12,
+ // Hosea
+ 9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+ 11, 15, 15, 10,
+ // Amos
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ // Micah
+ 16, 13, 12, 14, 14, 16, 20,
+ // Joel
+ 20, 27, 5, 21,
+ // Obadiah
+ 21,
+ // Jonah
+ 16, 11, 10, 11,
+ // Nahum
+ 14, 14, 19,
+ // Habakkuk
+ 17, 20, 19,
+ // Zephaniah
+ 18, 15, 20,
+ // Haggai
+ 15, 23,
+ // Zechariah
+ 17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+ 17, 14, 9, 21,
+ // Malachi
+ 14, 17, 24, 0,
+ // Isaiah
+ 31, 21, 26, 6, 30, 13, 25, 23, 20, 34,
+ 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+ 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+ 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+ 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+ 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
+ 11, 12, 19, 11, 25, 24,
+ // Jeremiah
+ 19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
+ 23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+ 14, 30, 40, 10, 20, 28, 46, 64, 7, 33,
+ 44, 38, 24, 22, 17, 32, 24, 40, 44, 13,
+ 22, 19, 32, 21, 28, 18, 16, 18, 22, 13,
+ 35, 34,
+ // Baruch
+ 22, 35, 38, 37, 9,
+ // Lamentations
+ 22, 22, 66, 22, 22,
+ // Epistle of Jeremiah
+ 72,
+ // Ezekiel
+ 28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+ 25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
+ 37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+ 18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+ 26, 20, 27, 31, 25, 24, 23, 35,
+ // Prayer of Azariah
+ 68,
+ // Susanna
+ 64,
+ // Daniel
+ 21, 49, 97, 37, 30, 29, 28, 27, 27, 21,
+ 45, 13,
+ // Bel and the Dragon
+ 42,
+ // I Enoch
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Odes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
Property changes on: trunk/versification/lxx_v11ns/canon_rahlfs.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: trunk/versification/lxx_v11ns/canon_saas.h
===================================================================
--- trunk/versification/lxx_v11ns/canon_saas.h 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/lxx_v11ns/canon_saas.h 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,394 +1,394 @@
-/******************************************************************************
- *
- * canon_saas.h - Versification data for the SAAS system
- *
- * $Id: canon_saas.h 2910 2013-07-18 10:23:23Z chrislit $
- *
- * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
- * CrossWire Bible Society
- * P. O. Box 2528
- * Tempe, AZ 85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#ifndef CANON_SAAS_H
-#define CANON_SAAS_H
-
-SWORD_NAMESPACE_START
-
-
-// Versification system: SAAS
-// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr PrMan 1Esd Ezra Neh Tob Jdt Esth 1Macc 2Macc 3Macc Ps Job Prov Eccl Song Wis Sir Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek Sus Dan Bel
-
-// Source: http://www.amazon.com/The-Orthodox-Study-Bible-Christianity/dp/0718003594
-
-/******************************************************************************
- * [on]tbooks_lxx - initialize static instance for all canonical
- * text names and chapmax
- */
-struct sbook otbooks_lxx[] = {
- {"Genesis", "Gen", "Gen", 50},
- {"Exodus", "Exod", "Exod", 40},
- {"Leviticus", "Lev", "Lev", 27},
- {"Numbers", "Num", "Num", 36},
- {"Deuteronomy", "Deut", "Deut", 34},
- {"Joshua", "Josh", "Josh", 24},
- {"Judges", "Judg", "Judg", 21},
- {"Ruth", "Ruth", "Ruth", 4},
- {"I Samuel", "1Sam", "1Sam", 31},
- {"II Samuel", "2Sam", "2Sam", 24},
- {"I Kings", "1Kgs", "1Kgs", 22},
- {"II Kings", "2Kgs", "2Kgs", 25},
- {"I Chronicles", "1Chr", "1Chr", 29},
- {"II Chronicles", "2Chr", "2Chr", 36},
- {"I Esdras", "1Esd", "1Esd", 9},
- {"Ezra", "Ezra", "Ezra", 10},
- {"Nehemiah", "Neh", "Neh", 13},
- {"Esther", "Esth", "Esth", 16},
- {"Judith", "Jdt", "Jdt", 16},
- {"Tobit", "Tob", "Tob", 14},
- {"I Maccabees", "1Macc", "1Macc", 16},
- {"II Maccabees", "2Macc", "2Macc", 15},
- {"III Maccabees", "3Macc", "3Macc", 7},
- {"IV Maccabees", "4Macc", "4Macc", 18},
- {"Psalms", "Ps", "Ps", 151},
- {"Prayer of Manasses", "PrMan", "PrMan", 1},
- {"Proverbs", "Prov", "Prov", 31},
- {"Ecclesiastes", "Eccl", "Eccl", 12},
- {"Song of Solomon", "Song", "Song", 8},
- {"Job", "Job", "Job", 42},
- {"Wisdom", "Wis", "Wis", 19},
- {"Sirach", "Sir", "Sir", 51},
- {"Psalms of Solomon", "PssSol", "PssSol", 18},
- {"Hosea", "Hos", "Hos", 14},
- {"Amos", "Amos", "Amos", 9},
- {"Micah", "Mic", "Mic", 7},
- {"Joel", "Joel", "Joel", 4},
- {"Obadiah", "Obad", "Obad", 1},
- {"Jonah", "Jonah", "Jonah", 4},
- {"Nahum", "Nah", "Nah", 3},
- {"Habakkuk", "Hab", "Hab", 3},
- {"Zephaniah", "Zeph", "Zeph", 3},
- {"Haggai", "Hag", "Hag", 2},
- {"Zechariah", "Zech", "Zech", 14},
- {"Malachi", "Mal", "Mal", 4},
- {"Isaiah", "Isa", "Isa", 66},
- {"Jeremiah", "Jer", "Jer", 52},
- {"Baruch", "Bar", "Bar", 5},
- {"Lamentations", "Lam", "Lam", 5},
- {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
- {"Ezekiel", "Ezek", "Ezek", 48},
- {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
- {"Susanna", "Sus", "Sus", 1},
- {"Daniel", "Dan", "Dan", 12},
- {"Bel and the Dragon", "Bel", "Bel", 1},
- {"I Enoch", "1En", "1En", 108},
- {"Odes", "Odes", "Odes", 14},
- {"", "", "", 0}
-};
-
-// for ntbooks_lxx, use ntbooks
-
-/******************************************************************************
- * Maximum verses per chapter
- */
-
-int vm_lxx[] = {
- // Genesis
- 31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
- 32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
- 34, 24, 20, 67, 33, 35, 46, 22, 35, 43,
- 54, 32, 20, 31, 29, 43, 36, 30, 23, 23,
- 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
- // Exodus
- 22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
- 10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
- 37, 30, 33, 18, 40, 37, 21, 38, 46, 38,
- 18, 35, 23, 35, 35, 39, 21, 27, 23, 32,
- // Leviticus
- 17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
- 47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
- 24, 33, 44, 23, 55, 46, 34,
- // Numbers
- 54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
- 35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
- 35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
- 54, 42, 56, 29, 34, 13,
- // Deuteronomy
- 46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
- 32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
- 23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
- 30, 52, 29, 12,
- // Joshua
- 18, 24, 17, 24, 15, 26, 26, 27, 33, 41,
- 23, 24, 32, 15, 64, 10, 18, 28, 54, 6,
- 49, 34, 16, 36,
- // Judges
- 36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
- 39, 15, 25, 20, 20, 31, 13, 31, 30, 48,
- 25,
- // Ruth
- 22, 23, 18, 22,
- // I Samuel
- 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
- 15, 25, 22, 52, 35, 23, 33, 19, 24, 42,
- 16, 23, 27, 23, 44, 25, 12, 25, 11, 32,
- 13,
- // II Samuel
- 27, 32, 39, 12, 26, 23, 29, 18, 13, 19,
- 27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
- 22, 51, 39, 25,
- // I Kings
- 53, 71, 27, 19, 29, 36, 50, 65, 18, 33,
- 39, 54, 34, 31, 32, 42, 24, 46, 21, 29,
- 43, 50,
- // II Kings
- 22, 25, 27, 44, 27, 33, 20, 29, 37, 36,
- 20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
- 26, 20, 37, 20, 30,
- // I Chronicles
- 42, 55, 24, 43, 41, 66, 40, 40, 44, 13,
- 47, 41, 14, 17, 29, 42, 27, 17, 19, 8,
- 30, 19, 32, 31, 31, 32, 34, 21, 30,
- // II Chronicles
- 18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
- 23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
- 20, 12, 21, 27, 28, 23, 8, 27, 36, 27,
- 21, 33, 25, 33, 31, 31,
- // I Esdras
- 55, 26, 24, 63, 71, 33, 15, 92, 55,
- // Ezra
- 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
- // Nehemiah
- 11, 20, 37, 17, 19, 19, 73, 18, 38, 39,
- 27, 44, 31,
- // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
- 22, 23, 15, 17, 22, 14, 10, 17, 30, 3,
- 0, 0, 0, 0, 0, 0,
- // Judith
- 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
- 23, 20, 20, 19, 14, 25,
- // Tobit
- 22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
- 19, 22, 18, 15,
- // I Maccabees
- 64, 70, 60, 61, 68, 63, 50, 31, 73, 89,
- 74, 53, 53, 49, 41, 24,
- // II Maccabees
- 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
- 38, 45, 26, 46, 39,
- // III Maccabees
- 28, 33, 30, 21, 51, 41, 23,
- // IV Maccabees
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Psalms
- 6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
- 9, 6, 7, 6, 11, 15, 51, 15, 10, 14,
- 32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
- 11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
- 12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
- 11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
- 13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
- 20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
- 8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
- 16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
- 29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
- 10, 9, 26, 9, 9, 2, 29, 176, 7, 8,
- 9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
- 18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
- 8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
- 7,
- // Prayer of Manasses
- 15,
- // Proverbs
- 35, 23, 38, 28, 23, 40, 27, 35, 25, 33,
- 30, 31, 27, 36, 38, 31, 30, 23, 29, 25,
- 30, 31, 36, 39, 31, 29, 29, 30, 28, 35,
- 30,
- // Ecclesiastes
- 18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
- 10, 14,
- // Song of Solomon
- 17, 17, 11, 16, 16, 12, 14, 14,
- // Job
- 22, 18, 26, 21, 27, 30, 21, 22, 35, 22,
- 20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
- 34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
- 40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
- 26, 22,
- // Wisdom
- 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
- 26, 27, 19, 31, 19, 29, 20, 25, 22,
- // Sirach
- 27, 18, 29, 31, 15, 37, 36, 19, 18, 31,
- 32, 18, 25, 27, 20, 28, 27, 32, 27, 31,
- 28, 27, 27, 34, 25, 20, 30, 26, 28, 25,
- 31, 24, 33, 26, 24, 27, 31, 34, 35, 30,
- 27, 25, 33, 23, 26, 20, 25, 25, 16, 29,
- 30,
- // Psalms of Solomon
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Hosea
- 11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
- 11, 15, 15, 10,
- // Amos
- 14, 16, 15, 13, 27, 14, 17, 14, 15,
- // Micah
- 16, 13, 12, 14, 14, 16, 20,
- // Joel
- 20, 27, 5, 21,
- // Obadiah
- 21,
- // Jonah
- 16, 11, 10, 11,
- // Nahum
- 14, 14, 19,
- // Habakkuk
- 17, 20, 19,
- // Zephaniah
- 18, 15, 20,
- // Haggai
- 15, 23,
- // Zechariah
- 17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
- 17, 14, 9, 21,
- // Malachi
- 14, 17, 24, 0,
- // Isaiah
- 31, 21, 26, 6, 30, 13, 25, 23, 20, 34,
- 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
- 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
- 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
- 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
- 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
- 11, 12, 20, 11, 25, 24,
- // Jeremiah
- 19, 37, 25, 31, 31, 30, 33, 21, 25, 21,
- 22, 17, 27, 22, 21, 21, 23, 23, 15, 18,
- 14, 30, 42, 10, 20, 26, 46, 60, 7, 32,
- 44, 25, 24, 14, 17, 27, 20, 40, 44, 13,
- 22, 19, 32, 21, 28, 8, 16, 18, 22, 13,
- 35, 28,
- // Baruch
- 22, 35, 38, 37, 9,
- // Lamentations
- 22, 22, 62, 22, 22,
- // Epistle of Jeremiah
- 73,
- // Ezekiel
- 27, 10, 27, 17, 17, 14, 27, 18, 11, 21,
- 25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
- 37, 31, 49, 27, 17, 21, 35, 26, 21, 26,
- 18, 32, 31, 31, 15, 38, 28, 23, 29, 48,
- 26, 20, 27, 31, 25, 24, 23, 35,
- // Prayer of Azariah
- 0,
- // Susanna
- 64,
- // Daniel
- 21, 49, 97, 37, 30, 29, 28, 27, 27, 21,
- 45, 13,
- // Bel and the Dragon
- 42,
- // I Enoch
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Odes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // Matthew
- 25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
- 30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
- 46, 46, 39, 51, 46, 75, 66, 20,
- // Mark
- 45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
- 33, 44, 37, 72, 47, 20,
- // Luke
- 80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
- 54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
- 38, 71, 56, 53,
- // John
- 52, 25, 36, 54, 47, 71, 53, 59, 41, 42,
- 57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
- 25,
- // Acts
- 26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
- 30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
- 40, 30, 35, 27, 27, 32, 44, 31,
- // Romans
- 32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
- 36, 21, 14, 26, 33, 27,
- // I Corinthians
- 31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
- 34, 31, 13, 40, 58, 24,
- // II Corinthians
- 24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
- 33, 21, 14,
- // Galatians
- 24, 21, 29, 31, 26, 18,
- // Ephesians
- 23, 22, 21, 32, 33, 24,
- // Philippians
- 30, 30, 21, 23,
- // Colossians
- 29, 23, 25, 18,
- // I Thessalonians
- 10, 20, 13, 18, 28,
- // II Thessalonians
- 12, 17, 18,
- // I Timothy
- 20, 15, 16, 16, 25, 21,
- // II Timothy
- 18, 26, 17, 22,
- // Titus
- 16, 15, 15,
- // Philemon
- 25,
- // Hebrews
- 14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
- 40, 29, 25,
- // James
- 27, 26, 18, 17, 20,
- // I Peter
- 25, 25, 22, 19, 14,
- // II Peter
- 21, 22, 18,
- // I John
- 10, 29, 24, 21, 21,
- // II John
- 13,
- // III John
- 15,
- // Jude
- 25,
- // Revelation of John
- 20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
- 19, 18, 18, 20, 9, 21, 18, 24, 21, 15,
- 27, 21
-};
-
-
-SWORD_NAMESPACE_END
-
-
-#endif
-Bar
+/******************************************************************************
+ *
+ * canon_saas.h - Versification data for the SAAS system
+ *
+ * $Id$
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef CANON_SAAS_H
+#define CANON_SAAS_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: SAAS
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr PrMan 1Esd Ezra Neh Tob Jdt Esth 1Macc 2Macc 3Macc Ps Job Prov Eccl Song Wis Sir Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek Sus Dan Bel
+
+// Source: http://www.amazon.com/The-Orthodox-Study-Bible-Christianity/dp/0718003594
+
+/******************************************************************************
+ * [on]tbooks_lxx - initialize static instance for all canonical
+ * text names and chapmax
+ */
+struct sbook otbooks_lxx[] = {
+ {"Genesis", "Gen", "Gen", 50},
+ {"Exodus", "Exod", "Exod", 40},
+ {"Leviticus", "Lev", "Lev", 27},
+ {"Numbers", "Num", "Num", 36},
+ {"Deuteronomy", "Deut", "Deut", 34},
+ {"Joshua", "Josh", "Josh", 24},
+ {"Judges", "Judg", "Judg", 21},
+ {"Ruth", "Ruth", "Ruth", 4},
+ {"I Samuel", "1Sam", "1Sam", 31},
+ {"II Samuel", "2Sam", "2Sam", 24},
+ {"I Kings", "1Kgs", "1Kgs", 22},
+ {"II Kings", "2Kgs", "2Kgs", 25},
+ {"I Chronicles", "1Chr", "1Chr", 29},
+ {"II Chronicles", "2Chr", "2Chr", 36},
+ {"I Esdras", "1Esd", "1Esd", 9},
+ {"Ezra", "Ezra", "Ezra", 10},
+ {"Nehemiah", "Neh", "Neh", 13},
+ {"Esther", "Esth", "Esth", 16},
+ {"Judith", "Jdt", "Jdt", 16},
+ {"Tobit", "Tob", "Tob", 14},
+ {"I Maccabees", "1Macc", "1Macc", 16},
+ {"II Maccabees", "2Macc", "2Macc", 15},
+ {"III Maccabees", "3Macc", "3Macc", 7},
+ {"IV Maccabees", "4Macc", "4Macc", 18},
+ {"Psalms", "Ps", "Ps", 151},
+ {"Prayer of Manasses", "PrMan", "PrMan", 1},
+ {"Proverbs", "Prov", "Prov", 31},
+ {"Ecclesiastes", "Eccl", "Eccl", 12},
+ {"Song of Solomon", "Song", "Song", 8},
+ {"Job", "Job", "Job", 42},
+ {"Wisdom", "Wis", "Wis", 19},
+ {"Sirach", "Sir", "Sir", 51},
+ {"Psalms of Solomon", "PssSol", "PssSol", 18},
+ {"Hosea", "Hos", "Hos", 14},
+ {"Amos", "Amos", "Amos", 9},
+ {"Micah", "Mic", "Mic", 7},
+ {"Joel", "Joel", "Joel", 4},
+ {"Obadiah", "Obad", "Obad", 1},
+ {"Jonah", "Jonah", "Jonah", 4},
+ {"Nahum", "Nah", "Nah", 3},
+ {"Habakkuk", "Hab", "Hab", 3},
+ {"Zephaniah", "Zeph", "Zeph", 3},
+ {"Haggai", "Hag", "Hag", 2},
+ {"Zechariah", "Zech", "Zech", 14},
+ {"Malachi", "Mal", "Mal", 4},
+ {"Isaiah", "Isa", "Isa", 66},
+ {"Jeremiah", "Jer", "Jer", 52},
+ {"Baruch", "Bar", "Bar", 5},
+ {"Lamentations", "Lam", "Lam", 5},
+ {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+ {"Ezekiel", "Ezek", "Ezek", 48},
+ {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+ {"Susanna", "Sus", "Sus", 1},
+ {"Daniel", "Dan", "Dan", 12},
+ {"Bel and the Dragon", "Bel", "Bel", 1},
+ {"I Enoch", "1En", "1En", 108},
+ {"Odes", "Odes", "Odes", 14},
+ {"", "", "", 0}
+};
+
+// for ntbooks_lxx, use ntbooks
+
+/******************************************************************************
+ * Maximum verses per chapter
+ */
+
+int vm_lxx[] = {
+ // Genesis
+ 31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+ 32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+ 34, 24, 20, 67, 33, 35, 46, 22, 35, 43,
+ 54, 32, 20, 31, 29, 43, 36, 30, 23, 23,
+ 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+ // Exodus
+ 22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+ 10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+ 37, 30, 33, 18, 40, 37, 21, 38, 46, 38,
+ 18, 35, 23, 35, 35, 39, 21, 27, 23, 32,
+ // Leviticus
+ 17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
+ 47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+ 24, 33, 44, 23, 55, 46, 34,
+ // Numbers
+ 54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
+ 35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+ 35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
+ 54, 42, 56, 29, 34, 13,
+ // Deuteronomy
+ 46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+ 32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+ 23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+ 30, 52, 29, 12,
+ // Joshua
+ 18, 24, 17, 24, 15, 26, 26, 27, 33, 41,
+ 23, 24, 32, 15, 64, 10, 18, 28, 54, 6,
+ 49, 34, 16, 36,
+ // Judges
+ 36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+ 39, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+ 25,
+ // Ruth
+ 22, 23, 18, 22,
+ // I Samuel
+ 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+ 15, 25, 22, 52, 35, 23, 33, 19, 24, 42,
+ 16, 23, 27, 23, 44, 25, 12, 25, 11, 32,
+ 13,
+ // II Samuel
+ 27, 32, 39, 12, 26, 23, 29, 18, 13, 19,
+ 27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+ 22, 51, 39, 25,
+ // I Kings
+ 53, 71, 27, 19, 29, 36, 50, 65, 18, 33,
+ 39, 54, 34, 31, 32, 42, 24, 46, 21, 29,
+ 43, 50,
+ // II Kings
+ 22, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+ 20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+ 26, 20, 37, 20, 30,
+ // I Chronicles
+ 42, 55, 24, 43, 41, 66, 40, 40, 44, 13,
+ 47, 41, 14, 17, 29, 42, 27, 17, 19, 8,
+ 30, 19, 32, 31, 31, 32, 34, 21, 30,
+ // II Chronicles
+ 18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+ 23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+ 20, 12, 21, 27, 28, 23, 8, 27, 36, 27,
+ 21, 33, 25, 33, 31, 31,
+ // I Esdras
+ 55, 26, 24, 63, 71, 33, 15, 92, 55,
+ // Ezra
+ 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+ // Nehemiah
+ 11, 20, 37, 17, 19, 19, 73, 18, 38, 39,
+ 27, 44, 31,
+ // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+ 22, 23, 15, 17, 22, 14, 10, 17, 30, 3,
+ 0, 0, 0, 0, 0, 0,
+ // Judith
+ 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+ 23, 20, 20, 19, 14, 25,
+ // Tobit
+ 22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+ 19, 22, 18, 15,
+ // I Maccabees
+ 64, 70, 60, 61, 68, 63, 50, 31, 73, 89,
+ 74, 53, 53, 49, 41, 24,
+ // II Maccabees
+ 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+ 38, 45, 26, 46, 39,
+ // III Maccabees
+ 28, 33, 30, 21, 51, 41, 23,
+ // IV Maccabees
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Psalms
+ 6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
+ 9, 6, 7, 6, 11, 15, 51, 15, 10, 14,
+ 32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+ 11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+ 12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
+ 11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
+ 13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+ 20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+ 8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+ 16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
+ 29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
+ 10, 9, 26, 9, 9, 2, 29, 176, 7, 8,
+ 9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
+ 18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
+ 8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+ 7,
+ // Prayer of Manasses
+ 15,
+ // Proverbs
+ 35, 23, 38, 28, 23, 40, 27, 35, 25, 33,
+ 30, 31, 27, 36, 38, 31, 30, 23, 29, 25,
+ 30, 31, 36, 39, 31, 29, 29, 30, 28, 35,
+ 30,
+ // Ecclesiastes
+ 18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+ 10, 14,
+ // Song of Solomon
+ 17, 17, 11, 16, 16, 12, 14, 14,
+ // Job
+ 22, 18, 26, 21, 27, 30, 21, 22, 35, 22,
+ 20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+ 34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+ 40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+ 26, 22,
+ // Wisdom
+ 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+ 26, 27, 19, 31, 19, 29, 20, 25, 22,
+ // Sirach
+ 27, 18, 29, 31, 15, 37, 36, 19, 18, 31,
+ 32, 18, 25, 27, 20, 28, 27, 32, 27, 31,
+ 28, 27, 27, 34, 25, 20, 30, 26, 28, 25,
+ 31, 24, 33, 26, 24, 27, 31, 34, 35, 30,
+ 27, 25, 33, 23, 26, 20, 25, 25, 16, 29,
+ 30,
+ // Psalms of Solomon
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Hosea
+ 11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+ 11, 15, 15, 10,
+ // Amos
+ 14, 16, 15, 13, 27, 14, 17, 14, 15,
+ // Micah
+ 16, 13, 12, 14, 14, 16, 20,
+ // Joel
+ 20, 27, 5, 21,
+ // Obadiah
+ 21,
+ // Jonah
+ 16, 11, 10, 11,
+ // Nahum
+ 14, 14, 19,
+ // Habakkuk
+ 17, 20, 19,
+ // Zephaniah
+ 18, 15, 20,
+ // Haggai
+ 15, 23,
+ // Zechariah
+ 17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+ 17, 14, 9, 21,
+ // Malachi
+ 14, 17, 24, 0,
+ // Isaiah
+ 31, 21, 26, 6, 30, 13, 25, 23, 20, 34,
+ 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+ 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+ 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+ 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+ 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
+ 11, 12, 20, 11, 25, 24,
+ // Jeremiah
+ 19, 37, 25, 31, 31, 30, 33, 21, 25, 21,
+ 22, 17, 27, 22, 21, 21, 23, 23, 15, 18,
+ 14, 30, 42, 10, 20, 26, 46, 60, 7, 32,
+ 44, 25, 24, 14, 17, 27, 20, 40, 44, 13,
+ 22, 19, 32, 21, 28, 8, 16, 18, 22, 13,
+ 35, 28,
+ // Baruch
+ 22, 35, 38, 37, 9,
+ // Lamentations
+ 22, 22, 62, 22, 22,
+ // Epistle of Jeremiah
+ 73,
+ // Ezekiel
+ 27, 10, 27, 17, 17, 14, 27, 18, 11, 21,
+ 25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
+ 37, 31, 49, 27, 17, 21, 35, 26, 21, 26,
+ 18, 32, 31, 31, 15, 38, 28, 23, 29, 48,
+ 26, 20, 27, 31, 25, 24, 23, 35,
+ // Prayer of Azariah
+ 0,
+ // Susanna
+ 64,
+ // Daniel
+ 21, 49, 97, 37, 30, 29, 28, 27, 27, 21,
+ 45, 13,
+ // Bel and the Dragon
+ 42,
+ // I Enoch
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Odes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // Matthew
+ 25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+ 30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+ 46, 46, 39, 51, 46, 75, 66, 20,
+ // Mark
+ 45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+ 33, 44, 37, 72, 47, 20,
+ // Luke
+ 80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+ 54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+ 38, 71, 56, 53,
+ // John
+ 52, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+ 57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+ 25,
+ // Acts
+ 26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+ 30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
+ 40, 30, 35, 27, 27, 32, 44, 31,
+ // Romans
+ 32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+ 36, 21, 14, 26, 33, 27,
+ // I Corinthians
+ 31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+ 34, 31, 13, 40, 58, 24,
+ // II Corinthians
+ 24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+ 33, 21, 14,
+ // Galatians
+ 24, 21, 29, 31, 26, 18,
+ // Ephesians
+ 23, 22, 21, 32, 33, 24,
+ // Philippians
+ 30, 30, 21, 23,
+ // Colossians
+ 29, 23, 25, 18,
+ // I Thessalonians
+ 10, 20, 13, 18, 28,
+ // II Thessalonians
+ 12, 17, 18,
+ // I Timothy
+ 20, 15, 16, 16, 25, 21,
+ // II Timothy
+ 18, 26, 17, 22,
+ // Titus
+ 16, 15, 15,
+ // Philemon
+ 25,
+ // Hebrews
+ 14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+ 40, 29, 25,
+ // James
+ 27, 26, 18, 17, 20,
+ // I Peter
+ 25, 25, 22, 19, 14,
+ // II Peter
+ 21, 22, 18,
+ // I John
+ 10, 29, 24, 21, 21,
+ // II John
+ 13,
+ // III John
+ 15,
+ // Jude
+ 25,
+ // Revelation of John
+ 20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+ 19, 18, 18, 20, 9, 21, 18, 24, 21, 15,
+ 27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
+Bar
Property changes on: trunk/versification/lxx_v11ns/canon_saas.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: trunk/versification/lxx_v11ns/canon_swete.h
===================================================================
--- trunk/versification/lxx_v11ns/canon_swete.h 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/lxx_v11ns/canon_swete.h 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,326 +1,326 @@
-/******************************************************************************
- *
- * canon_swete.h - Versification data for the Swete system
- *
- * $Id: canon_swete.h 2910 2013-07-18 10:23:23Z chrislit $
- *
- * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
- * CrossWire Bible Society
- * P. O. Box 2528
- * Tempe, AZ 85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#ifndef CANON_SWETE_H
-#define CANON_SWETE_H
-
-SWORD_NAMESPACE_START
-
-
-// Versification system: Swete
-// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs
-// 1Chr 2Chr 1Esd Ezra Neh Ps Prov Eccl Song Job Wis Sir Esth Jdt Tob
-// Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek Dan Sus Bel 1Macc 2Macc 3Macc 4Macc PssSol 1En Odes
-
-// Source: http://biblerefshelf.sudalyph.org/koine-greek/the-old-testament-in-greek-by-h-b-swete (Internet Archive & Google Books)
-
-/******************************************************************************
- * [on]tbooks_swete - initialize static instance for all canonical
- * text names and chapmax
- */
-struct sbook otbooks_swete[] = {
- {"Genesis", "Gen", "Gen", 50},
- {"Exodus", "Exod", "Exod", 40},
- {"Leviticus", "Lev", "Lev", 27},
- {"Numbers", "Num", "Num", 36},
- {"Deuteronomy", "Deut", "Deut", 34},
- {"Joshua", "Josh", "Josh", 24},
- {"Judges", "Judg", "Judg", 21},
- {"Ruth", "Ruth", "Ruth", 4},
- {"I Samuel", "1Sam", "1Sam", 31},
- {"II Samuel", "2Sam", "2Sam", 24},
- {"I Kings", "1Kgs", "1Kgs", 22},
- {"II Kings", "2Kgs", "2Kgs", 25},
- {"I Chronicles", "1Chr", "1Chr", 29},
- {"II Chronicles", "2Chr", "2Chr", 36},
- {"I Esdras", "1Esd", "1Esd", 9},
- {"Ezra", "Ezra", "Ezra", 10},
- {"Nehemiah", "Neh", "Neh", 13},
- {"Esther", "Esth", "Esth", 16},
- {"Judith", "Jdt", "Jdt", 16},
- {"Tobit", "Tob", "Tob", 14},
- {"I Maccabees", "1Macc", "1Macc", 16},
- {"II Maccabees", "2Macc", "2Macc", 15},
- {"III Maccabees", "3Macc", "3Macc", 7},
- {"IV Maccabees", "4Macc", "4Macc", 18},
- {"Psalms", "Ps", "Ps", 151},
- {"Prayer of Manasses", "PrMan", "PrMan", 1},
- {"Proverbs", "Prov", "Prov", 31},
- {"Ecclesiastes", "Eccl", "Eccl", 12},
- {"Song of Solomon", "Song", "Song", 8},
- {"Job", "Job", "Job", 42},
- {"Wisdom", "Wis", "Wis", 19},
- {"Sirach", "Sir", "Sir", 51},
- {"Psalms of Solomon", "PssSol", "PssSol", 18},
- {"Hosea", "Hos", "Hos", 14},
- {"Amos", "Amos", "Amos", 9},
- {"Micah", "Mic", "Mic", 7},
- {"Joel", "Joel", "Joel", 4},
- {"Obadiah", "Obad", "Obad", 1},
- {"Jonah", "Jonah", "Jonah", 4},
- {"Nahum", "Nah", "Nah", 3},
- {"Habakkuk", "Hab", "Hab", 3},
- {"Zephaniah", "Zeph", "Zeph", 3},
- {"Haggai", "Hag", "Hag", 2},
- {"Zechariah", "Zech", "Zech", 14},
- {"Malachi", "Mal", "Mal", 4},
- {"Isaiah", "Isa", "Isa", 66},
- {"Jeremiah", "Jer", "Jer", 52},
- {"Baruch", "Bar", "Bar", 5},
- {"Lamentations", "Lam", "Lam", 5},
- {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
- {"Ezekiel", "Ezek", "Ezek", 48},
- {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
- {"Susanna", "Sus", "Sus", 1},
- {"Daniel", "Dan", "Dan", 12},
- {"Bel and the Dragon", "Bel", "Bel", 1},
- {"I Enoch", "1En", "1En", 108},
- {"Odes", "Odes", "Odes", 14},
- {"", "", "", 0}
-};
-
-// for ntbooks_swete, use ntbooks
-
-/******************************************************************************
- * Maximum verses per chapter
- */
-
-int vm_swete[] = {
- // Genesis
- 31, 24, 24, 26, 31, 22, 24, 22, 29, 32,
- 32, 20, 18, 24, 20, 16, 27, 33, 38, 18,
- 34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
- 55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
- 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
- // Exodus
- 22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
- 10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
- 36, 31, 33, 18, 40, 37, 21, 39, 46, 38,
- 18, 35, 23, 35, 35, 40, 21, 27, 23, 32,
- // Leviticus
- 17, 16, 17, 35, 19, 40, 28, 36, 24, 20,
- 47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
- 24, 33, 44, 23, 55, 46, 34,
- // Numbers
- 54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
- 35, 15, 34, 45, 41, 50, 13, 32, 22, 29,
- 35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
- 54, 42, 56, 29, 34, 13,
- // Deuteronomy
- 46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
- 32, 32, 18, 28, 23, 22, 20, 22, 21, 20,
- 23, 30, 25, 22, 19, 19, 26, 68, 29, 20,
- 30, 52, 29, 12,
- // Joshua
- 18, 24, 17, 24, 15, 27, 26, 29, 33, 42,
- 23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
- 45, 34, 16, 33,
- // Judges
- 36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
- 40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
- 25,
- // Ruth
- 22, 23, 18, 22,
- // I Samuel
- 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
- 15, 25, 23, 52, 35, 23, 54, 29, 24, 43,
- 15, 23, 28, 23, 44, 25, 12, 25, 11, 31,
- 13,
- // II Samuel
- 27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
- 27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
- 22, 51, 39, 25,
- // I Kings
- 53, 46, 28, 33, 17, 34, 50, 66, 28, 33,
- 43, 33, 34, 31, 34, 34, 24, 46, 21, 29,
- 43, 54,
- // II Kings
- 18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
- 21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
- 26, 20, 37, 20, 30,
- // I Chronicles
- 54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
- 47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
- 30, 19, 32, 31, 31, 32, 34, 21, 30,
- // II Chronicles
- 17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
- 23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
- 20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
- 21, 33, 25, 33, 27, 23,
- // I Esdras
- 55, 25, 23, 63, 70, 33, 15, 92, 55,
- // Ezra
- 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
- // Nehemiah
- 11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
- 36, 47, 31,
- // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
- 22, 23, 15, 17, 14, 14, 10, 17, 31, 13,
- 12/17, 6/7, 18/30, 19/16, 19/24, 24/11,
- // Judith
- 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
- 23, 20, 20, 19, 14, 25,
- // Tobit
- 22, 14, 17, 21, 22, 18, 17, 21, 6, 12,
- 19, 22, 18, 15,
- // I Maccabees
- 64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
- 74, 53, 53, 49, 41, 24,
- // II Maccabees
- 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
- 38, 45, 26, 46, 39,
- // III Maccabees
- 29, 33, 30, 21, 51, 41, 23,
- // IV Maccabees
- 35, 24, 21, 26, 38, 35, 24, 29, 32, 21,
- 27, 20, 27, 20, 32, 25, 24, 24,
- // Psalms
- 6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
- 9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
- 32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
- 11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
- 12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
- 11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
- 13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
- 20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
- 8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
- 16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
- 29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
- 10, 9, 26, 9, 10, 2, 29, 176, 7, 8,
- 9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
- 18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
- 8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
- 7,
- // Prayer of Manasses
- 0,
- // Proverbs
- 33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
- 31, 28, 25, 35, 29, 33, 28, 23, 26, 24,
- 31, 29, 35, 77, 28, 28, 27, 28, 49, 0,
- 0,
- // Ecclesiastes
- 18, 26, 22, 17, 19, 11, 30, 17, 18, 20,
- 10, 14,
- // Song of Solomon
- 17, 17, 11, 16, 17, 12, 13, 14,
- // Job
- 22, 13, 26, 21, 27, 30, 21, 22, 35, 21,
- 20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
- 34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
- 40, 22, 33, 37, 16, 33, 24, 41, 35, 27,
- 25, 17,
- // Wisdom
- 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
- 26, 27, 19, 31, 19, 29, 21, 25, 22,
- // Sirach
- 30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
- 34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
- 28, 27, 27, 34, 26, 29, 30, 26, 28, 40,
- 31, 26, 13, 31, 24, 31, 31, 34, 35, 30,
- 22, 25, 33, 23, 26, 20, 25, 25, 16, 29,
- 30,
- // Psalms of Solomon
- 8, 41, 16, 29, 22, 9, 9, 40, 20, 9,
- 9, 8, 11, 6, 15, 15, 51, 14,
- // Hosea
- 11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
- 12, 14, 15, 10,
- // Amos
- 15, 16, 15, 13, 27, 14, 17, 14, 15,
- // Micah
- 16, 13, 12, 13, 15, 16, 20,
- // Joel
- 20, 32, 21, 0,
- // Obadiah
- 21,
- // Jonah
- 16, 11, 10, 11,
- // Nahum
- 15, 14, 19,
- // Habakkuk
- 17, 20, 19,
- // Zephaniah
- 18, 14, 20,
- // Haggai
- 14, 23,
- // Zechariah
- 21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
- 17, 14, 9, 21,
- // Malachi
- 14, 17, 18, 6
- // Isaiah
- 31, 21, 26, 6, 30, 13, 25, 22, 21, 34,
- 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
- 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
- 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
- 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
- 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
- 11, 12, 19, 12, 25, 24,
- // Jeremiah
- 19, 36, 25, 31, 31, 30, 34, 22, 26, 25,
- 23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
- 14, 30, 40, 10, 19, 28, 46, 64, 23, 16,
- 44, 24, 24, 18, 17, 32, 24, 40, 44, 13,
- 22, 19, 32, 21, 28, 18, 16, 18, 22, 13,
- 35, 34,
- // Baruch
- 22, 35, 38, 37, 9,
- // Lamentations
- 22, 22, 66, 22, 22,
- // Epistle of Jeremiah
- 72,
- // Ezekiel
- 28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
- 25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
- 32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
- 18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
- 26, 20, 27, 31, 25, 24, 23, 35,
- // Prayer of Azariah
- 0,
- // Susanna (x2: OG + Th)
- 64,
- // Daniel (x2: OG + Th)
- 21, 49, 100, 34, 31, 28, 28, 27, 27, 21,
- 45, 13,
- // Bel and the Dragon (x2: OG + Th)
- 42,
- // I Enoch (x3: P, Sync1, Sync2)
- 9, 3, 1, 0, 9, 8, 6, 4, 11, 22,
- 2, 6, 10, 25, 12, 4, 8, 16, 3, 7,
- 10, 14, 4, 6, 7, 6, 5, 3, 2, 3,
- 3, 6, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 49, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Odes
- 19, 43, 10, 20, 10, 19, 20, 15, 45, 88,
- 55, 32, 79, 1,
-};
-
-
-SWORD_NAMESPACE_END
-
-
-#endif
+/******************************************************************************
+ *
+ * canon_swete.h - Versification data for the Swete system
+ *
+ * $Id$
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef CANON_SWETE_H
+#define CANON_SWETE_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Swete
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs
+// 1Chr 2Chr 1Esd Ezra Neh Ps Prov Eccl Song Job Wis Sir Esth Jdt Tob
+// Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek Dan Sus Bel 1Macc 2Macc 3Macc 4Macc PssSol 1En Odes
+
+// Source: http://biblerefshelf.sudalyph.org/koine-greek/the-old-testament-in-greek-by-h-b-swete (Internet Archive & Google Books)
+
+/******************************************************************************
+ * [on]tbooks_swete - initialize static instance for all canonical
+ * text names and chapmax
+ */
+struct sbook otbooks_swete[] = {
+ {"Genesis", "Gen", "Gen", 50},
+ {"Exodus", "Exod", "Exod", 40},
+ {"Leviticus", "Lev", "Lev", 27},
+ {"Numbers", "Num", "Num", 36},
+ {"Deuteronomy", "Deut", "Deut", 34},
+ {"Joshua", "Josh", "Josh", 24},
+ {"Judges", "Judg", "Judg", 21},
+ {"Ruth", "Ruth", "Ruth", 4},
+ {"I Samuel", "1Sam", "1Sam", 31},
+ {"II Samuel", "2Sam", "2Sam", 24},
+ {"I Kings", "1Kgs", "1Kgs", 22},
+ {"II Kings", "2Kgs", "2Kgs", 25},
+ {"I Chronicles", "1Chr", "1Chr", 29},
+ {"II Chronicles", "2Chr", "2Chr", 36},
+ {"I Esdras", "1Esd", "1Esd", 9},
+ {"Ezra", "Ezra", "Ezra", 10},
+ {"Nehemiah", "Neh", "Neh", 13},
+ {"Esther", "Esth", "Esth", 16},
+ {"Judith", "Jdt", "Jdt", 16},
+ {"Tobit", "Tob", "Tob", 14},
+ {"I Maccabees", "1Macc", "1Macc", 16},
+ {"II Maccabees", "2Macc", "2Macc", 15},
+ {"III Maccabees", "3Macc", "3Macc", 7},
+ {"IV Maccabees", "4Macc", "4Macc", 18},
+ {"Psalms", "Ps", "Ps", 151},
+ {"Prayer of Manasses", "PrMan", "PrMan", 1},
+ {"Proverbs", "Prov", "Prov", 31},
+ {"Ecclesiastes", "Eccl", "Eccl", 12},
+ {"Song of Solomon", "Song", "Song", 8},
+ {"Job", "Job", "Job", 42},
+ {"Wisdom", "Wis", "Wis", 19},
+ {"Sirach", "Sir", "Sir", 51},
+ {"Psalms of Solomon", "PssSol", "PssSol", 18},
+ {"Hosea", "Hos", "Hos", 14},
+ {"Amos", "Amos", "Amos", 9},
+ {"Micah", "Mic", "Mic", 7},
+ {"Joel", "Joel", "Joel", 4},
+ {"Obadiah", "Obad", "Obad", 1},
+ {"Jonah", "Jonah", "Jonah", 4},
+ {"Nahum", "Nah", "Nah", 3},
+ {"Habakkuk", "Hab", "Hab", 3},
+ {"Zephaniah", "Zeph", "Zeph", 3},
+ {"Haggai", "Hag", "Hag", 2},
+ {"Zechariah", "Zech", "Zech", 14},
+ {"Malachi", "Mal", "Mal", 4},
+ {"Isaiah", "Isa", "Isa", 66},
+ {"Jeremiah", "Jer", "Jer", 52},
+ {"Baruch", "Bar", "Bar", 5},
+ {"Lamentations", "Lam", "Lam", 5},
+ {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+ {"Ezekiel", "Ezek", "Ezek", 48},
+ {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+ {"Susanna", "Sus", "Sus", 1},
+ {"Daniel", "Dan", "Dan", 12},
+ {"Bel and the Dragon", "Bel", "Bel", 1},
+ {"I Enoch", "1En", "1En", 108},
+ {"Odes", "Odes", "Odes", 14},
+ {"", "", "", 0}
+};
+
+// for ntbooks_swete, use ntbooks
+
+/******************************************************************************
+ * Maximum verses per chapter
+ */
+
+int vm_swete[] = {
+ // Genesis
+ 31, 24, 24, 26, 31, 22, 24, 22, 29, 32,
+ 32, 20, 18, 24, 20, 16, 27, 33, 38, 18,
+ 34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+ 55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
+ 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+ // Exodus
+ 22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
+ 10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+ 36, 31, 33, 18, 40, 37, 21, 39, 46, 38,
+ 18, 35, 23, 35, 35, 40, 21, 27, 23, 32,
+ // Leviticus
+ 17, 16, 17, 35, 19, 40, 28, 36, 24, 20,
+ 47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+ 24, 33, 44, 23, 55, 46, 34,
+ // Numbers
+ 54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
+ 35, 15, 34, 45, 41, 50, 13, 32, 22, 29,
+ 35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
+ 54, 42, 56, 29, 34, 13,
+ // Deuteronomy
+ 46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+ 32, 32, 18, 28, 23, 22, 20, 22, 21, 20,
+ 23, 30, 25, 22, 19, 19, 26, 68, 29, 20,
+ 30, 52, 29, 12,
+ // Joshua
+ 18, 24, 17, 24, 15, 27, 26, 29, 33, 42,
+ 23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
+ 45, 34, 16, 33,
+ // Judges
+ 36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+ 40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+ 25,
+ // Ruth
+ 22, 23, 18, 22,
+ // I Samuel
+ 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+ 15, 25, 23, 52, 35, 23, 54, 29, 24, 43,
+ 15, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+ 13,
+ // II Samuel
+ 27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+ 27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
+ 22, 51, 39, 25,
+ // I Kings
+ 53, 46, 28, 33, 17, 34, 50, 66, 28, 33,
+ 43, 33, 34, 31, 34, 34, 24, 46, 21, 29,
+ 43, 54,
+ // II Kings
+ 18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+ 21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
+ 26, 20, 37, 20, 30,
+ // I Chronicles
+ 54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
+ 47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
+ 30, 19, 32, 31, 31, 32, 34, 21, 30,
+ // II Chronicles
+ 17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
+ 23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
+ 20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+ 21, 33, 25, 33, 27, 23,
+ // I Esdras
+ 55, 25, 23, 63, 70, 33, 15, 92, 55,
+ // Ezra
+ 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+ // Nehemiah
+ 11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
+ 36, 47, 31,
+ // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+ 22, 23, 15, 17, 14, 14, 10, 17, 31, 13,
+ 12/17, 6/7, 18/30, 19/16, 19/24, 24/11,
+ // Judith
+ 16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+ 23, 20, 20, 19, 14, 25,
+ // Tobit
+ 22, 14, 17, 21, 22, 18, 17, 21, 6, 12,
+ 19, 22, 18, 15,
+ // I Maccabees
+ 64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+ 74, 53, 53, 49, 41, 24,
+ // II Maccabees
+ 36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+ 38, 45, 26, 46, 39,
+ // III Maccabees
+ 29, 33, 30, 21, 51, 41, 23,
+ // IV Maccabees
+ 35, 24, 21, 26, 38, 35, 24, 29, 32, 21,
+ 27, 20, 27, 20, 32, 25, 24, 24,
+ // Psalms
+ 6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
+ 9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+ 32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+ 11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+ 12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
+ 11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
+ 13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+ 20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+ 8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+ 16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
+ 29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
+ 10, 9, 26, 9, 10, 2, 29, 176, 7, 8,
+ 9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
+ 18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
+ 8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+ 7,
+ // Prayer of Manasses
+ 0,
+ // Proverbs
+ 33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+ 31, 28, 25, 35, 29, 33, 28, 23, 26, 24,
+ 31, 29, 35, 77, 28, 28, 27, 28, 49, 0,
+ 0,
+ // Ecclesiastes
+ 18, 26, 22, 17, 19, 11, 30, 17, 18, 20,
+ 10, 14,
+ // Song of Solomon
+ 17, 17, 11, 16, 17, 12, 13, 14,
+ // Job
+ 22, 13, 26, 21, 27, 30, 21, 22, 35, 21,
+ 20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+ 34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+ 40, 22, 33, 37, 16, 33, 24, 41, 35, 27,
+ 25, 17,
+ // Wisdom
+ 16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+ 26, 27, 19, 31, 19, 29, 21, 25, 22,
+ // Sirach
+ 30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+ 34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
+ 28, 27, 27, 34, 26, 29, 30, 26, 28, 40,
+ 31, 26, 13, 31, 24, 31, 31, 34, 35, 30,
+ 22, 25, 33, 23, 26, 20, 25, 25, 16, 29,
+ 30,
+ // Psalms of Solomon
+ 8, 41, 16, 29, 22, 9, 9, 40, 20, 9,
+ 9, 8, 11, 6, 15, 15, 51, 14,
+ // Hosea
+ 11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+ 12, 14, 15, 10,
+ // Amos
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ // Micah
+ 16, 13, 12, 13, 15, 16, 20,
+ // Joel
+ 20, 32, 21, 0,
+ // Obadiah
+ 21,
+ // Jonah
+ 16, 11, 10, 11,
+ // Nahum
+ 15, 14, 19,
+ // Habakkuk
+ 17, 20, 19,
+ // Zephaniah
+ 18, 14, 20,
+ // Haggai
+ 14, 23,
+ // Zechariah
+ 21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+ 17, 14, 9, 21,
+ // Malachi
+ 14, 17, 18, 6
+ // Isaiah
+ 31, 21, 26, 6, 30, 13, 25, 22, 21, 34,
+ 16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+ 17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+ 9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+ 29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+ 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
+ 11, 12, 19, 12, 25, 24,
+ // Jeremiah
+ 19, 36, 25, 31, 31, 30, 34, 22, 26, 25,
+ 23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+ 14, 30, 40, 10, 19, 28, 46, 64, 23, 16,
+ 44, 24, 24, 18, 17, 32, 24, 40, 44, 13,
+ 22, 19, 32, 21, 28, 18, 16, 18, 22, 13,
+ 35, 34,
+ // Baruch
+ 22, 35, 38, 37, 9,
+ // Lamentations
+ 22, 22, 66, 22, 22,
+ // Epistle of Jeremiah
+ 72,
+ // Ezekiel
+ 28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+ 25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+ 32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+ 18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+ 26, 20, 27, 31, 25, 24, 23, 35,
+ // Prayer of Azariah
+ 0,
+ // Susanna (x2: OG + Th)
+ 64,
+ // Daniel (x2: OG + Th)
+ 21, 49, 100, 34, 31, 28, 28, 27, 27, 21,
+ 45, 13,
+ // Bel and the Dragon (x2: OG + Th)
+ 42,
+ // I Enoch (x3: P, Sync1, Sync2)
+ 9, 3, 1, 0, 9, 8, 6, 4, 11, 22,
+ 2, 6, 10, 25, 12, 4, 8, 16, 3, 7,
+ 10, 14, 4, 6, 7, 6, 5, 3, 2, 3,
+ 3, 6, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 49, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Odes
+ 19, 43, 10, 20, 10, 19, 20, 15, 45, 88,
+ 55, 32, 79, 1,
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
Property changes on: trunk/versification/lxx_v11ns/canon_swete.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: trunk/versification/lxx_v11ns/canon_thomson.h
===================================================================
--- trunk/versification/lxx_v11ns/canon_thomson.h 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/lxx_v11ns/canon_thomson.h 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,322 +1,322 @@
-/******************************************************************************
- *
- * canon_thomson.h - Versification data for the Thomson system
- *
- * $Id: canon_thomson.h 2910 2013-07-18 10:23:23Z chrislit $
- *
- * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
- * CrossWire Bible Society
- * P. O. Box 2528
- * Tempe, AZ 85280-2528
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#ifndef CANON_THOMSON_H
-#define CANON_THOMSON_H
-
-SWORD_NAMESPACE_START
-
-// Versification system: Thomson
-// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal
-
-// Source: http://thetencommandmentsministry.us/ministry/charles_thomson/ (Internet Archive & Google Books)
-
-/******************************************************************************
- * [on]tbooks_thomson - initialize static instance for all canonical
- * text names and chapmax
- */
-struct sbook otbooks_thomson[] = {
- {"Genesis", "Gen", "Gen", 50},
- {"Exodus", "Exod", "Exod", 40},
- {"Leviticus", "Lev", "Lev", 27},
- {"Numbers", "Num", "Num", 36},
- {"Deuteronomy", "Deut", "Deut", 34},
- {"Joshua", "Josh", "Josh", 24},
- {"Judges", "Judg", "Judg", 21},
- {"Ruth", "Ruth", "Ruth", 4},
- {"I Samuel", "1Sam", "1Sam", 31},
- {"II Samuel", "2Sam", "2Sam", 24},
- {"I Kings", "1Kgs", "1Kgs", 22},
- {"II Kings", "2Kgs", "2Kgs", 25},
- {"I Chronicles", "1Chr", "1Chr", 29},
- {"II Chronicles", "2Chr", "2Chr", 36},
- {"I Esdras", "1Esd", "1Esd", 9},
- {"Ezra", "Ezra", "Ezra", 10},
- {"Nehemiah", "Neh", "Neh", 13},
- {"Esther", "Esth", "Esth", 16},
- {"Judith", "Jdt", "Jdt", 16},
- {"Tobit", "Tob", "Tob", 14},
- {"I Maccabees", "1Macc", "1Macc", 16},
- {"II Maccabees", "2Macc", "2Macc", 15},
- {"III Maccabees", "3Macc", "3Macc", 7},
- {"IV Maccabees", "4Macc", "4Macc", 18},
- {"Psalms", "Ps", "Ps", 151},
- {"Prayer of Manasses", "PrMan", "PrMan", 1},
- {"Proverbs", "Prov", "Prov", 31},
- {"Ecclesiastes", "Eccl", "Eccl", 12},
- {"Song of Solomon", "Song", "Song", 8},
- {"Job", "Job", "Job", 42},
- {"Wisdom", "Wis", "Wis", 19},
- {"Sirach", "Sir", "Sir", 51},
- {"Psalms of Solomon", "PssSol", "PssSol", 18},
- {"Hosea", "Hos", "Hos", 14},
- {"Amos", "Amos", "Amos", 9},
- {"Micah", "Mic", "Mic", 7},
- {"Joel", "Joel", "Joel", 4},
- {"Obadiah", "Obad", "Obad", 1},
- {"Jonah", "Jonah", "Jonah", 4},
- {"Nahum", "Nah", "Nah", 3},
- {"Habakkuk", "Hab", "Hab", 3},
- {"Zephaniah", "Zeph", "Zeph", 3},
- {"Haggai", "Hag", "Hag", 2},
- {"Zechariah", "Zech", "Zech", 14},
- {"Malachi", "Mal", "Mal", 4},
- {"Isaiah", "Isa", "Isa", 66},
- {"Jeremiah", "Jer", "Jer", 52},
- {"Baruch", "Bar", "Bar", 5},
- {"Lamentations", "Lam", "Lam", 5},
- {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
- {"Ezekiel", "Ezek", "Ezek", 48},
- {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
- {"Susanna", "Sus", "Sus", 1},
- {"Daniel", "Dan", "Dan", 12},
- {"Bel and the Dragon", "Bel", "Bel", 1},
- {"I Enoch", "1En", "1En", 108},
- {"Odes", "Odes", "Odes", 14},
- {"", "", "", 0}
-};
-
-/******************************************************************************
- * Maximum verses per chapter
- */
-
-int vm_thomson[] = {
- // Genesis
- 31, 24, 23, 26, 28, 22, 24, 22, 29, 32,
- 32, 20, 18, 24, 21, 15, 26, 32, 38, 18,
- 34, 24, 20, 66, 34, 34, 46, 22, 35, 43,
- 55, 32, 20, 31, 28, 43, 36, 30, 23, 22,
- 56, 38, 34, 34, 28, 34, 31, 22, 33, 26,
- // Exodus
- 22, 24, 22, 31, 22, 28, 25, 32, 35, 28,
- 10, 50, 22, 31, 27, 35, 15, 27, 25, 26,
- 36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
- 18, 35, 23, 35, 35, 8, 0, 0, 0, 38,
- // Leviticus
- 17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
- 47, 8, 59, 54, 33, 33, 16, 30, 36, 26,
- 24, 33, 44, 23, 54, 46, 34,
- // Numbers
- 54, 34, 51, 48, 30, 27, 89, 26, 23, 36,
- 35, 15, 33, 45, 41, 50, 13, 32, 22, 29,
- 35, 41, 30, 25, 17, 65, 22, 31, 40, 16,
- 54, 42, 56, 29, 34, 13,
- // Deuteronomy
- 45, 37, 28, 49, 33, 25, 26, 20, 29, 22,
- 31, 32, 18, 28, 23, 21, 20, 22, 20, 20,
- 22, 30, 25, 22, 19, 19, 27, 68, 29, 20,
- 30, 52, 29, 10,
- // Joshua
- 18, 24, 17, 24, 15, 27, 26, 35, 27, 41,
- 23, 15, 32, 14, 63, 10, 18, 25, 51, 9,
- 45, 34, 16, 33,
- // Judges
- 36, 22, 31, 23, 32, 40, 25, 34, 57, 18,
- 40, 15, 25, 20, 20, 31, 12, 31, 30, 48,
- 25,
- // Ruth
- 22, 23, 18, 18,
- // I Samuel
- 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
- 15, 25, 23, 52, 35, 23, 54, 28, 24, 42,
- 15, 23, 29, 22, 43, 25, 12, 25, 11, 31,
- 13,
- // II Samuel
- 27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
- 27, 31, 38, 33, 37, 23, 29, 33, 43, 23,
- 22, 51, 26, 25,
- // I Kings
- 53, 46, 28, 34, 17, 38, 51, 66, 27, 28,
- 43, 33, 34, 29, 34, 34, 24, 45, 21, 29,
- 43, 52,
- // II Kings
- 18, 25, 27, 44, 27, 33, 19, 29, 37, 36,
- 20, 21, 25, 29, 38, 20, 41, 37, 37, 20,
- 26, 20, 37, 20, 29,
- // I Chronicles
- 51, 55, 24, 43, 26, 77, 40, 39, 44, 14,
- 47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
- 30, 19, 32, 31, 30, 32, 33, 21, 29,
- // II Chronicles
- 17, 18, 17, 22, 14, 40, 22, 17, 30, 19,
- 23, 16, 22, 14, 19, 14, 18, 34, 11, 36,
- 20, 11, 21, 27, 28, 23, 9, 27, 36, 27,
- 2, 33, 24, 33, 27, 22,
- // I Esdras
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Ezra
- 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
- // Nehemiah
- 11, 19, 32, 23, 19, 19, 73, 18, 38, 39,
- 36, 47, 30,
- // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
- 21, 23, 15, 17, 14, 14, 10, 17, 31, 3,
- 0, 0, 0, 0, 0, 0,
- // Judith
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // Tobit
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
- // I Maccabees?
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0,
- // II Maccabees?
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0,
- // III Maccabees?
- 0, 0, 0, 0, 0, 0, 0,
- // IV Maccabees?
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Psalms
- 6, 12, 8, 8, 11, 10, 15, 9, 20, 18,
- 7, 8, 5, 7, 5, 11, 15, 50, 14, 9,
- 13, 31, 6, 10, 22, 12, 14, 9, 11, 12,
- 24, 11, 22, 22, 28, 12, 40, 22, 13, 17,
- 13, 11, 5, 26, 17, 11, 9, 14, 20, 23,
- 19, 9, 6, 7, 23, 13, 11, 10, 17, 12,
- 8, 11, 11, 10, 13, 20, 7, 35, 35, 5,
- 24, 19, 28, 23, 9, 12, 19, 72, 13, 19,
- 16, 8, 18, 12, 13, 17, 7, 18, 52, 17,
- 16, 15, 5, 23, 11, 13, 12, 9, 9, 5,
- 8, 28, 22, 35, 45, 48, 43, 13, 31, 7,
- 10, 10, 9, 8, 18, 19, 1, 29, 176, 7,
- 8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
- 3, 18, 3, 3, 21, 26, 9, 8, 24, 13,
- 10, 7, 12, 15, 22, 10, 20, 14, 9, 6,
- 1,
- // Prayer of Manasses
- 0,
- // Proverbs
- 33, 22, 35, 27, 23, 35, 28, 37, 18, 32,
- 31, 28, 25, 35, 33, 33, 28, 22, 29, 30,
- 31, 28, 35, 34, 28, 28, 27, 28, 27, 33,
- 31,
- // Ecclesiastes
- 18, 26, 22, 16, 20, 12, 29, 17, 18, 20,
- 10, 13,
- // Song of Solomon
- 17, 17, 11, 16, 16, 13, 13, 15,
- // Job
- 22, 13, 26, 21, 27, 30, 22, 22, 35, 22,
- 20, 25, 27, 22, 35, 22, 16, 21, 29, 29,
- 34, 30, 17, 25, 6, 14, 22, 27, 25, 31,
- 40, 22, 33, 35, 16, 32, 24, 41, 29, 24,
- 34, 17,
- // Wisdom
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
- // Sirach
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0,
- // Psalms of Solomon
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Hosea
- 11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
- 12, 13, 16, 9,
- // Amos
- 15, 16, 15, 13, 26, 14, 17, 13, 15,
- // Micah
- 16, 13, 12, 13, 14, 16, 19,
- // Joel
- 20, 32, 21, 0,
- // Obadiah
- 21,
- // Jonah
- 17, 10, 10, 11,
- // Nahum
- 15, 13, 19,
- // Habakkuk
- 16, 20, 19,
- // Zephaniah
- 18, 15, 20,
- // Haggai
- 14, 23,
- // Zechariah
- 21, 13, 10, 13, 11, 15, 13, 23, 17, 12,
- 17, 13, 9, 21,
- // Malachi
- 14, 17, 18, 6
- // Isaiah
- 31, 21, 26, 6, 30, 13, 25, 22, 20, 33,
- 16, 6, 22, 32, 9, 14, 14, 7, 24, 6,
- 16, 25, 18, 23, 12, 21, 13, 28, 24, 33,
- 9, 19, 23, 17, 9, 22, 38, 22, 8, 31,
- 29, 25, 28, 28, 25, 13, 15, 21, 26, 11,
- 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
- 11, 12, 19, 12, 25, 24,
- // Jeremiah
- 19, 37, 25, 31, 31, 29, 34, 21, 26, 25,
- 23, 17, 27, 21, 21, 21, 27, 23, 15, 18,
- 12, 30, 40, 10, 38, 24, 18, 17, 31, 23,
- 40, 44, 13, 22, 19, 32, 21, 29, 18, 16,
- 18, 22, 13, 30, 5, 28, 7, 44, 38, 46,
- 63, 34,
- // Baruch?
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 22, 35, 38, 37, 9,
- // Lamentations
- 22, 22, 66, 22, 22,
- // Epistle of Jeremiah
- 0,
- // Ezekiel
- 27, 9, 27, 17, 17, 14, 27, 18, 11, 22,
- 24, 28, 23, 23, 8, 63, 24, 31, 14, 48,
- 32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
- 18, 32, 33, 30, 15, 38, 28, 23, 29, 49,
- 26, 20, 27, 31, 25, 24, 23, 34,
- // Prayer of Azariah
- 0,
- // Susanna
- 0,
- // Daniel
- 20, 49, 30, 37, 30, 28, 28, 27, 27, 21,
- 45, 13,
- // Bel and the Dragon
- 0,
- // I Enoch
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,
- // Odes
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,
-};
-
-
-SWORD_NAMESPACE_END
-
-
-#endif
+/******************************************************************************
+ *
+ * canon_thomson.h - Versification data for the Thomson system
+ *
+ * $Id$
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef CANON_THOMSON_H
+#define CANON_THOMSON_H
+
+SWORD_NAMESPACE_START
+
+// Versification system: Thomson
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal
+
+// Source: http://thetencommandmentsministry.us/ministry/charles_thomson/ (Internet Archive & Google Books)
+
+/******************************************************************************
+ * [on]tbooks_thomson - initialize static instance for all canonical
+ * text names and chapmax
+ */
+struct sbook otbooks_thomson[] = {
+ {"Genesis", "Gen", "Gen", 50},
+ {"Exodus", "Exod", "Exod", 40},
+ {"Leviticus", "Lev", "Lev", 27},
+ {"Numbers", "Num", "Num", 36},
+ {"Deuteronomy", "Deut", "Deut", 34},
+ {"Joshua", "Josh", "Josh", 24},
+ {"Judges", "Judg", "Judg", 21},
+ {"Ruth", "Ruth", "Ruth", 4},
+ {"I Samuel", "1Sam", "1Sam", 31},
+ {"II Samuel", "2Sam", "2Sam", 24},
+ {"I Kings", "1Kgs", "1Kgs", 22},
+ {"II Kings", "2Kgs", "2Kgs", 25},
+ {"I Chronicles", "1Chr", "1Chr", 29},
+ {"II Chronicles", "2Chr", "2Chr", 36},
+ {"I Esdras", "1Esd", "1Esd", 9},
+ {"Ezra", "Ezra", "Ezra", 10},
+ {"Nehemiah", "Neh", "Neh", 13},
+ {"Esther", "Esth", "Esth", 16},
+ {"Judith", "Jdt", "Jdt", 16},
+ {"Tobit", "Tob", "Tob", 14},
+ {"I Maccabees", "1Macc", "1Macc", 16},
+ {"II Maccabees", "2Macc", "2Macc", 15},
+ {"III Maccabees", "3Macc", "3Macc", 7},
+ {"IV Maccabees", "4Macc", "4Macc", 18},
+ {"Psalms", "Ps", "Ps", 151},
+ {"Prayer of Manasses", "PrMan", "PrMan", 1},
+ {"Proverbs", "Prov", "Prov", 31},
+ {"Ecclesiastes", "Eccl", "Eccl", 12},
+ {"Song of Solomon", "Song", "Song", 8},
+ {"Job", "Job", "Job", 42},
+ {"Wisdom", "Wis", "Wis", 19},
+ {"Sirach", "Sir", "Sir", 51},
+ {"Psalms of Solomon", "PssSol", "PssSol", 18},
+ {"Hosea", "Hos", "Hos", 14},
+ {"Amos", "Amos", "Amos", 9},
+ {"Micah", "Mic", "Mic", 7},
+ {"Joel", "Joel", "Joel", 4},
+ {"Obadiah", "Obad", "Obad", 1},
+ {"Jonah", "Jonah", "Jonah", 4},
+ {"Nahum", "Nah", "Nah", 3},
+ {"Habakkuk", "Hab", "Hab", 3},
+ {"Zephaniah", "Zeph", "Zeph", 3},
+ {"Haggai", "Hag", "Hag", 2},
+ {"Zechariah", "Zech", "Zech", 14},
+ {"Malachi", "Mal", "Mal", 4},
+ {"Isaiah", "Isa", "Isa", 66},
+ {"Jeremiah", "Jer", "Jer", 52},
+ {"Baruch", "Bar", "Bar", 5},
+ {"Lamentations", "Lam", "Lam", 5},
+ {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+ {"Ezekiel", "Ezek", "Ezek", 48},
+ {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+ {"Susanna", "Sus", "Sus", 1},
+ {"Daniel", "Dan", "Dan", 12},
+ {"Bel and the Dragon", "Bel", "Bel", 1},
+ {"I Enoch", "1En", "1En", 108},
+ {"Odes", "Odes", "Odes", 14},
+ {"", "", "", 0}
+};
+
+/******************************************************************************
+ * Maximum verses per chapter
+ */
+
+int vm_thomson[] = {
+ // Genesis
+ 31, 24, 23, 26, 28, 22, 24, 22, 29, 32,
+ 32, 20, 18, 24, 21, 15, 26, 32, 38, 18,
+ 34, 24, 20, 66, 34, 34, 46, 22, 35, 43,
+ 55, 32, 20, 31, 28, 43, 36, 30, 23, 22,
+ 56, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+ // Exodus
+ 22, 24, 22, 31, 22, 28, 25, 32, 35, 28,
+ 10, 50, 22, 31, 27, 35, 15, 27, 25, 26,
+ 36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+ 18, 35, 23, 35, 35, 8, 0, 0, 0, 38,
+ // Leviticus
+ 17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+ 47, 8, 59, 54, 33, 33, 16, 30, 36, 26,
+ 24, 33, 44, 23, 54, 46, 34,
+ // Numbers
+ 54, 34, 51, 48, 30, 27, 89, 26, 23, 36,
+ 35, 15, 33, 45, 41, 50, 13, 32, 22, 29,
+ 35, 41, 30, 25, 17, 65, 22, 31, 40, 16,
+ 54, 42, 56, 29, 34, 13,
+ // Deuteronomy
+ 45, 37, 28, 49, 33, 25, 26, 20, 29, 22,
+ 31, 32, 18, 28, 23, 21, 20, 22, 20, 20,
+ 22, 30, 25, 22, 19, 19, 27, 68, 29, 20,
+ 30, 52, 29, 10,
+ // Joshua
+ 18, 24, 17, 24, 15, 27, 26, 35, 27, 41,
+ 23, 15, 32, 14, 63, 10, 18, 25, 51, 9,
+ 45, 34, 16, 33,
+ // Judges
+ 36, 22, 31, 23, 32, 40, 25, 34, 57, 18,
+ 40, 15, 25, 20, 20, 31, 12, 31, 30, 48,
+ 25,
+ // Ruth
+ 22, 23, 18, 18,
+ // I Samuel
+ 28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+ 15, 25, 23, 52, 35, 23, 54, 28, 24, 42,
+ 15, 23, 29, 22, 43, 25, 12, 25, 11, 31,
+ 13,
+ // II Samuel
+ 27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+ 27, 31, 38, 33, 37, 23, 29, 33, 43, 23,
+ 22, 51, 26, 25,
+ // I Kings
+ 53, 46, 28, 34, 17, 38, 51, 66, 27, 28,
+ 43, 33, 34, 29, 34, 34, 24, 45, 21, 29,
+ 43, 52,
+ // II Kings
+ 18, 25, 27, 44, 27, 33, 19, 29, 37, 36,
+ 20, 21, 25, 29, 38, 20, 41, 37, 37, 20,
+ 26, 20, 37, 20, 29,
+ // I Chronicles
+ 51, 55, 24, 43, 26, 77, 40, 39, 44, 14,
+ 47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
+ 30, 19, 32, 31, 30, 32, 33, 21, 29,
+ // II Chronicles
+ 17, 18, 17, 22, 14, 40, 22, 17, 30, 19,
+ 23, 16, 22, 14, 19, 14, 18, 34, 11, 36,
+ 20, 11, 21, 27, 28, 23, 9, 27, 36, 27,
+ 2, 33, 24, 33, 27, 22,
+ // I Esdras
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Ezra
+ 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+ // Nehemiah
+ 11, 19, 32, 23, 19, 19, 73, 18, 38, 39,
+ 36, 47, 30,
+ // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+ 21, 23, 15, 17, 14, 14, 10, 17, 31, 3,
+ 0, 0, 0, 0, 0, 0,
+ // Judith
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // Tobit
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ // I Maccabees?
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ // II Maccabees?
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0,
+ // III Maccabees?
+ 0, 0, 0, 0, 0, 0, 0,
+ // IV Maccabees?
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Psalms
+ 6, 12, 8, 8, 11, 10, 15, 9, 20, 18,
+ 7, 8, 5, 7, 5, 11, 15, 50, 14, 9,
+ 13, 31, 6, 10, 22, 12, 14, 9, 11, 12,
+ 24, 11, 22, 22, 28, 12, 40, 22, 13, 17,
+ 13, 11, 5, 26, 17, 11, 9, 14, 20, 23,
+ 19, 9, 6, 7, 23, 13, 11, 10, 17, 12,
+ 8, 11, 11, 10, 13, 20, 7, 35, 35, 5,
+ 24, 19, 28, 23, 9, 12, 19, 72, 13, 19,
+ 16, 8, 18, 12, 13, 17, 7, 18, 52, 17,
+ 16, 15, 5, 23, 11, 13, 12, 9, 9, 5,
+ 8, 28, 22, 35, 45, 48, 43, 13, 31, 7,
+ 10, 10, 9, 8, 18, 19, 1, 29, 176, 7,
+ 8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+ 3, 18, 3, 3, 21, 26, 9, 8, 24, 13,
+ 10, 7, 12, 15, 22, 10, 20, 14, 9, 6,
+ 1,
+ // Prayer of Manasses
+ 0,
+ // Proverbs
+ 33, 22, 35, 27, 23, 35, 28, 37, 18, 32,
+ 31, 28, 25, 35, 33, 33, 28, 22, 29, 30,
+ 31, 28, 35, 34, 28, 28, 27, 28, 27, 33,
+ 31,
+ // Ecclesiastes
+ 18, 26, 22, 16, 20, 12, 29, 17, 18, 20,
+ 10, 13,
+ // Song of Solomon
+ 17, 17, 11, 16, 16, 13, 13, 15,
+ // Job
+ 22, 13, 26, 21, 27, 30, 22, 22, 35, 22,
+ 20, 25, 27, 22, 35, 22, 16, 21, 29, 29,
+ 34, 30, 17, 25, 6, 14, 22, 27, 25, 31,
+ 40, 22, 33, 35, 16, 32, 24, 41, 29, 24,
+ 34, 17,
+ // Wisdom
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ // Sirach
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0,
+ // Psalms of Solomon
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Hosea
+ 11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+ 12, 13, 16, 9,
+ // Amos
+ 15, 16, 15, 13, 26, 14, 17, 13, 15,
+ // Micah
+ 16, 13, 12, 13, 14, 16, 19,
+ // Joel
+ 20, 32, 21, 0,
+ // Obadiah
+ 21,
+ // Jonah
+ 17, 10, 10, 11,
+ // Nahum
+ 15, 13, 19,
+ // Habakkuk
+ 16, 20, 19,
+ // Zephaniah
+ 18, 15, 20,
+ // Haggai
+ 14, 23,
+ // Zechariah
+ 21, 13, 10, 13, 11, 15, 13, 23, 17, 12,
+ 17, 13, 9, 21,
+ // Malachi
+ 14, 17, 18, 6
+ // Isaiah
+ 31, 21, 26, 6, 30, 13, 25, 22, 20, 33,
+ 16, 6, 22, 32, 9, 14, 14, 7, 24, 6,
+ 16, 25, 18, 23, 12, 21, 13, 28, 24, 33,
+ 9, 19, 23, 17, 9, 22, 38, 22, 8, 31,
+ 29, 25, 28, 28, 25, 13, 15, 21, 26, 11,
+ 23, 15, 12, 17, 13, 11, 21, 14, 21, 22,
+ 11, 12, 19, 12, 25, 24,
+ // Jeremiah
+ 19, 37, 25, 31, 31, 29, 34, 21, 26, 25,
+ 23, 17, 27, 21, 21, 21, 27, 23, 15, 18,
+ 12, 30, 40, 10, 38, 24, 18, 17, 31, 23,
+ 40, 44, 13, 22, 19, 32, 21, 29, 18, 16,
+ 18, 22, 13, 30, 5, 28, 7, 44, 38, 46,
+ 63, 34,
+ // Baruch?
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 22, 35, 38, 37, 9,
+ // Lamentations
+ 22, 22, 66, 22, 22,
+ // Epistle of Jeremiah
+ 0,
+ // Ezekiel
+ 27, 9, 27, 17, 17, 14, 27, 18, 11, 22,
+ 24, 28, 23, 23, 8, 63, 24, 31, 14, 48,
+ 32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+ 18, 32, 33, 30, 15, 38, 28, 23, 29, 49,
+ 26, 20, 27, 31, 25, 24, 23, 34,
+ // Prayer of Azariah
+ 0,
+ // Susanna
+ 0,
+ // Daniel
+ 20, 49, 30, 37, 30, 28, 28, 27, 27, 21,
+ 45, 13,
+ // Bel and the Dragon
+ 0,
+ // I Enoch
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ // Odes
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
Property changes on: trunk/versification/lxx_v11ns/canon_thomson.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id
Added: svn:eol-style
+ native
Modified: trunk/versification/makeabbrevs.pl
===================================================================
--- trunk/versification/makeabbrevs.pl 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/makeabbrevs.pl 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,81 +1,81 @@
-#!/usr/bin/perl
-
-# $finalBook = "Rev"; # quit reading canon files after we reach this book (an OSIS id)-- this is a temporary measure for 1.6.0, since we don't support any apocrypha yet anyway
-
-# @canons will contain this list of files, these are in a basic XML format.
-# Each file lists osisIDs along with the English names associated with the
-# osisID. These aren't exhaustive, and may or may not overlap (but hopefully
-# don't). We are only using these to load mappings from osisIDs.
- at canons = (
- "canon.bible.xml", # the Bible, broadly defined
-# "canon.af.xml", # Apostolic Fathers
-# "canon.otp.xml", # OT pseudepigrapha
-# "canon.nta.xml", # NT apocrypha
-# "canon.lds.xml", # Mormon books
-# "canon.naghammadi.xml", # Nag Hammadi Library
-# "canon.qumran.xml", # Qumran mss
-# "canon.classical.xml", # intended for classical works, currently just Josephus
-);
-
- at abbrevsQueue = ();
-
-if ($finalBook eq "") {
- $finalBook = "\#PARSE ALL BOOKS\#";
-}
-
-foreach $mapfile (@canons) {
- open MAP, "$mapfile";
- while (<MAP>) {
- $line = $_;
-
- $line =~ s/<!\-\-.+?\-\->//g;
- $line =~ s/\&/\&/g;
-
- if ($line =~ /<id>(.+?)<\/id>/) {
- if ($id eq $finalBook) {
- last;
- }
- $id = $1;
- $osis{lc($id)} = $id;
- push @abbrevsQueue, uc($id);
- }
- elsif ($line =~ /<name>(.+?)<\/name>/) {
- $name = $1;
- if ($osis{lc($name)} eq "") {
- $osis{lc($name)} = $id;
- push @abbrevsQueue, uc($name);
- }
- else {
- if ($warn) {
- print "ERROR: Duplicate mapping from $id found in $mapfile.\n";
- }
- }
-
- if ($idmap{$id} eq "") {
- $idmap{$id} = $name;
- }
- else {
- # Duplicates most likely indicate alternate names, so ignore them.
- if ($warn) {
- print "ERROR: Duplicate mapping from $id found in $mapfile.\n";
- }
- }
- }
- }
- close (MAP);
-}
-
-$abbrevs = "/******************************************************************************\n * canon_abbrevs.h - Canonical text information to be included by VerseKey.cpp\n *\n * Copyright 1998-2009 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\n#ifndef CANON_ABBREVS_H\n#define CANON_ABBREVS_H\n\nSWORD_NAMESPACE_START\n\n\n/******************************************************************************\n * Abbreviations - MUST be in alphabetical order & by PRIORITY\n * RULE: first match of entire key\n * (e.g. key: \"1CH\"; match: \"1CHRONICLES\")\n */\n\nconst struct abbrev builtin_abbrevs\[\] = {\n";
-
- at abbrevsQueue = sort @abbrevsQueue;
-foreach $a (@abbrevsQueue) {
- if ($a =~ /^.+\d/) {
- $abbrevs .= "//";
- }
- $abbrevs .= " {\"" . $a . "\", \"" . $osis{lc($a)} . "\"},\t\t// " . $idmap{$osis{lc($a)}} . "\n";
-}
-$abbrevs .= " {\"\", \"\"}\n};\n\n\nSWORD_NAMESPACE_END\n\n\n#endif\n";
-
-open OUTF, ">canon_abbrevs.h";
-print OUTF $abbrevs;
-close OUTF;
+#!/usr/bin/perl
+
+# $finalBook = "Rev"; # quit reading canon files after we reach this book (an OSIS id)-- this is a temporary measure for 1.6.0, since we don't support any apocrypha yet anyway
+
+# @canons will contain this list of files, these are in a basic XML format.
+# Each file lists osisIDs along with the English names associated with the
+# osisID. These aren't exhaustive, and may or may not overlap (but hopefully
+# don't). We are only using these to load mappings from osisIDs.
+ at canons = (
+ "canon.bible.xml", # the Bible, broadly defined
+# "canon.af.xml", # Apostolic Fathers
+# "canon.otp.xml", # OT pseudepigrapha
+# "canon.nta.xml", # NT apocrypha
+# "canon.lds.xml", # Mormon books
+# "canon.naghammadi.xml", # Nag Hammadi Library
+# "canon.qumran.xml", # Qumran mss
+# "canon.classical.xml", # intended for classical works, currently just Josephus
+);
+
+ at abbrevsQueue = ();
+
+if ($finalBook eq "") {
+ $finalBook = "\#PARSE ALL BOOKS\#";
+}
+
+foreach $mapfile (@canons) {
+ open MAP, "$mapfile";
+ while (<MAP>) {
+ $line = $_;
+
+ $line =~ s/<!\-\-.+?\-\->//g;
+ $line =~ s/\&/\&/g;
+
+ if ($line =~ /<id>(.+?)<\/id>/) {
+ if ($id eq $finalBook) {
+ last;
+ }
+ $id = $1;
+ $osis{lc($id)} = $id;
+ push @abbrevsQueue, uc($id);
+ }
+ elsif ($line =~ /<name>(.+?)<\/name>/) {
+ $name = $1;
+ if ($osis{lc($name)} eq "") {
+ $osis{lc($name)} = $id;
+ push @abbrevsQueue, uc($name);
+ }
+ else {
+ if ($warn) {
+ print "ERROR: Duplicate mapping from $id found in $mapfile.\n";
+ }
+ }
+
+ if ($idmap{$id} eq "") {
+ $idmap{$id} = $name;
+ }
+ else {
+ # Duplicates most likely indicate alternate names, so ignore them.
+ if ($warn) {
+ print "ERROR: Duplicate mapping from $id found in $mapfile.\n";
+ }
+ }
+ }
+ }
+ close (MAP);
+}
+
+$abbrevs = "/******************************************************************************\n * canon_abbrevs.h - Canonical text information to be included by VerseKey.cpp\n *\n * Copyright 1998-2009 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\n#ifndef CANON_ABBREVS_H\n#define CANON_ABBREVS_H\n\nSWORD_NAMESPACE_START\n\n\n/******************************************************************************\n * Abbreviations - MUST be in alphabetical order & by PRIORITY\n * RULE: first match of entire key\n * (e.g. key: \"1CH\"; match: \"1CHRONICLES\")\n */\n\nconst struct abbrev builtin_abbrevs\[\] = {\n";
+
+ at abbrevsQueue = sort @abbrevsQueue;
+foreach $a (@abbrevsQueue) {
+ if ($a =~ /^.+\d/) {
+ $abbrevs .= "//";
+ }
+ $abbrevs .= " {\"" . $a . "\", \"" . $osis{lc($a)} . "\"},\t\t// " . $idmap{$osis{lc($a)}} . "\n";
+}
+$abbrevs .= " {\"\", \"\"}\n};\n\n\nSWORD_NAMESPACE_END\n\n\n#endif\n";
+
+open OUTF, ">canon_abbrevs.h";
+print OUTF $abbrevs;
+close OUTF;
Property changes on: trunk/versification/makeabbrevs.pl
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/versification/v11n_check.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/versification/v11nexport.pl
===================================================================
--- trunk/versification/v11nexport.pl 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/v11nexport.pl 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,117 +1,117 @@
-#!/usr/bin/perl
-
-if (@ARGV[0] eq "") {
- print "This is an /extremely/ rudimentary utility for exporting a v11n definition (canon.h-type) file into a list of verses contained in that v11n.\nIt takes one mandatory argument: a canon.h-type file.\nIt can take two additional arugments.\nIf one of them is \"osis\" the output will be an OSIS file.\nThe other optional argument will be used as the name of the output file.";
- exit();
-}
-
-open (INF, @ARGV[0]);
-
-$name = "v11n";
-if (@ARGV[1] ne "") {
- $arg = @ARGV[1];
- if ($arg =~ /^osis$/i) {
- $osis = true;
- }
- else {
- $name = $arg;
- }
- if (@ARGV[2] ne "") {
- $arg = @ARGV[2];
- if ($arg =~ /osis/i && $osis == false) {
- $osis = true;
- }
- else {
- $name = $arg;
- }
- }
-}
-
-if ($osis) {
- open (OUTF, ">$name.osis.xml");
-}
-else {
- open (OUTF, ">$name.imp");
-}
-
-$mode = 0;
-
-while (<INF>) {
- $line = $_;
- if ($line =~ /struct\s+sbook/) {
- $mode = 1;
- }
- elsif ($line =~ /int\s+vm/) {
- $mode = 2;
- }
- else {
- if ($mode == 1) {
- if ($line =~ /{\".+?\", \".+?\", \"(.+?)\", (\d+)}/) {
- $book{$1} = $2;
- push @bookList, $1;
- }
- }
- if ($mode == 2) {
- if ($line =~ /^([\s\d,]+)$/) {
- $vssList .= "$1, ";
- }
- }
- }
-}
-
-$vssList =~ s/\s*//g;
-$vssList =~ s/,,/,/g;
-
-if ($osis) {
- print OUTF "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osis xmlns=\"http://www.bibletechnologies.net/2003/OSIS/namespace\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace http://www.bibletechnologies.net/osisCore.2.1.1.xsd\">\n<osisText osisRefWork=\"Bible\" xml:lang=\"en\" osisIDWork=\"Bible.canondemo\">\n<header>\n<work osisWork=\"Bible.canondemo\"/>\n</header>\n";
-}
-
-
-while (@bookList != ()) {
- if ($osis && $thisBook ne "") {
- print OUTF "<\/chapter>\n";
- print OUTF "<\/div>\n";
- }
-
- $thisBook = shift @bookList;
- $cmax = $book{$thisBook};
- $thisChap = 0;
-
- if ($osis) {
- print OUTF "<div type=\"book\" osisID=\"$thisBook\">\n";
- }
-
- while ($thisChap < $cmax) {
- if ($osis && $thisChap != 0) {
- print OUTF "<\/chapter>\n";
- }
-
- $thisChap++;
-
- if ($osis) {
- print OUTF "<chapter osisID=\"$thisBook\.$thisChap\">\n";
- }
-
- $vssList =~ s/^(\d+),//;
- $vmax = $1;
- $thisVers = 0;
-
- while ($thisVers < $vmax) {
- $thisVers++;
-
- if ($osis) {
- print OUTF "<verse osisID=\"$thisBook\.$thisChap\.$thisVers\">\n$thisBook.$thisChap.$thisVers\n<\/verse>\n";
- }
- else {
- print OUTF "\$\$\$$thisBook $thisChap:$thisVers\n$thisBook.$thisChap.$thisVers\n";
- }
- }
- }
-}
-
-if ($osis) {
- print OUTF "<\/chapter>\n";
- print OUTF "<\/div>\n";
- print OUTF "<\/osisText>\n";
- print OUTF "<\/osis>\n";
-}
+#!/usr/bin/perl
+
+if (@ARGV[0] eq "") {
+ print "This is an /extremely/ rudimentary utility for exporting a v11n definition (canon.h-type) file into a list of verses contained in that v11n.\nIt takes one mandatory argument: a canon.h-type file.\nIt can take two additional arugments.\nIf one of them is \"osis\" the output will be an OSIS file.\nThe other optional argument will be used as the name of the output file.";
+ exit();
+}
+
+open (INF, @ARGV[0]);
+
+$name = "v11n";
+if (@ARGV[1] ne "") {
+ $arg = @ARGV[1];
+ if ($arg =~ /^osis$/i) {
+ $osis = true;
+ }
+ else {
+ $name = $arg;
+ }
+ if (@ARGV[2] ne "") {
+ $arg = @ARGV[2];
+ if ($arg =~ /osis/i && $osis == false) {
+ $osis = true;
+ }
+ else {
+ $name = $arg;
+ }
+ }
+}
+
+if ($osis) {
+ open (OUTF, ">$name.osis.xml");
+}
+else {
+ open (OUTF, ">$name.imp");
+}
+
+$mode = 0;
+
+while (<INF>) {
+ $line = $_;
+ if ($line =~ /struct\s+sbook/) {
+ $mode = 1;
+ }
+ elsif ($line =~ /int\s+vm/) {
+ $mode = 2;
+ }
+ else {
+ if ($mode == 1) {
+ if ($line =~ /{\".+?\", \".+?\", \"(.+?)\", (\d+)}/) {
+ $book{$1} = $2;
+ push @bookList, $1;
+ }
+ }
+ if ($mode == 2) {
+ if ($line =~ /^([\s\d,]+)$/) {
+ $vssList .= "$1, ";
+ }
+ }
+ }
+}
+
+$vssList =~ s/\s*//g;
+$vssList =~ s/,,/,/g;
+
+if ($osis) {
+ print OUTF "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osis xmlns=\"http://www.bibletechnologies.net/2003/OSIS/namespace\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace http://www.bibletechnologies.net/osisCore.2.1.1.xsd\">\n<osisText osisRefWork=\"Bible\" xml:lang=\"en\" osisIDWork=\"Bible.canondemo\">\n<header>\n<work osisWork=\"Bible.canondemo\"/>\n</header>\n";
+}
+
+
+while (@bookList != ()) {
+ if ($osis && $thisBook ne "") {
+ print OUTF "<\/chapter>\n";
+ print OUTF "<\/div>\n";
+ }
+
+ $thisBook = shift @bookList;
+ $cmax = $book{$thisBook};
+ $thisChap = 0;
+
+ if ($osis) {
+ print OUTF "<div type=\"book\" osisID=\"$thisBook\">\n";
+ }
+
+ while ($thisChap < $cmax) {
+ if ($osis && $thisChap != 0) {
+ print OUTF "<\/chapter>\n";
+ }
+
+ $thisChap++;
+
+ if ($osis) {
+ print OUTF "<chapter osisID=\"$thisBook\.$thisChap\">\n";
+ }
+
+ $vssList =~ s/^(\d+),//;
+ $vmax = $1;
+ $thisVers = 0;
+
+ while ($thisVers < $vmax) {
+ $thisVers++;
+
+ if ($osis) {
+ print OUTF "<verse osisID=\"$thisBook\.$thisChap\.$thisVers\">\n$thisBook.$thisChap.$thisVers\n<\/verse>\n";
+ }
+ else {
+ print OUTF "\$\$\$$thisBook $thisChap:$thisVers\n$thisBook.$thisChap.$thisVers\n";
+ }
+ }
+ }
+}
+
+if ($osis) {
+ print OUTF "<\/chapter>\n";
+ print OUTF "<\/div>\n";
+ print OUTF "<\/osisText>\n";
+ print OUTF "<\/osis>\n";
+}
Property changes on: trunk/versification/v11nexport.pl
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Modified: trunk/versification/v11nsys.pl
===================================================================
--- trunk/versification/v11nsys.pl 2013-07-23 15:49:19 UTC (rev 437)
+++ trunk/versification/v11nsys.pl 2013-07-23 15:52:52 UTC (rev 438)
@@ -1,356 +1,356 @@
-#!/usr/bin/perl
-
-###############################################################################
-#
-# versification (v11n) system .h file generator:
-# processes various file types, including VPL, IMP, OSIS, & CCEL's
-# versification XML files (see http://www.ccel.org/refsys/refsys.html)
-# and generates a C++ header file for use in the Sword project
-#
-###############################################################################
-
-
-$mode = "osis";
-$count = "last";
-$aMode = "";
-$warn = 1;
-
-($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-
-if (@ARGV[0] ne "") {
- $n = 0;
- while (@ARGV[$n] ne "") {
- if (@ARGV[$n] eq "--vpl") {
- $mode = "vpl";
- print "Set interpretation mode to VPL.\n";
- }
- elsif (@ARGV[$n] eq "--imp") {
- $mode = "imp";
- print "Set interpretation mode to IMP.\n";
- }
- elsif (@ARGV[$n] eq "--osis") {
- $mode = "osis";
- print "Set interpretation mode to OSIS.\n";
- }
- elsif (@ARGV[$n] eq "--xml") {
- $mode = "xml";
- }
- elsif (@ARGV[$n] eq "--count") {
- $count = "count";
- print "Set count mode to last.\n";
- }
- elsif (@ARGV[$n] eq "--last") {
- $count = "last";
- }
- elsif (@ARGV[$n] eq "--nowarn") {
- $warn = 0;
- print "Warning messages disabled.\n";
- }
- elsif (@ARGV[$n] =~ /--abbr=(.+)/) {
- $aMode = $1;
- print "Set abbreviation mode to \"$aMode\".\n";
- }
- elsif (@ARGV[$n] =~ /^\-+(h|\?|usage)/) {
- printUsage();
- exit();
- }
- else {
- push @srcfiles, @ARGV[$n];
- }
- $n++;
- }
-}
-if ($mode eq "xml") {
- print "Set interpretation mode to CCEL XML.\n";
-}
-if ($count eq "last") {
- print "Set count mode to last.\n";
-}
-
-if (@srcfiles == 0) {
- printUsage();
- exit();
-}
-
-sub buildBooksArrays {
- if ($lastBook ne "" && $osis{lc($lastBook)} eq "") {
- print "ERROR: Unknown book abbreviation: $lastBook in $v11n\n";
- }
- if ($osis{lc($lastBook)} eq "Matt") {
- $otnt = 1;
- }
-
- $osisBook = $osis{lc($lastBook)};
- if ($count eq "count") {
- $cval = $cCount;
- }
- else {
- $cval = $lastChap;
- }
- if ($otnt == 0) {
- $otbooks .= " {\"$idmap{$osisBook}\", \"$osisBook\", \"$osisBook\", $cval},\n";
- }
- else {
- $ntbooks .= " {\"$idmap{$osisBook}\", \"$osisBook\", \"$osisBook\", $cval},\n";
- }
- $bookOrder .= " $osisBook";
- if ($warn == 1) {
- if ($cCount ne $lastChap) {
- print "WARNING: chapter count ($cCount) does not equal last chapter ($lastChap) in book $osisBook of versification $v11n ($infile).\n";
- }
- }
-}
-
-sub printUsage() {
- print " v11nsys.pl --? --nowarn --(vpl|imp|xml|osis) --(count|last) --abbr=[abbrMode] [files]\n\n When run without any arguments, this script looks for the CCEL files: Bible.*.xml.\n\n Otherwise, supply the script with a list of files (or wildcard) and it will attempt to create a v11n system definition on that basis.\n\n --? prints usage (this).\n\n --nowarn turns warning messages off.\n\n --vpl instructs the script to interpret files as VPL files.\n --imp instructs the script to interpret files as IMP files.\n --xml instructs the script to interpret files as XML files using CCEL's definition format (default).\n --osis instructs the script to interpret files as OSIS XML files.\n\n --count instructs the script to count chapters/verse it encounters.\n --last instructs the script to assume that the last chapter/verse it encounters is equal to the number of chaptes/verses in a book/chapter (default).\n\n --abbr=[abbrMode] instructs the script to use an alternative set of abbreviations (olb, westminster, & lxx are currently defined) in preference to the default, whenever the two conflict.\n\n";
-}
-
-# @canons will contain this list of files, these are in a basic XML format.
-# Each file lists osisIDs along with the English names associated with the
-# osisID. These aren't exhaustive, and may or may not overlap (but hopefully
-# don't). We are only using these to load mappings from osisIDs.
- at canons = (
- "canon.bible.xml", # the Bible, broadly defined
- "canon.af.xml", # Apostolic Fathers
- "canon.otp.xml", # OT pseudepigrapha
- "canon.nta.xml", # NT apocrypha
- "canon.lds.xml", # Mormon books
- "canon.naghammadi.xml", # Nag Hammadi Library
- "canon.qumran.xml", # Qumran mss
- "canon.classical.xml", # intended for classical works, currently just Josephus
-);
-
-foreach $mapfile (@canons) {
- open MAP, "$mapfile";
- while (<MAP>) {
- $line = $_;
-
- $line =~ s/<!\-\-.+?\-\->//g;
- $line =~ s/\&/\&/g;
-
- if ($line =~ /<id>(.+?)<\/id>/) {
- $id = $1;
- $osis{lc($id)} = $id;
- $abbrevs{lc($id)} = "$id;"
- }
- elsif ($line =~ /<abbr mode=\"([^\"]+)\">(.+?)<\/abbr>/) {
- if ($aMode eq $1) {
- $name = $2;
- if ($osis{lc($name)} ne "") {
- if ($warn == 1) {
- print "WARNING: Duplicate mapping from $name found in $mapfile (<abbr mode=\"\">). Overwriting.\n";
- }
- }
- $osis{lc($name)} = $id;
- }
- }
- elsif ($line =~ /<abbr>(.+?)<\/abbr>/) {
- $name = $1;
- if ($osis{lc($name)} eq "") {
- $osis{lc($name)} = $id;
- }
- else {
- if ($osis{lc($name)} ne $id) {
- if ($warn == 1) {
- print "WARNING: Duplicate mapping from $name found in $mapfile (<abbr>).\n";
- }
- }
- }
- }
- elsif ($line =~ /<name>(.+?)<\/name>/) {
- $name = $1;
- if ($osis{lc($name)} eq "") {
- $osis{lc($name)} = $id;
- $abbrevs{lc($id)} .= "$name;"
- }
- else {
- if ($osis{lc($name)} ne $id) {
- if ($warn == 1) {
- print "WARNING: Duplicate mapping from $name found in $mapfile (<name>).\n";
- }
- }
- }
-
- # Always assign the first <name> value here, which should always be the Sword name of the book; ignore all subsequent <name>s.
- if ($idmap{$id} eq "") {
- $idmap{$id} = $name;
- }
- }
- }
- close (MAP);
-}
-
-foreach $infile (@srcfiles) {
- if ($infile =~ /^Bible.+xml$/) {
- $infile =~ /^Bible(\.(.+))?\.xml/;
- $v11n = $2;
- if ($v11n eq "") {
- $v11n = "NRSVA";
- }
- }
- else {
- $v11n = $infile;
- $v11n =~ s/\.[^\.]*$//;
- $v11n =~ s/^.+\///;
- }
- $outfile = lc("canon_$v11n.h");
-
- print "Processing $infile --> $outfile (v11n: $v11n).\n";
-
- open INF, $infile;
- open OUTF, ">$outfile";
-
- print OUTF "/******************************************************************************\n * $outfile - Versification data for the $v11n system\n *\n * Copyright " . ($year+1900) . " 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 CANON_" . uc($v11n) . "_H\n#define CANON_" . uc($v11n) . "_H\n\nSWORD_NAMESPACE_START\n\n\n";
-
- $thisBook = "";
- $thisChap = "";
- $thisVers = "";
-
- $bCount = 0;
- $cCount = 0;
- $vCount = 0;
-
- $abbrevs = "/******************************************************************************\n * Abbreviations - MUST be in alphabetical order & by PRIORITY\n * RULE: first match of entire key\n * (e.g. key: \"1CH\"; match: \"1CHRONICLES\")\n */\n\nconst struct abbrev builtin_abbrevs_" . lc($v11n) . "\[\] = {\n";
- $abbrevsCloser = " {\"\", \"\"}\n};\n\n\n";
- $abbrevsList = "";
-
- $vm = "/******************************************************************************\n * Maximum verses per chapter\n */\n\nint vm_" . lc($v11n) . "\[\] = {";
- $otbooks = "/******************************************************************************\n * [on]tbooks_" . lc($v11n) . " - initialize static instance for all canonical\n * text names and chapmax\n */\nstruct sbook otbooks_" . lc($v11n) . "\[\] = {\n";
- $ntbooks = "struct sbook ntbooks_" . lc($v11n) . "\[\] = {\n";
- $booksCloser = " {\"\", \"\", \"\", 0}\n};\n\n";
-
- $bookOrder = "// Book order:";
-
- $otnt = 0; # 0 = ot, 1 = nt
-
- $idList = "";
- if ($mode eq "osis") {
- while (<INF>) {
- $line = $_;
- $line =~ s/<verse([^>]+)(osisID=\"[^\"]+\")/$idList .= "$2\n";/eg;
- }
-
- close (INF);
-
- open (TMP, ">tempfile");
- print TMP $idList;
- close (TMP);
-
- open (INF, "tempfile");
- }
-
- while (<INF>) {
- $line = $_;
-
- $osisID = "";
-
- if ($line =~ /<osisID.+?code=\"([^\"]+?)\"\/>/) {
- $osisID = $1;
- }
- elsif ($mode eq "vpl" && $line =~ /^([^:]+?) ([0-9A-Za-z]+):([0-9A-Za-z]+)/) {
- $osisID = "$1.$2.$3";
- }
- elsif ($mode eq "imp" && $line =~ /^\$\$\$([^:]+?) ([0-9A-Za-z]+):([0-9A-Za-z]+)/) {
- $osisID = "$1.$2.$3";
- }
- elsif ($mode eq "osis" && $line =~ /osisID=\"([^\"]+)\"/) {
- $osisID = $1;
- }
-
- if ($osisID =~ /\.0(\.|$)/) { # in the case of chap/verse 0
- $osisID = "";
- }
-
- if ($osisID ne "") {
- $lastBook = $thisBook;
- $lastChap = $thisChap;
- $lastVers = $thisVers;
-
- $osisID =~ /([^\.]+)\.([a-zA-Z\d]+)\.([a-zA-Z\d]+)/;
-
- $thisBook = $1;
- $thisChap = $2;
- $thisVers = $3;
-
- if ((($thisBook ne $lastBook) || ($thisChap ne $lastChap)) && $lastVers ne "") {
- if ($count eq "count") {
- $vm .= "$vCount, ";
- }
- else {
- $vm .= "$lastVers, ";
- }
- if ($warn == 1) {
- if ($vCount ne $lastVers) {
- print "WARNING: verse count ($vCount) does not equal last verse ($lastVers) in chapter $osis{lc($lastBook)} $lastChap of versification $v11n ($infile).\n";
- }
- }
- }
-
- if ($thisBook ne $lastBook) {
- $bCount++;
- $vm .= "\n // $idmap{$osis{lc($thisBook)}}\n ";
- $abbrevsList .= $abbrevs{lc($osis{lc($thisBook)})};
-
- if ($lastBook ne "") {
- buildBooksArrays{};
- }
- $cCount = 1;
- $vCount = 1;
- }
- elsif ($thisChap ne $lastChap) {
- $cCount++;
- $vCount = 1;
- }
- elsif ($thisVers ne $lastVers) {
- $vCount++;
- }
- }
- }
- if ($count eq "count") {
- $vm .= "$vCount";
- }
- else {
- $vm .= "$thisVers";
- }
- $vm .= "\n};\n";
- $vm =~ s/((\d+, ){10})(?=\d+,)/\1\n /g;
-
- if ($warn == 1) {
- if ($vCount ne $thisVers) {
- print "WARNING: verse count ($vCount) does not equal last verse ($thisVers) in chapter $osis{lc($lastBook)} $lastChap of versification $v11n ($infile).\n";
- }
- }
-
- buildBooksArrays();
- $otbooks .= $booksCloser;
- $ntbooks .= $booksCloser;
-
- $abbrevsList = lc($abbrevsList);
- @abbrevsQueue = ();
- while ($abbrevsList =~ /^(.+?);/) {
- push @abbrevsQueue, $1;
- $abbrevsList =~ s/^(.+?);//;
- }
- @abbrevsQueue = sort @abbrevsQueue;
- foreach $a (@abbrevsQueue) {
- $abbrevs .= " {\"" . uc($a) . "\", \"" . $osis{lc($a)} . "\"},\t\t// " . $idmap{$osis{lc($a)}} . "\n";
- }
- $abbrevs .= $abbrevsCloser;
-
-
-
- print OUTF "// Versification system: $v11n\n";
- print OUTF "$bookOrder\n\n";
-
- print OUTF $otbooks;
- print OUTF $ntbooks;
-# print OUTF $abbrevs; # line disabled so that we don't print out replacement builtin_abbrev line
- print OUTF $vm;
-
- print OUTF "\n\nSWORD_NAMESPACE_END\n\n\n#endif\n";
-
- close (INF);
- close (OUTF);
- unlink("tempfile");
-}
+#!/usr/bin/perl
+
+###############################################################################
+#
+# versification (v11n) system .h file generator:
+# processes various file types, including VPL, IMP, OSIS, & CCEL's
+# versification XML files (see http://www.ccel.org/refsys/refsys.html)
+# and generates a C++ header file for use in the Sword project
+#
+###############################################################################
+
+
+$mode = "osis";
+$count = "last";
+$aMode = "";
+$warn = 1;
+
+($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+
+if (@ARGV[0] ne "") {
+ $n = 0;
+ while (@ARGV[$n] ne "") {
+ if (@ARGV[$n] eq "--vpl") {
+ $mode = "vpl";
+ print "Set interpretation mode to VPL.\n";
+ }
+ elsif (@ARGV[$n] eq "--imp") {
+ $mode = "imp";
+ print "Set interpretation mode to IMP.\n";
+ }
+ elsif (@ARGV[$n] eq "--osis") {
+ $mode = "osis";
+ print "Set interpretation mode to OSIS.\n";
+ }
+ elsif (@ARGV[$n] eq "--xml") {
+ $mode = "xml";
+ }
+ elsif (@ARGV[$n] eq "--count") {
+ $count = "count";
+ print "Set count mode to last.\n";
+ }
+ elsif (@ARGV[$n] eq "--last") {
+ $count = "last";
+ }
+ elsif (@ARGV[$n] eq "--nowarn") {
+ $warn = 0;
+ print "Warning messages disabled.\n";
+ }
+ elsif (@ARGV[$n] =~ /--abbr=(.+)/) {
+ $aMode = $1;
+ print "Set abbreviation mode to \"$aMode\".\n";
+ }
+ elsif (@ARGV[$n] =~ /^\-+(h|\?|usage)/) {
+ printUsage();
+ exit();
+ }
+ else {
+ push @srcfiles, @ARGV[$n];
+ }
+ $n++;
+ }
+}
+if ($mode eq "xml") {
+ print "Set interpretation mode to CCEL XML.\n";
+}
+if ($count eq "last") {
+ print "Set count mode to last.\n";
+}
+
+if (@srcfiles == 0) {
+ printUsage();
+ exit();
+}
+
+sub buildBooksArrays {
+ if ($lastBook ne "" && $osis{lc($lastBook)} eq "") {
+ print "ERROR: Unknown book abbreviation: $lastBook in $v11n\n";
+ }
+ if ($osis{lc($lastBook)} eq "Matt") {
+ $otnt = 1;
+ }
+
+ $osisBook = $osis{lc($lastBook)};
+ if ($count eq "count") {
+ $cval = $cCount;
+ }
+ else {
+ $cval = $lastChap;
+ }
+ if ($otnt == 0) {
+ $otbooks .= " {\"$idmap{$osisBook}\", \"$osisBook\", \"$osisBook\", $cval},\n";
+ }
+ else {
+ $ntbooks .= " {\"$idmap{$osisBook}\", \"$osisBook\", \"$osisBook\", $cval},\n";
+ }
+ $bookOrder .= " $osisBook";
+ if ($warn == 1) {
+ if ($cCount ne $lastChap) {
+ print "WARNING: chapter count ($cCount) does not equal last chapter ($lastChap) in book $osisBook of versification $v11n ($infile).\n";
+ }
+ }
+}
+
+sub printUsage() {
+ print " v11nsys.pl --? --nowarn --(vpl|imp|xml|osis) --(count|last) --abbr=[abbrMode] [files]\n\n When run without any arguments, this script looks for the CCEL files: Bible.*.xml.\n\n Otherwise, supply the script with a list of files (or wildcard) and it will attempt to create a v11n system definition on that basis.\n\n --? prints usage (this).\n\n --nowarn turns warning messages off.\n\n --vpl instructs the script to interpret files as VPL files.\n --imp instructs the script to interpret files as IMP files.\n --xml instructs the script to interpret files as XML files using CCEL's definition format (default).\n --osis instructs the script to interpret files as OSIS XML files.\n\n --count instructs the script to count chapters/verse it encounters.\n --last instructs the script to assume that the last chapter/verse it encounters is equal to the number of chaptes/verses in a book/chapter (default).\n\n --abbr=[abbrMode] instructs the script to use an alternative set of abbreviations (olb, westminster, & lxx are currently defined) in preference to the default, whenever the two conflict.\n\n";
+}
+
+# @canons will contain this list of files, these are in a basic XML format.
+# Each file lists osisIDs along with the English names associated with the
+# osisID. These aren't exhaustive, and may or may not overlap (but hopefully
+# don't). We are only using these to load mappings from osisIDs.
+ at canons = (
+ "canon.bible.xml", # the Bible, broadly defined
+ "canon.af.xml", # Apostolic Fathers
+ "canon.otp.xml", # OT pseudepigrapha
+ "canon.nta.xml", # NT apocrypha
+ "canon.lds.xml", # Mormon books
+ "canon.naghammadi.xml", # Nag Hammadi Library
+ "canon.qumran.xml", # Qumran mss
+ "canon.classical.xml", # intended for classical works, currently just Josephus
+);
+
+foreach $mapfile (@canons) {
+ open MAP, "$mapfile";
+ while (<MAP>) {
+ $line = $_;
+
+ $line =~ s/<!\-\-.+?\-\->//g;
+ $line =~ s/\&/\&/g;
+
+ if ($line =~ /<id>(.+?)<\/id>/) {
+ $id = $1;
+ $osis{lc($id)} = $id;
+ $abbrevs{lc($id)} = "$id;"
+ }
+ elsif ($line =~ /<abbr mode=\"([^\"]+)\">(.+?)<\/abbr>/) {
+ if ($aMode eq $1) {
+ $name = $2;
+ if ($osis{lc($name)} ne "") {
+ if ($warn == 1) {
+ print "WARNING: Duplicate mapping from $name found in $mapfile (<abbr mode=\"\">). Overwriting.\n";
+ }
+ }
+ $osis{lc($name)} = $id;
+ }
+ }
+ elsif ($line =~ /<abbr>(.+?)<\/abbr>/) {
+ $name = $1;
+ if ($osis{lc($name)} eq "") {
+ $osis{lc($name)} = $id;
+ }
+ else {
+ if ($osis{lc($name)} ne $id) {
+ if ($warn == 1) {
+ print "WARNING: Duplicate mapping from $name found in $mapfile (<abbr>).\n";
+ }
+ }
+ }
+ }
+ elsif ($line =~ /<name>(.+?)<\/name>/) {
+ $name = $1;
+ if ($osis{lc($name)} eq "") {
+ $osis{lc($name)} = $id;
+ $abbrevs{lc($id)} .= "$name;"
+ }
+ else {
+ if ($osis{lc($name)} ne $id) {
+ if ($warn == 1) {
+ print "WARNING: Duplicate mapping from $name found in $mapfile (<name>).\n";
+ }
+ }
+ }
+
+ # Always assign the first <name> value here, which should always be the Sword name of the book; ignore all subsequent <name>s.
+ if ($idmap{$id} eq "") {
+ $idmap{$id} = $name;
+ }
+ }
+ }
+ close (MAP);
+}
+
+foreach $infile (@srcfiles) {
+ if ($infile =~ /^Bible.+xml$/) {
+ $infile =~ /^Bible(\.(.+))?\.xml/;
+ $v11n = $2;
+ if ($v11n eq "") {
+ $v11n = "NRSVA";
+ }
+ }
+ else {
+ $v11n = $infile;
+ $v11n =~ s/\.[^\.]*$//;
+ $v11n =~ s/^.+\///;
+ }
+ $outfile = lc("canon_$v11n.h");
+
+ print "Processing $infile --> $outfile (v11n: $v11n).\n";
+
+ open INF, $infile;
+ open OUTF, ">$outfile";
+
+ print OUTF "/******************************************************************************\n * $outfile - Versification data for the $v11n system\n *\n * Copyright " . ($year+1900) . " 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 CANON_" . uc($v11n) . "_H\n#define CANON_" . uc($v11n) . "_H\n\nSWORD_NAMESPACE_START\n\n\n";
+
+ $thisBook = "";
+ $thisChap = "";
+ $thisVers = "";
+
+ $bCount = 0;
+ $cCount = 0;
+ $vCount = 0;
+
+ $abbrevs = "/******************************************************************************\n * Abbreviations - MUST be in alphabetical order & by PRIORITY\n * RULE: first match of entire key\n * (e.g. key: \"1CH\"; match: \"1CHRONICLES\")\n */\n\nconst struct abbrev builtin_abbrevs_" . lc($v11n) . "\[\] = {\n";
+ $abbrevsCloser = " {\"\", \"\"}\n};\n\n\n";
+ $abbrevsList = "";
+
+ $vm = "/******************************************************************************\n * Maximum verses per chapter\n */\n\nint vm_" . lc($v11n) . "\[\] = {";
+ $otbooks = "/******************************************************************************\n * [on]tbooks_" . lc($v11n) . " - initialize static instance for all canonical\n * text names and chapmax\n */\nstruct sbook otbooks_" . lc($v11n) . "\[\] = {\n";
+ $ntbooks = "struct sbook ntbooks_" . lc($v11n) . "\[\] = {\n";
+ $booksCloser = " {\"\", \"\", \"\", 0}\n};\n\n";
+
+ $bookOrder = "// Book order:";
+
+ $otnt = 0; # 0 = ot, 1 = nt
+
+ $idList = "";
+ if ($mode eq "osis") {
+ while (<INF>) {
+ $line = $_;
+ $line =~ s/<verse([^>]+)(osisID=\"[^\"]+\")/$idList .= "$2\n";/eg;
+ }
+
+ close (INF);
+
+ open (TMP, ">tempfile");
+ print TMP $idList;
+ close (TMP);
+
+ open (INF, "tempfile");
+ }
+
+ while (<INF>) {
+ $line = $_;
+
+ $osisID = "";
+
+ if ($line =~ /<osisID.+?code=\"([^\"]+?)\"\/>/) {
+ $osisID = $1;
+ }
+ elsif ($mode eq "vpl" && $line =~ /^([^:]+?) ([0-9A-Za-z]+):([0-9A-Za-z]+)/) {
+ $osisID = "$1.$2.$3";
+ }
+ elsif ($mode eq "imp" && $line =~ /^\$\$\$([^:]+?) ([0-9A-Za-z]+):([0-9A-Za-z]+)/) {
+ $osisID = "$1.$2.$3";
+ }
+ elsif ($mode eq "osis" && $line =~ /osisID=\"([^\"]+)\"/) {
+ $osisID = $1;
+ }
+
+ if ($osisID =~ /\.0(\.|$)/) { # in the case of chap/verse 0
+ $osisID = "";
+ }
+
+ if ($osisID ne "") {
+ $lastBook = $thisBook;
+ $lastChap = $thisChap;
+ $lastVers = $thisVers;
+
+ $osisID =~ /([^\.]+)\.([a-zA-Z\d]+)\.([a-zA-Z\d]+)/;
+
+ $thisBook = $1;
+ $thisChap = $2;
+ $thisVers = $3;
+
+ if ((($thisBook ne $lastBook) || ($thisChap ne $lastChap)) && $lastVers ne "") {
+ if ($count eq "count") {
+ $vm .= "$vCount, ";
+ }
+ else {
+ $vm .= "$lastVers, ";
+ }
+ if ($warn == 1) {
+ if ($vCount ne $lastVers) {
+ print "WARNING: verse count ($vCount) does not equal last verse ($lastVers) in chapter $osis{lc($lastBook)} $lastChap of versification $v11n ($infile).\n";
+ }
+ }
+ }
+
+ if ($thisBook ne $lastBook) {
+ $bCount++;
+ $vm .= "\n // $idmap{$osis{lc($thisBook)}}\n ";
+ $abbrevsList .= $abbrevs{lc($osis{lc($thisBook)})};
+
+ if ($lastBook ne "") {
+ buildBooksArrays{};
+ }
+ $cCount = 1;
+ $vCount = 1;
+ }
+ elsif ($thisChap ne $lastChap) {
+ $cCount++;
+ $vCount = 1;
+ }
+ elsif ($thisVers ne $lastVers) {
+ $vCount++;
+ }
+ }
+ }
+ if ($count eq "count") {
+ $vm .= "$vCount";
+ }
+ else {
+ $vm .= "$thisVers";
+ }
+ $vm .= "\n};\n";
+ $vm =~ s/((\d+, ){10})(?=\d+,)/\1\n /g;
+
+ if ($warn == 1) {
+ if ($vCount ne $thisVers) {
+ print "WARNING: verse count ($vCount) does not equal last verse ($thisVers) in chapter $osis{lc($lastBook)} $lastChap of versification $v11n ($infile).\n";
+ }
+ }
+
+ buildBooksArrays();
+ $otbooks .= $booksCloser;
+ $ntbooks .= $booksCloser;
+
+ $abbrevsList = lc($abbrevsList);
+ @abbrevsQueue = ();
+ while ($abbrevsList =~ /^(.+?);/) {
+ push @abbrevsQueue, $1;
+ $abbrevsList =~ s/^(.+?);//;
+ }
+ @abbrevsQueue = sort @abbrevsQueue;
+ foreach $a (@abbrevsQueue) {
+ $abbrevs .= " {\"" . uc($a) . "\", \"" . $osis{lc($a)} . "\"},\t\t// " . $idmap{$osis{lc($a)}} . "\n";
+ }
+ $abbrevs .= $abbrevsCloser;
+
+
+
+ print OUTF "// Versification system: $v11n\n";
+ print OUTF "$bookOrder\n\n";
+
+ print OUTF $otbooks;
+ print OUTF $ntbooks;
+# print OUTF $abbrevs; # line disabled so that we don't print out replacement builtin_abbrev line
+ print OUTF $vm;
+
+ print OUTF "\n\nSWORD_NAMESPACE_END\n\n\n#endif\n";
+
+ close (INF);
+ close (OUTF);
+ unlink("tempfile");
+}
Property changes on: trunk/versification/v11nsys.pl
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
More information about the sword-cvs
mailing list