[sword-svn] r2882 - trunk/include

[chrislit at crosswire.org]

Author: chrislit
Date: 2013-07-12 17:50:14 -0700 (Fri, 12 Jul 2013)
New Revision: 2882

Modified:
   trunk/include/canon_lxx.h
Log:
updated to accept NETS (both primary & secondary v11ns)


Modified: trunk/include/canon_lxx.h
===================================================================
--- trunk/include/canon_lxx.h	2013-07-12 06:28:03 UTC (rev 2881)
+++ trunk/include/canon_lxx.h	2013-07-13 00:50:14 UTC (rev 2882)
@@ -41,8 +41,10 @@
 
 // Todo:
 // X Rahlfs
-// X Swete
-//   NETS (http://ccat.sas.upenn.edu/nets/edition/)
+// X Swete Primary
+//   Swete Secondary
+// X NETS Primary (http://ccat.sas.upenn.edu/nets/edition/)
+// X NETS Secondary (http://ccat.sas.upenn.edu/nets/edition/)
 // X SAAS
 // X Brenton
 // X Charles
@@ -126,11 +128,11 @@
   // Genesis
   31, 25, 25, 26, 32, 23, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 44, 55, 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, 32, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 31, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 40, 21, 27, 23, 38,
+  22, 25, 22, 31, 23, 30, 29, 32, 35, 29, 10, 51, 22, 31, 27, 36, 16, 27, 25, 26, 37, 31, 33, 18, 40, 37, 21, 43, 46, 38, 18, 35, 23, 35, 35, 40, 29, 27, 43, 38,
   // Leviticus
   17, 16, 17, 35, 26, 40, 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, 34, 45, 41, 50, 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, 27, 89, 26, 23, 36, 35, 16, 34, 45, 41, 50, 28, 32, 22, 29, 35, 41, 30, 25, 18, 65, 23, 31, 40, 17, 54, 42, 56, 29, 34, 13,
   // Deuteronomy
   46, 37, 29, 49, 33, 25, 26, 20, 29, 22, 32, 32, 19, 29, 23, 22, 20, 22, 21, 20, 23, 30, 26, 24, 19, 19, 26, 69, 29, 20, 30, 52, 29, 12,
   // Joshua
@@ -140,11 +142,11 @@
   // 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, 43, 16, 23, 28, 23, 44, 25, 12, 25, 11, 32, 13,
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27, 15, 25, 23, 52, 35, 23, 54, 29, 24, 43, 16, 23, 29, 23, 44, 25, 12, 25, 11, 32, 13,
   // II Samuel
   27, 32, 39, 12, 26, 23, 29, 18, 13, 19, 27, 31, 39, 33, 37, 23, 29, 33, 44, 26, 22, 51, 39, 25,
   // I Kings
-  53, 71, 28, 34, 32, 36, 51, 66, 28, 33, 43, 54, 34, 31, 34, 42, 24, 46, 21, 29, 43, 54,
+  53, 71, 28, 34, 32, 38, 51, 66, 28, 33, 43, 54, 34, 31, 34, 42, 24, 46, 21, 43, 43, 54,
   // II Kings
   22, 25, 27, 44, 27, 33, 20, 29, 37, 36, 21, 22, 25, 29, 38, 20, 41, 37, 37, 21, 26, 20, 37, 20, 30,
   // I Chronicles
@@ -158,7 +160,7 @@
   // Nehemiah
   11, 20, 37, 23, 19, 19, 73, 18, 38, 40, 36, 47, 31,
   // Esther (chapters 11-16 represent the additions, whether identified as chapters 11-16 or additions A-F)
-  22, 23, 15, 17, 22, 14, 10, 17, 32, 13, 17, 7, 30, 19, 24, 24
+  22, 23, 19, 29, 24, 22, 59, 17, 32, 13, 18, 7, 30, 19, 24, 24
   // Judith
   16, 28, 10, 15, 24, 21, 32, 36, 14, 23, 23, 20, 20, 19, 14, 25,
   // Tobit
@@ -178,19 +180,19 @@
   // Proverbs
   35, 23, 38, 28, 23, 40, 27, 36, 25, 33, 31, 31, 27, 36, 38, 33, 30, 23, 29, 30, 31, 31, 36, 77, 31, 29, 29, 30, 49, 35, 31,
   // Ecclesiastes
-  18, 26, 22, 17, 19, 12, 30, 17, 18, 20, 10, 14,
+  18, 26, 22, 17, 20, 12, 30, 17, 18, 20, 10, 14,
   // Song of Solomon
-  17, 17, 11, 16, 17, 12, 14, 14,
+  17, 17, 11, 16, 17, 13, 14, 14,
   // Job
   22, 18, 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, 32, 26, 22,
   // Wisdom
   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, 40, 31, 26, 31, 31, 34, 35, 30, 27, 25, 33, 24, 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, 27, 31, 26, 40, 42, 28, 40, 31, 34, 35, 30, 27, 25, 33, 24, 26, 20, 25, 25, 16, 29, 30,
   // Psalms of Solomon
   8, 41, 16, 29, 22, 9, 10, 40, 20, 9, 9, 8, 12, 10, 15, 15, 51, 14,
   // Hosea
-  11, 25, 5, 19, 15, 12, 16, 14, 17, 15, 12, 15, 15, 10,
+  11, 25, 5, 19, 15, 12, 16, 14, 17, 15, 12, 15, 16, 10,
   // Amos
   15, 16, 15, 13, 27, 15, 17, 14, 15,
   // Micah
@@ -200,7 +202,7 @@
   // Obadiah
   21,
   // Jonah
-  16, 11, 10, 11,
+  17, 11, 10, 11,
   // Nahum
   15, 14, 19,
   // Habakkuk
@@ -216,7 +218,7 @@
   // Isaiah
   31, 21, 26, 6, 30, 13, 25, 23, 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, 11, 21, 14, 21, 22, 11, 12, 20, 12, 25, 24,
   // Jeremiah
-  19, 37, 25, 31, 31, 30, 34, 23, 26, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 42, 10, 39, 28, 46, 64, 23, 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, 26, 25, 23, 17, 27, 22, 21, 21, 27, 23, 15, 18, 14, 30, 42, 10, 39, 28, 46, 64, 32, 33, 44, 44, 24, 22, 19, 32, 24, 40, 44, 16, 22, 22, 32, 30, 28, 28, 22, 44, 39, 46, 64, 34,
   // Baruch
   22, 35, 38, 37, 9,
   // Lamentations