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

[chrislit at crosswire.org]

Author: chrislit
Date: 2013-07-25 19:51:14 -0700 (Thu, 25 Jul 2013)
New Revision: 2917

Modified:
   trunk/cmake/sources.cmake
   trunk/include/Makefile.am
   trunk/src/mgr/versificationmgr.cpp
Log:
plugged LXX & Orthodox v11ns back into the versificationmgr & build systems


Modified: trunk/cmake/sources.cmake
===================================================================
--- trunk/cmake/sources.cmake	2013-07-25 14:51:24 UTC (rev 2916)
+++ trunk/cmake/sources.cmake	2013-07-26 02:51:14 UTC (rev 2917)
@@ -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-25 14:51:24 UTC (rev 2916)
+++ trunk/include/Makefile.am	2013-07-26 02:51:14 UTC (rev 2917)
@@ -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/src/mgr/versificationmgr.cpp
===================================================================
--- trunk/src/mgr/versificationmgr.cpp	2013-07-25 14:51:24 UTC (rev 2916)
+++ trunk/src/mgr/versificationmgr.cpp	2013-07-26 02:51:14 UTC (rev 2917)
@@ -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 as used in Orthodox Bibles (NT only in 1.7.0)
+#include <canon_lxx.h>		// General LXX v11n system (includes GNT, as used in Orthodox Bibles)
+#include <canon_orthodox.h>	// Orthodox v11n system as used in Orthodox Bibles
 
 using std::vector;
 using std::map;
@@ -72,8 +72,8 @@
 		systemVersificationMgr->registerVersificationSystem("Catholic2", otbooks_catholic2, ntbooks, vm_catholic2);
 		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_null, ntbooks, vm_orthodox);
+		systemVersificationMgr->registerVersificationSystem("LXX", otbooks_lxx, ntbooks, vm_lxx);
+		systemVersificationMgr->registerVersificationSystem("Orthodox", otbooks_orthodox, ntbooks, vm_orthodox);
 	}
 	return systemVersificationMgr;
 }