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

[chrislit at crosswire.org]

Author: chrislit
Date: 2010-10-02 14:13:34 -0700 (Sat, 02 Oct 2010)
New Revision: 2558

Modified:
   trunk/include/Makefile.am
   trunk/src/mgr/versemgr.cpp
Log:
added Catholic & SynodalP v11ns to VerseMgr

Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am	2010-10-02 21:08:35 UTC (rev 2557)
+++ trunk/include/Makefile.am	2010-10-02 21:13:34 UTC (rev 2558)
@@ -170,5 +170,7 @@
 pkginclude_HEADERS += $(swincludedir)/canon_vulg.h
 pkginclude_HEADERS += $(swincludedir)/canon_german.h
 pkginclude_HEADERS += $(swincludedir)/canon_luther.h
+pkginclude_HEADERS += $(swincludedir)/canon_catholic.h
+pkginclude_HEADERS += $(swincludedir)/canon_synodalp.h
 pkginclude_HEADERS += $(swincludedir)/canon_null.h
 

Modified: trunk/src/mgr/versemgr.cpp
===================================================================
--- trunk/src/mgr/versemgr.cpp	2010-10-02 21:08:35 UTC (rev 2557)
+++ trunk/src/mgr/versemgr.cpp	2010-10-02 21:13:34 UTC (rev 2558)
@@ -4,7 +4,7 @@
  *
  * $Id: versemgr.cpp 2108 2007-10-13 20:35:02Z scribe $
  *
- * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
+ * Copyright 2010 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -34,11 +34,13 @@
 #include <canon_mt.h>		// Masoretic Text (MT) v11n system
 #include <canon_kjva.h>		// KJV + Apocrypha v11n system
 #include <canon_nrsv.h>		// NRSV v11n system
-#include <canon_nrsva.h>	// NRSVA + Apocrypha v11n system
+#include <canon_nrsva.h>	// NRSV + Apocrypha v11n system
 #include <canon_synodal.h>	// Russian Synodal v11n system
 #include <canon_vulg.h>		// Vulgate v11n system
 #include <canon_german.h>	// German v11n system
 #include <canon_luther.h>	// Luther v11n system
+#include <canon_catholic.h>	// Catholic v11n system
+#include <canon_synodalp.h>	// SynodalP v11n system (KJV with Synodal-like verse counts)
 
 using std::vector;
 using std::map;
@@ -59,8 +61,10 @@
 		systemVerseMgr->registerVersificationSystem("NRSVA", otbooks_nrsva, ntbooks, vm_nrsva);
 		systemVerseMgr->registerVersificationSystem("Synodal", otbooks_synodal, ntbooks_synodal, vm_synodal);
 		systemVerseMgr->registerVersificationSystem("Vulg", otbooks_vulg, ntbooks_vulg, vm_vulg);
-		systemVerseMgr->registerVersificationSystem("German", otbooks_german, ntbooks_german, vm_german);
+		systemVerseMgr->registerVersificationSystem("German", otbooks_german, ntbooks, vm_german);
 		systemVerseMgr->registerVersificationSystem("Luther", otbooks_luther, ntbooks_luther, vm_luther);
+		systemVerseMgr->registerVersificationSystem("Catholic", otbooks_catholic, ntbooks, vm_catholic);
+		systemVerseMgr->registerVersificationSystem("SynodalP", otbooks, ntbooks, vm_synodalp);
 	}
 	return systemVerseMgr;
 }