regularlized & corrected data entry errors

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

7 files changed, 14 insertions, 87 deletions

diff --git a/versification/lxx_v11ns/canon_brenton.h b/versification/lxx_v11ns/canon_brenton.h
index d397e8c..6c9f7cd 100644
--- a/versification/lxx_v11ns/canon_brenton.h
+++ b/versification/lxx_v11ns/canon_brenton.h
@@ -73,7 +73,7 @@ struct sbook otbooks_brenton[] = {
   {"Hosea", "Hos", "Hos", 14},
   {"Amos", "Amos", "Amos", 9},
   {"Micah", "Mic", "Mic", 7},
-  {"Joel", "Joel", "Joel", 3},
+  {"Joel", "Joel", "Joel", 4},
   {"Obadiah", "Obad", "Obad", 1},
   {"Jonah", "Jonah", "Jonah", 4},
   {"Nahum", "Nah", "Nah", 3},
@@ -246,7 +246,7 @@ int vm_brenton[] = {
   // Micah
   16, 13, 12, 13, 15, 16, 20,
   // Joel
-  20, 32, 21,
+  20, 32, 21, 0,
   // Obadiah
   21,
   // Jonah
diff --git a/versification/lxx_v11ns/canon_charles.h b/versification/lxx_v11ns/canon_charles.h
index 0ce852d..58a8098 100644
--- a/versification/lxx_v11ns/canon_charles.h
+++ b/versification/lxx_v11ns/canon_charles.h
@@ -172,7 +172,9 @@ int vm_charles[] = {
   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, 13,
-  12/17, 6/7, 18/30, 19/16, 19/24, 24/11,
+  // 11-16 : 12, 6, 18, 19, 19, 24,
+  // A-F   : 17, 7, 30, 16, 24, 11,
+  17, 7, 30, 19, 24, 24,
   // Judith
   16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
   23, 20, 20, 19, 13, 25,
@@ -301,7 +303,6 @@ int vm_charles[] = {
   // Bel and the Dragon
   42,
   // I Enoch
-  // I Enoch
   9, 3, 1, 1, 9, 8, 6, 4, 11, 22,
   2, 6, 10, 25, 12, 4, 8, 16, 3, 8,
   10, 14, 4, 6, 7, 6, 5, 3, 2, 3,
diff --git a/versification/lxx_v11ns/canon_howard.h b/versification/lxx_v11ns/canon_howard.h
index f303891..eb05d35 100644
--- a/versification/lxx_v11ns/canon_howard.h
+++ b/versification/lxx_v11ns/canon_howard.h
@@ -301,9 +301,6 @@ int vm_howard[] = {
   // Bel and the Dragon

   0,

   // I Enoch

-  9, 3, 1, 1, 10, 8, 6, 4, 11, 22,

-  2, 6, 10, 25, 12, 3, 8, 16, 3, 7,

-  10, 14, 4, 6, 7, 6, 5, 3, 2, 3,

   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

diff --git a/versification/lxx_v11ns/canon_ottley.h b/versification/lxx_v11ns/canon_ottley.h
index e968d71..1b647e6 100644
--- a/versification/lxx_v11ns/canon_ottley.h
+++ b/versification/lxx_v11ns/canon_ottley.h
@@ -309,9 +309,6 @@ int vm_ottley[] = {
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 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,
diff --git a/versification/lxx_v11ns/canon_saas.h b/versification/lxx_v11ns/canon_saas.h
index 3511da9..fe32448 100644
--- a/versification/lxx_v11ns/canon_saas.h
+++ b/versification/lxx_v11ns/canon_saas.h
@@ -315,75 +315,6 @@ int vm_lxx[] = {
   // Odes
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0,
-  // 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, 50, 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, 26, 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, 14,
-  // 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, 9, 21, 18, 24, 21, 15,
-  27, 21
 };
 
 
diff --git a/versification/lxx_v11ns/canon_swete.h b/versification/lxx_v11ns/canon_swete.h
index 3be2f45..98b2750 100644
--- a/versification/lxx_v11ns/canon_swete.h
+++ b/versification/lxx_v11ns/canon_swete.h
@@ -174,7 +174,9 @@ int vm_swete[] = {
   36, 47, 31,
   // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
   22, 23, 15, 17, 14, 14, 10, 17, 31, 13,
-  12/17, 6/7, 18/30, 19/16, 19/24, 24/11,
+  // 11-16 : 12, 6, 18, 19, 19, 24,
+  // A-F   : 17, 7, 30, 16, 24, 11,
+  17, 7, 30, 19, 24, 24,
   // Judith
   16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
   23, 20, 20, 19, 14, 25,
diff --git a/versification/lxx_v11ns/canon_thomson.h b/versification/lxx_v11ns/canon_thomson.h
index ee98f23..9d5e671 100644
--- a/versification/lxx_v11ns/canon_thomson.h
+++ b/versification/lxx_v11ns/canon_thomson.h
@@ -176,15 +176,15 @@ int vm_thomson[] = {
   // Tobit
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0,
-  // I Maccabees?
+  // I Maccabees
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0,
-  // II Maccabees?
+  // II Maccabees
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0,
-  // III Maccabees?
+  // III Maccabees
   0, 0, 0, 0, 0, 0, 0,
-  // IV Maccabees?
+  // IV Maccabees
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0,
   // Psalms
@@ -276,9 +276,8 @@ int vm_thomson[] = {
   40, 44, 13, 22, 19, 32, 21, 29, 18, 16,
   18, 22, 13, 30, 5, 28, 7, 44, 38, 46,
   63, 34,
-  // Baruch?
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  22, 35, 38, 37, 9,
+  // Baruch
+  0, 0, 0, 0, 0,
   // Lamentations
   22, 22, 66, 22, 22,
   // Epistle of Jeremiah