[sword-svn] r2892 - in trunk: cmake include src/mgr

[chrislit at crosswire.org]

Author: chrislit
Date: 2013-07-13 16:45:09 -0700 (Sat, 13 Jul 2013)
New Revision: 2892

Modified:
   trunk/cmake/sources.cmake
   trunk/include/Makefile.am
   trunk/src/mgr/versificationmgr.cpp
Log:
removed LXX_NT v11n from VersificationMgr
added LXX & Orthodox v11ns to VersificationMgr


Modified: trunk/cmake/sources.cmake
===================================================================
--- trunk/cmake/sources.cmake	2013-07-13 23:41:01 UTC (rev 2891)
+++ trunk/cmake/sources.cmake	2013-07-13 23:45:09 UTC (rev 2892)
@@ -412,6 +412,8 @@
 	include/canon_luther.h
 	include/canon_null.h
 	include/canon_rahlfs.h
+	include/canon_lxx.h
+	include/canon_orthodox.h
 )
 
 SET(INTERNAL_REGEX_HEADER

Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am	2013-07-13 23:41:01 UTC (rev 2891)
+++ trunk/include/Makefile.am	2013-07-13 23:45:09 UTC (rev 2892)
@@ -179,6 +179,8 @@
 pkginclude_HEADERS += $(swincludedir)/canon_catholic.h
 pkginclude_HEADERS += $(swincludedir)/canon_catholic2.h
 pkginclude_HEADERS += $(swincludedir)/canon_rahlfs.h
-pkginclude_HEADERS += $(swincludedir)/canon_lxx_nt.h
+#pkginclude_HEADERS += $(swincludedir)/canon_lxx_nt.h
+pkginclude_HEADERS += $(swincludedir)/canon_lxx.h
+pkginclude_HEADERS += $(swincludedir)/canon_orthodox.h
 pkginclude_HEADERS += $(swincludedir)/canon_null.h
 

Modified: trunk/src/mgr/versificationmgr.cpp
===================================================================
--- trunk/src/mgr/versificationmgr.cpp	2013-07-13 23:41:01 UTC (rev 2891)
+++ trunk/src/mgr/versificationmgr.cpp	2013-07-13 23:45:09 UTC (rev 2892)
@@ -43,7 +43,9 @@
 #include <canon_catholic.h>	// Catholic v11n system (10 chapter Esther)
 #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_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)
 
 using std::vector;
 using std::map;
@@ -69,7 +71,9 @@
 		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("LXX_NT", otbooks_rahlfs, ntbooks, vm_lxx_nt);
+		//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);
 	}
 	return systemVersificationMgr;
 }