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

[chrislit at crosswire.org]

Author: chrislit
Date: 2013-07-31 05:09:08 -0700 (Wed, 31 Jul 2013)
New Revision: 2930

Modified:
   trunk/include/canon_lxx_nt.h
   trunk/include/canon_orthodox.h
   trunk/include/canon_synodalprot.h
   trunk/include/config.h
   trunk/src/mgr/versificationmgr.cpp
Log:
fixed some properties
removed extra table from SynodalProt v11n

Modified: trunk/include/canon_lxx_nt.h
===================================================================
--- trunk/include/canon_lxx_nt.h	2013-07-31 11:52:24 UTC (rev 2929)
+++ trunk/include/canon_lxx_nt.h	2013-07-31 12:09:08 UTC (rev 2930)
@@ -2,7 +2,7 @@
  *
  *  canon_lxx_nt.h -	Versification data for the LXX + NT system
  *
- * $Id: canon_nrsva.h 2833 2013-06-29 06:40:28Z chrislit $
+ * $Id$
  *
  * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society


Property changes on: trunk/include/canon_lxx_nt.h
___________________________________________________________________
Added: svn:keywords
   + Author Date Id
Added: svn:eol-style
   + native


Property changes on: trunk/include/canon_orthodox.h
___________________________________________________________________
Added: svn:keywords
   + Author Date Id
Added: svn:eol-style
   + native

Modified: trunk/include/canon_synodalprot.h
===================================================================
--- trunk/include/canon_synodalprot.h	2013-07-31 11:52:24 UTC (rev 2929)
+++ trunk/include/canon_synodalprot.h	2013-07-31 12:09:08 UTC (rev 2930)
@@ -1,10 +1,10 @@
 /******************************************************************************
  *
- *  canon_synodalprot.h -	Versification data for the Synodal system
+ *  canon_synodalprot.h -	Versification data for the SynodalProt system
  *
- * 
+ * $Id$
  *
- * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
  *	P. O. Box 2528
  *	Tempe, AZ  85280-2528
@@ -74,36 +74,7 @@
   {"", "", "", 0}
 };
 
-struct sbook ntbooks_synodalProt[] = {
-  {"Matthew", "Matt", "Matt", 28},
-  {"Mark", "Mark", "Mark", 16},
-  {"Luke", "Luke", "Luke", 24},
-  {"John", "John", "John", 21},
-  {"Acts", "Acts", "Acts", 28},
-  {"James", "Jas", "Jas", 5},
-  {"I Peter", "1Pet", "1Pet", 5},
-  {"II Peter", "2Pet", "2Pet", 3},
-  {"I John", "1John", "1John", 5},
-  {"II John", "2John", "2John", 1},
-  {"III John", "3John", "3John", 1},
-  {"Jude", "Jude", "Jude", 1},
-  {"Romans", "Rom", "Rom", 16},
-  {"I Corinthians", "1Cor", "1Cor", 16},
-  {"II Corinthians", "2Cor", "2Cor", 13},
-  {"Galatians", "Gal", "Gal", 6},
-  {"Ephesians", "Eph", "Eph", 6},
-  {"Philippians", "Phil", "Phil", 4},
-  {"Colossians", "Col", "Col", 4},
-  {"I Thessalonians", "1Thess", "1Thess", 5},
-  {"II Thessalonians", "2Thess", "2Thess", 3},
-  {"I Timothy", "1Tim", "1Tim", 6},
-  {"II Timothy", "2Tim", "2Tim", 4},
-  {"Titus", "Titus", "Titus", 3},
-  {"Philemon", "Phlm", "Phlm", 1},
-  {"Hebrews", "Heb", "Heb", 13},
-  {"Revelation of John", "Rev", "Rev", 22},
-  {"", "", "", 0}
-};
+// for ntbooks_synodalprot, use ntbooks_synodal
 
 /******************************************************************************
  *	Maximum verses per chapter


Property changes on: trunk/include/canon_synodalprot.h
___________________________________________________________________
Added: svn:keywords
   + Author Date Id
Added: svn:eol-style
   + native


Property changes on: trunk/include/config.h
___________________________________________________________________
Modified: svn:keywords
   - author date id
   + Author Date Id

Modified: trunk/src/mgr/versificationmgr.cpp
===================================================================
--- trunk/src/mgr/versificationmgr.cpp	2013-07-31 11:52:24 UTC (rev 2929)
+++ trunk/src/mgr/versificationmgr.cpp	2013-07-31 12:09:08 UTC (rev 2930)
@@ -66,7 +66,7 @@
 		systemVersificationMgr->registerVersificationSystem("NRSV", otbooks, ntbooks, vm_nrsv);
 		systemVersificationMgr->registerVersificationSystem("NRSVA", otbooks_nrsva, ntbooks, vm_nrsva);
 		systemVersificationMgr->registerVersificationSystem("Synodal", otbooks_synodal, ntbooks_synodal, vm_synodal);
-		systemVersificationMgr->registerVersificationSystem("SynodalProt", otbooks_synodalProt, ntbooks_synodalProt, vm_synodalProt);
+		systemVersificationMgr->registerVersificationSystem("SynodalProt", otbooks_synodalProt, ntbooks_synodal, vm_synodalProt);
 		systemVersificationMgr->registerVersificationSystem("Vulg", otbooks_vulg, ntbooks_vulg, vm_vulg);
 		systemVersificationMgr->registerVersificationSystem("German", otbooks_german, ntbooks, vm_german);
 		systemVersificationMgr->registerVersificationSystem("Luther", otbooks_luther, ntbooks_luther, vm_luther);