[sword-svn] r3490 - in trunk: . include src/mgr
scribe at crosswire.org
scribe at crosswire.org
Sat Sep 2 02:38:18 MST 2017
Author: scribe
Date: 2017-09-02 02:38:18 -0700 (Sat, 02 Sep 2017)
New Revision: 3490
Modified:
trunk/ChangeLog
trunk/include/canon_calvin.h
trunk/include/canon_darbyfr.h
trunk/include/canon_segond.h
trunk/src/mgr/versificationmgr.cpp
Log:
Adding French mapping data. Patch submitted by domcox <dominique at corbex.org>
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2017-09-02 09:30:13 UTC (rev 3489)
+++ trunk/ChangeLog 2017-09-02 09:38:18 UTC (rev 3490)
@@ -1,5 +1,10 @@
API ChangeLog
+
+01-Sep-2017 Troy A. Griffitts <scribe at crosswire.org>
+ Adding French mapping data.
+ Patch submitted by domcox <dominique at corbex.org>
+
21-May-2017 Troy A. Griffitts <scribe at crosswire.org>
Added --with-icuregex option to use ICU regex engine
Modified: trunk/include/canon_calvin.h
===================================================================
--- trunk/include/canon_calvin.h 2017-09-02 09:30:13 UTC (rev 3489)
+++ trunk/include/canon_calvin.h 2017-09-02 09:38:18 UTC (rev 3490)
@@ -3,7 +3,7 @@
* canon_calvin.h - Versification data for French Bibles de Genève
* (Bibles de Genève, Épée, Martin, Ostervald)
*
- * $Id: canon_calvin.h 2015-08-22 10:53:22 domcox $
+ * $Id$
*
* Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
@@ -289,6 +289,107 @@
27, 21
};
+unsigned char mappings_calvin[] = {
+ 0,
+ 4, 13, 1, 0, 12, 16, 0,
+ 4, 13, 2, 0, 13, 1, 0,
+ 4, 30, 1, 0, 29, 40, 0,
+ 4, 30, 2, 0, 30, 1, 0,
+ 9, 20, 43, 0, 20, 42, 0,
+ 9, 24, 1, 0, 23, 29, 0,
+ 9, 24, 2, 0, 24, 1, 0,
+ 11, 22, 44, 0, 22, 43, 0,
+ 18, 39, 1, 0, 38, 39, 0,
+ 18, 39, 4, 0, 39, 1, 0,
+ 18, 39, 34, 0, 40, 1, 0,
+ 18, 40, 1, 0, 40, 6, 0,
+ 18, 40, 20, 0, 41, 1, 0,
+ 18, 41, 1, 0, 41, 10, 0,
+ 19, 3, 2, 0, 3, 1, 0,
+ 19, 4, 2, 0, 4, 1, 0,
+ 19, 5, 2, 0, 5, 1, 0,
+ 19, 6, 2, 0, 6, 1, 0,
+ 19, 7, 2, 0, 7, 1, 0,
+ 19, 8, 2, 0, 8, 1, 0,
+ 19, 9, 2, 0, 9, 1, 0,
+ 19, 12, 2, 0, 12, 1, 0,
+ 19, 18, 2, 0, 18, 1, 0,
+ 19, 19, 2, 0, 19, 1, 0,
+ 19, 20, 2, 0, 20, 1, 0,
+ 19, 21, 2, 0, 21, 1, 0,
+ 19, 22, 2, 0, 22, 1, 0,
+ 19, 30, 2, 0, 30, 1, 0,
+ 19, 31, 2, 0, 31, 1, 0,
+ 19, 34, 2, 0, 34, 1, 0,
+ 19, 36, 2, 0, 36, 1, 0,
+ 19, 38, 2, 0, 38, 1, 0,
+ 19, 39, 2, 0, 39, 1, 0,
+ 19, 40, 2, 0, 40, 1, 0,
+ 19, 41, 2, 0, 41, 1, 0,
+ 19, 42, 2, 0, 42, 1, 0,
+ 19, 44, 2, 0, 44, 1, 0,
+ 19, 45, 2, 0, 45, 1, 0,
+ 19, 46, 2, 0, 46, 1, 0,
+ 19, 47, 2, 0, 47, 1, 0,
+ 19, 48, 2, 0, 48, 1, 0,
+ 19, 49, 2, 0, 49, 1, 0,
+ 19, 51, 2, 0, 51, 1, 0,
+ 19, 51, 3, 0, 51, 1, 0,
+ 19, 52, 2, 0, 52, 1, 0,
+ 19, 52, 3, 0, 52, 1, 0,
+ 19, 53, 2, 0, 53, 1, 0,
+ 19, 54, 3, 0, 54, 1, 0,
+ 19, 55, 2, 0, 55, 1, 0,
+ 19, 56, 2, 0, 56, 1, 0,
+ 19, 57, 2, 0, 57, 1, 0,
+ 19, 58, 2, 0, 58, 1, 0,
+ 19, 59, 2, 0, 59, 1, 0,
+ 19, 60, 2, 0, 60, 1, 0,
+ 19, 60, 3, 0, 60, 1, 0,
+ 19, 61, 2, 0, 61, 1, 0,
+ 19, 62, 2, 0, 62, 1, 0,
+ 19, 63, 2, 0, 63, 1, 0,
+ 19, 64, 2, 0, 64, 1, 0,
+ 19, 65, 2, 0, 65, 1, 0,
+ 19, 67, 2, 0, 67, 1, 0,
+ 19, 68, 2, 0, 68, 1, 0,
+ 19, 69, 2, 0, 69, 1, 0,
+ 19, 70, 2, 0, 70, 1, 0,
+ 19, 75, 2, 0, 75, 1, 0,
+ 19, 76, 2, 0, 76, 1, 0,
+ 19, 77, 2, 0, 77, 1, 0,
+ 19, 80, 2, 0, 80, 1, 0,
+ 19, 81, 2, 0, 81, 1, 0,
+ 19, 83, 2, 0, 83, 1, 0,
+ 19, 84, 2, 0, 84, 1, 0,
+ 19, 85, 2, 0, 85, 1, 0,
+ 19, 88, 2, 0, 88, 1, 0,
+ 19, 89, 2, 0, 89, 1, 0,
+ 19, 92, 2, 0, 92, 1, 0,
+ 19, 102, 2, 0, 102, 1, 0,
+ 19, 108, 2, 0, 108, 1, 0,
+ 19, 140, 2, 0, 140, 1, 0,
+ 19, 142, 2, 0, 142, 1, 0,
+ 21, 12, 1, 0, 11, 9, 0,
+ 21, 12, 3, 0, 12, 1, 0,
+ 23, 8, 23, 0, 9, 1, 0,
+ 23, 9, 1, 0, 9, 2, 0,
+ 26, 21, 1, 0, 20, 45, 0,
+ 26, 21, 6, 0, 21, 1, 0,
+ 28, 12, 1, 0, 11, 12, 0,
+ 28, 12, 2, 0, 12, 1, 0,
+ 32, 2, 1, 0, 1, 17, 0,
+ 32, 2, 2, 0, 2, 1, 0,
+ 41, 9, 51, 0, 9, 50, 0,
+ 41, 10, 53, 0, 10, 52, 0,
+ 44, 19, 40, 0, 19, 41, 0,
+ 45, 3, 23, 0, 3, 24, 0,
+ 46, 3, 22, 0, 3, 23, 0,
+ 64, 1, 15, 0, 1, 14, 0,
+ 66, 12, 18, 0, 13, 1, 0,
+ 0
+};
+
SWORD_NAMESPACE_END
#endif
Modified: trunk/include/canon_darbyfr.h
===================================================================
--- trunk/include/canon_darbyfr.h 2017-09-02 09:30:13 UTC (rev 3489)
+++ trunk/include/canon_darbyfr.h 2017-09-02 09:38:18 UTC (rev 3490)
@@ -2,7 +2,7 @@
*
* canon_darbyfr.h - Versification data for the French Darby Bibles
*
- * $Id: canon_darbyfr.h 2015-08-22 22:30:20 domcox $
+ * $Id$
*
* Copyright 1998-2015 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
@@ -271,6 +271,41 @@
27, 21
};
+unsigned char mappings_darbyfr[] = {
+ 0,
+ 3, 5, 20, 0, 6, 1, 0,
+ 3, 6, 1, 0, 6, 8, 0,
+ 4, 13, 1, 0, 12, 16, 0,
+ 4, 13, 2, 0, 13, 1, 0,
+ 4, 30, 2, 0, 30, 1, 0,
+ 5, 28, 69, 0, 29, 1, 0,
+ 5, 29, 1, 0, 29, 2, 0,
+ 9, 20, 43, 0, 20, 42, 0,
+ 9, 24, 1, 0, 23, 29, 0,
+ 9, 24, 2, 0, 24, 1, 0,
+ 11, 22, 44, 0, 22, 43, 0,
+ 18, 39, 1, 0, 38, 39, 0,
+ 18, 39, 4, 0, 39, 1, 0,
+ 18, 39, 34, 0, 40, 1, 0,
+ 18, 40, 1, 0, 40, 6, 0,
+ 18, 40, 20, 0, 41, 1, 0,
+ 18, 41, 1, 0, 41, 9, 0,
+ 18, 41, 1, 0, 41, 10, 0,
+ 19, 13, 1, 0, 13, 2, 0,
+ 26, 21, 1, 0, 20, 45, 0,
+ 26, 21, 6, 0, 21, 1, 0,
+ 28, 12, 1, 0, 11, 12, 0,
+ 28, 12, 2, 0, 12, 1, 0,
+ 32, 2, 1, 0, 1, 17, 0,
+ 32, 2, 2, 0, 2, 1, 0,
+ 41, 9, 51, 0, 9, 50, 0,
+ 43, 1, 39, 0, 1, 38, 0,
+ 47, 13, 13, 0, 13, 14, 0,
+ 64, 1, 15, 0, 1, 14, 0,
+ 66, 12, 18, 0, 13, 1, 0,
+ 0
+};
+
SWORD_NAMESPACE_END
#endif
Modified: trunk/include/canon_segond.h
===================================================================
--- trunk/include/canon_segond.h 2017-09-02 09:30:13 UTC (rev 3489)
+++ trunk/include/canon_segond.h 2017-09-02 09:38:18 UTC (rev 3490)
@@ -3,7 +3,7 @@
* canon_segond.h - Versification data for French Louis Segond original
* and revised Bibles
*
- * $Id: canon_segond.h 2015-08-22 22:52:34 domcox $
+ * $Id$
*
* Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
@@ -272,6 +272,119 @@
27, 21
};
+unsigned char mappings_segond[] = {
+ 0,
+ 2, 7, 26, 0, 8, 1, 0,
+ 2, 8, 1, 0, 8, 5, 0,
+ 3, 5, 20, 0, 6, 1, 0,
+ 3, 6, 1, 0, 6, 8, 0,
+ 4, 30, 1, 0, 29, 40, 0,
+ 4, 30, 2, 0, 30, 1, 0,
+ 9, 20, 43, 0, 20, 42, 0,
+ 9, 24, 1, 0, 23, 29, 0,
+ 9, 24, 2, 0, 24, 1, 0,
+ 11, 22, 44, 0, 22, 43, 0,
+ 18, 39, 1, 0, 38, 39, 0,
+ 18, 39, 4, 0, 39, 1, 0,
+ 18, 39, 34, 0, 40, 1, 0,
+ 18, 40, 1, 0, 40, 6, 0,
+ 18, 40, 20, 0, 41, 1, 0,
+ 18, 41, 1, 0, 41, 10, 0,
+ 19, 3, 2, 0, 3, 1, 0,
+ 19, 4, 2, 0, 4, 1, 0,
+ 19, 5, 2, 0, 5, 1, 0,
+ 19, 6, 2, 0, 6, 1, 0,
+ 19, 7, 2, 0, 7, 1, 0,
+ 19, 8, 2, 0, 8, 1, 0,
+ 19, 9, 2, 0, 9, 1, 0,
+ 19, 12, 2, 0, 12, 1, 0,
+ 19, 18, 2, 0, 18, 1, 0,
+ 19, 19, 2, 0, 19, 1, 0,
+ 19, 20, 2, 0, 20, 1, 0,
+ 19, 21, 2, 0, 21, 1, 0,
+ 19, 22, 2, 0, 22, 1, 0,
+ 19, 30, 2, 0, 30, 1, 0,
+ 19, 31, 2, 0, 31, 1, 0,
+ 19, 34, 2, 0, 34, 1, 0,
+ 19, 36, 2, 0, 36, 1, 0,
+ 19, 38, 2, 0, 38, 1, 0,
+ 19, 39, 2, 0, 39, 1, 0,
+ 19, 40, 2, 0, 40, 1, 0,
+ 19, 41, 2, 0, 41, 1, 0,
+ 19, 42, 2, 0, 42, 1, 0,
+ 19, 44, 2, 0, 44, 1, 0,
+ 19, 45, 2, 0, 45, 1, 0,
+ 19, 46, 2, 0, 46, 1, 0,
+ 19, 47, 2, 0, 47, 1, 0,
+ 19, 48, 2, 0, 48, 1, 0,
+ 19, 49, 2, 0, 49, 1, 0,
+ 19, 51, 2, 0, 51, 1, 0,
+ 19, 51, 3, 0, 51, 1, 0,
+ 19, 52, 2, 0, 52, 1, 0,
+ 19, 52, 3, 0, 52, 1, 0,
+ 19, 53, 2, 0, 53, 1, 0,
+ 19, 54, 3, 0, 54, 1, 0,
+ 19, 55, 2, 0, 55, 1, 0,
+ 19, 56, 2, 0, 56, 1, 0,
+ 19, 57, 2, 0, 57, 1, 0,
+ 19, 58, 2, 0, 58, 1, 0,
+ 19, 59, 2, 0, 59, 1, 0,
+ 19, 60, 2, 0, 60, 1, 0,
+ 19, 60, 3, 0, 60, 1, 0,
+ 19, 61, 2, 0, 61, 1, 0,
+ 19, 62, 2, 0, 62, 1, 0,
+ 19, 63, 2, 0, 63, 1, 0,
+ 19, 64, 2, 0, 64, 1, 0,
+ 19, 65, 2, 0, 65, 1, 0,
+ 19, 67, 2, 0, 67, 1, 0,
+ 19, 68, 2, 0, 68, 1, 0,
+ 19, 69, 2, 0, 69, 1, 0,
+ 19, 70, 2, 0, 70, 1, 0,
+ 19, 75, 2, 0, 75, 1, 0,
+ 19, 76, 2, 0, 76, 1, 0,
+ 19, 77, 2, 0, 77, 1, 0,
+ 19, 80, 2, 0, 80, 1, 0,
+ 19, 81, 2, 0, 81, 1, 0,
+ 19, 83, 2, 0, 83, 1, 0,
+ 19, 84, 2, 0, 84, 1, 0,
+ 19, 85, 2, 0, 85, 1, 0,
+ 19, 88, 2, 0, 88, 1, 0,
+ 19, 89, 2, 0, 89, 1, 0,
+ 19, 92, 2, 0, 92, 1, 0,
+ 19, 102, 2, 0, 102, 1, 0,
+ 19, 108, 2, 0, 108, 1, 0,
+ 19, 140, 2, 0, 140, 1, 0,
+ 19, 142, 2, 0, 142, 1, 0,
+ 21, 4, 17, 0, 5, 1, 0,
+ 21, 5, 1, 0, 5, 2, 0,
+ 21, 12, 1, 0, 11, 9, 0,
+ 21, 12, 3, 0, 12, 1, 0,
+ 22, 7, 1, 0, 6, 13, 0,
+ 22, 7, 2, 0, 7, 1, 0,
+ 23, 8, 23, 0, 9, 1, 0,
+ 23, 9, 1, 0, 9, 2, 0,
+ 23, 63, 19, 0, 64, 1, 0,
+ 23, 64, 2, 0, 64, 3, 0,
+ 26, 21, 1, 0, 20, 45, 0,
+ 26, 21, 6, 0, 21, 1, 0,
+ 28, 2, 1, 0, 1, 10, 0,
+ 28, 2, 3, 0, 2, 1, 0,
+ 28, 12, 1, 0, 11, 12, 0,
+ 28, 12, 2, 0, 12, 1, 0,
+ 32, 2, 1, 0, 1, 17, 0,
+ 32, 2, 2, 0, 2, 1, 0,
+ 33, 4, 14, 0, 5, 1, 0,
+ 33, 5, 1, 0, 5, 2, 0,
+ 34, 2, 1, 0, 1, 15, 0,
+ 34, 2, 2, 0, 2, 1, 0,
+ 41, 9, 51, 0, 9, 50, 0,
+ 44, 19, 40, 0, 19, 41, 0,
+ 47, 13, 12, 0, 13, 13, 0,
+ 64, 1, 15, 0, 1, 14, 0,
+ 66, 12, 18, 0, 13, 1, 0,
+ 0
+};
+
SWORD_NAMESPACE_END
#endif
Modified: trunk/src/mgr/versificationmgr.cpp
===================================================================
--- trunk/src/mgr/versificationmgr.cpp 2017-09-02 09:30:13 UTC (rev 3489)
+++ trunk/src/mgr/versificationmgr.cpp 2017-09-02 09:38:18 UTC (rev 3490)
@@ -76,9 +76,9 @@
systemVersificationMgr->registerVersificationSystem("Catholic2", otbooks_catholic2, ntbooks, vm_catholic2);
systemVersificationMgr->registerVersificationSystem("LXX", otbooks_lxx, ntbooks, vm_lxx);
systemVersificationMgr->registerVersificationSystem("Orthodox", otbooks_orthodox, ntbooks, vm_orthodox);
- systemVersificationMgr->registerVersificationSystem("Calvin", otbooks, ntbooks, vm_calvin);
- systemVersificationMgr->registerVersificationSystem("DarbyFr", otbooks, ntbooks, vm_darbyfr);
- systemVersificationMgr->registerVersificationSystem("Segond", otbooks, ntbooks, vm_segond);
+ systemVersificationMgr->registerVersificationSystem("Calvin", otbooks, ntbooks, vm_calvin, mappings_calvin);
+ systemVersificationMgr->registerVersificationSystem("DarbyFr", otbooks, ntbooks, vm_darbyfr, mappings_darbyfr);
+ systemVersificationMgr->registerVersificationSystem("Segond", otbooks, ntbooks, vm_segond, mappings_segond);
}
return systemVersificationMgr;
}
More information about the sword-cvs
mailing list