set properties

git-svn-id: https://www.crosswire.org/svn/sword-tools/trunk@461 07627401-56e2-0310-80f4-f8cd0041bdcd

4 files changed, 641 insertions, 641 deletions

diff --git a/versification/lxx_v11ns/canon_cambridge.h b/versification/lxx_v11ns/canon_cambridge.h
index 14a0d88..4b08c00 100644
--- a/versification/lxx_v11ns/canon_cambridge.h
+++ b/versification/lxx_v11ns/canon_cambridge.h
@@ -2,7 +2,7 @@
  *
  *  canon_cambridge.h -	Versification data for the Cambridge system
  *
- * $Id: canon_cambridge.h 446 2013-07-25 04:39:18Z chrislit $
+ * $Id$
  *
  * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society
diff --git a/versification/lxx_v11ns/canon_eob.h b/versification/lxx_v11ns/canon_eob.h
index ac10458..8909128 100644
--- a/versification/lxx_v11ns/canon_eob.h
+++ b/versification/lxx_v11ns/canon_eob.h
@@ -1,320 +1,320 @@
-/******************************************************************************

- *

- *  canon_eob.h -	Versification data for the EOB system

- *

- * $Id: canon_eob.h 444 2013-07-24 08:21:17Z chrislit $

- *

- * Copyright 2013 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_EOB_H

-#define CANON_EOB_H

-

-SWORD_NAMESPACE_START

-

-

-// Versification system: EOB (just the OT previews available)

-// Book order: Ps PrMan ... Zeph

-

-// Source: http://www.synaxis.info/psalter/5_english/c_psalms/EOB_psalter.pdf

-//         http://www.orthodoxanswers.org/eob/download/zephaniah.pdf

-

-/******************************************************************************

- * [on]tbooks_eob - initialize static instance for all canonical

- *		 text names and chapmax

- */

-struct sbook otbooks_eob[] = {

-  {"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},

-  {"I Esdras", "1Esd", "1Esd", 9},

-  {"Ezra", "Ezra", "Ezra", 10},

-  {"Nehemiah", "Neh", "Neh", 13},

-  {"Esther", "Esth", "Esth", 16},

-  {"Judith", "Jdt", "Jdt", 16},

-  {"Tobit", "Tob", "Tob", 14},

-  {"I Maccabees", "1Macc", "1Macc", 16},

-  {"II Maccabees", "2Macc", "2Macc", 15},

-  {"III Maccabees", "3Macc", "3Macc", 7},

-  {"IV Maccabees", "4Macc", "4Macc", 18},

-  {"Psalms", "Ps", "Ps", 151},

-  {"Prayer of Manasses", "PrMan", "PrMan", 1},

-  {"Proverbs", "Prov", "Prov", 31},

-  {"Ecclesiastes", "Eccl", "Eccl", 12},

-  {"Song of Solomon", "Song", "Song", 8},

-  {"Job", "Job", "Job", 42},

-  {"Wisdom", "Wis", "Wis", 19},

-  {"Sirach", "Sir", "Sir", 51},

-  {"Psalms of Solomon", "PssSol", "PssSol", 18},

-  {"Hosea", "Hos", "Hos", 14},

-  {"Amos", "Amos", "Amos", 9},

-  {"Micah", "Mic", "Mic", 7},

-  {"Joel", "Joel", "Joel", 4},

-  {"Obadiah", "Obad", "Obad", 1},

-  {"Jonah", "Jonah", "Jonah", 4},

-  {"Nahum", "Nah", "Nah", 3},

-  {"Habakkuk", "Hab", "Hab", 3},

-  {"Zephaniah", "Zeph", "Zeph", 3},

-  {"Haggai", "Hag", "Hag", 2},

-  {"Zechariah", "Zech", "Zech", 14},

-  {"Malachi", "Mal", "Mal", 4},

-  {"Isaiah", "Isa", "Isa", 66},

-  {"Jeremiah", "Jer", "Jer", 52},

-  {"Baruch", "Bar", "Bar", 5},

-  {"Lamentations", "Lam", "Lam", 5},

-  {"Epistle of Jeremiah", "EpJer", "EpJer", 1},

-  {"Ezekiel", "Ezek", "Ezek", 48},

-  {"Prayer of Azariah", "PrAzar", "PrAzar", 1},

-  {"Susanna", "Sus", "Sus", 1},

-  {"Daniel", "Dan", "Dan", 12},

-  {"Bel and the Dragon", "Bel", "Bel", 1},

-  {"I Enoch", "1En", "1En", 108},

-  {"Odes", "Odes", "Odes", 14},

-  {"", "", "", 0}

-};

-

-/******************************************************************************

- *	Maximum verses per chapter

- */

-

-int vm_eob[] = {

-  // Genesis

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Exodus

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Leviticus

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0,

-  // Numbers

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // Deuteronomy

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // Joshua

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // Judges

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0,

-  // Ruth

-  0, 0, 0, 0,

-  // I Samuel

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0,

-  // II Samuel

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // I Kings

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // II Kings

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0,

-  // I Chronicles

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // II Chronicles

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // I Esdras

-  0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Ezra

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Nehemiah

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0,

-  // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // Judith

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // Tobit

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // I Maccabees

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // II Maccabees

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0,

-  // III Maccabees

-  0, 0, 0, 0, 0, 0, 0,

-  // IV Maccabees

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Psalms

-  6, 12, 8, 8, 12, 10, 17, 9, 38, 7,

-  8, 6, 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, 26, 9, 10, 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, 11, 9, 14, 9, 6,

-  7,

-  // Prayer of Manasses

-  15,

-  // Proverbs

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0,

-  // Ecclesiastes

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // Song of Solomon

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Job

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // Wisdom

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Sirach

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0,

-  // Psalms of Solomon

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Hosea

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // Amos

-  0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Micah

-  0, 0, 0, 0, 0, 0, 0,

-  // Joel

-  0, 0, 0, 0,

-  // Obadiah

-  0,

-  // Jonah

-  0, 0, 0, 0,

-  // Nahum

-  0, 0, 0,

-  // Habakkuk

-  0, 0, 0,

-  // Zephaniah

-  18, 14, 20,

-  // Haggai

-  0, 0,

-  // Zechariah

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // Malachi

-  0, 0, 0, 0,

-  // Isaiah

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // Jeremiah

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // Baruch

-  0, 0, 0, 0, 0,

-  // Lamentations

-  0, 0, 0, 0, 0,

-  // Epistle of Jeremiah

-  0,

-  // Ezekiel

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Prayer of Azariah

-  0,

-  // Susanna

-  0,

-  // Daniel

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // Bel and the Dragon

-  0,

-  // I Enoch

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Odes

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-};

-

-SWORD_NAMESPACE_END

-#endif

+/******************************************************************************
+ *
+ *  canon_eob.h -	Versification data for the EOB system
+ *
+ * $Id$
+ *
+ * Copyright 2013 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_EOB_H
+#define CANON_EOB_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: EOB (just the OT previews available)
+// Book order: Ps PrMan ... Zeph
+
+// Source: http://www.synaxis.info/psalter/5_english/c_psalms/EOB_psalter.pdf
+//         http://www.orthodoxanswers.org/eob/download/zephaniah.pdf
+
+/******************************************************************************
+ * [on]tbooks_eob - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_eob[] = {
+  {"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},
+  {"I Esdras", "1Esd", "1Esd", 9},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Esther", "Esth", "Esth", 16},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Tobit", "Tob", "Tob", 14},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"III Maccabees", "3Macc", "3Macc", 7},
+  {"IV Maccabees", "4Macc", "4Macc", 18},
+  {"Psalms", "Ps", "Ps", 151},
+  {"Prayer of Manasses", "PrMan", "PrMan", 1},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Job", "Job", "Job", 42},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Psalms of Solomon", "PssSol", "PssSol", 18},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Amos", "Amos", "Amos", 9},
+  {"Micah", "Mic", "Mic", 7},
+  {"Joel", "Joel", "Joel", 4},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Baruch", "Bar", "Bar", 5},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+  {"Susanna", "Sus", "Sus", 1},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Bel and the Dragon", "Bel", "Bel", 1},
+  {"I Enoch", "1En", "1En", 108},
+  {"Odes", "Odes", "Odes", 14},
+  {"", "", "", 0}
+};
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_eob[] = {
+  // Genesis
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Exodus
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Leviticus
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0,
+  // Numbers
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // Deuteronomy
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // Joshua
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // Judges
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0,
+  // Ruth
+  0, 0, 0, 0,
+  // I Samuel
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0,
+  // II Samuel
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // I Kings
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // II Kings
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0,
+  // I Chronicles
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // II Chronicles
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // I Esdras
+  0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Ezra
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Nehemiah
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0,
+  // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // Judith
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // Tobit
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // I Maccabees
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // II Maccabees
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0,
+  // III Maccabees
+  0, 0, 0, 0, 0, 0, 0,
+  // IV Maccabees
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Psalms
+  6, 12, 8, 8, 12, 10, 17, 9, 38, 7,
+  8, 6, 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, 26, 9, 10, 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, 11, 9, 14, 9, 6,
+  7,
+  // Prayer of Manasses
+  15,
+  // Proverbs
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0,
+  // Ecclesiastes
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // Song of Solomon
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Job
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // Wisdom
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Sirach
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0,
+  // Psalms of Solomon
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Hosea
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // Amos
+  0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Micah
+  0, 0, 0, 0, 0, 0, 0,
+  // Joel
+  0, 0, 0, 0,
+  // Obadiah
+  0,
+  // Jonah
+  0, 0, 0, 0,
+  // Nahum
+  0, 0, 0,
+  // Habakkuk
+  0, 0, 0,
+  // Zephaniah
+  18, 14, 20,
+  // Haggai
+  0, 0,
+  // Zechariah
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // Malachi
+  0, 0, 0, 0,
+  // Isaiah
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // Jeremiah
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // Baruch
+  0, 0, 0, 0, 0,
+  // Lamentations
+  0, 0, 0, 0, 0,
+  // Epistle of Jeremiah
+  0,
+  // Ezekiel
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Prayer of Azariah
+  0,
+  // Susanna
+  0,
+  // Daniel
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // Bel and the Dragon
+  0,
+  // I Enoch
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Odes
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/versification/lxx_v11ns/canon_moore.h b/versification/lxx_v11ns/canon_moore.h
index 2a58ffc..89afd47 100644
--- a/versification/lxx_v11ns/canon_moore.h
+++ b/versification/lxx_v11ns/canon_moore.h
@@ -1,319 +1,319 @@
-/******************************************************************************

- *

- *  canon_moore.h -	Versification data for the Moore system

- *

- * $Id: canon_moore.h 444 2013-07-24 08:21:17Z chrislit $

- *

- * Copyright 2013 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_MOORE_H

-#define CANON_MOORE_H

-

-SWORD_NAMESPACE_START

-

-

-// Versification system: Moore

-// Book order: Ps

-

-// Source: http://www.synaxis.info/psalter/5_english/c_psalms/FrLazarusMoore-Psalter.txt

-

-/******************************************************************************

- * [on]tbooks_moore - initialize static instance for all canonical

- *		 text names and chapmax

- */

-struct sbook otbooks_moore[] = {

-  {"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},

-  {"I Esdras", "1Esd", "1Esd", 9},

-  {"Ezra", "Ezra", "Ezra", 10},

-  {"Nehemiah", "Neh", "Neh", 13},

-  {"Esther", "Esth", "Esth", 16},

-  {"Judith", "Jdt", "Jdt", 16},

-  {"Tobit", "Tob", "Tob", 14},

-  {"I Maccabees", "1Macc", "1Macc", 16},

-  {"II Maccabees", "2Macc", "2Macc", 15},

-  {"III Maccabees", "3Macc", "3Macc", 7},

-  {"IV Maccabees", "4Macc", "4Macc", 18},

-  {"Psalms", "Ps", "Ps", 151},

-  {"Prayer of Manasses", "PrMan", "PrMan", 1},

-  {"Proverbs", "Prov", "Prov", 31},

-  {"Ecclesiastes", "Eccl", "Eccl", 12},

-  {"Song of Solomon", "Song", "Song", 8},

-  {"Job", "Job", "Job", 42},

-  {"Wisdom", "Wis", "Wis", 19},

-  {"Sirach", "Sir", "Sir", 51},

-  {"Psalms of Solomon", "PssSol", "PssSol", 18},

-  {"Hosea", "Hos", "Hos", 14},

-  {"Amos", "Amos", "Amos", 9},

-  {"Micah", "Mic", "Mic", 7},

-  {"Joel", "Joel", "Joel", 4},

-  {"Obadiah", "Obad", "Obad", 1},

-  {"Jonah", "Jonah", "Jonah", 4},

-  {"Nahum", "Nah", "Nah", 3},

-  {"Habakkuk", "Hab", "Hab", 3},

-  {"Zephaniah", "Zeph", "Zeph", 3},

-  {"Haggai", "Hag", "Hag", 2},

-  {"Zechariah", "Zech", "Zech", 14},

-  {"Malachi", "Mal", "Mal", 4},

-  {"Isaiah", "Isa", "Isa", 66},

-  {"Jeremiah", "Jer", "Jer", 52},

-  {"Baruch", "Bar", "Bar", 5},

-  {"Lamentations", "Lam", "Lam", 5},

-  {"Epistle of Jeremiah", "EpJer", "EpJer", 1},

-  {"Ezekiel", "Ezek", "Ezek", 48},

-  {"Prayer of Azariah", "PrAzar", "PrAzar", 1},

-  {"Susanna", "Sus", "Sus", 1},

-  {"Daniel", "Dan", "Dan", 12},

-  {"Bel and the Dragon", "Bel", "Bel", 1},

-  {"I Enoch", "1En", "1En", 108},

-  {"Odes", "Odes", "Odes", 14},

-  {"", "", "", 0}

-};

-

-/******************************************************************************

- *	Maximum verses per chapter

- */

-

-int vm_moore[] = {

-  // Genesis

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Exodus

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Leviticus

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0,

-  // Numbers

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // Deuteronomy

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // Joshua

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // Judges

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0,

-  // Ruth

-  0, 0, 0, 0,

-  // I Samuel

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0,

-  // II Samuel

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // I Kings

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // II Kings

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0,

-  // I Chronicles

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // II Chronicles

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // I Esdras

-  0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Ezra

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Nehemiah

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0,

-  // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // Judith

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // Tobit

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // I Maccabees

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // II Maccabees

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0,

-  // III Maccabees

-  0, 0, 0, 0, 0, 0, 0,

-  // IV Maccabees

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Psalms

-  6, 13, 8, 9, 13, 9, 18, 10, 39, 7, 

-  8, 6, 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, 14, 18, 13, 

-  11, 6, 27, 18, 12, 10, 15, 20, 23, 19, 

-  10, 7, 7, 24, 14, 12, 11, 19, 12, 9, 

-  13, 12, 11, 14, 20, 7, 36, 37, 7, 6, 

-  19, 28, 23, 10, 12, 20, 72, 13, 19, 16, 

-  8, 18, 12, 13, 17, 7, 18, 53, 17, 16, 

-  15, 5, 23, 11, 13, 12, 9, 9, 5, 8, 

-  29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 

-  10, 9, 26, 9, 10, 2, 29, 176, 7, 8, 

-  9, 4, 8, 5, 7, 5, 6, 8, 8, 3, 

-  18, 3, 3, 21, 26, 8, 8, 24, 15, 10, 

-  8, 12, 15, 22, 10, 11, 9, 14, 9, 6,

-  7,

-  // Prayer of Manasses

-  0,

-  // Proverbs

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0,

-  // Ecclesiastes

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // Song of Solomon

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Job

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // Wisdom

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Sirach

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0,

-  // Psalms of Solomon

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Hosea

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // Amos

-  0, 0, 0, 0, 0, 0, 0, 0, 0,

-  // Micah

-  0, 0, 0, 0, 0, 0, 0,

-  // Joel

-  0, 0, 0, 0,

-  // Obadiah

-  0,

-  // Jonah

-  0, 0, 0, 0,

-  // Nahum

-  0, 0, 0,

-  // Habakkuk

-  0, 0, 0,

-  // Zephaniah

-  0, 0, 0,

-  // Haggai

-  0, 0,

-  // Zechariah

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-  // Malachi

-  0, 0, 0, 0,

-  // Isaiah

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0,

-  // Jeremiah

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // Baruch

-  0, 0, 0, 0, 0,

-  // Lamentations

-  0, 0, 0, 0, 0,

-  // Epistle of Jeremiah

-  0,

-  // Ezekiel

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Prayer of Azariah

-  0,

-  // Susanna

-  0,

-  // Daniel

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0,

-  // Bel and the Dragon

-  0,

-  // I Enoch

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0, 0, 0, 0, 0,

-  // Odes

-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

-  0, 0, 0, 0,

-};

-

-SWORD_NAMESPACE_END

-#endif

+/******************************************************************************
+ *
+ *  canon_moore.h -	Versification data for the Moore system
+ *
+ * $Id$
+ *
+ * Copyright 2013 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_MOORE_H
+#define CANON_MOORE_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Moore
+// Book order: Ps
+
+// Source: http://www.synaxis.info/psalter/5_english/c_psalms/FrLazarusMoore-Psalter.txt
+
+/******************************************************************************
+ * [on]tbooks_moore - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_moore[] = {
+  {"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},
+  {"I Esdras", "1Esd", "1Esd", 9},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Esther", "Esth", "Esth", 16},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Tobit", "Tob", "Tob", 14},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"III Maccabees", "3Macc", "3Macc", 7},
+  {"IV Maccabees", "4Macc", "4Macc", 18},
+  {"Psalms", "Ps", "Ps", 151},
+  {"Prayer of Manasses", "PrMan", "PrMan", 1},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Job", "Job", "Job", 42},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Psalms of Solomon", "PssSol", "PssSol", 18},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Amos", "Amos", "Amos", 9},
+  {"Micah", "Mic", "Mic", 7},
+  {"Joel", "Joel", "Joel", 4},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Baruch", "Bar", "Bar", 5},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+  {"Susanna", "Sus", "Sus", 1},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Bel and the Dragon", "Bel", "Bel", 1},
+  {"I Enoch", "1En", "1En", 108},
+  {"Odes", "Odes", "Odes", 14},
+  {"", "", "", 0}
+};
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_moore[] = {
+  // Genesis
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Exodus
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Leviticus
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0,
+  // Numbers
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // Deuteronomy
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // Joshua
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // Judges
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0,
+  // Ruth
+  0, 0, 0, 0,
+  // I Samuel
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0,
+  // II Samuel
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // I Kings
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // II Kings
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0,
+  // I Chronicles
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // II Chronicles
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // I Esdras
+  0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Ezra
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Nehemiah
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0,
+  // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // Judith
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // Tobit
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // I Maccabees
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // II Maccabees
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0,
+  // III Maccabees
+  0, 0, 0, 0, 0, 0, 0,
+  // IV Maccabees
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Psalms
+  6, 13, 8, 9, 13, 9, 18, 10, 39, 7, 
+  8, 6, 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, 14, 18, 13, 
+  11, 6, 27, 18, 12, 10, 15, 20, 23, 19, 
+  10, 7, 7, 24, 14, 12, 11, 19, 12, 9, 
+  13, 12, 11, 14, 20, 7, 36, 37, 7, 6, 
+  19, 28, 23, 10, 12, 20, 72, 13, 19, 16, 
+  8, 18, 12, 13, 17, 7, 18, 53, 17, 16, 
+  15, 5, 23, 11, 13, 12, 9, 9, 5, 8, 
+  29, 22, 35, 45, 48, 43, 14, 31, 7, 10, 
+  10, 9, 26, 9, 10, 2, 29, 176, 7, 8, 
+  9, 4, 8, 5, 7, 5, 6, 8, 8, 3, 
+  18, 3, 3, 21, 26, 8, 8, 24, 15, 10, 
+  8, 12, 15, 22, 10, 11, 9, 14, 9, 6,
+  7,
+  // Prayer of Manasses
+  0,
+  // Proverbs
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0,
+  // Ecclesiastes
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // Song of Solomon
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Job
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // Wisdom
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Sirach
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0,
+  // Psalms of Solomon
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Hosea
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // Amos
+  0, 0, 0, 0, 0, 0, 0, 0, 0,
+  // Micah
+  0, 0, 0, 0, 0, 0, 0,
+  // Joel
+  0, 0, 0, 0,
+  // Obadiah
+  0,
+  // Jonah
+  0, 0, 0, 0,
+  // Nahum
+  0, 0, 0,
+  // Habakkuk
+  0, 0, 0,
+  // Zephaniah
+  0, 0, 0,
+  // Haggai
+  0, 0,
+  // Zechariah
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+  // Malachi
+  0, 0, 0, 0,
+  // Isaiah
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0,
+  // Jeremiah
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // Baruch
+  0, 0, 0, 0, 0,
+  // Lamentations
+  0, 0, 0, 0, 0,
+  // Epistle of Jeremiah
+  0,
+  // Ezekiel
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Prayer of Azariah
+  0,
+  // Susanna
+  0,
+  // Daniel
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0,
+  // Bel and the Dragon
+  0,
+  // I Enoch
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0,
+  // Odes
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0,
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/versification/lxx_v11ns/canon_papoutsis.h b/versification/lxx_v11ns/canon_papoutsis.h
index c3d2b5d..e5524a1 100644
--- a/versification/lxx_v11ns/canon_papoutsis.h
+++ b/versification/lxx_v11ns/canon_papoutsis.h
@@ -2,7 +2,7 @@
  *
  *  canon_papoutsis.h -	Versification data for the Papoutsis system
  *
- * $Id: canon_papoutsis.h 446 2013-07-25 04:39:18Z chrislit $
+ * $Id$
  *
  * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
  *	CrossWire Bible Society