Canon darbyfr.h - Revision history

David Haslam: == See also == Category:Versification

2017-03-03T19:47:41Z

== See also == Category:Versification

Domcox: moved Canon fredarby.h to Canon darbyfr.h: Reflect changes in Sword tree

2015-08-22T20:44:24Z

moved Canon fredarby.h to Canon darbyfr.h: Reflect changes in Sword tree

Domcox at 20:43, 22 August 2015

2015-08-22T20:43:36Z

Domcox at 20:42, 22 August 2015

2015-08-22T20:42:46Z

Domcox: Rename to fredarby

2015-08-22T08:54:13Z

Rename to fredarby

Domcox: moved Canon darby fr.h to Canon fredarby.h: Reflect change in sword tree.

2015-08-22T08:51:21Z

moved Canon darby fr.h to Canon fredarby.h: Reflect change in sword tree.

Domcox: Duplicated ot_books and nt_books removed.

2015-08-22T08:27:10Z

Duplicated ot_books and nt_books removed.

Domcox: Created page with "

 /******************************************************************************  *  *  canon_darby_fr.h -	Versification data dor the French Darby Bibles  *  * $Id: canon_da..."

2015-08-12T09:06:20Z

Created page with "<pre> /****************************************************************************** * * canon_darby_fr.h - Versification data dor the French Darby Bibles * * $Id: canon_da..."

New page

<pre>
/******************************************************************************
*
* canon_darby_fr.h - Versification data dor the French Darby Bibles
*
* $Id: canon_darby_fr.h 2015-08-12 10:50:20 domcox $
*
* Copyright 1998-2015 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
* P. O. Box 2528
* Tempe, AZ 85280-2528
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation version 2.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
*/

#ifndef CANON_DARBY_FR_H
#define CANON_DARBY_FR_H

#include <canon_abbrevs.h>

SWORD_NAMESPACE_START

// Versification system: darby_fr
// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev

// This is based on French Darby translations from 1885 to our days. Both German and English versions differ.

/******************************************************************************
* [on]tbooks_darby_fr - initialize static instance for all canonical
* text names and chapmax
*/
// for otbooks_darby_fr, use otbooks

// for ntbooks_darby_fr, use ntbooks

/******************************************************************************
* Maximum verses per chapter
*/
struct sbook otbooks_darby_fr[] = {
{"Genesis", "Gen", "Gen", 50},
{"Exodus", "Exod", "Exod", 40},
{"Leviticus", "Lev", "Lev", 27},
{"Numbers", "Num", "Num", 36},
{"Deuteronomy", "Deut", "Deut", 34},
{"Joshua", "Josh", "Josh", 24},
{"Judges", "Judg", "Judg", 21},
{"Ruth", "Ruth", "Ruth", 4},
{"I Samuel", "1Sam", "1Sam", 31},
{"II Samuel", "2Sam", "2Sam", 24},
{"I Kings", "1Kgs", "1Kgs", 22},
{"II Kings", "2Kgs", "2Kgs", 25},
{"I Chronicles", "1Chr", "1Chr", 29},
{"II Chronicles", "2Chr", "2Chr", 36},
{"Ezra", "Ezra", "Ezra", 10},
{"Nehemiah", "Neh", "Neh", 13},
{"Esther", "Esth", "Esth", 10},
{"Job", "Job", "Job", 42},
{"Psalms", "Ps", "Ps", 150},
{"Proverbs", "Prov", "Prov", 31},
{"Ecclesiastes", "Eccl", "Eccl", 12},
{"Song of Solomon", "Song", "Song", 8},
{"Isaiah", "Isa", "Isa", 66},
{"Jeremiah", "Jer", "Jer", 52},
{"Lamentations", "Lam", "Lam", 5},
{"Ezekiel", "Ezek", "Ezek", 48},
{"Daniel", "Dan", "Dan", 12},
{"Hosea", "Hos", "Hos", 14},
{"Joel", "Joel", "Joel", 3},
{"Amos", "Amos", "Amos", 9},
{"Obadiah", "Obad", "Obad", 1},
{"Jonah", "Jonah", "Jonah", 4},
{"Micah", "Mic", "Mic", 7},
{"Nahum", "Nah", "Nah", 3},
{"Habakkuk", "Hab", "Hab", 3},
{"Zephaniah", "Zeph", "Zeph", 3},
{"Haggai", "Hag", "Hag", 2},
{"Zechariah", "Zech", "Zech", 14},
{"Malachi", "Mal", "Mal", 4},
{"", "", "", 0}
};
struct sbook ntbooks_darby_fr[] = {
{"Matthew", "Matt", "Matt", 28},
{"Mark", "Mark", "Mark", 16},
{"Luke", "Luke", "Luke", 24},
{"John", "John", "John", 21},
{"Acts", "Acts", "Acts", 28},
{"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},
{"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},
{"Revelation of John", "Rev", "Rev", 22},
{"", "", "", 0}
};

/******************************************************************************
* Maximum verses per chapter
*/

int vm_darby_fr[] = {
// Genesis
31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
// Exodus
22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
// Leviticus
17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
24, 33, 44, 23, 55, 46, 34,
// Numbers
54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
35, 15, 34, 45, 41, 50, 13, 32, 22, 29,
35, 41, 30, 25, 18, 65, 23, 31, 40, 17,
54, 42, 56, 29, 34, 13,
// Deuteronomy
46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
32, 32, 18, 29, 23, 22, 20, 22, 21, 20,
23, 30, 25, 22, 19, 19, 26, 69, 29, 20,
30, 52, 29, 12,
// Joshua
18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
45, 34, 16, 33,
// Judges
36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
25,
// Ruth
22, 23, 18, 22,
// I Samuel
28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
15, 25, 23, 52, 35, 23, 58, 30, 24, 43,
15, 23, 28, 23, 44, 25, 12, 25, 11, 31,
13,
// II Samuel
27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
22, 51, 39, 25,
// I Kings
53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
29, 54,
// II Kings
18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
26, 20, 37, 20, 30,
// I Chronicles
54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
30, 19, 32, 31, 31, 32, 34, 21, 30,
// II Chronicles
17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
21, 33, 25, 33, 27, 23,
// Ezra
11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
// Nehemiah
11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
36, 47, 31,
// Esther
22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
// Job
22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
40, 22, 33, 37, 16, 33, 24, 38, 38, 27,
25, 17,
// Psalms
6, 12, 8, 8, 12, 10, 17, 9, 20, 18,
7, 8, 5, 7, 5, 11, 15, 50, 14, 9,
13, 31, 6, 10, 22, 12, 14, 9, 11, 12,
24, 11, 22, 22, 28, 12, 40, 22, 13, 17,
13, 11, 5, 26, 17, 11, 9, 14, 20, 23,
19, 9, 6, 7, 23, 13, 11, 11, 17, 12,
8, 12, 11, 10, 13, 20, 7, 35, 36, 5,
24, 20, 28, 23, 10, 12, 20, 72, 13, 19,
16, 8, 18, 12, 13, 17, 7, 18, 52, 17,
16, 15, 5, 23, 11, 13, 12, 9, 9, 5,
8, 28, 22, 35, 45, 48, 43, 13, 31, 7,
10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
3, 18, 3, 3, 21, 26, 9, 8, 24, 13,
10, 7, 12, 15, 21, 10, 20, 14, 9, 6,
// Proverbs
33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
31,
// Ecclesiastes
18, 26, 22, 16, 20, 12, 29, 17, 18, 20,
10, 14,
// Song of Solomon
17, 17, 11, 16, 16, 13, 13, 14,
// Isaiah
31, 22, 26, 6, 30, 13, 25, 22, 21, 34,
16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
11, 12, 19, 12, 25, 24,
// Jeremiah
19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
64, 34,
// Lamentations
22, 22, 66, 22, 22,
// Ezekiel
28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
26, 20, 27, 31, 25, 24, 23, 35,
// Daniel
21, 49, 30, 37, 31, 28, 28, 27, 27, 21,
45, 13,
// Hosea
11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
11, 15, 16, 9,
// Joel
20, 32, 21,
// Amos
15, 16, 15, 13, 27, 14, 17, 14, 15,
// Obadiah
21,
// Jonah
16, 11, 10, 11,
// Micah
16, 13, 12, 13, 15, 16, 20,
// Nahum
15, 13, 19,
// Habakkuk
17, 20, 19,
// Zephaniah
18, 15, 20,
// Haggai
15, 23,
// Zechariah
21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
17, 14, 9, 21,
// Malachi
14, 17, 18, 6,
// -----------------------------------------------------------------
// Matthew
25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
46, 46, 39, 51, 46, 75, 66, 20,
// Mark
45, 28, 35, 41, 43, 56, 37, 38, 51, 52,
33, 44, 37, 72, 47, 20,
// Luke
80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
38, 71, 56, 53,
// John
52, 25, 36, 54, 47, 71, 53, 59, 41, 42,
57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
25,
// Acts
26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
40, 30, 35, 27, 27, 32, 44, 31,
// Romans
32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
36, 21, 14, 23, 33, 27,
// I Corinthians
31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
34, 31, 13, 40, 58, 24,
// II Corinthians
24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
33, 21, 13,
// Galatians
24, 21, 29, 31, 26, 18,
// Ephesians
23, 22, 21, 32, 33, 24,
// Philippians
30, 30, 21, 23,
// Colossians
29, 23, 25, 18,
// I Thessalonians
10, 20, 13, 18, 28,
// II Thessalonians
12, 17, 18,
// I Timothy
20, 15, 16, 16, 25, 21,
// II Timothy
18, 26, 17, 22,
// Titus
16, 15, 15,
// Philemon
25,
// Hebrews
14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
40, 29, 25,
// James
27, 26, 18, 17, 20,
// I Peter
25, 25, 22, 19, 14,
// II Peter
21, 22, 18,
// I John
10, 29, 24, 21, 21,
// II John
13,
// III John
15,
// Jude
25,
// Revelation of John
20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
27, 21
};

SWORD_NAMESPACE_END

#endif
</pre>

@@ Line 4: / Line 4: @@
   *  canon_darbyfr.h -	Versification data for the French Darby Bibles
+  *
-  * $Id: canon_darbyf.h 2015-08-22 22:30:20 domcox $
+  * $Id: canon_darbyfr.h 2015-08-22 22:30:20 domcox $
+  *
   * Copyright 1998-2015 CrossWire Bible Society (http://www.crosswire.org)

@@ Line 2: / Line 2: @@
 /******************************************************************************
+  *
-  *  canon_fredarby.h -	Versification data dor the French Darby Bibles
+  *  canon_darbyfr.h -	Versification data for the French Darby Bibles
+  *
-  * $Id: canon_fredarby.h 2015-08-22 10:50:20 domcox $
+  * $Id: canon_darbyf.h 2015-08-22 22:30:20 domcox $
+  *
   * Copyright 1998-2015 CrossWire Bible Society (http://www.crosswire.org)
@@ Line 22: / Line 22: @@
   */
-#ifndef CANON_FREDARBY_H
+#ifndef CANON_DARBYFR_H
-#define CANON_FREDARBY_H
+#define CANON_DARBYFR_H
 SWORD_NAMESPACE_START
-// Versification system: FreDarby
+// Versification system: DarbyFR
 // Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev
-// This is based on French Darby translations from 1885 to our days. Both German and English Darby use another system.
+// This versification scheme is based on the French Darby translation.
 /******************************************************************************
-  * [on]tbooks_darby_fr - initialize static instance for all canonical
+  * [on]tbooks_darbyfr - initialize static instance for all canonical
   *                       text names and chapmax
+  *
-  * for otbooks_fredarby, use otbooks
+  * for otbooks_darbyfr, use otbooks
+  *
-  * for ntbooks_fredarby, use ntbooks
+  * for ntbooks_darbyfr, use ntbooks
+  *
   ******************************************************************************/
@@ Line 48: / Line 48: @@
   */
-int vm_fredarby[] = {
+int vm_darbyfr[] = {
    // Genesis
 , 25, 24, 26, 32, 22, 24, 22, 29, 32,
@@ Line 272: / Line 272: @@
 , 21
 };
 SWORD_NAMESPACE_END
 #endif
 </pre>

← Older revision		Revision as of 19:47, 3 March 2017
Line 277:		Line 277:
	#endif		#endif
	</pre>		</pre>
		+
		+	== See also ==
		+	[[Category:Versification]]

← Older revision	Revision as of 20:44, 22 August 2015
(No difference)

← Older revision	Revision as of 08:51, 22 August 2015
(No difference)

@@ Line 24: / Line 24: @@
 #ifndef CANON_DARBY_FR_H
 #define CANON_DARBY_FR_H
 SWORD_NAMESPACE_START
@@ Line 39: / Line 37: @@
   * [on]tbooks_darby_fr - initialize static instance for all canonical
   *                       text names and chapmax
-  */
-// for otbooks_darby_fr, use otbooks
+ * for otbooks_darby_fr, use otbooks
-−
+ *
-// for ntbooks_darby_fr, use ntbooks
+ * for ntbooks_darby_fr, use ntbooks
-−
+  *
-/******************************************************************************
+  ******************************************************************************/
-  *	Maximum verses per chapter
+  //	Maximum verses per chapter
-  */
+  //
 int vm_darby_fr[] = {
@@ Line 295: / Line 217: @@
    // Acts
 , 47, 26, 37, 42, 15, 60, 40, 43, 48,
 , 25, 52, 28, 41, 40, 34, 28, 41, 38,
 , 30, 35, 27, 27, 32, 44, 31,