[sword-svn] r2895 - in trunk: cmake include src/mgr
chrislit at crosswire.org
chrislit at crosswire.org
Mon Jul 15 22:22:03 MST 2013
Author: chrislit
Date: 2013-07-15 22:22:03 -0700 (Mon, 15 Jul 2013)
New Revision: 2895
Modified:
trunk/cmake/sources.cmake
trunk/include/Makefile.am
trunk/include/canon_rahlfs.h
trunk/src/mgr/versificationmgr.cpp
Log:
removed LXX & Orthodox v11ns for now
expanded Rahlfs v11n to include NRSVA NT
Modified: trunk/cmake/sources.cmake
===================================================================
--- trunk/cmake/sources.cmake 2013-07-16 04:38:43 UTC (rev 2894)
+++ trunk/cmake/sources.cmake 2013-07-16 05:22:03 UTC (rev 2895)
@@ -412,8 +412,8 @@
include/canon_luther.h
include/canon_null.h
include/canon_rahlfs.h
- include/canon_lxx.h
- include/canon_orthodox.h
+ #include/canon_lxx.h
+ #include/canon_orthodox.h
)
SET(INTERNAL_REGEX_HEADER
Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am 2013-07-16 04:38:43 UTC (rev 2894)
+++ trunk/include/Makefile.am 2013-07-16 05:22:03 UTC (rev 2895)
@@ -180,7 +180,7 @@
pkginclude_HEADERS += $(swincludedir)/canon_catholic2.h
pkginclude_HEADERS += $(swincludedir)/canon_rahlfs.h
#pkginclude_HEADERS += $(swincludedir)/canon_lxx_nt.h
-pkginclude_HEADERS += $(swincludedir)/canon_lxx.h
-pkginclude_HEADERS += $(swincludedir)/canon_orthodox.h
+#pkginclude_HEADERS += $(swincludedir)/canon_lxx.h
+#pkginclude_HEADERS += $(swincludedir)/canon_orthodox.h
pkginclude_HEADERS += $(swincludedir)/canon_null.h
Modified: trunk/include/canon_rahlfs.h
===================================================================
--- trunk/include/canon_rahlfs.h 2013-07-16 04:38:43 UTC (rev 2894)
+++ trunk/include/canon_rahlfs.h 2013-07-16 05:22:03 UTC (rev 2895)
@@ -26,7 +26,7 @@
// Versification system: Rahlfs
-// Book order: Gen Exod Lev Num Deut Josh JoshA JudgB Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Esth Jdt Tob TobS 1Macc 2Macc 3Macc 4Macc Ps Odes 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 SusTh Dan DanTh Bel BelTh
+// Book order: Gen Exod Lev Num Deut Josh JoshA JudgB Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Esth Jdt Tob TobS 1Macc 2Macc 3Macc 4Macc Ps Odes 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 SusTh Dan DanTh Bel BelTh 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
/******************************************************************************
* [on]tbooks_rahlfs - initialize static instance for all canonical
@@ -95,6 +95,8 @@
{"", "", "", 0}
};
+// for ntbooks_rahlfs, use ntbooks
+
/******************************************************************************
* Maximum verses per chapter
*/
@@ -217,7 +219,61 @@
// Bel and the Dragon
42,
// Bel and the Dragon Th
- 42
+ 42,
+ // 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
+ 51, 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, 23, 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, 8, 21, 18, 24, 21, 15, 27, 21
};
Modified: trunk/src/mgr/versificationmgr.cpp
===================================================================
--- trunk/src/mgr/versificationmgr.cpp 2013-07-16 04:38:43 UTC (rev 2894)
+++ trunk/src/mgr/versificationmgr.cpp 2013-07-16 05:22:03 UTC (rev 2895)
@@ -44,8 +44,8 @@
#include <canon_catholic2.h> // Catholic2 v11n system (16 chapter Esther)
#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_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)
using std::vector;
using std::map;
@@ -70,10 +70,10 @@
systemVersificationMgr->registerVersificationSystem("Luther", otbooks_luther, ntbooks_luther, vm_luther);
systemVersificationMgr->registerVersificationSystem("Catholic", otbooks_catholic, ntbooks, vm_catholic);
systemVersificationMgr->registerVersificationSystem("Catholic2", otbooks_catholic2, ntbooks, vm_catholic2);
- systemVersificationMgr->registerVersificationSystem("Rahlfs", otbooks_rahlfs, ntbooks_null, vm_rahlfs);
+ 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("LXX", otbooks_lxx, ntbooks, vm_lxx);
+ //systemVersificationMgr->registerVersificationSystem("Orthodox", otbooks_orthodox, ntbooks, vm_orthodox);
}
return systemVersificationMgr;
}
More information about the sword-cvs
mailing list