[jsword-svn] r2215 - in trunk/jsword/src/main: java/org/crosswire/jsword/versification java/org/crosswire/jsword/versification/system resources
dmsmith at crosswire.org
dmsmith at crosswire.org
Tue Jan 17 16:18:17 MST 2012
Author: dmsmith
Date: 2012-01-17 16:18:17 -0700 (Tue, 17 Jan 2012)
New Revision: 2215
Modified:
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/ReferenceSystem.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java
trunk/jsword/src/main/resources/BibleNames.properties
trunk/jsword/src/main/resources/BibleNames_en.properties
Log:
Removed chapter 0 from versification definitions.
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -25,6 +25,7 @@
import org.crosswire.jsword.book.CaseType;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.system.SystemKJV;
/**
* BibleInfo is a static class that deals with Bible book names, and conversion to and from
@@ -1103,7 +1104,7 @@
},
};
- public static ReferenceSystem referenceSystem = new ReferenceSystem(osisName, kjvBooks, kjvLastVerse);
+ public static ReferenceSystem referenceSystem = new ReferenceSystem(osisName, SystemKJV.booksOT, SystemKJV.booksNT, SystemKJV.lastVerseOT, SystemKJV.lastVerseNT);
/**
* A singleton used to do initialization. Could be used to change static
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/ReferenceSystem.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/ReferenceSystem.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/ReferenceSystem.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -100,6 +100,135 @@
}
/**
+ * Construct a ReferenceSystem.
+ *
+ * @param osisName
+ * The name of this reference system
+ * @param booksOT
+ * An ordered list of books in this reference system. The list
+ * should not include INTRO_BIBLE, or INTRO_OT.
+ * @param booksOT
+ * An ordered list of books in this reference system. The list
+ * should not include INTRO_BIBLE, or INTRO_OT.
+ * @param lastVerseOT
+ * For each book in booksOT, this has an array with one entry for
+ * each chapter whose value is the highest numbered verse in that
+ * chapter. Do not include chapter 0.
+ * @param lastVerseNT
+ * For each book in booksNT, this has an array with one entry for
+ * each chapter whose value is the highest numbered verse in that
+ * chapter. Do not include chapter 0.
+ */
+ public ReferenceSystem(String osisName, BibleBook[] booksOT, BibleBook[] booksNT, int[][] lastVerseOT, int[][] lastVerseNT) {
+ this.osisName = osisName;
+
+ // Copy the books into an aggregated BibleBook array
+ // including INTRO_BIBLE and INTRO_OT/INTRO_NT for non-null book lists
+ int bookCount = 1; // Always include the INTRO_BIBLE
+ if (booksOT.length > 0) {
+ bookCount += booksOT.length + 1; // All of the OT books and INTRO_OT
+ }
+
+ int ntStart = bookCount;
+ if (booksNT.length > 0) {
+ bookCount += booksNT.length + 1; // All of the NT books and INTRO_NT
+ }
+ BibleBook[] books= new BibleBook[bookCount];
+ books[0] = BibleBook.INTRO_BIBLE;
+ if (booksOT.length > 0) {
+ books[1] = BibleBook.INTRO_OT;
+ System.arraycopy(booksOT, 0, books, 2, booksOT.length);
+ }
+
+ if (booksNT.length > 0) {
+ books[ntStart] = BibleBook.INTRO_NT;
+ System.arraycopy(booksNT, 0, books, ntStart + 1, booksNT.length);
+ }
+
+ this.bookList = new BibleBookList(books);
+
+ int ordinal = 0;
+
+ // Create an independent copy of lastVerse.
+ this.lastVerse = new int[bookCount][];
+ int bookIndex = 0;
+
+ // Add in the bible introduction
+ int chapters[] = new int[1];
+ chapters[0] = 0;
+ this.lastVerse[bookIndex++] = chapters;
+
+ // Now append the OT info
+ if (lastVerseOT.length > 0) {
+ // Add in the testament intro
+ chapters = new int[1];
+ chapters[0] = 0;
+ this.lastVerse[bookIndex++] = chapters;
+ // then all the testament info
+ for (int i = 0; i < lastVerseOT.length; i++) {
+ int[] src = lastVerseOT[i];
+ // Add one as the location for chapter 0.
+ int[] dest = new int[src.length + 1];
+ this.lastVerse[bookIndex++] = dest;
+ // The last verse of chapter 0 is 0
+ dest[0] = 0;
+ // copy the last verse array for the chapter
+ System.arraycopy(src, 0, dest, 1, src.length);
+ }
+ }
+
+ // Now append the NT info
+ if (lastVerseNT.length > 0) {
+ // Add in the testament intro
+ chapters = new int[1];
+ chapters[0] = 0;
+ this.lastVerse[bookIndex++] = chapters;
+ // then all the testament info
+ for (int i = 0; i < lastVerseNT.length; i++) {
+ int[] src = lastVerseNT[i];
+ // Add one as the location for chapter 0.
+ int[] dest = new int[src.length + 1];
+ this.lastVerse[bookIndex++] = dest;
+ // The last verse of chapter 0 is 0
+ dest[0] = 0;
+ // copy the last verse array for the chapter
+ System.arraycopy(src, 0, dest, 1, src.length);
+ }
+ }
+
+ // Initialize chapterStarts to be a parallel array to lastVerse,
+ // but with chapter starts
+ this.chapterStarts = new int[bookCount][];
+ for (bookIndex = 0; bookIndex < bookCount; bookIndex++) {
+
+ // Remember where the OT ends
+ if (bookList.getBook(bookIndex) == BibleBook.INTRO_NT) {
+ this.otMaxOrdinal = ordinal - 1;
+ }
+
+ // Save off the chapter starts
+ int[] src = this.lastVerse[bookIndex];
+ int numChapters = src.length;
+ int[] dest = new int[numChapters];
+ this.chapterStarts[bookIndex] = dest;
+ for (int chapterIndex = 0; chapterIndex < numChapters; chapterIndex++) {
+ // Save off the chapter start
+ dest[chapterIndex] = ordinal;
+
+ // Set ordinal to the start of the next chapter or book introduction.
+ // The number of verses in each chapter, when including verse 0,
+ // is one more that the largest numbered verse in the chapter.
+ ordinal += src[chapterIndex] + 1;
+ }
+ }
+
+ // Remember where the NT ends
+ this.ntMaxOrdinal = ordinal - 1;
+// ReferenceSystem.dump(System.out, this.osisName, this.bookList, this.lastVerse);
+// ReferenceSystem.dump(System.out, this.osisName, this.bookList, this.chapterStarts);
+ }
+
+ /**
* Get the OSIS name for this ReferenceSystem.
* @return the OSIS name of the ReferenceSystem
*/
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -36,126 +36,126 @@
public static BibleBook[] booksNT = SystemDefault.booksNT;
public static int lastVerseNT[][] =
- {
+ {
// Matthew
{
- 0, 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 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
{
- 0, 45, 28, 35, 41, 43, 56, 37, 38, 50,
+ 45, 28, 35, 41, 43, 56, 37, 38, 50,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 0, 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 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
{
- 0, 51, 25, 36, 54, 47, 71, 53, 59, 41,
+ 51, 25, 36, 54, 47, 71, 53, 59, 41,
42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 0, 26, 47, 26, 37, 42, 15, 60, 40, 43,
+ 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
{
- 0, 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 23, 33, 27,
},
// I Corinthians
{
- 0, 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// II Corinthians
{
- 0, 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 33, 21, 13,
},
// Galatians
{
- 0, 24, 21, 29, 31, 26, 18,
+ 24, 21, 29, 31, 26, 18,
},
// Ephesians
{
- 0, 23, 22, 21, 32, 33, 24,
+ 23, 22, 21, 32, 33, 24,
},
// Philippians
{
- 0, 30, 30, 21, 23,
+ 30, 30, 21, 23,
},
// Colossians
{
- 0, 29, 23, 25, 18,
+ 29, 23, 25, 18,
},
// I Thessalonians
{
- 0, 10, 20, 13, 18, 28,
+ 10, 20, 13, 18, 28,
},
// II Thessalonians
{
- 0, 12, 17, 18,
+ 12, 17, 18,
},
// I Timothy
{
- 0, 20, 15, 16, 16, 25, 21,
+ 20, 15, 16, 16, 25, 21,
},
// II Timothy
{
- 0, 18, 26, 17, 22,
+ 18, 26, 17, 22,
},
// Titus
{
- 0, 16, 15, 15,
+ 16, 15, 15,
},
// Philemon
{
- 0, 25,
+ 25,
},
// Hebrews
{
- 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// James
{
- 0, 27, 26, 18, 17, 20,
+ 27, 26, 18, 17, 20,
},
// I Peter
{
- 0, 25, 25, 22, 19, 14,
+ 25, 25, 22, 19, 14,
},
// II Peter
{
- 0, 21, 22, 18,
+ 21, 22, 18,
},
// I John
{
- 0, 10, 29, 24, 21, 21,
+ 10, 29, 24, 21, 21,
},
// II John
{
- 0, 13,
+ 13,
},
// III John
{
- 0, 15,
+ 15,
},
// Jude
{
- 0, 25,
+ 25,
},
// Revelation of John
{
- 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 20, 29, 22, 11, 14, 17, 17, 13, 21,
11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
15, 27, 21,
},
@@ -215,7 +215,7 @@
{
// Gen
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -224,7 +224,7 @@
},
// Exodus
{
- 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 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,
@@ -232,116 +232,116 @@
},
// Leviticus
{
- 0, 17, 16, 17, 35, 26, 23, 38, 36, 24,
+ 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
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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
{
- 0, 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 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
{
- 0, 36, 23, 31, 24, 32, 40, 25, 35, 57,
+ 36, 23, 31, 24, 32, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// I Samuel
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 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
{
- 0, 53, 46, 28, 20, 32, 38, 51, 66, 28,
+ 53, 46, 28, 20, 32, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 54,
},
// II Kings
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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
{
- 0, 54, 55, 24, 43, 41, 66, 40, 40, 44,
+ 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
{
- 0, 18, 17, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 0, 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 11, 20, 38, 17, 19, 19, 73, 18, 37,
40, 36, 47, 31,
},
// Tobit
{
- 0, 22, 14, 17, 21, 23, 19, 17, 21, 6,
+ 22, 14, 17, 21, 23, 19, 17, 21, 6,
14, 19, 22, 18, 15,
},
// Judith
{
- 0, 16, 28, 10, 15, 24, 21, 32, 36, 14,
+ 16, 28, 10, 15, 24, 21, 32, 36, 14,
23, 23, 20, 20, 19, 14, 25,
},
// Esther
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// I Maccabees
{
- 0, 64, 70, 60, 61, 68, 63, 50, 32, 73,
+ 64, 70, 60, 61, 68, 63, 50, 32, 73,
89, 74, 54, 53, 49, 41, 24,
},
// II Maccabees
{
- 0, 36, 32, 40, 50, 27, 31, 42, 36, 29,
+ 36, 32, 40, 50, 27, 31, 42, 36, 29,
38, 38, 46, 26, 46, 39,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -349,7 +349,7 @@
},
// Psalms
{
- 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 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,
@@ -368,28 +368,28 @@
},
// Proverbs
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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
{
- 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 18, 26, 22, 17, 19, 12, 29, 17, 18,
20, 10, 14,
},
// Song of Solomon
{
- 0, 17, 17, 11, 17, 16, 12, 14, 14,
+ 17, 17, 11, 17, 16, 12, 14, 14,
},
// Wisdom
{
- 0, 16, 24, 19, 20, 23, 25, 30, 21, 19,
+ 16, 24, 19, 20, 23, 25, 30, 21, 19,
21, 26, 27, 19, 31, 19, 29, 21, 25, 22,
},
// Sirach
{
- 0, 30, 18, 31, 31, 17, 37, 36, 19, 18,
+ 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,
@@ -398,7 +398,7 @@
},
// Isaiah
{
- 0, 31, 22, 26, 6, 30, 13, 25, 24, 21,
+ 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,
@@ -408,7 +408,7 @@
},
// Jeremiah
{
- 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 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,
@@ -417,15 +417,15 @@
},
// Lamentations
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Baruch
{
- 0, 22, 35, 38, 37, 9, 72,
+ 22, 35, 38, 37, 9, 72,
},
// Ezekiel
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -433,58 +433,58 @@
},
// Daniel
{
- 0, 21, 49, 100, 34, 30, 29, 28, 27, 27,
+ 21, 49, 100, 34, 30, 29, 28, 27, 27,
21, 45, 13, 64, 43,
},
// Hosea
{
- 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 9, 25, 5, 19, 15, 11, 16, 14, 17,
15, 11, 15, 15, 10,
},
// Joel
{
- 0, 20, 27, 5, 21,
+ 20, 27, 5, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obadiah
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 16, 11, 10, 11,
+ 16, 11, 10, 11,
},
// Micah
{
- 0, 16, 13, 12, 14, 14, 16, 20,
+ 16, 13, 12, 14, 14, 16, 20,
},
// Nahum
{
- 0, 14, 14, 19,
+ 14, 14, 19,
},
// Habakkuk
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zephaniah
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Haggai
{
- 0, 15, 23,
+ 15, 23,
},
// Zechariah
{
- 0, 17, 17, 10, 16, 11, 15, 14, 23, 17,
+ 17, 17, 10, 16, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
{
- 0, 14, 17, 24,
+ 14, 17, 24,
},
};
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -43,7 +43,7 @@
{
// Gen
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -52,7 +52,7 @@
},
// Exodus
{
- 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 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,
@@ -60,116 +60,116 @@
},
// Leviticus
{
- 0, 17, 16, 17, 35, 26, 23, 38, 36, 24,
+ 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
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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
{
- 0, 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 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
{
- 0, 36, 23, 31, 24, 32, 40, 25, 35, 57,
+ 36, 23, 31, 24, 32, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// I Samuel
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 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
{
- 0, 53, 46, 28, 20, 32, 38, 51, 66, 28,
+ 53, 46, 28, 20, 32, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 54,
},
// II Kings
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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
{
- 0, 54, 55, 24, 43, 41, 66, 40, 40, 44,
+ 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
{
- 0, 18, 17, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 0, 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 11, 20, 38, 17, 19, 19, 73, 18, 37,
40, 36, 47, 31,
},
// Tobit
{
- 0, 22, 14, 17, 21, 23, 19, 17, 21, 6,
+ 22, 14, 17, 21, 23, 19, 17, 21, 6,
14, 19, 22, 18, 15,
},
// Judith
{
- 0, 16, 28, 10, 15, 24, 21, 32, 36, 14,
+ 16, 28, 10, 15, 24, 21, 32, 36, 14,
23, 23, 20, 20, 19, 14, 25,
},
// Esther
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
13, 12, 6, 18, 19, 19, 24,
},
// I Maccabees
{
- 0, 64, 70, 60, 61, 68, 63, 50, 32, 73,
+ 64, 70, 60, 61, 68, 63, 50, 32, 73,
89, 74, 54, 53, 49, 41, 24,
},
// II Maccabees
{
- 0, 36, 32, 40, 50, 27, 31, 42, 36, 29,
+ 36, 32, 40, 50, 27, 31, 42, 36, 29,
38, 38, 46, 26, 46, 39,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -177,7 +177,7 @@
},
// Psalms
{
- 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 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,
@@ -196,28 +196,28 @@
},
// Proverbs
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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
{
- 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 18, 26, 22, 17, 19, 12, 29, 17, 18,
20, 10, 14,
},
// Song of Solomon
{
- 0, 17, 17, 11, 17, 16, 12, 14, 14,
+ 17, 17, 11, 17, 16, 12, 14, 14,
},
// Wisdom
{
- 0, 16, 24, 19, 20, 23, 25, 30, 21, 19,
+ 16, 24, 19, 20, 23, 25, 30, 21, 19,
21, 26, 27, 19, 31, 19, 29, 21, 25, 22,
},
// Sirach
{
- 0, 30, 18, 31, 31, 17, 37, 36, 19, 18,
+ 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,
@@ -226,7 +226,7 @@
},
// Isaiah
{
- 0, 31, 22, 26, 6, 30, 13, 25, 24, 21,
+ 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,
@@ -236,7 +236,7 @@
},
// Jeremiah
{
- 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 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,
@@ -245,15 +245,15 @@
},
// Lamentations
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Baruch
{
- 0, 22, 35, 38, 37, 9, 72,
+ 22, 35, 38, 37, 9, 72,
},
// Ezekiel
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -261,58 +261,58 @@
},
// Daniel
{
- 0, 21, 49, 100, 34, 30, 29, 28, 27, 27,
+ 21, 49, 100, 34, 30, 29, 28, 27, 27,
21, 45, 13, 64, 43,
},
// Hosea
{
- 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 9, 25, 5, 19, 15, 11, 16, 14, 17,
15, 11, 15, 15, 10,
},
// Joel
{
- 0, 20, 27, 5, 21,
+ 20, 27, 5, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obadiah
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 16, 11, 10, 11,
+ 16, 11, 10, 11,
},
// Micah
{
- 0, 16, 13, 12, 14, 14, 16, 20,
+ 16, 13, 12, 14, 14, 16, 20,
},
// Nahum
{
- 0, 14, 14, 19,
+ 14, 14, 19,
},
// Habakkuk
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zephaniah
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Haggai
{
- 0, 15, 23,
+ 15, 23,
},
// Zechariah
{
- 0, 17, 17, 10, 16, 11, 15, 14, 23, 17,
+ 17, 17, 10, 16, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
{
- 0, 14, 17, 24,
+ 14, 17, 24,
},
};
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -38,124 +38,124 @@
{
// Matthew
{
- 0, 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 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
{
- 0, 45, 28, 35, 41, 43, 56, 37, 38, 50,
+ 45, 28, 35, 41, 43, 56, 37, 38, 50,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 0, 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 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
{
- 0, 51, 25, 36, 54, 47, 71, 53, 59, 41,
+ 51, 25, 36, 54, 47, 71, 53, 59, 41,
42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 0, 26, 47, 26, 37, 42, 15, 60, 40, 43,
+ 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
{
- 0, 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 23, 33, 27,
},
// I Corinthians
{
- 0, 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// II Corinthians
{
- 0, 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 33, 21, 13,
},
// Galatians
{
- 0, 24, 21, 29, 31, 26, 18,
+ 24, 21, 29, 31, 26, 18,
},
// Ephesians
{
- 0, 23, 22, 21, 32, 33, 24,
+ 23, 22, 21, 32, 33, 24,
},
// Philippians
{
- 0, 30, 30, 21, 23,
+ 30, 30, 21, 23,
},
// Colossians
{
- 0, 29, 23, 25, 18,
+ 29, 23, 25, 18,
},
// I Thessalonians
{
- 0, 10, 20, 13, 18, 28,
+ 10, 20, 13, 18, 28,
},
// II Thessalonians
{
- 0, 12, 17, 18,
+ 12, 17, 18,
},
// I Timothy
{
- 0, 20, 15, 16, 16, 25, 21,
+ 20, 15, 16, 16, 25, 21,
},
// II Timothy
{
- 0, 18, 26, 17, 22,
+ 18, 26, 17, 22,
},
// Titus
{
- 0, 16, 15, 15,
+ 16, 15, 15,
},
// Philemon
{
- 0, 25,
+ 25,
},
// Hebrews
{
- 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// James
{
- 0, 27, 26, 18, 17, 20,
+ 27, 26, 18, 17, 20,
},
// I Peter
{
- 0, 25, 25, 22, 19, 14,
+ 25, 25, 22, 19, 14,
},
// II Peter
{
- 0, 21, 22, 18,
+ 21, 22, 18,
},
// I John
{
- 0, 10, 29, 24, 21, 21,
+ 10, 29, 24, 21, 21,
},
// II John
{
- 0, 13,
+ 13,
},
// III John
{
- 0, 15,
+ 15,
},
// Jude
{
- 0, 25,
+ 25,
},
// Revelation of John
{
- 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 20, 29, 22, 11, 14, 17, 17, 13, 21,
11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
15, 27, 21,
},
@@ -165,7 +165,7 @@
{
// Genesis
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -174,7 +174,7 @@
},
// Exodus
{
- 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 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,
@@ -182,43 +182,43 @@
},
// Leviticus
{
- 0, 17, 16, 17, 35, 26, 23, 38, 36, 24,
+ 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
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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
{
- 0, 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 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
{
- 0, 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// I Samuel
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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,
@@ -226,53 +226,53 @@
},
// II Samuel
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 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
{
- 0, 53, 46, 28, 20, 32, 38, 51, 66, 28,
+ 53, 46, 28, 20, 32, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 54,
},
// II Kings
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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
{
- 0, 54, 55, 24, 43, 41, 66, 40, 40, 44,
+ 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
{
- 0, 18, 17, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 0, 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 11, 20, 38, 17, 19, 19, 73, 18, 37,
40, 36, 47, 31,
},
// Esther
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -280,7 +280,7 @@
},
// Psalms
{
- 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 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,
@@ -299,23 +299,23 @@
},
// Proverbs
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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
{
- 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 18, 26, 22, 17, 19, 12, 29, 17, 18,
20, 10, 14,
},
// Song of Solomon
{
- 0, 17, 17, 11, 16, 16, 12, 14, 14,
+ 17, 17, 11, 16, 16, 12, 14, 14,
},
// Isaiah
{
- 0, 31, 22, 26, 6, 30, 13, 25, 23, 20,
+ 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,
@@ -325,7 +325,7 @@
},
// Jeremiah
{
- 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 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,
@@ -334,11 +334,11 @@
},
// Lamentations
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Ezekiel
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -346,58 +346,58 @@
},
// Daniel
{
- 0, 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 49, 33, 34, 30, 29, 28, 27, 27,
21, 45, 13,
},
// Hosea
{
- 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 9, 25, 5, 19, 15, 11, 16, 14, 17,
15, 11, 15, 15, 10,
},
// Joel
{
- 0, 20, 27, 5, 21,
+ 20, 27, 5, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obadiah
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 16, 11, 10, 11,
+ 16, 11, 10, 11,
},
// Micah
{
- 0, 16, 13, 12, 14, 14, 16, 20,
+ 16, 13, 12, 14, 14, 16, 20,
},
// Nahum
{
- 0, 14, 14, 19,
+ 14, 14, 19,
},
// Habakkuk
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zephaniah
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Haggai
{
- 0, 15, 23,
+ 15, 23,
},
// Zechariah
{
- 0, 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 17, 17, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
{
- 0, 14, 17, 24,
+ 14, 17, 24,
},
};
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -40,124 +40,124 @@
{
// Matt
{
- 0, 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 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
{
- 0, 45, 28, 35, 41, 43, 56, 37, 38, 50,
+ 45, 28, 35, 41, 43, 56, 37, 38, 50,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 0, 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 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
{
- 0, 51, 25, 36, 54, 47, 71, 53, 59, 41,
+ 51, 25, 36, 54, 47, 71, 53, 59, 41,
42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 0, 26, 47, 26, 37, 42, 15, 60, 40, 43,
+ 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,
},
// Rom
{
- 0, 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 23, 33, 27,
},
// 1Cor
{
- 0, 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// 2Cor
{
- 0, 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 33, 21, 14,
},
// Gal
{
- 0, 24, 21, 29, 31, 26, 18,
+ 24, 21, 29, 31, 26, 18,
},
// Eph
{
- 0, 23, 22, 21, 32, 33, 24,
+ 23, 22, 21, 32, 33, 24,
},
// Phil
{
- 0, 30, 30, 21, 23,
+ 30, 30, 21, 23,
},
// Col
{
- 0, 29, 23, 25, 18,
+ 29, 23, 25, 18,
},
// 1Thess
{
- 0, 10, 20, 13, 18, 28,
+ 10, 20, 13, 18, 28,
},
// 2Thess
{
- 0, 12, 17, 18,
+ 12, 17, 18,
},
// 1Tim
{
- 0, 20, 15, 16, 16, 25, 21,
+ 20, 15, 16, 16, 25, 21,
},
// 2Tim
{
- 0, 18, 26, 17, 22,
+ 18, 26, 17, 22,
},
// Titus
{
- 0, 16, 15, 15,
+ 16, 15, 15,
},
// Phlm
{
- 0, 25,
+ 25,
},
// Heb
{
- 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// Jas
{
- 0, 27, 26, 18, 17, 20,
+ 27, 26, 18, 17, 20,
},
// 1Pet
{
- 0, 25, 25, 22, 19, 14,
+ 25, 25, 22, 19, 14,
},
// 2Pet
{
- 0, 21, 22, 18,
+ 21, 22, 18,
},
// 1John
{
- 0, 10, 29, 24, 21, 21,
+ 10, 29, 24, 21, 21,
},
// 2John
{
- 0, 13,
+ 13,
},
// 3John
{
- 0, 14,
+ 14,
},
// Jude
{
- 0, 25,
+ 25,
},
// Rev
{
- 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 20, 29, 22, 11, 14, 17, 17, 13, 21,
11, 19, 17, 18, 20, 8, 21, 18, 24, 21,
15, 27, 21,
},
@@ -170,7 +170,7 @@
{
// Gen
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -179,7 +179,7 @@
},
// Exod
{
- 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 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,
@@ -187,96 +187,96 @@
},
// Lev
{
- 0, 17, 16, 17, 35, 19, 30, 38, 36, 24,
+ 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,
},
// Num
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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,
},
// Deut
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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,
},
// Josh
{
- 0, 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 18, 24, 17, 24, 15, 27, 26, 35, 27,
43, 23, 24, 33, 15, 63, 10, 18, 28, 51,
9, 45, 34, 16, 33,
},
// Judg
{
- 0, 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// 1Sam
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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,
},
// 2Sam
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 27, 32, 39, 12, 25, 23, 29, 18, 13,
19, 27, 31, 39, 33, 37, 23, 29, 33, 43,
26, 22, 51, 39, 25,
},
// 1Kgs
{
- 0, 53, 46, 28, 34, 18, 38, 51, 66, 28,
+ 53, 46, 28, 34, 18, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 53,
},
// 2Kgs
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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,
},
// 1Chr
{
- 0, 54, 55, 24, 43, 26, 81, 40, 40, 44,
+ 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,
},
// 2Chr
{
- 0, 17, 18, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Neh
{
- 0, 11, 20, 32, 23, 19, 19, 73, 18, 38,
+ 11, 20, 32, 23, 19, 19, 73, 18, 38,
39, 36, 47, 31,
},
// Esth
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -284,7 +284,7 @@
},
// Ps
{
- 0, 6, 12, 8, 8, 12, 10, 17, 9, 20,
+ 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,
@@ -303,23 +303,23 @@
},
// Prov
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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,
},
// Eccl
{
- 0, 18, 26, 22, 16, 20, 12, 29, 17, 18,
+ 18, 26, 22, 16, 20, 12, 29, 17, 18,
20, 10, 14,
},
// Song
{
- 0, 17, 17, 11, 16, 16, 13, 13, 14,
+ 17, 17, 11, 16, 16, 13, 13, 14,
},
// Isa
{
- 0, 31, 22, 26, 6, 30, 13, 25, 22, 21,
+ 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,
@@ -329,7 +329,7 @@
},
// Jer
{
- 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 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,
@@ -338,11 +338,11 @@
},
// Lam
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Ezek
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -350,65 +350,64 @@
},
// Dan
{
- 0, 21, 49, 30, 37, 31, 28, 28, 27, 27,
+ 21, 49, 30, 37, 31, 28, 28, 27, 27,
21, 45, 13,
},
// Hos
{
- 0, 11, 23, 5, 19, 15, 11, 16, 14, 17,
+ 11, 23, 5, 19, 15, 11, 16, 14, 17,
15, 12, 14, 16, 9,
},
// Joel
{
- 0, 20, 32, 21,
+ 20, 32, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obad
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 17, 10, 10, 11,
+ 17, 10, 10, 11,
},
// Mic
{
- 0, 16, 13, 12, 13, 15, 16, 20,
+ 16, 13, 12, 13, 15, 16, 20,
},
// Nah
{
- 0, 15, 13, 19,
+ 15, 13, 19,
},
// Hab
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zeph
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Hag
{
- 0, 15, 23,
+ 15, 23,
},
// Zech
{
- 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 21, 13, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Mal
{
- 0, 14, 17, 18, 6,
+ 14, 17, 18, 6,
},
};
+
/**
* Constant for the ordinal number of the first verse in each chapter.
*/
- // Note the sentinel at the end of the array is one greater
- // than the last ordinal in the last book
public static final int[][] kjvChapterStarts =
{
// Bible Introduction
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -100,7 +100,7 @@
{
// Gen
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -109,7 +109,7 @@
},
// Exod
{
- 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 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,
@@ -117,96 +117,96 @@
},
// Lev
{
- 0, 17, 16, 17, 35, 19, 30, 38, 36, 24,
+ 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,
},
// Num
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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,
},
// Deut
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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,
},
// Josh
{
- 0, 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 18, 24, 17, 24, 15, 27, 26, 35, 27,
43, 23, 24, 33, 15, 63, 10, 18, 28, 51,
9, 45, 34, 16, 33,
},
// Judg
{
- 0, 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// 1Sam
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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,
},
// 2Sam
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 27, 32, 39, 12, 25, 23, 29, 18, 13,
19, 27, 31, 39, 33, 37, 23, 29, 33, 43,
26, 22, 51, 39, 25,
},
// 1Kgs
{
- 0, 53, 46, 28, 34, 18, 38, 51, 66, 28,
+ 53, 46, 28, 34, 18, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 53,
},
// 2Kgs
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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,
},
// 1Chr
{
- 0, 54, 55, 24, 43, 26, 81, 40, 40, 44,
+ 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,
},
// 2Chr
{
- 0, 17, 18, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Neh
{
- 0, 11, 20, 32, 23, 19, 19, 73, 18, 38,
+ 11, 20, 32, 23, 19, 19, 73, 18, 38,
39, 36, 47, 31,
},
// Esth
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -214,7 +214,7 @@
},
// Ps
{
- 0, 6, 12, 8, 8, 12, 10, 17, 9, 20,
+ 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,
@@ -233,23 +233,23 @@
},
// Prov
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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,
},
// Eccl
{
- 0, 18, 26, 22, 16, 20, 12, 29, 17, 18,
+ 18, 26, 22, 16, 20, 12, 29, 17, 18,
20, 10, 14,
},
// Song
{
- 0, 17, 17, 11, 16, 16, 13, 13, 14,
+ 17, 17, 11, 16, 16, 13, 13, 14,
},
// Isa
{
- 0, 31, 22, 26, 6, 30, 13, 25, 22, 21,
+ 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,
@@ -259,7 +259,7 @@
},
// Jer
{
- 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 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,
@@ -268,11 +268,11 @@
},
// Lam
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Ezek
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -280,91 +280,91 @@
},
// Dan
{
- 0, 21, 49, 30, 37, 31, 28, 28, 27, 27,
+ 21, 49, 30, 37, 31, 28, 28, 27, 27,
21, 45, 13,
},
// Hos
{
- 0, 11, 23, 5, 19, 15, 11, 16, 14, 17,
+ 11, 23, 5, 19, 15, 11, 16, 14, 17,
15, 12, 14, 16, 9,
},
// Joel
{
- 0, 20, 32, 21,
+ 20, 32, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obad
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 17, 10, 10, 11,
+ 17, 10, 10, 11,
},
// Mic
{
- 0, 16, 13, 12, 13, 15, 16, 20,
+ 16, 13, 12, 13, 15, 16, 20,
},
// Nah
{
- 0, 15, 13, 19,
+ 15, 13, 19,
},
// Hab
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zeph
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Hag
{
- 0, 15, 23,
+ 15, 23,
},
// Zech
{
- 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 21, 13, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Mal
{
- 0, 14, 17, 18, 6,
+ 14, 17, 18, 6,
},
// I Esdras
{
- 0, 58, 30, 24, 63, 73, 34, 15, 96, 55,
+ 58, 30, 24, 63, 73, 34, 15, 96, 55,
},
// II Esdras
{
- 0, 40, 48, 36, 52, 56, 59, 70, 63, 47,
+ 40, 48, 36, 52, 56, 59, 70, 63, 47,
59, 46, 51, 58, 48, 63, 78,
},
// Tobit
{
- 0, 22, 14, 17, 21, 22, 17, 18, 21, 6,
+ 22, 14, 17, 21, 22, 17, 18, 21, 6,
12, 19, 22, 18, 15,
},
// Judith
{
- 0, 16, 28, 10, 15, 24, 21, 32, 36, 14,
+ 16, 28, 10, 15, 24, 21, 32, 36, 14,
23, 23, 20, 20, 19, 13, 25,
},
// Additions to Esther
{
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1,
13, 12, 6, 18, 19, 16, 24,
},
// Wisdom
{
- 0, 16, 24, 19, 20, 23, 25, 30, 21, 18,
+ 16, 24, 19, 20, 23, 25, 30, 21, 18,
21, 26, 27, 19, 31, 19, 29, 21, 25, 22,
},
// Sirach
{
- 0, 30, 18, 31, 31, 15, 37, 36, 19, 18,
+ 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,
@@ -373,32 +373,32 @@
},
// Baruch
{
- 0, 22, 35, 37, 37, 9, 73,
+ 22, 35, 37, 37, 9, 73,
},
// Prayer of Azariah
{
- 0, 68,
+ 68,
},
// Susanna
{
- 0, 64,
+ 64,
},
// Bel and the Dragon
{
- 0, 42,
+ 42,
},
// Prayer of Manasses
{
- 0, 1,
+ 1,
},
// I Maccabees
{
- 0, 64, 70, 60, 61, 68, 63, 50, 32, 73,
+ 64, 70, 60, 61, 68, 63, 50, 32, 73,
89, 74, 53, 53, 49, 41, 24,
},
// II Maccabees
{
- 0, 36, 32, 40, 50, 27, 31, 42, 36, 29,
+ 36, 32, 40, 50, 27, 31, 42, 36, 29,
38, 38, 45, 26, 46, 39,
},
};
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -86,7 +86,7 @@
{
// Genesis
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -95,7 +95,7 @@
},
// Exodus
{
- 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 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,
@@ -103,64 +103,64 @@
},
// Leviticus
{
- 0, 17, 16, 17, 35, 26, 23, 38, 36, 24,
+ 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
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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
{
- 0, 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 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
{
- 0, 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// I Samuel
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 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
{
- 0, 53, 46, 28, 20, 32, 38, 51, 66, 28,
+ 53, 46, 28, 20, 32, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 54,
},
// II Kings
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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
{
- 0, 31, 22, 26, 6, 30, 13, 25, 23, 20,
+ 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,
@@ -170,7 +170,7 @@
},
// Jeremiah
{
- 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 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,
@@ -179,7 +179,7 @@
},
// Ezekiel
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -187,70 +187,70 @@
},
// Hosea
{
- 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 9, 25, 5, 19, 15, 11, 16, 14, 17,
15, 11, 15, 15, 10,
},
// Joel
{
- 0, 20, 27, 5, 21,
+ 20, 27, 5, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obadiah
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 16, 11, 10, 11,
+ 16, 11, 10, 11,
},
// Micah
{
- 0, 16, 13, 12, 14, 14, 16, 20,
+ 16, 13, 12, 14, 14, 16, 20,
},
// Nahum
{
- 0, 14, 14, 19,
+ 14, 14, 19,
},
// Habakkuk
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zephaniah
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Haggai
{
- 0, 15, 23,
+ 15, 23,
},
// Zechariah
{
- 0, 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 17, 17, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
{
- 0, 14, 17, 24,
+ 14, 17, 24,
},
// I Chronicles
{
- 0, 54, 55, 24, 43, 41, 66, 40, 40, 44,
+ 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
{
- 0, 18, 17, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 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,
@@ -269,7 +269,7 @@
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -277,46 +277,46 @@
},
// Proverbs
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// Song of Solomon
{
- 0, 17, 17, 11, 16, 16, 12, 14, 14,
+ 17, 17, 11, 16, 16, 12, 14, 14,
},
// Ecclesiastes
{
- 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 18, 26, 22, 17, 19, 12, 29, 17, 18,
20, 10, 14,
},
// Lamentations
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Esther
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Daniel
{
- 0, 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 49, 33, 34, 30, 29, 28, 27, 27,
21, 45, 13,
},
// Ezra
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 0, 11, 20, 38, 17, 19, 19, 72, 18, 37,
+ 11, 20, 38, 17, 19, 19, 72, 18, 37,
40, 36, 47, 31,
},
};
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -65,128 +65,129 @@
BibleBook.JUDE,
BibleBook.REV,
};
+
public static int[][] lastVerseNT =
{
// Matthew
{
- 0, 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 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
{
- 0, 45, 28, 35, 41, 43, 56, 37, 38, 50,
+ 45, 28, 35, 41, 43, 56, 37, 38, 50,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 0, 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 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
{
- 0, 51, 25, 36, 54, 47, 71, 53, 59, 41,
+ 51, 25, 36, 54, 47, 71, 53, 59, 41,
42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 0, 26, 47, 26, 37, 42, 15, 60, 40, 43,
+ 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
{
- 0, 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 23, 33, 27,
},
// I Corinthians
{
- 0, 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// II Corinthians
{
- 0, 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 33, 21, 13,
},
// Galatians
{
- 0, 24, 21, 29, 31, 26, 18,
+ 24, 21, 29, 31, 26, 18,
},
// Ephesians
{
- 0, 23, 22, 21, 32, 33, 24,
+ 23, 22, 21, 32, 33, 24,
},
// Philippians
{
- 0, 30, 30, 21, 23,
+ 30, 30, 21, 23,
},
// Colossians
{
- 0, 29, 23, 25, 18,
+ 29, 23, 25, 18,
},
// I Thessalonians
{
- 0, 10, 20, 13, 18, 28,
+ 10, 20, 13, 18, 28,
},
// II Thessalonians
{
- 0, 12, 17, 18,
+ 12, 17, 18,
},
// I Timothy
{
- 0, 20, 15, 16, 16, 25, 21,
+ 20, 15, 16, 16, 25, 21,
},
// II Timothy
{
- 0, 18, 26, 17, 22,
+ 18, 26, 17, 22,
},
// Titus
{
- 0, 16, 15, 15,
+ 16, 15, 15,
},
// Philemon
{
- 0, 25,
+ 25,
},
// I Peter
{
- 0, 25, 25, 22, 19, 14,
+ 25, 25, 22, 19, 14,
},
// II Peter
{
- 0, 21, 22, 18,
+ 21, 22, 18,
},
// I John
{
- 0, 10, 29, 24, 21, 21,
+ 10, 29, 24, 21, 21,
},
// II John
{
- 0, 13,
+ 13,
},
// III John
{
- 0, 15,
+ 15,
},
// Hebrews
{
- 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// James
{
- 0, 27, 26, 18, 17, 20,
+ 27, 26, 18, 17, 20,
},
// Jude
{
- 0, 25,
+ 25,
},
// Revelation of John
{
- 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 20, 29, 22, 11, 14, 17, 17, 13, 21,
11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
15, 27, 21,
},
@@ -250,7 +251,7 @@
{
// Genesis
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -259,7 +260,7 @@
},
// Exodus
{
- 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 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,
@@ -267,43 +268,43 @@
},
// Leviticus
{
- 0, 17, 16, 17, 35, 26, 23, 38, 36, 24,
+ 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
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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
{
- 0, 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 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
{
- 0, 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// I Samuel
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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,
@@ -311,53 +312,53 @@
},
// II Samuel
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 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
{
- 0, 53, 46, 28, 20, 32, 38, 51, 66, 28,
+ 53, 46, 28, 20, 32, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 54,
},
// II Kings
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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
{
- 0, 54, 55, 24, 43, 41, 66, 40, 40, 44,
+ 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
{
- 0, 18, 17, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 0, 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 11, 20, 38, 17, 19, 19, 73, 18, 37,
40, 36, 47, 31,
},
// Esther
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -365,7 +366,7 @@
},
// Psalms
{
- 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 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,
@@ -384,23 +385,23 @@
},
// Proverbs
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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
{
- 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 18, 26, 22, 17, 19, 12, 29, 17, 18,
20, 10, 14,
},
// Song of Solomon
{
- 0, 17, 17, 11, 16, 16, 12, 14, 14,
+ 17, 17, 11, 16, 16, 12, 14, 14,
},
// Isaiah
{
- 0, 31, 22, 26, 6, 30, 13, 25, 23, 20,
+ 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,
@@ -410,7 +411,7 @@
},
// Jeremiah
{
- 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 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,
@@ -419,11 +420,11 @@
},
// Lamentations
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Ezekiel
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -431,77 +432,77 @@
},
// Daniel
{
- 0, 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 49, 33, 34, 30, 29, 28, 27, 27,
21, 45, 13,
},
// Hosea
{
- 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 9, 25, 5, 19, 15, 11, 16, 14, 17,
15, 11, 15, 15, 10,
},
// Joel
{
- 0, 20, 27, 5, 21,
+ 20, 27, 5, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obadiah
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 16, 11, 10, 11,
+ 16, 11, 10, 11,
},
// Micah
{
- 0, 16, 13, 12, 14, 14, 16, 20,
+ 16, 13, 12, 14, 14, 16, 20,
},
// Nahum
{
- 0, 14, 14, 19,
+ 14, 14, 19,
},
// Habakkuk
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zephaniah
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Haggai
{
- 0, 15, 23,
+ 15, 23,
},
// Zechariah
{
- 0, 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 17, 17, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
{
- 0, 14, 17, 24,
+ 14, 17, 24,
},
// Judith
{
- 0, 11, 18, 12, 14, 26, 20, 24, 28, 15,
+ 11, 18, 12, 14, 26, 20, 24, 28, 15,
21, 17, 21, 31, 16, 16, 31,
},
// Wisdom
{
- 0, 16, 25, 19, 20, 24, 27, 30, 21, 19,
+ 16, 25, 19, 20, 24, 27, 30, 21, 19,
21, 26, 27, 19, 31, 19, 29, 21, 25, 21,
},
// Tobit
{
- 0, 25, 23, 25, 22, 29, 23, 20, 23, 12,
+ 25, 23, 25, 22, 29, 23, 20, 23, 12,
13, 20, 22, 22, 17,
},
// Sirach
{
- 0, 38, 23, 34, 36, 18, 37, 40, 22, 25,
+ 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,
@@ -510,29 +511,29 @@
},
// Baruch
{
- 0, 22, 35, 38, 37, 9, 73,
+ 22, 35, 38, 37, 9, 73,
},
// I Maccabees
{
- 0, 68, 70, 60, 61, 68, 63, 50, 32, 73,
+ 68, 70, 60, 61, 68, 63, 50, 32, 73,
89, 74, 54, 54, 49, 41, 24,
},
// II Maccabees
{
- 0, 36, 33, 40, 50, 27, 31, 42, 36, 29,
+ 36, 33, 40, 50, 27, 31, 42, 36, 29,
38, 38, 46, 26, 46, 40,
},
// Additions to Esther
{
- 0, 4, 8, 12, 12, 16, 9, 8,
+ 4, 8, 12, 12, 16, 9, 8,
},
// Additions to Daniel
{
- 0, 64, 41, 66,
+ 64, 41, 66,
},
// Prayer of Manasses
{
- 0, 16,
+ 16,
},
};
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -88,7 +88,7 @@
{
// Genesis
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -97,7 +97,7 @@
},
// Exodus
{
- 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 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,
@@ -105,64 +105,64 @@
},
// Leviticus
{
- 0, 17, 16, 17, 35, 26, 23, 38, 36, 24,
+ 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
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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
{
- 0, 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 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
{
- 0, 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// I Samuel
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 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
{
- 0, 53, 46, 28, 20, 32, 38, 51, 66, 28,
+ 53, 46, 28, 20, 32, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 54,
},
// II Kings
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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
{
- 0, 31, 22, 26, 6, 30, 13, 25, 23, 20,
+ 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,
@@ -172,7 +172,7 @@
},
// Jeremiah
{
- 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 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,
@@ -181,7 +181,7 @@
},
// Ezekiel
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -189,57 +189,57 @@
},
// Hosea
{
- 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 9, 25, 5, 19, 15, 11, 16, 14, 17,
15, 11, 15, 15, 10,
},
// Joel
{
- 0, 20, 27, 5, 21,
+ 20, 27, 5, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obadiah
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 16, 11, 10, 11,
+ 16, 11, 10, 11,
},
// Micah
{
- 0, 16, 13, 12, 14, 14, 16, 20,
+ 16, 13, 12, 14, 14, 16, 20,
},
// Nahum
{
- 0, 14, 14, 19,
+ 14, 14, 19,
},
// Habakkuk
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zephaniah
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Haggai
{
- 0, 15, 23,
+ 15, 23,
},
// Zechariah
{
- 0, 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 17, 17, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
{
- 0, 14, 17, 24,
+ 14, 17, 24,
},
// Psalms
{
- 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 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,
@@ -258,7 +258,7 @@
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -266,57 +266,57 @@
},
// Proverbs
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// Song of Solomon
{
- 0, 17, 17, 11, 16, 16, 12, 14, 14,
+ 17, 17, 11, 16, 16, 12, 14, 14,
},
// Ecclesiastes
{
- 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 18, 26, 22, 17, 19, 12, 29, 17, 18,
20, 10, 14,
},
// Lamentations
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Esther
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Daniel
{
- 0, 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 49, 33, 34, 30, 29, 28, 27, 27,
21, 45, 13,
},
// Ezra
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 0, 11, 20, 38, 17, 19, 19, 72, 18, 37,
+ 11, 20, 38, 17, 19, 19, 72, 18, 37,
40, 36, 47, 31,
},
// I Chronicles
{
- 0, 54, 55, 24, 43, 41, 66, 40, 40, 44,
+ 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
{
- 0, 18, 17, 17, 22, 14, 42, 22, 18, 31,
+ 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/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -41,124 +41,124 @@
{
// Matt
{
- 0, 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 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
{
- 0, 45, 28, 35, 41, 43, 56, 37, 38, 50,
+ 45, 28, 35, 41, 43, 56, 37, 38, 50,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 0, 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 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
{
- 0, 51, 25, 36, 54, 47, 71, 53, 59, 41,
+ 51, 25, 36, 54, 47, 71, 53, 59, 41,
42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 0, 26, 47, 26, 37, 42, 15, 60, 40, 43,
+ 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,
},
// Rom
{
- 0, 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 23, 33, 27,
},
// 1Cor
{
- 0, 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// 2Cor
{
- 0, 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 33, 21, 14,
},
// Gal
{
- 0, 24, 21, 29, 31, 26, 18,
+ 24, 21, 29, 31, 26, 18,
},
// Eph
{
- 0, 23, 22, 21, 32, 33, 24,
+ 23, 22, 21, 32, 33, 24,
},
// Phil
{
- 0, 30, 30, 21, 23,
+ 30, 30, 21, 23,
},
// Col
{
- 0, 29, 23, 25, 18,
+ 29, 23, 25, 18,
},
// 1Thess
{
- 0, 10, 20, 13, 18, 28,
+ 10, 20, 13, 18, 28,
},
// 2Thess
{
- 0, 12, 17, 18,
+ 12, 17, 18,
},
// 1Tim
{
- 0, 20, 15, 16, 16, 25, 21,
+ 20, 15, 16, 16, 25, 21,
},
// 2Tim
{
- 0, 18, 26, 17, 22,
+ 18, 26, 17, 22,
},
// Titus
{
- 0, 16, 15, 15,
+ 16, 15, 15,
},
// Phlm
{
- 0, 25,
+ 25,
},
// Heb
{
- 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// Jas
{
- 0, 27, 26, 18, 17, 20,
+ 27, 26, 18, 17, 20,
},
// 1Pet
{
- 0, 25, 25, 22, 19, 14,
+ 25, 25, 22, 19, 14,
},
// 2Pet
{
- 0, 21, 22, 18,
+ 21, 22, 18,
},
// 1John
{
- 0, 10, 29, 24, 21, 21,
+ 10, 29, 24, 21, 21,
},
// 2John
{
- 0, 13,
+ 13,
},
// 3John
{
- 0, 15,
+ 15,
},
// Jude
{
- 0, 25,
+ 25,
},
// Rev
{
- 0, 20, 29, 22, 11, 14, 17, 17, 13, 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/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -98,11 +98,12 @@
BibleBook.ESD2,
BibleBook.MACC4,
};
+
public static final int[][] lastVerseOT =
{
// Gen
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -111,7 +112,7 @@
},
// Exod
{
- 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 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,
@@ -119,96 +120,96 @@
},
// Lev
{
- 0, 17, 16, 17, 35, 19, 30, 38, 36, 24,
+ 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,
},
// Num
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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,
},
// Deut
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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,
},
// Josh
{
- 0, 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 18, 24, 17, 24, 15, 27, 26, 35, 27,
43, 23, 24, 33, 15, 63, 10, 18, 28, 51,
9, 45, 34, 16, 33,
},
// Judg
{
- 0, 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// 1Sam
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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,
},
// 2Sam
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 27, 32, 39, 12, 25, 23, 29, 18, 13,
19, 27, 31, 39, 33, 37, 23, 29, 33, 43,
26, 22, 51, 39, 25,
},
// 1Kgs
{
- 0, 53, 46, 28, 34, 18, 38, 51, 66, 28,
+ 53, 46, 28, 34, 18, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 53,
},
// 2Kgs
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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,
},
// 1Chr
{
- 0, 54, 55, 24, 43, 26, 81, 40, 40, 44,
+ 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,
},
// 2Chr
{
- 0, 17, 18, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Neh
{
- 0, 11, 20, 32, 23, 19, 19, 73, 18, 38,
+ 11, 20, 32, 23, 19, 19, 73, 18, 38,
39, 36, 47, 31,
},
// Esth
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -216,7 +217,7 @@
},
// Ps
{
- 0, 6, 12, 8, 8, 12, 10, 17, 9, 20,
+ 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,
@@ -235,23 +236,23 @@
},
// Prov
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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,
},
// Eccl
{
- 0, 18, 26, 22, 16, 20, 12, 29, 17, 18,
+ 18, 26, 22, 16, 20, 12, 29, 17, 18,
20, 10, 14,
},
// Song
{
- 0, 17, 17, 11, 16, 16, 13, 13, 14,
+ 17, 17, 11, 16, 16, 13, 13, 14,
},
// Isa
{
- 0, 31, 22, 26, 6, 30, 13, 25, 22, 21,
+ 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,
@@ -261,7 +262,7 @@
},
// Jer
{
- 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 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,
@@ -270,11 +271,11 @@
},
// Lam
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Ezek
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -282,82 +283,82 @@
},
// Dan
{
- 0, 21, 49, 30, 37, 31, 28, 28, 27, 27,
+ 21, 49, 30, 37, 31, 28, 28, 27, 27,
21, 45, 13,
},
// Hos
{
- 0, 11, 23, 5, 19, 15, 11, 16, 14, 17,
+ 11, 23, 5, 19, 15, 11, 16, 14, 17,
15, 12, 14, 16, 9,
},
// Joel
{
- 0, 20, 32, 21,
+ 20, 32, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obad
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 17, 10, 10, 11,
+ 17, 10, 10, 11,
},
// Mic
{
- 0, 16, 13, 12, 13, 15, 16, 20,
+ 16, 13, 12, 13, 15, 16, 20,
},
// Nah
{
- 0, 15, 13, 19,
+ 15, 13, 19,
},
// Hab
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zeph
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Hag
{
- 0, 15, 23,
+ 15, 23,
},
// Zech
{
- 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 21, 13, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Mal
{
- 0, 14, 17, 18, 6,
+ 14, 17, 18, 6,
},
// Tobit
{
- 0, 22, 14, 17, 21, 22, 18, 16, 21, 6,
+ 22, 14, 17, 21, 22, 18, 16, 21, 6,
13, 18, 22, 17, 15,
},
// Judith
{
- 0, 16, 28, 10, 15, 24, 21, 32, 36, 14,
+ 16, 28, 10, 15, 24, 21, 32, 36, 14,
23, 23, 20, 20, 19, 43, 25,
},
// Esther (Greek)
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
13, 12, 6, 18, 19, 16, 24,
},
// Wisdom
{
- 0, 16, 24, 19, 20, 23, 25, 30, 21, 18,
+ 16, 24, 19, 20, 23, 25, 30, 21, 18,
21, 26, 27, 19, 31, 19, 29, 21, 25, 22,
},
// Sirach
{
- 0, 30, 18, 31, 31, 15, 37, 36, 19, 18,
+ 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,
@@ -366,54 +367,54 @@
},
// Baruch
{
- 0, 22, 35, 37, 37, 9, 73,
+ 22, 35, 37, 37, 9, 73,
},
// Prayer of Azariah
{
- 0, 68,
+ 68,
},
// Susanna
{
- 0, 64,
+ 64,
},
// Bel and the Dragon
{
- 0, 42,
+ 42,
},
// I Maccabees
{
- 0, 64, 70, 60, 61, 68, 63, 50, 32, 73,
+ 64, 70, 60, 61, 68, 63, 50, 32, 73,
89, 74, 53, 53, 49, 41, 24,
},
// II Maccabees
{
- 0, 36, 32, 40, 50, 27, 31, 42, 36, 29,
+ 36, 32, 40, 50, 27, 31, 42, 36, 29,
38, 38, 45, 26, 46, 39,
},
// I Esdras
{
- 0, 58, 30, 24, 63, 73, 34, 15, 96, 55,
+ 58, 30, 24, 63, 73, 34, 15, 96, 55,
},
// Prayer of Manasses
{
- 0, 15,
+ 15,
},
// Additional Psalm
{
- 0, 7,
+ 7,
},
// III Maccabees
{
- 0, 29, 33, 30, 21, 51, 41, 23,
+ 29, 33, 30, 21, 51, 41, 23,
},
// II Esdras
{
- 0, 40, 48, 36, 52, 56, 59, 140, 63, 47,
+ 40, 48, 36, 52, 56, 59, 140, 63, 47,
59, 46, 51, 58, 48, 63, 78,
},
// IV Maccabees
{
- 0, 35, 24, 21, 26, 38, 35, 23, 29, 32,
+ 35, 24, 21, 26, 38, 35, 23, 29, 32,
21, 27, 19, 27, 20, 32, 25, 24, 24,
},
};
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -95,124 +95,124 @@
{
// Matthew
{
- 0, 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 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
{
- 0, 45, 28, 35, 41, 43, 56, 37, 38, 50,
+ 45, 28, 35, 41, 43, 56, 37, 38, 50,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 0, 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 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
{
- 0, 51, 25, 36, 54, 47, 71, 53, 59, 41,
+ 51, 25, 36, 54, 47, 71, 53, 59, 41,
42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 0, 26, 47, 26, 37, 42, 15, 60, 40, 43,
+ 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
{
- 0, 27, 26, 18, 17, 20,
+ 27, 26, 18, 17, 20,
},
// I Peter
{
- 0, 25, 25, 22, 19, 14,
+ 25, 25, 22, 19, 14,
},
// II Peter
{
- 0, 21, 22, 18,
+ 21, 22, 18,
},
// I John
{
- 0, 10, 29, 24, 21, 21,
+ 10, 29, 24, 21, 21,
},
// II John
{
- 0, 13,
+ 13,
},
// III John
{
- 0, 15,
+ 15,
},
// Jude
{
- 0, 25,
+ 25,
},
// Romans
{
- 0, 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 26, 33, 24,
},
// I Corinthians
{
- 0, 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// II Corinthians
{
- 0, 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 32, 21, 13,
},
// Galatians
{
- 0, 24, 21, 29, 31, 26, 18,
+ 24, 21, 29, 31, 26, 18,
},
// Ephesians
{
- 0, 23, 22, 21, 32, 33, 24,
+ 23, 22, 21, 32, 33, 24,
},
// Philippians
{
- 0, 30, 30, 21, 23,
+ 30, 30, 21, 23,
},
// Colossians
{
- 0, 29, 23, 25, 18,
+ 29, 23, 25, 18,
},
// I Thessalonians
{
- 0, 10, 20, 13, 18, 28,
+ 10, 20, 13, 18, 28,
},
// II Thessalonians
{
- 0, 12, 17, 18,
+ 12, 17, 18,
},
// I Timothy
{
- 0, 20, 15, 16, 16, 25, 21,
+ 20, 15, 16, 16, 25, 21,
},
// II Timothy
{
- 0, 18, 26, 17, 22,
+ 18, 26, 17, 22,
},
// Titus
{
- 0, 16, 15, 15,
+ 16, 15, 15,
},
// Philemon
{
- 0, 25,
+ 25,
},
// Hebrews
{
- 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// Revelation of John
{
- 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 20, 29, 22, 11, 14, 17, 17, 13, 21,
11, 19, 17, 18, 20, 8, 21, 18, 24, 21,
15, 27, 21
}
@@ -277,7 +277,7 @@
{
// Genesis
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -286,7 +286,7 @@
},
// Exodus
{
- 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 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,
@@ -294,114 +294,114 @@
},
// Leviticus
{
- 0, 17, 16, 17, 35, 19, 30, 38, 36, 24,
+ 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
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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
{
- 0, 18, 24, 17, 24, 16, 26, 26, 35, 27,
+ 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
{
- 0, 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// I Samuel
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 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
{
- 0, 53, 46, 28, 34, 18, 38, 51, 66, 28,
+ 53, 46, 28, 34, 18, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 53,
},
// II Kings
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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
{
- 0, 54, 55, 24, 43, 26, 81, 40, 40, 44,
+ 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
{
- 0, 17, 18, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 12,
+ 12,
},
// Ezra
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 0, 11, 20, 32, 23, 19, 19, 73, 18, 38,
+ 11, 20, 32, 23, 19, 19, 73, 18, 38,
39, 36, 47, 31,
},
// I Esdras
{
- 0, 58, 31, 24, 63, 70, 34, 15, 92, 55,
+ 58, 31, 24, 63, 70, 34, 15, 92, 55,
},
// Tobit
{
- 0, 22, 14, 17, 21, 22, 18, 17, 21, 6,
+ 22, 14, 17, 21, 22, 18, 17, 21, 6,
13, 18, 22, 18, 15,
},
// Judith
{
- 0, 16, 28, 10, 15, 24, 21, 32, 36, 14,
+ 16, 28, 10, 15, 24, 21, 32, 36, 14,
23, 23, 20, 20, 19, 14, 25,
},
// Esther
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -409,7 +409,7 @@
},
// Psalms
{
- 0, 6, 12, 9, 9, 13, 11, 18, 10, 39,
+ 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,
@@ -428,28 +428,28 @@
},
// Proverbs
{
- 0, 33, 22, 35, 29, 23, 35, 27, 36, 18,
+ 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
{
- 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 18, 26, 22, 17, 19, 12, 29, 17, 18,
20, 10, 14,
},
// Song of Solomon
{
- 0, 16, 17, 11, 16, 16, 12, 14, 14,
+ 16, 17, 11, 16, 16, 12, 14, 14,
},
// Wisdom
{
- 0, 16, 24, 19, 20, 24, 27, 30, 21, 19,
+ 16, 24, 19, 20, 24, 27, 30, 21, 19,
21, 27, 28, 19, 31, 19, 29, 20, 25, 21,
},
// Sirach
{
- 0, 30, 18, 31, 35, 18, 37, 39, 22, 23,
+ 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,
@@ -458,7 +458,7 @@
},
// Isaiah
{
- 0, 31, 22, 25, 6, 30, 13, 25, 22, 21,
+ 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,
@@ -468,7 +468,7 @@
},
// Jeremiah
{
- 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 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,
@@ -477,19 +477,19 @@
},
// Lamentations
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Epistle of Jeremiah
{
- 0, 72,
+ 72,
},
// Baruch
{
- 0, 22, 35, 38, 37, 9,
+ 22, 35, 38, 37, 9,
},
// Ezekiel
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -497,76 +497,76 @@
},
// Daniel
{
- 0, 21, 49, 100, 34, 31, 28, 28, 27, 27,
+ 21, 49, 100, 34, 31, 28, 28, 27, 27,
21, 45, 13, 64, 42,
},
// Hosea
{
- 0, 11, 23, 5, 19, 15, 11, 16, 14, 17,
+ 11, 23, 5, 19, 15, 11, 16, 14, 17,
15, 12, 14, 15, 10,
},
// Joel
{
- 0, 20, 32, 21,
+ 20, 32, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obadiah
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 16, 11, 10, 11,
+ 16, 11, 10, 11,
},
// Micah
{
- 0, 16, 13, 12, 13, 15, 16, 20,
+ 16, 13, 12, 13, 15, 16, 20,
},
// Nahum
{
- 0, 15, 13, 19,
+ 15, 13, 19,
},
// Habakkuk
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zephaniah
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Haggai
{
- 0, 15, 23,
+ 15, 23,
},
// Zechariah
{
- 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 21, 13, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
{
- 0, 14, 17, 18, 6,
+ 14, 17, 18, 6,
},
// I Maccabees
{
- 0, 64, 70, 60, 61, 68, 63, 50, 32, 73,
+ 64, 70, 60, 61, 68, 63, 50, 32, 73,
89, 74, 53, 53, 49, 41, 24,
},
// II Maccabees
{
- 0, 36, 33, 40, 50, 27, 31, 42, 36, 29,
+ 36, 33, 40, 50, 27, 31, 42, 36, 29,
38, 38, 45, 26, 46, 39,
},
// III Maccabees
{
- 0, 25, 24, 22, 16, 36, 37, 20,
+ 25, 24, 22, 16, 36, 37, 20,
},
// II Esdras
{
- 0, 40, 48, 36, 52, 56, 59, 70, 63, 47,
+ 40, 48, 36, 52, 56, 59, 70, 63, 47,
60, 46, 51, 58, 48, 63, 78,
},
};
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -41,124 +41,124 @@
{
// Matthew
{
- 0, 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 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
{
- 0, 45, 28, 35, 41, 43, 56, 37, 38, 50,
+ 45, 28, 35, 41, 43, 56, 37, 38, 50,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 0, 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 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
{
- 0, 51, 25, 36, 54, 47, 71, 53, 59, 41,
+ 51, 25, 36, 54, 47, 71, 53, 59, 41,
42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 0, 26, 47, 26, 37, 42, 15, 60, 40, 43,
+ 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
{
- 0, 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 26, 33, 24,
},
// I Corinthians
{
- 0, 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// II Corinthians
{
- 0, 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 32, 21, 13,
},
// Galatians
{
- 0, 24, 21, 29, 31, 26, 18,
+ 24, 21, 29, 31, 26, 18,
},
// Ephesians
{
- 0, 23, 22, 21, 32, 33, 24,
+ 23, 22, 21, 32, 33, 24,
},
// Philippians
{
- 0, 30, 30, 21, 23,
+ 30, 30, 21, 23,
},
// Colossians
{
- 0, 29, 23, 25, 18,
+ 29, 23, 25, 18,
},
// I Thessalonians
{
- 0, 10, 20, 13, 18, 28,
+ 10, 20, 13, 18, 28,
},
// II Thessalonians
{
- 0, 12, 17, 18,
+ 12, 17, 18,
},
// I Timothy
{
- 0, 20, 15, 16, 16, 25, 21,
+ 20, 15, 16, 16, 25, 21,
},
// II Timothy
{
- 0, 18, 26, 17, 22,
+ 18, 26, 17, 22,
},
// Titus
{
- 0, 16, 15, 15,
+ 16, 15, 15,
},
// Philemon
{
- 0, 25,
+ 25,
},
// Hebrews
{
- 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// James
{
- 0, 27, 26, 18, 17, 20,
+ 27, 26, 18, 17, 20,
},
// I Peter
{
- 0, 25, 25, 22, 19, 14,
+ 25, 25, 22, 19, 14,
},
// II Peter
{
- 0, 21, 22, 18,
+ 21, 22, 18,
},
// I John
{
- 0, 10, 29, 24, 21, 21,
+ 10, 29, 24, 21, 21,
},
// II John
{
- 0, 13,
+ 13,
},
// III John
{
- 0, 15,
+ 15,
},
// Jude
{
- 0, 25,
+ 25,
},
// Revelation of John
{
- 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 20, 29, 22, 11, 14, 17, 17, 13, 21,
11, 19, 17, 18, 20, 8, 21, 18, 24, 21,
15, 27, 21
}
@@ -169,7 +169,7 @@
{
// Gen
{
- 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 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,
@@ -178,7 +178,7 @@
},
// Exodus
{
- 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 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,
@@ -186,96 +186,96 @@
},
// Leviticus
{
- 0, 17, 16, 17, 35, 19, 30, 38, 36, 24,
+ 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
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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
{
- 0, 18, 24, 17, 24, 16, 26, 26, 35, 27,
+ 18, 24, 17, 24, 16, 26, 26, 35, 27,
43, 23, 24, 33, 15, 63, 10, 18, 28, 51,
9, 45, 34, 16, 33,
},
// Judges
{
- 0, 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// I Samuel
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 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
{
- 0, 53, 46, 28, 34, 18, 38, 51, 66, 28,
+ 53, 46, 28, 34, 18, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 53,
},
// II Kings
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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
{
- 0, 54, 55, 24, 43, 26, 81, 40, 40, 44,
+ 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
{
- 0, 17, 18, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 0, 11, 20, 32, 23, 19, 19, 73, 18, 38,
+ 11, 20, 32, 23, 19, 19, 73, 18, 38,
39, 36, 47, 31,
},
// Esther
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -283,7 +283,7 @@
},
// Psalms
{
- 0, 6, 12, 9, 9, 13, 11, 18, 10, 39,
+ 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,
@@ -302,23 +302,23 @@
},
// Proverbs
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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
{
- 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 18, 26, 22, 17, 19, 12, 29, 17, 18,
20, 10, 14,
},
// Song of Solomon
{
- 0, 16, 17, 11, 16, 16, 12, 14, 14,
+ 16, 17, 11, 16, 16, 12, 14, 14,
},
// Isaiah
{
- 0, 31, 22, 25, 6, 30, 13, 25, 22, 21,
+ 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,
@@ -328,7 +328,7 @@
},
// Jeremiah
{
- 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 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,
@@ -337,11 +337,11 @@
},
// Lamentations
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Ezekiel
{
- 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -349,58 +349,58 @@
},
// Daniel
{
- 0, 21, 49, 33, 34, 31, 28, 28, 27, 27,
+ 21, 49, 33, 34, 31, 28, 28, 27, 27,
21, 45, 13,
},
// Hosea
{
- 0, 11, 23, 5, 19, 15, 11, 16, 14, 17,
+ 11, 23, 5, 19, 15, 11, 16, 14, 17,
15, 12, 14, 15, 10,
},
// Joel
{
- 0, 20, 32, 21,
+ 20, 32, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ 15, 16, 15, 13, 27, 14, 17, 14, 15,
},
// Obadiah
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 16, 11, 10, 11,
+ 16, 11, 10, 11,
},
// Micah
{
- 0, 16, 13, 12, 13, 15, 16, 20,
+ 16, 13, 12, 13, 15, 16, 20,
},
// Nahum
{
- 0, 15, 13, 19,
+ 15, 13, 19,
},
// Habakkuk
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zephaniah
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Haggai
{
- 0, 15, 23,
+ 15, 23,
},
// Zechariah
{
- 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 21, 13, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
{
- 0, 14, 17, 18, 6,
+ 14, 17, 18, 6,
},
};
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java 2012-01-17 23:18:17 UTC (rev 2215)
@@ -76,147 +76,147 @@
{
// Matthew
{
- 0, 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 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
{
- 0, 45, 28, 35, 40, 43, 56, 37, 39, 49,
+ 45, 28, 35, 40, 43, 56, 37, 39, 49,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 0, 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 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
{
- 0, 51, 25, 36, 54, 47, 72, 53, 59, 41,
+ 51, 25, 36, 54, 47, 72, 53, 59, 41,
42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 0, 26, 47, 26, 37, 42, 15, 59, 40, 43,
+ 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
{
- 0, 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 23, 33, 27,
},
// I Corinthians
{
- 0, 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// II Corinthians
{
- 0, 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 33, 21, 13,
},
// Galatians
{
- 0, 24, 21, 29, 31, 26, 18,
+ 24, 21, 29, 31, 26, 18,
},
// Ephesians
{
- 0, 23, 22, 21, 32, 33, 24,
+ 23, 22, 21, 32, 33, 24,
},
// Philippians
{
- 0, 30, 30, 21, 23,
+ 30, 30, 21, 23,
},
// Colossians
{
- 0, 29, 23, 25, 18,
+ 29, 23, 25, 18,
},
// I Thessalonians
{
- 0, 10, 20, 13, 18, 28,
+ 10, 20, 13, 18, 28,
},
// II Thessalonians
{
- 0, 12, 17, 18,
+ 12, 17, 18,
},
// I Timothy
{
- 0, 20, 15, 16, 16, 25, 21,
+ 20, 15, 16, 16, 25, 21,
},
// II Timothy
{
- 0, 18, 26, 17, 22,
+ 18, 26, 17, 22,
},
// Titus
{
- 0, 16, 15, 15,
+ 16, 15, 15,
},
// Philemon
{
- 0, 25,
+ 25,
},
// Hebrews
{
- 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// James
{
- 0, 27, 26, 18, 17, 20,
+ 27, 26, 18, 17, 20,
},
// I Peter
{
- 0, 25, 25, 22, 19, 14,
+ 25, 25, 22, 19, 14,
},
// II Peter
{
- 0, 21, 22, 18,
+ 21, 22, 18,
},
// I John
{
- 0, 10, 29, 24, 21, 21,
+ 10, 29, 24, 21, 21,
},
// II John
{
- 0, 13,
+ 13,
},
// III John
{
- 0, 15,
+ 15,
},
// Jude
{
- 0, 25,
+ 25,
},
// Revelation of John
{
- 0, 20, 29, 22, 11, 14, 17, 17, 13, 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
{
- 0, 15,
+ 15,
},
// I Esdras
{
- 0, 58, 31, 24, 63, 73, 34, 15, 97, 56,
+ 58, 31, 24, 63, 73, 34, 15, 97, 56,
},
// II Esdras
{
- 0, 40, 48, 36, 52, 56, 59, 140, 63, 47,
+ 40, 48, 36, 52, 56, 59, 140, 63, 47,
60, 46, 51, 58, 48, 63, 78,
},
// Additional Psalm
{
- 0, 7,
+ 7,
},
// Laodiceans
{
- 0, 20,
+ 20,
}
};
@@ -277,7 +277,7 @@
{
// Genesis
{
- 0, 31, 25, 24, 26, 31, 22, 24, 22, 29,
+ 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,
@@ -286,7 +286,7 @@
},
// Exodus
{
- 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 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,
@@ -294,106 +294,106 @@
},
// Leviticus
{
- 0, 17, 16, 17, 35, 19, 30, 38, 36, 24,
+ 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
{
- 0, 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 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
{
- 0, 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 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
{
- 0, 18, 24, 17, 25, 16, 27, 26, 35, 27,
+ 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
{
- 0, 36, 23, 31, 24, 32, 40, 25, 35, 57,
+ 36, 23, 31, 24, 32, 40, 25, 35, 57,
18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 24,
},
// Ruth
{
- 0, 22, 23, 18, 22,
+ 22, 23, 18, 22,
},
// I Samuel
{
- 0, 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 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
{
- 0, 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 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
{
- 0, 53, 46, 28, 34, 18, 38, 51, 66, 28,
+ 53, 46, 28, 34, 18, 38, 51, 66, 28,
29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 54,
},
// II Kings
{
- 0, 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 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
{
- 0, 54, 55, 24, 43, 26, 81, 40, 40, 44,
+ 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
{
- 0, 17, 18, 17, 22, 14, 42, 22, 18, 31,
+ 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
{
- 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 0, 11, 20, 31, 23, 19, 19, 73, 18, 38,
+ 11, 20, 31, 23, 19, 19, 73, 18, 38,
39, 36, 46, 31,
},
// Tobit
{
- 0, 25, 23, 25, 23, 28, 22, 20, 24, 12,
+ 25, 23, 25, 23, 28, 22, 20, 24, 12,
13, 21, 22, 23, 17,
},
// Judith
{
- 0, 12, 18, 15, 17, 29, 21, 25, 34, 19,
+ 12, 18, 15, 17, 29, 21, 25, 34, 19,
20, 21, 20, 31, 18, 15, 31,
},
// Esther
{
- 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
13, 12, 6, 18, 19, 19, 24,
},
// Job
{
- 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 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,
@@ -401,7 +401,7 @@
},
// Psalms
{
- 0, 6, 13, 9, 10, 13, 11, 18, 10, 39,
+ 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,
@@ -420,28 +420,28 @@
},
// Proverbs
{
- 0, 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 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
{
- 0, 18, 26, 22, 17, 19, 11, 30, 17, 18,
+ 18, 26, 22, 17, 19, 11, 30, 17, 18,
20, 10, 14,
},
// Song of Solomon
{
- 0, 16, 17, 11, 16, 17, 12, 13, 14,
+ 16, 17, 11, 16, 17, 12, 13, 14,
},
// Wisdom
{
- 0, 16, 25, 19, 20, 24, 27, 30, 21, 19,
+ 16, 25, 19, 20, 24, 27, 30, 21, 19,
21, 27, 27, 19, 31, 19, 29, 20, 25, 20,
},
// Sirach
{
- 0, 40, 23, 34, 36, 18, 37, 40, 22, 25,
+ 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,
@@ -450,7 +450,7 @@
},
// Isaiah
{
- 0, 31, 22, 26, 6, 30, 13, 25, 22, 21,
+ 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,
@@ -460,7 +460,7 @@
},
// Jeremiah
{
- 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 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,
@@ -469,15 +469,15 @@
},
// Lamentations
{
- 0, 22, 22, 66, 22, 22,
+ 22, 22, 66, 22, 22,
},
// Baruch
{
- 0, 22, 35, 38, 37, 9, 72,
+ 22, 35, 38, 37, 9, 72,
},
// Ezekiel
{
- 0, 28, 9, 27, 17, 17, 14, 27, 18, 11,
+ 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,
@@ -485,67 +485,67 @@
},
// Daniel
{
- 0, 21, 49, 100, 34, 31, 28, 28, 27, 27,
+ 21, 49, 100, 34, 31, 28, 28, 27, 27,
21, 45, 13, 65, 42,
},
// Hosea
{
- 0, 11, 24, 5, 19, 15, 11, 16, 14, 17,
+ 11, 24, 5, 19, 15, 11, 16, 14, 17,
15, 12, 14, 15, 10,
},
// Joel
{
- 0, 20, 32, 21,
+ 20, 32, 21,
},
// Amos
{
- 0, 15, 16, 15, 13, 27, 15, 17, 14, 15,
+ 15, 16, 15, 13, 27, 15, 17, 14, 15,
},
// Obadiah
{
- 0, 21,
+ 21,
},
// Jonah
{
- 0, 16, 11, 10, 11,
+ 16, 11, 10, 11,
},
// Micah
{
- 0, 16, 13, 12, 13, 14, 16, 20,
+ 16, 13, 12, 13, 14, 16, 20,
},
// Nahum
{
- 0, 15, 13, 19,
+ 15, 13, 19,
},
// Habakkuk
{
- 0, 17, 20, 19,
+ 17, 20, 19,
},
// Zephaniah
{
- 0, 18, 15, 20,
+ 18, 15, 20,
},
// Haggai
{
- 0, 14, 24,
+ 14, 24,
},
// Zechariah
{
- 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 21, 13, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
{
- 0, 14, 17, 18, 6,
+ 14, 17, 18, 6,
},
// I Maccabees
{
- 0, 67, 70, 60, 61, 68, 63, 50, 32, 73,
+ 67, 70, 60, 61, 68, 63, 50, 32, 73,
89, 74, 54, 54, 49, 41, 24,
},
// II Maccabees
{
- 0, 36, 33, 40, 50, 27, 31, 42, 36, 29,
+ 36, 33, 40, 50, 27, 31, 42, 36, 29,
38, 38, 46, 26, 46, 40,
},
};
Modified: trunk/jsword/src/main/resources/BibleNames.properties
===================================================================
--- trunk/jsword/src/main/resources/BibleNames.properties 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/resources/BibleNames.properties 2012-01-17 23:18:17 UTC (rev 2215)
@@ -401,6 +401,18 @@
Herm.Vis.Short=Vis
Herm.Vis.Alt=
+# Other non-canonical books
+AddDan.Full=Additions to Daniel
+AddDan.Short=AddDan
+AddDan.Alt=
+AddPs.Full=Additions to Psalms
+AddPs.Short=AddPs
+AddPs.Alt=
+EsthGr.Full=Esther (Greek)
+EsthGr.Short=EsthGr
+EsthGr.Alt=
+
+
# Introduction titles for the book as a whole, the OT and the NT.
Intro.Bible.Full=Bible Introduction
Intro.Bible.Short=Bible Intro
Modified: trunk/jsword/src/main/resources/BibleNames_en.properties
===================================================================
--- trunk/jsword/src/main/resources/BibleNames_en.properties 2012-01-16 16:44:11 UTC (rev 2214)
+++ trunk/jsword/src/main/resources/BibleNames_en.properties 2012-01-17 23:18:17 UTC (rev 2215)
@@ -399,6 +399,17 @@
Herm.Vis.Short=Vis
Herm.Vis.Alt=
+# Other non-canonical books
+AddDan.Full=Additions to Daniel
+AddDan.Short=AddDan
+AddDan.Alt=
+AddPs.Full=Additions to Psalms
+AddPs.Short=AddPs
+AddPs.Alt=
+EsthGr.Full=Esther (Greek)
+EsthGr.Short=EsthGr
+EsthGr.Alt=
+
# Introduction titles for the book as a whole, the OT and the NT.
Intro.Bible.Full=Bible Introduction
Intro.Bible.Short=Bible Intro
More information about the jsword-svn
mailing list