[sword-svn] r2915 - trunk/include

chrislit at crosswire.org chrislit at crosswire.org
Tue Jul 23 09:55:55 MST 2013


Author: chrislit
Date: 2013-07-23 09:55:54 -0700 (Tue, 23 Jul 2013)
New Revision: 2915

Modified:
   trunk/include/canon.h
   trunk/include/canon_catholic.h
   trunk/include/canon_catholic2.h
   trunk/include/canon_german.h
   trunk/include/canon_kjva.h
   trunk/include/canon_leningrad.h
   trunk/include/canon_luther.h
   trunk/include/canon_lxx_nt.h
   trunk/include/canon_mt.h
   trunk/include/canon_nrsv.h
   trunk/include/canon_nrsva.h
   trunk/include/canon_rahlfs.h
   trunk/include/canon_synodal.h
   trunk/include/canon_vulg.h
Log:
split verse counts on decades for easier reading/comparison

Modified: trunk/include/canon.h
===================================================================
--- trunk/include/canon.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -111,93 +111,134 @@
 
 int vm[] = {
   // 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,
+  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,
+  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, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37,
-    27, 24, 33, 44, 23, 55, 46, 34,
+  17, 16, 17, 35, 19, 30, 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, 16, 33, 45, 41, 50, 13, 32, 22,
-    29, 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 16,
+  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, 68, 29, 20, 30, 52, 29, 12,
+  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, 68, 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,
+  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,
+  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,
-    42, 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  15, 23, 29, 22, 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,
+  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, 53,
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53,
   // 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,
+  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,
+  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,
+  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,
+  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, 41,
-    30, 24, 34, 17,
+  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, 41, 30, 24,
+  34, 17,
   // Psalms
-  6, 12, 8, 8, 12, 10, 17, 9, 20, 18, 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, 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,
+  6, 12, 8, 8, 12, 10, 17, 9, 20, 18,
+  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, 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,
+  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,
+  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,
+  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,
+  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,
-    49, 32, 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,
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 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,
+  21, 49, 30, 37, 31, 28, 28, 27, 27, 21,
+  45, 13,
   // Hosea
-  11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9,
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 16, 9,
   // Joel
   20, 32, 21,
   // Amos
@@ -217,30 +258,39 @@
   // Haggai
   15, 23,
   // Zechariah
-  21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
-    31, 25,
+  51, 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,
+  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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -262,7 +312,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -278,8 +329,9 @@
   // Jude
   25,
   // Revelation of John
-  20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21,
-    15, 27, 21
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 17, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_catholic.h
===================================================================
--- trunk/include/canon_catholic.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_catholic.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -88,75 +88,158 @@
 
 int vm_catholic[] = {
   // 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, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  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,
+  54, 33, 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, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 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,
+  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, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 66, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 66, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
   // Deuteronomy
-  46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12,
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 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,
+  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, 32, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25,
+  36, 23, 31, 24, 32, 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, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 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, 32, 44, 26, 22, 51, 39, 25,
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
   // I Kings
-  53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54,
+  53, 46, 28, 20, 32, 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, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30,
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
   // I Chronicles
-  54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
   // II Chronicles
-  18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23,
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 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, 38, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31,
+  11, 20, 38, 17, 19, 19, 73, 18, 37, 40,
+  36, 47, 31,
   // Tobit
-  22, 14, 17, 21, 23, 19, 17, 21, 6, 14, 19, 22, 18, 15,
+  22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+  19, 22, 18, 15,
   // Judith
-  16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25,
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
   // Esther
   22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
   // I Maccabees
-  64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 54, 53, 49, 41, 24,
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 54, 53, 49, 41, 24,
   // II Maccabees
-  36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 46, 26, 46, 39,
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 39,
   // 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, 14, 14, 24, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, 26, 17,
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 14, 14, 24, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+  26, 17,
   // Psalms
-  6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 24, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 9, 29, 22, 35, 45, 48, 43, 14, 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, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 24,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  9, 29, 22, 35, 45, 48, 43, 14, 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, 14,
+  10, 8, 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,
+  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, 17, 19, 12, 29, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
   // Song of Solomon
   17, 17, 11, 17, 16, 12, 14, 14,
   // Wisdom
-  16, 24, 19, 20, 23, 25, 30, 21, 19, 21, 26, 27, 19, 31, 19, 29, 21, 25, 22,
+  16, 24, 19, 20, 23, 25, 30, 21, 19, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 22,
   // Sirach
-  30, 18, 31, 31, 17, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 32, 28, 27, 28, 34, 26, 29, 30, 26, 28, 25, 31, 24, 33, 31, 26, 31, 31, 34, 35, 30, 27, 25, 35, 23, 26, 20, 25, 25, 16, 29, 30,
+  30, 18, 31, 31, 17, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 32,
+  28, 27, 28, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 33, 31, 26, 31, 31, 34, 35, 30,
+  27, 25, 35, 23, 26, 20, 25, 25, 16, 29,
+  30,
   // Isaiah
-  31, 22, 26, 6, 30, 13, 25, 24, 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, 11, 25, 24,
+  31, 22, 26, 6, 30, 13, 25, 24, 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, 11, 25, 24,
   // Jeremiah
-  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
   // Baruch
   22, 35, 38, 37, 9, 72,
   // 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,
+  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, 100, 34, 30, 29, 28, 27, 27, 21, 45, 13, 64, 43,
+  21, 49, 100, 34, 30, 29, 28, 27, 27, 21,
+  45, 13, 64, 43,
   // Hosea
-  9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10,
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
   // Joel
   20, 27, 5, 21,
   // Amos
@@ -176,25 +259,38 @@
   // Haggai
   15, 23,
   // Zechariah
-  17, 17, 10, 16, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  17, 17, 10, 16, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 24,
   // 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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 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, 49, 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, 40, 30, 35, 27, 27, 32, 44, 31,
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 49,
+  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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -216,7 +312,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -232,7 +329,9 @@
   // 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
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_catholic2.h
===================================================================
--- trunk/include/canon_catholic2.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_catholic2.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -90,75 +90,159 @@
 
 int vm_catholic2[] = {
   // 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, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  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,
+  54, 33, 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, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 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,
+  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, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 66, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 66, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
   // Deuteronomy
-  46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12,
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 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,
+  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, 32, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25,
+  36, 23, 31, 24, 32, 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, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 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, 32, 44, 26, 22, 51, 39, 25,
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
   // I Kings
-  53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54,
+  53, 46, 28, 20, 32, 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, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30,
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
   // I Chronicles
-  54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
   // II Chronicles
-  18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23,
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 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, 38, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31,
+  11, 20, 38, 17, 19, 19, 73, 18, 37, 40,
+  36, 47, 31,
   // Tobit
-  22, 14, 17, 21, 23, 19, 17, 21, 6, 14, 19, 22, 18, 15,
+  22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+  19, 22, 18, 15,
   // Judith
-  16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25,
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
   // Esther
-  22, 23, 15, 17, 14, 14, 10, 17, 32, 13, 12, 6, 18, 19, 19, 24, 
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 13,
+  12, 6, 18, 19, 19, 24, 
   // I Maccabees
-  64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 54, 53, 49, 41, 24,
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 54, 53, 49, 41, 24,
   // II Maccabees
-  36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 46, 26, 46, 39,
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 39,
   // 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, 14, 14, 24, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 30, 32, 26, 17,
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 14, 14, 24, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+  26, 17,
   // Psalms
-  6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 24, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 9, 29, 22, 35, 45, 48, 43, 14, 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, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 24,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  9, 29, 22, 35, 45, 48, 43, 14, 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, 14,
+  10, 8, 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,
+  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, 17, 19, 12, 29, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
   // Song of Solomon
   17, 17, 11, 17, 16, 12, 14, 14,
   // Wisdom
-  16, 24, 19, 20, 23, 25, 30, 21, 19, 21, 26, 27, 19, 31, 19, 29, 21, 25, 22,
+  16, 24, 19, 20, 23, 25, 30, 21, 19, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 22,
   // Sirach
-  30, 18, 31, 31, 17, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 32, 28, 27, 28, 34, 26, 29, 30, 26, 28, 25, 31, 24, 33, 31, 26, 31, 31, 34, 35, 30, 27, 25, 35, 23, 26, 20, 25, 25, 16, 29, 30,
+  30, 18, 31, 31, 17, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 32,
+  28, 27, 28, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 33, 31, 26, 31, 31, 34, 35, 30,
+  27, 25, 35, 23, 26, 20, 25, 25, 16, 29,
+  30,
   // Isaiah
-  31, 22, 26, 6, 30, 13, 25, 24, 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, 11, 25, 24,
+  31, 22, 26, 6, 30, 13, 25, 24, 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, 11, 25, 24,
   // Jeremiah
-  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
   // Baruch
   22, 35, 38, 37, 9, 72,
   // 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,
+  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, 100, 34, 30, 29, 28, 27, 27, 21, 45, 13, 64, 43,
+  21, 49, 100, 34, 30, 29, 28, 27, 27, 21,
+  45, 13, 64, 43,
   // Hosea
-  9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10,
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
   // Joel
   20, 27, 5, 21,
   // Amos
@@ -178,25 +262,38 @@
   // Haggai
   15, 23,
   // Zechariah
-  17, 17, 10, 16, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  17, 17, 10, 16, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 24,
   // 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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 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, 49, 30, 25, 52, 28, 41, 40, 34, 28, 41, 38, 40, 30, 35, 27, 27, 32, 44, 31,
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 49,
+  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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -218,7 +315,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -234,7 +332,9 @@
   // 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
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_german.h
===================================================================
--- trunk/include/canon_german.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_german.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -81,61 +81,134 @@
 
 int vm_german[] = {
   // 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, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  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,
+  54, 33, 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, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 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,
+  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, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
   // Deuteronomy
-  46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12,
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 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,
+  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,
+  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, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 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, 32, 44, 26, 22, 51, 39, 25,
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
   // I Kings
-  53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54,
+  53, 46, 28, 20, 32, 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, 20, 22, 25, 29, 39, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30,
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 39, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
   // I Chronicles
-  54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
   // II Chronicles
-  18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23,
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 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, 38, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31,
+  11, 20, 38, 17, 19, 19, 73, 18, 37, 40,
+  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, 41, 30, 32, 26, 17,
+  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, 41, 30, 32,
+  26, 17,
   // Psalms
-  6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 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, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 23,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 29, 22, 35, 45, 48, 43, 14, 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, 14,
+  10, 8, 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,
+  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, 17, 19, 12, 29, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
   // Song of Solomon
   17, 17, 11, 16, 16, 12, 14, 14,
   // Isaiah
-  31, 22, 26, 6, 30, 13, 25, 23, 20, 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, 11, 25, 24,
+  31, 22, 26, 6, 30, 13, 25, 23, 20, 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, 11, 25, 24,
   // Jeremiah
-  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
+  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, 33, 34, 30, 29, 28, 27, 27, 21, 45, 13,
+  21, 49, 33, 34, 30, 29, 28, 27, 27, 21,
+  45, 13,
   // Hosea
-  9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10,
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
   // Joel
   20, 27, 5, 21,
   // Amos
@@ -155,25 +228,38 @@
   // Haggai
   15, 23,
   // Zechariah
-  17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 24,
   // 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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 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, 40, 38, 40, 30, 35, 27, 27, 32, 44, 31,
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 40, 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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -195,7 +281,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -211,7 +298,9 @@
   // 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
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_kjva.h
===================================================================
--- trunk/include/canon_kjva.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_kjva.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -97,61 +97,134 @@
 
 int vm_kjva[] = {
   // 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,
+  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,
+  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, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34,
+  17, 16, 17, 35, 19, 30, 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, 16, 33, 45, 41, 50, 13, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 16,
+  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, 68, 29, 20, 30, 52, 29, 12,
+  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, 68, 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,
+  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,
+  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, 42, 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  15, 23, 29, 22, 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,
+  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, 53,
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53,
   // 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,
+  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,
+  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,
+  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,
+  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, 41, 30, 24, 34, 17,
+  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, 41, 30, 24,
+  34, 17,
   // Psalms
-  6, 12, 8, 8, 12, 10, 17, 9, 20, 18, 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, 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,
+  6, 12, 8, 8, 12, 10, 17, 9, 20, 18,
+  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, 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,
+  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,
+  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,
+  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,
+  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, 49, 32, 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,
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 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,
+  21, 49, 30, 37, 31, 28, 28, 27, 27, 21,
+  45, 13,
   // Hosea
-  11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9,
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 16, 9,
   // Joel
   20, 32, 21,
   // Amos
@@ -171,23 +244,34 @@
   // Haggai
   15, 23,
   // Zechariah
-  21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 18, 6,
   // I Esdras
   58, 30, 24, 63, 73, 34, 15, 96, 55,
   // II Esdras
-  40, 48, 36, 52, 56, 59, 70, 63, 47, 59, 46, 51, 58, 48, 63, 78,
+  40, 48, 36, 52, 56, 59, 70, 63, 47, 59,
+  46, 51, 58, 48, 63, 78,
   // Tobit
-  22, 14, 17, 21, 22, 17, 18, 21, 6, 12, 19, 22, 18, 15,
+  22, 14, 17, 21, 22, 17, 18, 21, 6, 12,
+  19, 22, 18, 15,
   // Judith
-  16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 13, 25,
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 13, 25,
   // Additions to Esther
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 12, 6, 18, 19, 16, 24,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 13,
+  12, 6, 18, 19, 16, 24,
   // Wisdom
-  16, 24, 19, 20, 23, 25, 30, 21, 18, 21, 26, 27, 19, 31, 19, 29, 21, 25, 22,
+  16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 22,
   // Sirach
-  30, 18, 31, 31, 15, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 32, 28, 27, 28, 34, 26, 29, 30, 26, 28, 25, 31, 24, 31, 26, 20, 26, 31, 34, 35, 30, 24, 25, 33, 22, 26, 20, 25, 25, 16, 29, 30,
+  30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 32,
+  28, 27, 28, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 31, 26, 20, 26, 31, 34, 35, 30,
+  24, 25, 33, 22, 26, 20, 25, 25, 16, 29,
+  30,
   // Baruch
   22, 35, 37, 37, 9, 73,
   // Prayer of Azariah
@@ -199,25 +283,39 @@
   // Prayer of Manasses
   1,
   // I Maccabees
-  64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 53, 53, 49, 41, 24,
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 53, 49, 41, 24,
   // II Maccabees
-  36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 45, 26, 46, 39,
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 45, 26, 46, 39,
   // 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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 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,
+  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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -239,7 +337,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -255,7 +354,9 @@
   // Jude
   25,
   // Revelation of John
-  20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 17, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_leningrad.h
===================================================================
--- trunk/include/canon_leningrad.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_leningrad.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -83,35 +83,79 @@
 
 int vm_leningrad[] = {
   // 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, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  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,
+  54, 33, 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, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 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,
+  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, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
   // Deuteronomy
-  46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12,
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 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,
+  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,
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
   // I Samuel
-  28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 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, 32, 44, 26, 22, 51, 39, 25,
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
   // I Kings
-  53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54,
+  53, 46, 28, 20, 32, 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, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30,
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
   // Isaiah
-  31, 22, 26, 6, 30, 13, 25, 23, 20, 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, 11, 25, 24,
+  31, 22, 26, 6, 30, 13, 25, 23, 20, 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, 11, 25, 24,
   // Jeremiah
-  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
   // 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,
+  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,
   // Hosea
-  9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10,
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
   // Joel
   20, 27, 5, 21,
   // Amos
@@ -131,35 +175,65 @@
   // Haggai
   15, 23,
   // Zechariah
-  17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 24,
   // I Chronicles
-  54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
   // II Chronicles
-  18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23,
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
   // Psalms
-  6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 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, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 23,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 29, 22, 35, 45, 48, 43, 14, 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, 14,
+  10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
   // 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, 41, 30, 32, 26, 17,
+  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, 41, 30, 32,
+  26, 17,
   // 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,
+  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,
   // Ruth
   22, 23, 18, 22,
   // Song of Solomon
   17, 17, 11, 16, 16, 12, 14, 14,
   // Ecclesiastes
-  18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
   // Lamentations
   22, 22, 66, 22, 22,
   // Esther
   22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
   // Daniel
-  21, 49, 33, 34, 30, 29, 28, 27, 27, 21, 45, 13,
+  21, 49, 33, 34, 30, 29, 28, 27, 27, 21,
+  45, 13,
   // Ezra
   11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
   // Nehemiah
-  11, 20, 38, 17, 19, 19, 72, 18, 37, 40, 36, 47, 31
+  11, 20, 38, 17, 19, 19, 72, 18, 37, 40,
+  36, 47, 31
 };
 
 

Modified: trunk/include/canon_luther.h
===================================================================
--- trunk/include/canon_luther.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_luther.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -122,61 +122,134 @@
 
 int vm_luther[] = {
   // 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, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  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,
+  54, 33, 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, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 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,
+  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, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
   // Deuteronomy
-  46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12,
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 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,
+  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,
+  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, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 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, 32, 44, 26, 22, 51, 39, 25,
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
   // I Kings
-  53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54,
+  53, 46, 28, 20, 32, 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, 20, 22, 25, 29, 39, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30,
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 39, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
   // I Chronicles
-  54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
   // II Chronicles
-  18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23,
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 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, 38, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31,
+  11, 20, 38, 17, 19, 19, 73, 18, 37, 40,
+  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, 41, 30, 32, 26, 17,
+  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, 41, 30, 32,
+  26, 17,
   // Psalms
-  6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 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, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 23,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 29, 22, 35, 45, 48, 43, 14, 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, 14,
+  10, 8, 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,
+  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, 17, 19, 12, 29, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
   // Song of Solomon
   17, 17, 11, 16, 16, 12, 14, 14,
   // Isaiah
-  31, 22, 26, 6, 30, 13, 25, 23, 20, 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, 11, 25, 24,
+  31, 22, 26, 6, 30, 13, 25, 23, 20, 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, 11, 25, 24,
   // Jeremiah
-  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
+  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, 33, 34, 30, 29, 28, 27, 27, 21, 45, 13,
+  21, 49, 33, 34, 30, 29, 28, 27, 27, 21,
+  45, 13,
   // Hosea
-  9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10,
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
   // Joel
   20, 27, 5, 21,
   // Amos
@@ -196,23 +269,34 @@
   // Haggai
   15, 23,
   // Zechariah
-  17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 24,
   // Judith
-  11, 18, 12, 14, 26, 20, 24, 28, 15, 21, 17, 21, 31, 16, 16, 31,
+  11, 18, 12, 14, 26, 20, 24, 28, 15, 21,
+  17, 21, 31, 16, 16, 31,
   // Wisdom
-  16, 25, 19, 20, 24, 27, 30, 21, 19, 21, 26, 27, 19, 31, 19, 29, 21, 25, 21,
+  16, 25, 19, 20, 24, 27, 30, 21, 19, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 21,
   // Tobit
-  25, 23, 25, 22, 29, 23, 20, 23, 12, 13, 20, 22, 22, 17,
+  25, 23, 25, 22, 29, 23, 20, 23, 12, 13,
+  20, 22, 22, 17,
   // Sirach
-  38, 23, 34, 36, 18, 37, 40, 22, 25, 34, 35, 19, 32, 27, 21, 30, 31, 33, 27, 33, 31, 33, 37, 47, 34, 28, 33, 30, 35, 27, 40, 28, 32, 31, 26, 28, 34, 39, 41, 32, 29, 26, 37, 26, 32, 23, 31, 28, 20, 31, 38,
+  38, 23, 34, 36, 18, 37, 40, 22, 25, 34,
+  35, 19, 32, 27, 21, 30, 31, 33, 27, 33,
+  31, 33, 37, 47, 34, 28, 33, 30, 35, 27,
+  40, 28, 32, 31, 26, 28, 34, 39, 41, 32,
+  29, 26, 37, 26, 32, 23, 31, 28, 20, 31,
+  38,
   // Baruch
   22, 35, 38, 37, 9, 73,
   // I Maccabees
-  68, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 54, 54, 49, 41, 24,
+  68, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 54, 54, 49, 41, 24,
   // II Maccabees
-  36, 33, 40, 50, 27, 31, 42, 36, 29, 38, 38, 46, 26, 46, 40,
+  36, 33, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 40,
   // Additions to Esther
   4, 8, 12, 12, 16, 9, 8,
   // Additions to Daniel
@@ -220,21 +304,33 @@
   // Prayer of Manasses
   16,
   // 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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 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, 40, 38, 40, 30, 35, 27, 27, 32, 44, 31,
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 40, 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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -266,13 +362,16 @@
   // III John
   15,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // 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
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_lxx_nt.h
===================================================================
--- trunk/include/canon_lxx_nt.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_lxx_nt.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -37,77 +37,154 @@
 int vm_lxx_nt[] = {
 // From Rahlfs v11n
   // 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, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  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,
+  54, 33, 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, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 21, 27, 23, 38,
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 21, 27, 23, 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,
+  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, 26, 89, 26, 23, 36, 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
   // Deuteronomy
-  46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12,
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+  30, 52, 29, 12,
   // Joshua
-  18, 24, 17, 24, 15, 27, 26, 29, 27, 42, 23, 24, 32, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33,
+  18, 24, 17, 24, 15, 27, 26, 29, 27, 42,
+  23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
   // Joshua A
-  18, 24, 17, 24, 15, 27, 26, 29, 27, 42, 23, 24, 32, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33,
+  18, 24, 17, 24, 15, 27, 26, 29, 27, 42,
+  23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
   // Judges B
-  36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25,
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
   // Judges
-  36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25,
+  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, 54, 29, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 54, 29, 24, 42,
+  16, 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, 32, 44, 26, 22, 51, 39, 25,
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
   // I Kings
-  53, 46, 28, 19, 32, 36, 50, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 29, 43, 54,
+  53, 46, 28, 19, 32, 36, 50, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 29,
+  43, 54,
   // II Kings
-  18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30,
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
   // I Chronicles
-  54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
   // II Chronicles
-  18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23,
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
   // I Esdras
   55, 26, 24, 63, 71, 33, 15, 92, 55,
   // Ezra
-  11, 70, 13, 24, 17, 22, 28, 36, 15, 44, 11, 20, 37, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31,
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  11, 20, 37, 17, 19, 19, 73, 18, 37, 40,
+  36, 47, 31,
   // Esther
   22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
   // Judith
-  16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25,
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
   // Tobit
-  22, 14, 17, 21, 23, 19, 17, 21, 6, 14, 19, 22, 18, 15,
+  22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+  19, 22, 18, 15,
   // Tobit S
-  22, 14, 17, 21, 23, 19, 17, 21, 6, 14, 19, 22, 18, 15,
+  22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+  19, 22, 18, 15,
   // I Maccabees
-  64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 53, 53, 49, 41, 24,
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 53, 49, 41, 24,
   // II Maccabees
-  36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 45, 26, 46, 39,
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 45, 26, 46, 39,
   // III Maccabees
   29, 33, 30, 21, 51, 41, 23,
   // IV Maccabees
-  35, 24, 21, 26, 38, 35, 23, 29, 32, 21, 27, 19, 27, 20, 32, 25, 24, 24,
+  35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
+  27, 19, 27, 20, 32, 25, 24, 24,
   // Psalms
-  6, 12, 9, 9, 13, 11, 18, 10, 39, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 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, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 11, 9, 14, 9, 6, 7,
+  6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
+  9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+  32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+  11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+  12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
+  11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
+  13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+  20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+  8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+  16, 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, 6, 5, 6, 8, 8, 3,
+  18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
+  8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+  7,
   // Odes
-  19, 43, 10, 19, 20, 10, 45, 88, 79, 9, 20, 15, 32, 46,
+  19, 43, 10, 19, 20, 10, 45, 88, 79, 9,
+  20, 15, 32, 46,
   // Proverbs
-  33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 22, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31,
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 22, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
   // Ecclesiastes
-  18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
   // Song of Solomon
   17, 17, 11, 16, 16, 12, 14, 14,
   // 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, 41, 30, 32, 26, 17,
+  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, 41, 30, 32,
+  26, 17,
   // Wisdom
-  16, 24, 19, 20, 23, 25, 30, 21, 18, 21, 26, 27, 19, 31, 19, 29, 20, 25, 22,
+  16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+  26, 27, 19, 31, 19, 29, 20, 25, 22,
   // Sirach
-  30, 18, 31, 31, 15, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 31, 28, 27, 27, 34, 26, 29, 30, 26, 28, 25, 31, 24, 33, 26, 24, 27, 31, 34, 35, 30, 27, 25, 33, 23, 26, 20, 25, 25, 16, 29, 30,
+  30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
+  28, 27, 27, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 33, 26, 24, 27, 31, 34, 35, 30,
+  27, 25, 33, 23, 26, 20, 25, 25, 16, 29,
+  30,
   // Psalms of Solomon
-  8, 37, 12, 25, 19, 6, 10, 34, 11, 8, 9, 6, 12, 10, 13, 15, 46, 12,
+  8, 37, 12, 25, 19, 6, 10, 34, 11, 8,
+  9, 6, 12, 10, 13, 15, 46, 12,
   // Hosea
-  9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10,
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
   // Amos
   15, 16, 15, 13, 27, 14, 17, 14, 15,
   // Micah
@@ -127,13 +204,25 @@
   // Haggai
   15, 23,
   // Zechariah
-  17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 24,
   // Isaiah
-  31, 21, 26, 6, 30, 13, 25, 23, 20, 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, 11, 21, 14, 21, 22, 11, 12, 19, 11, 25, 24,
+  31, 21, 26, 6, 30, 13, 25, 23, 20, 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, 11, 21, 14, 21, 22,
+  11, 12, 19, 11, 25, 24,
   // Jeremiah
-  19, 37, 25, 31, 31, 30, 34, 23, 25, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 20, 28, 46, 64, 7, 33, 44, 38, 24, 22, 17, 32, 24, 40, 44, 13, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 35, 34,
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 20, 28, 46, 64, 7, 33,
+  44, 38, 24, 22, 17, 32, 24, 40, 44, 13,
+  22, 19, 32, 21, 28, 18, 16, 18, 22, 13,
+  35, 34,
   // Baruch
   22, 35, 38, 37, 9,
   // Lamentations
@@ -141,15 +230,21 @@
   // Epistle of Jeremiah
   72,
   // 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,
+  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,
   // Susanna
   64,
   // Susanna Th
   64,
   // Daniel
-  21, 49, 97, 37, 30, 29, 28, 27, 27, 21, 45, 13,
+  21, 49, 97, 37, 30, 29, 28, 27, 27, 21,
+  45, 13,
   // Daniel Th
-  21, 49, 97, 37, 30, 29, 28, 27, 27, 21, 45, 13,
+  21, 49, 97, 37, 30, 29, 28, 27, 27, 21,
+  45, 13,
   // Bel and the Dragon
   42,
   // Bel and the Dragon Th
@@ -157,21 +252,33 @@
 
 // from NRSVA v11n
   // 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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 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,
+  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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -193,7 +300,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -209,7 +317,9 @@
   // 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
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_mt.h
===================================================================
--- trunk/include/canon_mt.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_mt.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -83,35 +83,79 @@
 
 int vm_mt[] = {
   // 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, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  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,
+  54, 33, 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, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 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,
+  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, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 19, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
   // Deuteronomy
-  46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12,
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 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,
+  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,
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
   // I Samuel
-  28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 58, 30, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 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, 32, 44, 26, 22, 51, 39, 25,
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
   // I Kings
-  53, 46, 28, 20, 32, 38, 51, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 43, 29, 54,
+  53, 46, 28, 20, 32, 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, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30,
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
   // Isaiah
-  31, 22, 26, 6, 30, 13, 25, 23, 20, 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, 11, 25, 24,
+  31, 22, 26, 6, 30, 13, 25, 23, 20, 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, 11, 25, 24,
   // Jeremiah
-  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 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,
   // 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,
+  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,
   // Hosea
-  9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10,
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
   // Joel
   20, 27, 5, 21,
   // Amos
@@ -131,35 +175,65 @@
   // Haggai
   15, 23,
   // Zechariah
-  17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 24,
   // Psalms
-  6, 12, 9, 9, 13, 11, 18, 10, 21, 18, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 5, 23, 11, 13, 12, 9, 9, 5, 8, 29, 22, 35, 45, 48, 43, 14, 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, 14, 10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 23,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 29, 22, 35, 45, 48, 43, 14, 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, 14,
+  10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
   // 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, 41, 30, 32, 26, 17,
+  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, 41, 30, 32,
+  26, 17,
   // 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,
+  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,
   // Ruth
   22, 23, 18, 22,
   // Song of Solomon
   17, 17, 11, 16, 16, 12, 14, 14,
   // Ecclesiastes
-  18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
   // Lamentations
   22, 22, 66, 22, 22,
   // Esther
   22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
   // Daniel
-  21, 49, 33, 34, 30, 29, 28, 27, 27, 21, 45, 13,
+  21, 49, 33, 34, 30, 29, 28, 27, 27, 21,
+  45, 13,
   // Ezra
   11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
   // Nehemiah
-  11, 20, 38, 17, 19, 19, 72, 18, 37, 40, 36, 47, 31,
+  11, 20, 38, 17, 19, 19, 72, 18, 37, 40,
+  36, 47, 31,
   // I Chronicles
-  54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
   // II Chronicles
-  18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23
 };
 
 

Modified: trunk/include/canon_nrsv.h
===================================================================
--- trunk/include/canon_nrsv.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_nrsv.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -42,61 +42,134 @@
 
 int vm_nrsv[] = {
   // 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,
+  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,
+  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, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34,
+  17, 16, 17, 35, 19, 30, 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, 16, 33, 45, 41, 50, 13, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 16,
+  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, 68, 29, 20, 30, 52, 29, 12,
+  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, 68, 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,
+  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,
+  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, 42, 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  15, 23, 29, 22, 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,
+  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, 53,
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53,
   // 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,
+  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,
+  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,
+  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,
+  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, 41, 30, 24, 34, 17,
+  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, 41, 30, 24,
+  34, 17,
   // Psalms
-  6, 12, 8, 8, 12, 10, 17, 9, 20, 18, 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, 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,
+  6, 12, 8, 8, 12, 10, 17, 9, 20, 18,
+  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, 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,
+  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,
+  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,
+  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,
+  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, 49, 32, 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,
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 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,
+  21, 49, 30, 37, 31, 28, 28, 27, 27, 21,
+  45, 13,
   // Hosea
-  11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9,
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 16, 9,
   // Joel
   20, 32, 21,
   // Amos
@@ -116,25 +189,38 @@
   // Haggai
   15, 23,
   // Zechariah
-  21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 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,
+  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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -156,7 +242,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -172,7 +259,9 @@
   // 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
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_nrsva.h
===================================================================
--- trunk/include/canon_nrsva.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_nrsva.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -99,61 +99,134 @@
 
 int vm_nrsva[] = {
   // 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,
+  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,
+  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, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34,
+  17, 16, 17, 35, 19, 30, 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, 16, 33, 45, 41, 50, 13, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 40, 16, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 16,
+  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, 68, 29, 20, 30, 52, 29, 12,
+  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, 68, 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,
+  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,
+  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, 42, 15, 23, 29, 22, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  15, 23, 29, 22, 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,
+  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, 53,
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53,
   // 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,
+  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,
+  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,
+  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,
+  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, 41, 30, 24, 34, 17,
+  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, 41, 30, 24,
+  34, 17,
   // Psalms
-  6, 12, 8, 8, 12, 10, 17, 9, 20, 18, 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, 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,
+  6, 12, 8, 8, 12, 10, 17, 9, 20, 18,
+  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, 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,
+  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,
+  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,
+  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,
+  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, 49, 32, 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,
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 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,
+  21, 49, 30, 37, 31, 28, 28, 27, 27, 21,
+  45, 13,
   // Hosea
-  11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 16, 9,
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 16, 9,
   // Joel
   20, 32, 21,
   // Amos
@@ -173,19 +246,29 @@
   // Haggai
   15, 23,
   // Zechariah
-  21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 18, 6,
   // Tobit
-  22, 14, 17, 21, 22, 18, 16, 21, 6, 13, 18, 22, 17, 15,
+  22, 14, 17, 21, 22, 18, 16, 21, 6, 13,
+  18, 22, 17, 15,
   // Judith
-  16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25,
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
   // Esther (Greek)
-  22, 23, 15, 17, 14, 14, 10, 17, 32, 13, 12, 6, 18, 19, 16, 24,
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 13,
+  12, 6, 18, 19, 16, 24,
   // Wisdom
-  16, 24, 19, 20, 23, 25, 30, 21, 18, 21, 26, 27, 19, 31, 19, 29, 21, 25, 22,
+  16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 22,
   // Sirach
-  30, 18, 31, 31, 15, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 31, 28, 27, 27, 34, 26, 29, 30, 26, 28, 25, 31, 24, 33, 31, 26, 31, 31, 34, 35, 30, 22, 25, 33, 23, 26, 20, 25, 25, 16, 29, 30,
+  30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
+  28, 27, 27, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 33, 31, 26, 31, 31, 34, 35, 30,
+  22, 25, 33, 23, 26, 20, 25, 25, 16, 29,
+  30,
   // Baruch
   22, 35, 37, 37, 9, 73,
   // Prayer of Azariah
@@ -195,9 +278,11 @@
   // Bel and the Dragon
   42,
   // I Maccabees
-  64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 53, 53, 49, 41, 24,
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 53, 49, 41, 24,
   // II Maccabees
-  36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 45, 26, 46, 39,
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 45, 26, 46, 39,
   // I Esdras
   58, 30, 24, 63, 73, 34, 15, 96, 55,
   // Prayer of Manasses
@@ -207,25 +292,39 @@
   // III Maccabees
   29, 33, 30, 21, 51, 41, 23,
   // II Esdras
-  40, 48, 36, 52, 56, 59, 140, 63, 47, 59, 46, 51, 58, 48, 63, 78,
+  40, 48, 36, 52, 56, 59, 140, 63, 47, 59,
+  46, 51, 58, 48, 63, 78,
   // IV Maccabees
-  35, 24, 21, 26, 38, 35, 23, 29, 32, 21, 27, 19, 27, 20, 32, 25, 24, 24,
+  35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
+  27, 19, 27, 20, 32, 25, 24, 24,
   // 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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 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,
+  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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -247,7 +346,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -263,7 +363,9 @@
   // 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
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_rahlfs.h
===================================================================
--- trunk/include/canon_rahlfs.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_rahlfs.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -103,77 +103,154 @@
 
 int vm_rahlfs[] = {
   // 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, 54, 33, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  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,
+  54, 33, 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, 29, 28, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 30, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 38, 21, 27, 23, 38,
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 21, 27, 23, 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,
+  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, 26, 89, 26, 23, 36, 35, 16, 33, 45, 41, 35, 28, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 26, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
   // Deuteronomy
-  46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 31, 19, 29, 23, 22, 20, 22, 21, 20, 23, 29, 26, 22, 19, 19, 26, 69, 28, 20, 30, 52, 29, 12,
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+  30, 52, 29, 12,
   // Joshua
-  18, 24, 17, 24, 15, 27, 26, 29, 27, 42, 23, 24, 32, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33,
+  18, 24, 17, 24, 15, 27, 26, 29, 27, 42,
+  23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
   // Joshua A
-  18, 24, 17, 24, 15, 27, 26, 29, 27, 42, 23, 24, 32, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 33,
+  18, 24, 17, 24, 15, 27, 26, 29, 27, 42,
+  23, 24, 32, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
   // Judges B
-  36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25,
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
   // Judges
-  36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25,
+  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, 54, 29, 24, 42, 16, 23, 28, 23, 44, 25, 12, 25, 11, 31, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 54, 29, 24, 42,
+  16, 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, 32, 44, 26, 22, 51, 39, 25,
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
   // I Kings
-  53, 46, 28, 19, 32, 36, 50, 66, 28, 29, 43, 33, 34, 31, 34, 34, 24, 46, 21, 29, 43, 54,
+  53, 46, 28, 19, 32, 36, 50, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 29,
+  43, 54,
   // II Kings
-  18, 25, 27, 44, 27, 33, 20, 29, 37, 36, 20, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30,
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
   // I Chronicles
-  54, 55, 24, 43, 41, 66, 40, 40, 44, 14, 47, 41, 14, 17, 29, 43, 27, 17, 19, 8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
   // II Chronicles
-  18, 17, 17, 22, 14, 42, 22, 18, 31, 19, 23, 16, 23, 14, 19, 14, 19, 34, 11, 37, 20, 12, 21, 27, 28, 23, 9, 27, 36, 27, 21, 33, 25, 33, 27, 23,
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
   // I Esdras
   55, 26, 24, 63, 71, 33, 15, 92, 55,
   // Ezra
-  11, 70, 13, 24, 17, 22, 28, 36, 15, 44, 11, 20, 37, 17, 19, 19, 73, 18, 37, 40, 36, 47, 31,
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  11, 20, 37, 17, 19, 19, 73, 18, 37, 40,
+  36, 47, 31,
   // Esther
   22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
   // Judith
-  16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25,
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
   // Tobit
-  22, 14, 17, 21, 23, 19, 17, 21, 6, 14, 19, 22, 18, 15,
+  22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+  19, 22, 18, 15,
   // Tobit S
-  22, 14, 17, 21, 23, 19, 17, 21, 6, 14, 19, 22, 18, 15,
+  22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+  19, 22, 18, 15,
   // I Maccabees
-  64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 53, 53, 49, 41, 24,
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 53, 49, 41, 24,
   // II Maccabees
-  36, 32, 40, 50, 27, 31, 42, 36, 29, 38, 38, 45, 26, 46, 39,
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 45, 26, 46, 39,
   // III Maccabees
   29, 33, 30, 21, 51, 41, 23,
   // IV Maccabees
-  35, 24, 21, 26, 38, 35, 23, 29, 32, 21, 27, 19, 27, 20, 32, 25, 24, 24,
+  35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
+  27, 19, 27, 20, 32, 25, 24, 24,
   // Psalms
-  6, 12, 9, 9, 13, 11, 18, 10, 39, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 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, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 11, 9, 14, 9, 6, 7,
+  6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
+  9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+  32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+  11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+  12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
+  11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
+  13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+  20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+  8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+  16, 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, 6, 5, 6, 8, 8, 3,
+  18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
+  8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+  7,
   // Odes
-  19, 43, 10, 19, 20, 10, 45, 88, 79, 9, 20, 15, 32, 46,
+  19, 43, 10, 19, 20, 10, 45, 88, 79, 9,
+  20, 15, 32, 46,
   // Proverbs
-  33, 22, 35, 27, 23, 35, 27, 36, 18, 32, 31, 28, 25, 35, 33, 33, 28, 22, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31,
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 22, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
   // Ecclesiastes
-  18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
   // Song of Solomon
   17, 17, 11, 16, 16, 12, 14, 14,
   // 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, 41, 30, 32, 26, 17,
+  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, 41, 30, 32,
+  26, 17,
   // Wisdom
-  16, 24, 19, 20, 23, 25, 30, 21, 18, 21, 26, 27, 19, 31, 19, 29, 20, 25, 22,
+  16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+  26, 27, 19, 31, 19, 29, 20, 25, 22,
   // Sirach
-  30, 18, 31, 31, 15, 37, 36, 19, 18, 31, 34, 18, 26, 27, 20, 30, 32, 33, 30, 31, 28, 27, 27, 34, 26, 29, 30, 26, 28, 25, 31, 24, 33, 26, 24, 27, 31, 34, 35, 30, 27, 25, 33, 23, 26, 20, 25, 25, 16, 29, 30,
+  30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
+  28, 27, 27, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 33, 26, 24, 27, 31, 34, 35, 30,
+  27, 25, 33, 23, 26, 20, 25, 25, 16, 29,
+  30,
   // Psalms of Solomon
-  8, 37, 12, 25, 19, 6, 10, 34, 11, 8, 9, 6, 12, 10, 13, 15, 46, 12,
+  8, 37, 12, 25, 19, 6, 10, 34, 11, 8,
+  9, 6, 12, 10, 13, 15, 46, 12,
   // Hosea
-  9, 25, 5, 19, 15, 11, 16, 14, 17, 15, 11, 15, 15, 10,
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
   // Amos
   15, 16, 15, 13, 27, 14, 17, 14, 15,
   // Micah
@@ -193,13 +270,25 @@
   // Haggai
   15, 23,
   // Zechariah
-  17, 17, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 24,
   // Isaiah
-  31, 21, 26, 6, 30, 13, 25, 23, 20, 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, 11, 21, 14, 21, 22, 11, 12, 19, 11, 25, 24,
+  31, 21, 26, 6, 30, 13, 25, 23, 20, 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, 11, 21, 14, 21, 22,
+  11, 12, 19, 11, 25, 24,
   // Jeremiah
-  19, 37, 25, 31, 31, 30, 34, 23, 25, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 40, 10, 20, 28, 46, 64, 7, 33, 44, 38, 24, 22, 17, 32, 24, 40, 44, 13, 22, 19, 32, 21, 28, 18, 16, 18, 22, 13, 35, 34,
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 20, 28, 46, 64, 7, 33,
+  44, 38, 24, 22, 17, 32, 24, 40, 44, 13,
+  22, 19, 32, 21, 28, 18, 16, 18, 22, 13,
+  35, 34,
   // Baruch
   22, 35, 38, 37, 9,
   // Lamentations
@@ -207,35 +296,53 @@
   // Epistle of Jeremiah
   72,
   // 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,
+  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,
   // Susanna
   64,
   // Susanna Th
   64,
   // Daniel
-  21, 49, 97, 37, 30, 29, 28, 27, 27, 21, 45, 13,
+  21, 49, 97, 37, 30, 29, 28, 27, 27, 21,
+  45, 13,
   // Daniel Th
-  21, 49, 97, 37, 30, 29, 28, 27, 27, 21, 45, 13,
+  21, 49, 97, 37, 30, 29, 28, 27, 27, 21,
+  45, 13,
   // Bel and the Dragon
   42,
   // Bel and the Dragon Th
   42,
   // 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,
+  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,
+  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,
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 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,
+  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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -257,7 +364,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -273,7 +381,9 @@
   // 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
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_synodal.h
===================================================================
--- trunk/include/canon_synodal.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_synodal.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -131,65 +131,145 @@
 
 int vm_synodal[] = {
   // 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, 
+  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, 
+  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, 19, 30, 38, 36, 24, 20, 47, 8, 59, 56, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 46, 34, 
+  17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+  47, 8, 59, 56, 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, 39, 17, 54, 42, 56, 29, 34, 13, 
+  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, 39, 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, 68, 29, 20, 30, 52, 29, 12, 
+  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, 68, 29, 20,
+  30, 52, 29, 12, 
   // Joshua
-  18, 24, 17, 24, 16, 26, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 45, 34, 16, 36, 
+  18, 24, 17, 24, 16, 26, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 36, 
   // Judges
-  36, 23, 31, 24, 31, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 25, 
+  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, 
+  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, 
+  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, 53, 
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53, 
   // 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, 
+  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, 
+  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, 
+  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, 
   // Prayer of Manasses
   12, 
   // Ezra
-  11, 70, 13, 24, 17, 22, 28, 36, 15, 44, 
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  
   // Nehemiah
-  11, 20, 32, 23, 19, 19, 73, 18, 38, 39, 36, 47, 31, 
+  11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
+  36, 47, 31, 
   // I Esdras
   58, 31, 24, 63, 70, 34, 15, 92, 55, 
   // Tobit
-  22, 14, 17, 21, 22, 18, 17, 21, 6, 13, 18, 22, 18, 15, 
+  22, 14, 17, 21, 22, 18, 17, 21, 6, 13,
+  18, 22, 18, 15, 
   // Judith
-  16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25, 
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25, 
   // Esther
-  22, 23, 15, 17, 14, 14, 10, 17, 32, 3, 
+  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, 41, 35, 27, 26, 17, 
+  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, 41, 35, 27,
+  26, 17, 
   // Psalms
-  6, 12, 9, 9, 13, 11, 18, 10, 39, 7, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 5, 27, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 14, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 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, 6, 5, 6, 8, 8, 3, 18, 3, 3, 21, 26, 9, 8, 24, 14, 10, 7, 12, 15, 21, 10, 11, 9, 14, 9, 6, 7, 
+  6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
+  9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+  32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+  11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+  12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
+  11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
+  13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+  20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+  8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+  16, 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, 6, 5, 6, 8, 8, 3,
+  18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
+  7, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+  7, 
   // Proverbs
-  33, 22, 35, 29, 23, 35, 27, 36, 18, 32, 31, 28, 26, 35, 33, 33, 28, 25, 29, 30, 31, 29, 35, 34, 28, 28, 27, 28, 27, 33, 31, 
+  33, 22, 35, 29, 23, 35, 27, 36, 18, 32,
+  31, 28, 26, 35, 33, 33, 28, 25, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31, 
   // Ecclesiastes
-  18, 26, 22, 17, 19, 12, 29, 17, 18, 20, 10, 14, 
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14, 
   // Song of Solomon
   16, 17, 11, 16, 16, 12, 14, 14, 
   // Wisdom
-  16, 24, 19, 20, 24, 27, 30, 21, 19, 21, 27, 28, 19, 31, 19, 29, 20, 25, 21, 
+  16, 24, 19, 20, 24, 27, 30, 21, 19, 21,
+  27, 28, 19, 31, 19, 29, 20, 25, 21, 
   // Sirach
-  30, 18, 31, 35, 18, 37, 39, 22, 23, 34, 34, 18, 32, 27, 20, 31, 31, 33, 28, 31, 31, 31, 37, 37, 29, 27, 33, 30, 31, 27, 37, 25, 33, 26, 23, 29, 34, 39, 42, 32, 29, 26, 36, 27, 31, 23, 31, 28, 18, 31, 38, 
+  30, 18, 31, 35, 18, 37, 39, 22, 23, 34,
+  34, 18, 32, 27, 20, 31, 31, 33, 28, 31,
+  31, 31, 37, 37, 29, 27, 33, 30, 31, 27,
+  37, 25, 33, 26, 23, 29, 34, 39, 42, 32,
+  29, 26, 36, 27, 31, 23, 31, 28, 18, 31,
+  38, 
   // Isaiah
-  31, 22, 25, 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, 
+  31, 22, 25, 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, 
+  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, 
   // Epistle of Jeremiah
@@ -197,11 +277,17 @@
   // Baruch
   22, 35, 38, 37, 9, 
   // Ezekiel
-  28, 10, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, 32, 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, 
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 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, 100, 34, 31, 28, 28, 27, 27, 21, 45, 13, 64, 42, 
+  21, 49, 100, 34, 31, 28, 28, 27, 27, 21,
+  45, 13, 64, 42, 
   // Hosea
-  11, 23, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 15, 10, 
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 15, 10, 
   // Joel
   20, 32, 21, 
   // Amos
@@ -221,27 +307,40 @@
   // Haggai
   15, 23, 
   // Zechariah
-  21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21, 
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21, 
   // Malachi
   14, 17, 18, 6, 
   // I Maccabees
-  64, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 53, 53, 49, 41, 24, 
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 53, 49, 41, 24, 
   // II Maccabees
-  36, 33, 40, 50, 27, 31, 42, 36, 29, 38, 38, 45, 26, 46, 39, 
+  36, 33, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 45, 26, 46, 39, 
   // III Maccabees
   25, 24, 22, 16, 36, 37, 20, 
   // II Esdras
-  40, 48, 36, 52, 56, 59, 70, 63, 47, 60, 46, 51, 58, 48, 63, 78, 
+  40, 48, 36, 52, 56, 59, 70, 63, 47, 60,
+  46, 51, 58, 48, 63, 78, 
   // 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, 
+  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, 
+  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, 
+  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
-  51, 25, 36, 54, 47, 71, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25, 
+  51, 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, 40, 38, 40, 30, 35, 27, 27, 32, 44, 31, 
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 40, 38,
+  40, 30, 35, 27, 27, 32, 44, 31, 
   // James
   27, 26, 18, 17, 20, 
   // I Peter
@@ -257,11 +356,14 @@
   // Jude
   25, 
   // Romans
-  32, 29, 31, 25, 21, 23, 25, 39, 33, 21, 36, 21, 14, 26, 33, 24, 
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 26, 33, 24, 
   // I Corinthians
-  31, 16, 23, 21, 13, 20, 40, 13, 27, 33, 34, 31, 13, 40, 58, 24, 
+  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, 32, 21, 13, 
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  32, 21, 13, 
   // Galatians
   24, 21, 29, 31, 26, 18, 
   // Ephesians
@@ -283,9 +385,12 @@
   // Philemon
   25, 
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25, 
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25, 
   // Revelation of John
-  20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 17, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
 };
 
 

Modified: trunk/include/canon_vulg.h
===================================================================
--- trunk/include/canon_vulg.h	2013-07-21 21:04:09 UTC (rev 2914)
+++ trunk/include/canon_vulg.h	2013-07-23 16:55:54 UTC (rev 2915)
@@ -128,71 +128,153 @@
 
 int vm_vulg[] = {
   // Genesis
-  31, 25, 24, 26, 31, 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, 32, 25,
+  31, 25, 24, 26, 31, 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, 32, 25,
   // 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, 36,
+  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, 36,
   // Leviticus
-  17, 16, 17, 35, 19, 30, 38, 36, 24, 20, 47, 8, 59, 57, 33, 34, 16, 30, 37, 27, 24, 33, 44, 23, 55, 45, 34,
+  17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 45, 34,
   // Numbers
-  54, 34, 51, 49, 31, 27, 89, 26, 23, 36, 34, 15, 34, 45, 41, 50, 13, 32, 22, 30, 35, 41, 30, 25, 18, 65, 23, 31, 39, 17, 54, 42, 56, 29, 34, 13,
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  34, 15, 34, 45, 41, 50, 13, 32, 22, 30,
+  35, 41, 30, 25, 18, 65, 23, 31, 39, 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, 68, 29, 20, 30, 52, 29, 12,
+  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, 68, 29, 20,
+  30, 52, 29, 12,
   // Joshua
-  18, 24, 17, 25, 16, 27, 26, 35, 27, 43, 23, 24, 33, 15, 63, 10, 18, 28, 51, 9, 43, 34, 16, 33,
+  18, 24, 17, 25, 16, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  43, 34, 16, 33,
   // Judges
-  36, 23, 31, 24, 32, 40, 25, 35, 57, 18, 40, 15, 25, 20, 20, 31, 13, 31, 30, 48, 24,
+  36, 23, 31, 24, 32, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  24,
   // 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,
+  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,
+  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,
+  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,
+  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, 46, 40, 14, 17, 29, 43, 27, 17, 19, 7, 30, 19, 32, 31, 31, 32, 34, 21, 30,
+  54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
+  46, 40, 14, 17, 29, 43, 27, 17, 19, 7,
+  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,
+  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, 31, 23, 19, 19, 73, 18, 38, 39, 36, 46, 31,
+  11, 20, 31, 23, 19, 19, 73, 18, 38, 39,
+  36, 46, 31,
   // Tobit
-  25, 23, 25, 23, 28, 22, 20, 24, 12, 13, 21, 22, 23, 17,
+  25, 23, 25, 23, 28, 22, 20, 24, 12, 13,
+  21, 22, 23, 17,
   // Judith
-  12, 18, 15, 17, 29, 21, 25, 34, 19, 20, 21, 20, 31, 18, 15, 31,
+  12, 18, 15, 17, 29, 21, 25, 34, 19, 20,
+  21, 20, 31, 18, 15, 31,
   // Esther
-  22, 23, 15, 17, 14, 14, 10, 17, 32, 13, 12, 6, 18, 19, 19, 24,
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 13,
+  12, 6, 18, 19, 19, 24,
   // Job
-  22, 13, 26, 21, 27, 30, 21, 22, 35, 22, 20, 25, 28, 22, 35, 23, 16, 21, 29, 29, 34, 30, 17, 25, 6, 14, 23, 28, 25, 31, 40, 22, 33, 37, 16, 33, 24, 41, 35, 28, 25, 16,
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 23, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 35, 28,
+  25, 16,
   // Psalms
-  6, 13, 9, 10, 13, 11, 18, 10, 39, 8, 9, 6, 7, 5, 11, 15, 51, 15, 10, 14, 32, 6, 10, 22, 12, 14, 9, 11, 13, 25, 11, 22, 23, 28, 13, 40, 23, 14, 18, 14, 12, 6, 26, 18, 12, 10, 15, 21, 23, 21, 11, 7, 9, 24, 13, 12, 12, 18, 14, 9, 13, 12, 11, 14, 20, 8, 36, 37, 6, 24, 20, 28, 23, 11, 13, 21, 72, 13, 20, 17, 8, 19, 13, 14, 17, 7, 19, 53, 17, 16, 16, 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, 27, 9, 8, 24, 14, 10, 8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+  6, 13, 9, 10, 13, 11, 18, 10, 39, 8,
+  9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+  32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+  11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+  12, 6, 26, 18, 12, 10, 15, 21, 23, 21,
+  11, 7, 9, 24, 13, 12, 12, 18, 14, 9,
+  13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+  20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+  8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+  16, 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, 27, 9, 8, 24, 14, 10,
+  8, 12, 15, 21, 10, 11, 9, 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,
+  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, 17, 19, 11, 30, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 19, 11, 30, 17, 18, 20,
+  10, 14,
   // Song of Solomon
   16, 17, 11, 16, 17, 12, 13, 14,
   // Wisdom
-  16, 25, 19, 20, 24, 27, 30, 21, 19, 21, 27, 27, 19, 31, 19, 29, 20, 25, 20,
+  16, 25, 19, 20, 24, 27, 30, 21, 19, 21,
+  27, 27, 19, 31, 19, 29, 20, 25, 20,
   // Sirach
-  40, 23, 34, 36, 18, 37, 40, 22, 25, 34, 36, 19, 32, 27, 22, 31, 31, 33, 28, 33, 31, 33, 38, 47, 36, 28, 33, 30, 35, 27, 42, 28, 33, 31, 26, 28, 34, 39, 41, 32, 28, 26, 37, 27, 31, 23, 31, 28, 19, 31, 38,
+  40, 23, 34, 36, 18, 37, 40, 22, 25, 34,
+  36, 19, 32, 27, 22, 31, 31, 33, 28, 33,
+  31, 33, 38, 47, 36, 28, 33, 30, 35, 27,
+  42, 28, 33, 31, 26, 28, 34, 39, 41, 32,
+  28, 26, 37, 27, 31, 23, 31, 28, 19, 31,
+  38,
   // 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, 26, 13, 15, 22, 26, 11, 23, 15, 12, 17, 13, 12, 21, 14, 21, 22, 11, 12, 19, 12, 25, 24,
+  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, 26, 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, 20, 28, 18, 16, 18, 22, 13, 30, 5, 28, 7, 47, 39, 46, 64, 34,
+  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, 20, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
   // Lamentations
   22, 22, 66, 22, 22,
   // Baruch
   22, 35, 38, 37, 9, 72,
   // Ezekiel
-  28, 9, 27, 17, 17, 14, 27, 18, 11, 22, 25, 28, 23, 23, 8, 63, 24, 32, 14, 49, 32, 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,
+  28, 9, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 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, 100, 34, 31, 28, 28, 27, 27, 21, 45, 13, 65, 42,
+  21, 49, 100, 34, 31, 28, 28, 27, 27, 21,
+  45, 13, 65, 42,
   // Hosea
-  11, 24, 5, 19, 15, 11, 16, 14, 17, 15, 12, 14, 15, 10,
+  11, 24, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 15, 10,
   // Joel
   20, 32, 21,
   // Amos
@@ -212,29 +294,44 @@
   // Haggai
   14, 24,
   // Zechariah
-  21, 13, 10, 14, 11, 15, 14, 23, 17, 12, 17, 14, 9, 21,
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
   // Malachi
   14, 17, 18, 6,
   // I Maccabees
-  67, 70, 60, 61, 68, 63, 50, 32, 73, 89, 74, 54, 54, 49, 41, 24,
+  67, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 54, 54, 49, 41, 24,
   // II Maccabees
-  36, 33, 40, 50, 27, 31, 42, 36, 29, 38, 38, 46, 26, 46, 40,
+  36, 33, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 40,
   // Matthew
-  25, 23, 17, 25, 48, 34, 29, 34, 38, 42, 30, 50, 58, 36, 39, 28, 26, 35, 30, 34, 46, 46, 39, 51, 46, 75, 66, 20,
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 26, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
   // Mark
-  45, 28, 35, 40, 43, 56, 37, 39, 49, 52, 33, 44, 37, 72, 47, 20,
+  45, 28, 35, 40, 43, 56, 37, 39, 49, 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,
+  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
-  51, 25, 36, 54, 47, 72, 53, 59, 41, 42, 57, 50, 38, 31, 27, 33, 26, 40, 42, 31, 25,
+  51, 25, 36, 54, 47, 72, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
   // Acts
-  26, 47, 26, 37, 42, 15, 59, 40, 43, 48, 30, 25, 52, 27, 41, 40, 34, 28, 40, 38, 40, 30, 35, 27, 27, 32, 44, 31,
+  26, 47, 26, 37, 42, 15, 59, 40, 43, 48,
+  30, 25, 52, 27, 41, 40, 34, 28, 40, 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,
+  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,
+  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,
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
   // Galatians
   24, 21, 29, 31, 26, 18,
   // Ephesians
@@ -256,7 +353,8 @@
   // Philemon
   25,
   // Hebrews
-  14, 18, 19, 16, 14, 20, 28, 13, 28, 39, 40, 29, 25,
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
   // James
   27, 26, 18, 17, 20,
   // I Peter
@@ -272,13 +370,16 @@
   // 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,
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21,
   // Prayer of Manasses
   15,
   // I Esdras
   58, 31, 24, 63, 73, 34, 15, 97, 56,
   // II Esdras
-  40, 48, 36, 52, 56, 59, 140, 63, 47, 60, 46, 51, 58, 48, 63, 78,
+  40, 48, 36, 52, 56, 59, 140, 63, 47, 60,
+  46, 51, 58, 48, 63, 78,
   // Additional Psalm
   7,
   // Laodiceans




More information about the sword-cvs mailing list