[sword-svn] r2909 - in trunk: include src/mgr
chrislit at crosswire.org
chrislit at crosswire.org
Thu Jul 18 02:57:09 MST 2013
Author: chrislit
Date: 2013-07-18 02:57:09 -0700 (Thu, 18 Jul 2013)
New Revision: 2909
Modified:
trunk/include/canon_orthodox.h
trunk/src/mgr/versificationmgr.cpp
Log:
added Orthodox v11n system (only NT planned for 1.7.0)
Modified: trunk/include/canon_orthodox.h
===================================================================
--- trunk/include/canon_orthodox.h 2013-07-17 22:44:29 UTC (rev 2908)
+++ trunk/include/canon_orthodox.h 2013-07-18 09:57:09 UTC (rev 2909)
@@ -26,270 +26,18 @@
// Versification system: Orthodox
-// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Neh Tob Jdt Esth 1Macc 2Macc 3Macc Ps PrMan 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 4Macc 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
+// Book order: 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
-// This versification system is based on the LXX versification system, q.v. for more information on the method of its compilation.
-// However, this versification system differs from the LXX system in that the book order follows that seen in modern Orthodox Bibles and books seen in some editions of the LXX but absent from modern Orthodox Bibles have been omitted.
+// For Sword 1.7.0, the Orthodox versification is limited to the NT. It will expand to include an OT in a subsequent release.
+// This NT consists of a union of verses found in the following Bibles, commonly used by Orthodox Christians:
+// OSB (NKJV) NT, NRSV NT, EOB, Antontiades' 1904/1912 Patriarchal GNT
+// Though this is heavily weighted towards English translations, it really amounts to the TR and the Patriarchal GNT.
/******************************************************************************
- * [on]tbooks_orthodox - initialize static instance for all canonical
- * text names and chapmax
- */
-struct sbook otbooks_orthodox[] = {
- {"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},
- {"Tobit", "Tob", "Tob", 14},
- {"Judith", "Jdt", "Jdt", 16},
- {"Esther", "Esth", "Esth", 16},
- {"I Maccabees", "1Macc", "1Macc", 16},
- {"II Maccabees", "2Macc", "2Macc", 15},
- {"III Maccabees", "3Macc", "3Macc", 7},
- {"Psalms", "Ps", "Ps", 151},
- {"Prayer of Manasses", "PrMan", "PrMan", 1},
- {"Job", "Job", "Job", 42},
- {"Proverbs", "Prov", "Prov", 31},
- {"Ecclesiastes", "Eccl", "Eccl", 12},
- {"Song of Solomon", "Song", "Song", 8},
- {"Wisdom", "Wis", "Wis", 19},
- {"Sirach", "Sir", "Sir", 51},
- {"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", 3},
- {"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},
- {"Susanna", "Sus", "Sus", 1},
- {"Daniel", "Dan", "Dan", 12},
- {"Bel and the Dragon", "Bel", "Bel", 1},
- {"IV Maccabees", "4Macc", "4Macc", 18},
- {"", "", "", 0}
-};
-
-/******************************************************************************
* Maximum verses per chapter
*/
int vm_orthodox[] = {
- // Genesis
- 31, 25, 25, 26, 32, 23, 24, 22, 29, 32,
- 32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
- 34, 24, 20, 67, 34, 35, 46, 22, 35, 44,
- 55, 33, 20, 31, 29, 43, 36, 30, 23, 23,
- 57, 39, 34, 34, 28, 34, 31, 22, 33, 26,
- // Exodus
- 22, 25, 22, 31, 23, 30, 29, 32, 35, 29,
- 10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
- 37, 31, 33, 18, 40, 37, 21, 43, 46, 38,
- 18, 35, 23, 35, 35, 40, 29, 31, 43, 38,
- // Leviticus
- 17, 16, 17, 35, 26, 40, 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, 27, 89, 26, 23, 36,
- 35, 16, 34, 45, 41, 50, 28, 32, 22, 29,
- 35, 41, 30, 25, 18, 65, 23, 31, 40, 17,
- 54, 42, 56, 29, 34, 13,
- // Deuteronomy
- 46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
- 32, 32, 19, 29, 23, 22, 20, 22, 21, 20,
- 23, 30, 26, 24, 19, 19, 26, 69, 29, 20,
- 30, 52, 29, 12,
- // Joshua
- 18, 24, 17, 24, 16, 27, 26, 35, 33, 43,
- 23, 24, 33, 15, 64, 10, 18, 28, 54, 9,
- 49, 34, 16, 36,
- // Judges
- 36, 23, 31, 24, 32, 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, 58, 30, 24, 43,
- 16, 23, 29, 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, 33, 44, 26,
- 22, 51, 39, 25,
- // I Kings
- 53, 71, 28, 34, 32, 38, 51, 66, 32, 33,
- 44, 54, 34, 31, 34, 42, 24, 46, 21, 43,
- 43, 54,
- // II Kings
- 22, 25, 27, 44, 27, 33, 20, 29, 37, 36,
- 21, 22, 25, 29, 38, 20, 41, 37, 37, 21,
- 26, 20, 37, 20, 30,
- // I Chronicles
- 54, 55, 24, 43, 41, 81, 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, 18, 17, 22, 14, 42, 22, 18, 31, 19,
- 23, 16, 23, 15, 19, 14, 19, 34, 11, 37,
- 20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
- 21, 33, 25, 33, 31, 23,
- // I Esdras
- 58, 31, 24, 63, 73, 34, 15, 97, 55,
- // Ezra
- 11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
- // Nehemiah
- 11, 20, 38, 23, 19, 19, 73, 18, 38, 40,
- 36, 47, 31,
- // Tobit
- 25, 22, 25, 23, 28, 19, 20, 24, 7, 14,
- 21, 22, 23, 16,
- // Judith
- 16, 28, 15, 17, 28, 21, 32, 36, 14, 23,
- 23, 20, 31, 19, 15, 30,
- // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
- 22, 23, 19, 29, 24, 22, 59, 17, 32, 13,
- 18, 7, 30, 19, 24, 24,
- // 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,
- // Psalms
- 6, 13, 9, 9, 13, 11, 18, 10, 39, 18,
- 9, 8, 7, 7, 11, 15, 51, 50, 14, 14,
- 32, 31, 10, 22, 22, 14, 14, 11, 13, 25,
- 24, 22, 23, 28, 28, 40, 40, 22, 18, 17,
- 13, 11, 27, 26, 17, 11, 15, 21, 23, 23,
- 19, 9, 9, 24, 23, 13, 12, 18, 17, 12,
- 13, 12, 11, 14, 20, 20, 36, 37, 36, 24,
- 24, 28, 28, 23, 13, 21, 72, 72, 20, 19,
- 16, 19, 18, 14, 17, 17, 19, 53, 52, 17,
- 16, 15, 23, 23, 13, 13, 12, 9, 9, 8,
- 29, 28, 35, 45, 48, 48, 43, 31, 31, 10,
- 10, 10, 26, 18, 19, 19, 29, 176, 176, 8,
- 9, 9, 8, 8, 6, 6, 6, 8, 8, 8,
- 18, 18, 3, 21, 26, 26, 9, 24, 24, 13,
- 10, 12, 15, 21, 21, 11, 20, 14, 9, 6,
- 7,
- // Prayer of Manasses
- 15,
- // Job
- 22, 18, 26, 21, 27, 30, 21, 22, 35, 22,
- 20, 25, 28, 22, 35, 23, 16, 21, 29, 29,
- 34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
- 40, 22, 33, 37, 16, 34, 24, 41, 35, 32,
- 34, 22,
- // Proverbs
- 35, 23, 38, 28, 23, 40, 27, 36, 25, 33,
- 31, 31, 27, 36, 38, 33, 30, 23, 29, 30,
- 31, 31, 36, 77, 31, 29, 29, 30, 49, 35,
- 31,
- // Ecclesiastes
- 18, 26, 22, 17, 20, 12, 30, 17, 18, 20,
- 10, 14,
- // Song of Solomon
- 17, 17, 11, 16, 17, 13, 14, 14,
- // Wisdom
- 16, 25, 19, 20, 24, 27, 30, 21, 19, 21,
- 27, 27, 19, 31, 19, 29, 21, 25, 22,
- // Sirach
- 40, 23, 34, 36, 18, 37, 40, 22, 25, 34,
- 36, 19, 32, 27, 22, 31, 32, 33, 30, 33,
- 31, 33, 37, 47, 36, 29, 32, 30, 35, 40,
- 42, 28, 40, 42, 28, 40, 34, 39, 41, 32,
- 28, 26, 37, 27, 31, 23, 31, 28, 19, 31,
- 38,
- // Hosea
- 11, 25, 5, 19, 15, 12, 16, 14, 17, 15,
- 12, 15, 16, 10,
- // Amos
- 15, 16, 15, 13, 27, 15, 17, 14, 15,
- // Micah
- 16, 13, 12, 14, 15, 16, 20,
- // Joel
- 20, 32, 26, 21,
- // Obadiah
- 21,
- // Jonah
- 17, 11, 10, 11,
- // Nahum
- 15, 14, 19,
- // Habakkuk
- 17, 20, 19,
- // Zephaniah
- 18, 15, 20,
- // Haggai
- 15, 24,
- // Zechariah
- 21, 17, 11, 14, 11, 15, 14, 23, 17, 12,
- 17, 14, 9, 21,
- // Malachi
- 14, 17, 24, 6,
- // Isaiah
- 31, 22, 26, 6, 30, 13, 25, 23, 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, 12, 21, 14, 21, 22,
- 11, 12, 20, 12, 25, 24,
- // Jeremiah
- 19, 37, 25, 31, 31, 30, 34, 23, 26, 25,
- 23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
- 14, 30, 42, 10, 39, 28, 46, 64, 32, 33,
- 44, 44, 26, 22, 19, 32, 24, 40, 44, 16,
- 22, 22, 32, 30, 28, 28, 22, 47, 39, 46,
- 64, 34,
- // Baruch
- 22, 35, 38, 37, 9,
- // Lamentations
- 22, 22, 66, 22, 22,
- // Epistle of Jeremiah
- 73,
- // Ezekiel
- 28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
- 25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
- 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,
- // Susanna
- 64,
- // Daniel
- 21, 49, 100, 37, 31, 29, 28, 27, 27, 21,
- 45, 13,
- // Bel and the Dragon
- 42,
- // IV Maccabees
- 35, 24, 21, 26, 38, 35, 25, 29, 32, 21,
- 27, 20, 27, 20, 32, 25, 24, 24,
// Matthew
25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
Modified: trunk/src/mgr/versificationmgr.cpp
===================================================================
--- trunk/src/mgr/versificationmgr.cpp 2013-07-17 22:44:29 UTC (rev 2908)
+++ trunk/src/mgr/versificationmgr.cpp 2013-07-18 09:57:09 UTC (rev 2909)
@@ -45,7 +45,7 @@
#include <canon_rahlfs.h> // Rahlfs LXX v11n system
//#include <canon_lxx_nt.h> // Rahlfs LXX + NTv11n system
//#include <canon_lxx.h> // General LXX v11n system (includes GNT, as used in Orthodox Bibles)
-//#include <canon_orthodox.h> // Orthodox v11n system (includes GNT, as used in Orthodox Bibles)
+#include <canon_orthodox.h> // Orthodox v11n system as used in Orthodox Bibles (NT only in 1.7.0)
using std::vector;
using std::map;
@@ -73,7 +73,7 @@
systemVersificationMgr->registerVersificationSystem("Rahlfs", otbooks_rahlfs, ntbooks, vm_rahlfs);
//systemVersificationMgr->registerVersificationSystem("LXX_NT", otbooks_rahlfs, ntbooks, vm_lxx_nt);
//systemVersificationMgr->registerVersificationSystem("LXX", otbooks_lxx, ntbooks, vm_lxx);
- //systemVersificationMgr->registerVersificationSystem("Orthodox", otbooks_orthodox, ntbooks, vm_orthodox);
+ systemVersificationMgr->registerVersificationSystem("Orthodox", otbooks_null, ntbooks, vm_orthodox);
}
return systemVersificationMgr;
}
More information about the sword-cvs
mailing list