[jsword-svn] r2213 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/passage jsword/src/main/java/org/crosswire/jsword/versification jsword/src/main/java/org/crosswire/jsword/versification/system jsword/src/test/java/org/crosswire/jsword/versification
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Jan 15 21:15:17 MST 2012
Author: dmsmith
Date: 2012-01-15 21:15:17 -0700 (Sun, 15 Jan 2012)
New Revision: 2213
Added:
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/ReferenceSystems.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/SystemDefault.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/test/java/org/crosswire/jsword/versification/BibleBookListTest.java
trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleBookTest.java
trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleNamesTest.java
trunk/jsword/src/test/java/org/crosswire/jsword/versification/ReferenceSystemTest.java
Removed:
trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleInfoTest.java
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBook.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/ReferenceSystem.java
trunk/jsword/src/test/java/org/crosswire/jsword/versification/AllTests.java
trunk/jsword/src/test/java/org/crosswire/jsword/versification/BookNameTest.java
Log:
more av11n work. now have the v11n data.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2012-01-14 15:17:58 UTC (rev 2212)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -588,7 +588,7 @@
// The user has chosen to not install a Bible when starting the program for the first time.
// The user has never installed a Bible.
// The user has deleted the last installed Bible.
- // The books are on a CD, USB or someother removeable media and are not available.
+ // The books are on a CD, USB or some other removable media and are not available.
String noBible = BDMsg.gettext("No Bible is installed");
CWOptionPane.showMessageDialog(this, noBible, noBible, JOptionPane.WARNING_MESSAGE);
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2012-01-14 15:17:58 UTC (rev 2212)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -61,12 +61,12 @@
thislevel = Level.BOOK;
int ec = BibleInfo.chaptersInBook(b);
int ev = BibleInfo.versesInChapter(b, ec);
- start = new Verse(b, 1, 1);
+ start = new Verse(b, 0, 0);
end = new Verse(b, ec, ev);
} else if (v == -1) {
thislevel = Level.CHAPTER;
int ev = BibleInfo.versesInChapter(b, c);
- start = new Verse(b, c, 1);
+ start = new Verse(b, c, 0);
end = new Verse(b, c, ev);
} else {
thislevel = Level.VERSE;
@@ -156,10 +156,10 @@
return WholeBibleTreeNode.getNode(this, books[i], -1, -1);
case BOOK:
- return WholeBibleTreeNode.getNode(this, range.getStart().getBook(), i + 1, -1);
+ return WholeBibleTreeNode.getNode(this, range.getStart().getBook(), i, -1);
case CHAPTER:
- return WholeBibleTreeNode.getNode(this, range.getStart().getBook(), range.getStart().getChapter(), i + 1);
+ return WholeBibleTreeNode.getNode(this, range.getStart().getBook(), range.getStart().getChapter(), i);
default:
return null;
@@ -176,10 +176,10 @@
return BibleInfo.booksInBible();
case BOOK:
- return BibleInfo.chaptersInBook(range.getStart().getBook());
+ return BibleInfo.chaptersInBook(range.getStart().getBook()) + 1;
case CHAPTER:
- return BibleInfo.versesInChapter(range.getStart().getBook(), range.getStart().getChapter());
+ return BibleInfo.versesInChapter(range.getStart().getBook(), range.getStart().getChapter()) + 1;
default:
return 0;
@@ -188,11 +188,11 @@
/**
* Returns the index of <code>node</code> in the receivers children. If the
- * receiver does not contain <code>node</code>, -1 will be returned.
+ * receiver does not contain <code>node</code>, 0 will be returned.
*/
public int getIndex(TreeNode node) {
if (!(node instanceof WholeBibleTreeNode)) {
- return -1;
+ return 0;
}
WholeBibleTreeNode vnode = (WholeBibleTreeNode) node;
@@ -202,13 +202,13 @@
return vnode.getVerseRange().getStart().getBook().ordinal();
case BOOK:
- return vnode.getVerseRange().getStart().getChapter() - 1;
+ return vnode.getVerseRange().getStart().getChapter();
case CHAPTER:
- return vnode.getVerseRange().getStart().getVerse() - 1;
+ return vnode.getVerseRange().getStart().getVerse();
default:
- return -1;
+ return 0;
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBook.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBook.java 2012-01-14 15:17:58 UTC (rev 2212)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBook.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -107,7 +107,7 @@
// Apocrypha
TOB("Tob"),
JDT("Jdt"),
- ADD_EST("AddEsth"),
+ ADD_ESTH("AddEsth"),
WIS("Wis"),
SIR("Sir"),
BAR("Bar"),
@@ -166,24 +166,44 @@
HERM("Herm"),
HERM_MAND("Herm.Mand"),
HERM_SIM("Herm.Sim"),
- HERM_VIS("Herm.Vis")
+ HERM_VIS("Herm.Vis"),
+ // Other books
+ ADD_DAN("AddDan"),
+ ADD_PS("AddPs"),
+ ESTH_GR("EsthGr"),
;
BibleBook(String osis) {
this.osis = osis;
}
+ /**
+ * Get the OSIS representation of this BibleBook.
+ *
+ * @return the OSIS name
+ */
public String getOSIS() {
return osis;
}
+ /**
+ * Get the OSIS representation of this BibleBook.
+ *
+ * @return the OSIS name
+ */
@Override
public String toString() {
return osis;
}
+ /**
+ * Case insensitive search for BibleBook for an OSIS name.
+ *
+ * @param osis
+ * @return the matching BibleBook or null
+ */
public static BibleBook fromOSIS(String osis) {
- String match = BookName.normalize(osis, EN_LOCALE);
+ String match = BookName.normalize(osis, Locale.ENGLISH);
return osisMap.get(match);
}
@@ -234,24 +254,8 @@
return bibleNames.getShortName(this);
}
- /* package */ BibleBook previous() {
- try {
- return BibleBook.books[ordinal() - 1];
- } catch (ArrayIndexOutOfBoundsException e) {
- return null;
- }
- }
-
- /* package */ BibleBook next() {
- try {
- return BibleBook.books[ordinal() + 1];
- } catch (ArrayIndexOutOfBoundsException e) {
- return null;
- }
- }
-
/**
- * Get number of a book from its name.
+ * Get a book from its name.
*
* @param find
* The string to identify
@@ -285,7 +289,7 @@
return getBook(find) != null;
}
- public static BibleBook[] getBooks() {
+ /* package */ static BibleBook[] getBooks() {
return books;
}
@@ -297,8 +301,8 @@
bibleNames = new BibleNames(locale);
// If the locale is not the program's default get it for alternates
- if (!locale.getLanguage().equals(EN_LOCALE.getLanguage())) {
- englishBibleNames = new BibleNames(EN_LOCALE);
+ if (!locale.getLanguage().equals(Locale.ENGLISH.getLanguage())) {
+ englishBibleNames = new BibleNames(Locale.ENGLISH);
}
}
@@ -333,12 +337,9 @@
/** English BibleNames, or null when using the program's default locale */
private static BibleNames englishBibleNames;
- /** The Locale of OSIS Names */
- private static final Locale EN_LOCALE = new Locale("en");
-
static {
for (BibleBook book : BibleBook.values()) {
- osisMap.put(BookName.normalize(book.getOSIS(), EN_LOCALE), book);
+ osisMap.put(BookName.normalize(book.getOSIS(), Locale.ENGLISH), book);
}
initialize();
}
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-14 15:17:58 UTC (rev 2212)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -21,8 +21,6 @@
*/
package org.crosswire.jsword.versification;
-import java.io.PrintStream;
-
import org.crosswire.jsword.JSOtherMsg;
import org.crosswire.jsword.book.CaseType;
import org.crosswire.jsword.passage.NoSuchVerseException;
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java 2012-01-14 15:17:58 UTC (rev 2212)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -49,9 +49,6 @@
}
/* package */ BookName getBookName(BibleBook book) {
- // This is faster than doing the check explicitly, unless
- // The exception is actually thrown, then it is a lot slower
- // I'd like to think that the norm is to get it right
return books[book.ordinal()];
}
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-14 15:17:58 UTC (rev 2212)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/ReferenceSystem.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -39,6 +39,9 @@
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
public class ReferenceSystem {
+ public ReferenceSystem() {
+ }
+
/**
* Construct a ReferenceSystem.
*
@@ -157,8 +160,8 @@
*/
public Verse getLastVerseInBook(Verse verse) {
BibleBook book = verse.getBook();
- int lastchap = BibleInfo.chaptersInBook(book);
- int lastverse = BibleInfo.versesInChapter(book, lastchap);
+ int lastchap = getLastChapter(book);
+ int lastverse = getLastVerse(book, lastchap);
return new Verse(book, lastchap, lastverse);
}
@@ -171,7 +174,7 @@
public Verse getLastVerseInChapter(Verse verse) {
BibleBook book = verse.getBook();
int chapter = verse.getChapter();
- int lastverse = BibleInfo.versesInChapter(book, chapter);
+ int lastverse = getLastVerse(book, chapter);
return new Verse(book, chapter, lastverse);
}
@@ -234,7 +237,7 @@
BibleBook b = verse.getBook();
int v = verse.getVerse();
int c = verse.getChapter();
- return v == BibleInfo.versesInChapter(b, c) && c == BibleInfo.chaptersInBook(b);
+ return v == getLastVerse(b, c) && c == getLastChapter(b);
}
/**
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/ReferenceSystems.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/ReferenceSystems.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/ReferenceSystems.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,50 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ * The ReferenceSystems class manages the creation of ReferenceSystems as needed.
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class ReferenceSystems {
+
+ public synchronized ReferenceSystem getReferenceSystem(String name) {
+ if (rsMap.containsKey(name)) {
+ return rsMap.get(name);
+ }
+ return null;
+ }
+
+ private ReferenceSystems() {
+
+ }
+
+ private Map<String, ReferenceSystem> rsMap = new HashMap<String, ReferenceSystem>();
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/ReferenceSystems.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,490 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemCatholic extends ReferenceSystem {
+ public static String name = "Catholic";
+
+ public static BibleBook[] booksNT = SystemDefault.booksNT;
+ public static int lastVerseNT[][] =
+ {
+ // Matthew
+ {
+ 0, 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,
+ 52, 33, 44, 37, 72, 47, 20,
+ },
+ // Luke
+ {
+ 0, 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,
+ 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
+ 31, 25,
+ },
+ // Acts
+ {
+ 0, 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,
+ 21, 36, 21, 14, 23, 33, 27,
+ },
+ // I Corinthians
+ {
+ 0, 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,
+ 18, 33, 21, 13,
+ },
+ // Galatians
+ {
+ 0, 24, 21, 29, 31, 26, 18,
+ },
+ // Ephesians
+ {
+ 0, 23, 22, 21, 32, 33, 24,
+ },
+ // Philippians
+ {
+ 0, 30, 30, 21, 23,
+ },
+ // Colossians
+ {
+ 0, 29, 23, 25, 18,
+ },
+ // I Thessalonians
+ {
+ 0, 10, 20, 13, 18, 28,
+ },
+ // II Thessalonians
+ {
+ 0, 12, 17, 18,
+ },
+ // I Timothy
+ {
+ 0, 20, 15, 16, 16, 25, 21,
+ },
+ // II Timothy
+ {
+ 0, 18, 26, 17, 22,
+ },
+ // Titus
+ {
+ 0, 16, 15, 15,
+ },
+ // Philemon
+ {
+ 0, 25,
+ },
+ // Hebrews
+ {
+ 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 39, 40, 29, 25,
+ },
+ // James
+ {
+ 0, 27, 26, 18, 17, 20,
+ },
+ // I Peter
+ {
+ 0, 25, 25, 22, 19, 14,
+ },
+ // II Peter
+ {
+ 0, 21, 22, 18,
+ },
+ // I John
+ {
+ 0, 10, 29, 24, 21, 21,
+ },
+ // II John
+ {
+ 0, 13,
+ },
+ // III John
+ {
+ 0, 15,
+ },
+ // Jude
+ {
+ 0, 25,
+ },
+ // Revelation of John
+ {
+ 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
+ 15, 27, 21,
+ },
+ };
+
+ public static BibleBook[] booksOT =
+ {
+ BibleBook.GEN,
+ BibleBook.EXOD,
+ BibleBook.LEV,
+ BibleBook.NUM,
+ BibleBook.DEUT,
+ BibleBook.JOSH,
+ BibleBook.JUDG,
+ BibleBook.RUTH,
+ BibleBook.SAM1,
+ BibleBook.SAM2,
+ BibleBook.KGS1,
+ BibleBook.KGS2,
+ BibleBook.CHR1,
+ BibleBook.CHR2,
+ BibleBook.EZRA,
+ BibleBook.NEH,
+ BibleBook.TOB,
+ BibleBook.JDT,
+ BibleBook.ESTH,
+ BibleBook.MACC1,
+ BibleBook.MACC2,
+ BibleBook.JOB,
+ BibleBook.PS,
+ BibleBook.PROV,
+ BibleBook.ECCL,
+ BibleBook.SONG,
+ BibleBook.WIS,
+ BibleBook.SIR,
+ BibleBook.ISA,
+ BibleBook.JER,
+ BibleBook.LAM,
+ BibleBook.BAR,
+ BibleBook.EZEK,
+ BibleBook.DAN,
+ BibleBook.HOS,
+ BibleBook.JOEL,
+ BibleBook.AMOS,
+ BibleBook.OBAD,
+ BibleBook.JONAH,
+ BibleBook.MIC,
+ BibleBook.NAH,
+ BibleBook.HAB,
+ BibleBook.ZEPH,
+ BibleBook.HAG,
+ BibleBook.ZECH,
+ BibleBook.MAL,
+ };
+
+ public static int lastVerseOT[][] =
+ {
+ // Gen
+ {
+ 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 26,
+ },
+ // Exodus
+ {
+ 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 38,
+ },
+ // Leviticus
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 25,
+ },
+ // Ruth
+ {
+ 0, 22, 23, 18, 22,
+ },
+ // I Samuel
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 44,
+ },
+ // Nehemiah
+ {
+ 0, 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 40, 36, 47, 31,
+ },
+ // Tobit
+ {
+ 0, 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,
+ 23, 23, 20, 20, 19, 14, 25,
+ },
+ // Esther
+ {
+ 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 3,
+ },
+ // I Maccabees
+ {
+ 0, 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,
+ 38, 38, 46, 26, 46, 39,
+ },
+ // Job
+ {
+ 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 14, 14, 24, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 32, 26, 17,
+ },
+ // Psalms
+ {
+ 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
+ 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
+ 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
+ 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
+ 24, 21, 11, 7, 9, 24, 14, 12, 12, 18,
+ 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
+ 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
+ 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
+ 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
+ 5, 9, 29, 22, 35, 45, 48, 43, 14, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
+ 6,
+ },
+ // Proverbs
+ {
+ 0, 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,
+ 20, 10, 14,
+ },
+ // Song of Solomon
+ {
+ 0, 17, 17, 11, 17, 16, 12, 14, 14,
+ },
+ // Wisdom
+ {
+ 0, 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,
+ 31, 34, 18, 26, 27, 20, 30, 32, 33, 30,
+ 32, 28, 27, 28, 34, 26, 29, 30, 26, 28,
+ 25, 31, 24, 33, 31, 26, 31, 31, 34, 35,
+ 30, 27, 25, 35, 23, 26, 20, 25, 25, 16,
+ 29, 30,
+ },
+ // Isaiah
+ {
+ 0, 31, 22, 26, 6, 30, 13, 25, 24, 21,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 11, 25, 24,
+ },
+ // Jeremiah
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Lamentations
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Baruch
+ {
+ 0, 22, 35, 38, 37, 9, 72,
+ },
+ // Ezekiel
+ {
+ 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Daniel
+ {
+ 0, 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,
+ 15, 11, 15, 15, 10,
+ },
+ // Joel
+ {
+ 0, 20, 27, 5, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ },
+ // Obadiah
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 16, 11, 10, 11,
+ },
+ // Micah
+ {
+ 0, 16, 13, 12, 14, 14, 16, 20,
+ },
+ // Nahum
+ {
+ 0, 14, 14, 19,
+ },
+ // Habakkuk
+ {
+ 0, 17, 20, 19,
+ },
+ // Zephaniah
+ {
+ 0, 18, 15, 20,
+ },
+ // Haggai
+ {
+ 0, 15, 23,
+ },
+ // Zechariah
+ {
+ 0, 17, 17, 10, 16, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Malachi
+ {
+ 0, 14, 17, 24,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,318 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ * The Catholic2 Versification differs from Catholic in that
+ * Esther 10 has 13 verses rather than 3 and Esther has 16
+ * chapters rather than 10.
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemCatholic2 extends ReferenceSystem {
+ public static String name = "Catholic2";
+ public static BibleBook[] booksNT = SystemDefault.booksNT;
+ public static int[][] lastVerseNT = SystemCatholic.lastVerseNT;
+
+ public static BibleBook[] booksOT = SystemCatholic.booksOT;
+ public static int lastVerseOT[][] =
+ {
+ // Gen
+ {
+ 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 26,
+ },
+ // Exodus
+ {
+ 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 38,
+ },
+ // Leviticus
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 25,
+ },
+ // Ruth
+ {
+ 0, 22, 23, 18, 22,
+ },
+ // I Samuel
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 44,
+ },
+ // Nehemiah
+ {
+ 0, 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 40, 36, 47, 31,
+ },
+ // Tobit
+ {
+ 0, 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,
+ 23, 23, 20, 20, 19, 14, 25,
+ },
+ // Esther
+ {
+ 0, 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,
+ 89, 74, 54, 53, 49, 41, 24,
+ },
+ // II Maccabees
+ {
+ 0, 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, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 14, 14, 24, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 32, 26, 17,
+ },
+ // Psalms
+ {
+ 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
+ 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
+ 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
+ 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
+ 24, 21, 11, 7, 9, 24, 14, 12, 12, 18,
+ 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
+ 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
+ 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
+ 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
+ 5, 9, 29, 22, 35, 45, 48, 43, 14, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
+ 6,
+ },
+ // Proverbs
+ {
+ 0, 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,
+ 20, 10, 14,
+ },
+ // Song of Solomon
+ {
+ 0, 17, 17, 11, 17, 16, 12, 14, 14,
+ },
+ // Wisdom
+ {
+ 0, 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,
+ 31, 34, 18, 26, 27, 20, 30, 32, 33, 30,
+ 32, 28, 27, 28, 34, 26, 29, 30, 26, 28,
+ 25, 31, 24, 33, 31, 26, 31, 31, 34, 35,
+ 30, 27, 25, 35, 23, 26, 20, 25, 25, 16,
+ 29, 30,
+ },
+ // Isaiah
+ {
+ 0, 31, 22, 26, 6, 30, 13, 25, 24, 21,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 11, 25, 24,
+ },
+ // Jeremiah
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Lamentations
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Baruch
+ {
+ 0, 22, 35, 38, 37, 9, 72,
+ },
+ // Ezekiel
+ {
+ 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Daniel
+ {
+ 0, 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,
+ 15, 11, 15, 15, 10,
+ },
+ // Joel
+ {
+ 0, 20, 27, 5, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ },
+ // Obadiah
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 16, 11, 10, 11,
+ },
+ // Micah
+ {
+ 0, 16, 13, 12, 14, 14, 16, 20,
+ },
+ // Nahum
+ {
+ 0, 14, 14, 19,
+ },
+ // Habakkuk
+ {
+ 0, 17, 20, 19,
+ },
+ // Zephaniah
+ {
+ 0, 18, 15, 20,
+ },
+ // Haggai
+ {
+ 0, 15, 23,
+ },
+ // Zechariah
+ {
+ 0, 17, 17, 10, 16, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Malachi
+ {
+ 0, 14, 17, 24,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemDefault.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemDefault.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemDefault.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,119 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ * The SystemDefault versification (v11n) is that of the Protestant KJV.
+ * This is the first v11n defined within JSword and SWORD.
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemDefault extends ReferenceSystem {
+
+ public static String name = "";
+
+ // Default for other Testament in single Testament Bibles
+ public static BibleBook[] booksNone =
+ {
+ };
+
+ // Default NT list is the most common
+ public static BibleBook[] booksNT =
+ {
+ BibleBook.MATT,
+ BibleBook.MARK,
+ BibleBook.LUKE,
+ BibleBook.JOHN,
+ BibleBook.ACTS,
+ BibleBook.ROM,
+ BibleBook.COR1,
+ BibleBook.COR2,
+ BibleBook.GAL,
+ BibleBook.EPH,
+ BibleBook.PHIL,
+ BibleBook.COL,
+ BibleBook.THESS1,
+ BibleBook.THESS2,
+ BibleBook.TIM1,
+ BibleBook.TIM2,
+ BibleBook.TITUS,
+ BibleBook.PHLM,
+ BibleBook.HEB,
+ BibleBook.JAS,
+ BibleBook.PET1,
+ BibleBook.PET2,
+ BibleBook.JOHN1,
+ BibleBook.JOHN2,
+ BibleBook.JOHN3,
+ BibleBook.JUDE,
+ BibleBook.REV,
+ };
+
+ public static BibleBook[] booksOT =
+ {
+ BibleBook.GEN,
+ BibleBook.EXOD,
+ BibleBook.LEV,
+ BibleBook.NUM,
+ BibleBook.DEUT,
+ BibleBook.JOSH,
+ BibleBook.JUDG,
+ BibleBook.RUTH,
+ BibleBook.SAM1,
+ BibleBook.SAM2,
+ BibleBook.KGS1,
+ BibleBook.KGS2,
+ BibleBook.CHR1,
+ BibleBook.CHR2,
+ BibleBook.EZRA,
+ BibleBook.NEH,
+ BibleBook.ESTH,
+ BibleBook.JOB,
+ BibleBook.PS,
+ BibleBook.PROV,
+ BibleBook.ECCL,
+ BibleBook.SONG,
+ BibleBook.ISA,
+ BibleBook.JER,
+ BibleBook.LAM,
+ BibleBook.EZEK,
+ BibleBook.DAN,
+ BibleBook.HOS,
+ BibleBook.JOEL,
+ BibleBook.AMOS,
+ BibleBook.OBAD,
+ BibleBook.JONAH,
+ BibleBook.MIC,
+ BibleBook.NAH,
+ BibleBook.HAB,
+ BibleBook.ZEPH,
+ BibleBook.HAG,
+ BibleBook.ZECH,
+ BibleBook.MAL,
+ };
+
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemDefault.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,403 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemGerman extends ReferenceSystem {
+ public static String name = "German";
+ public static BibleBook[] booksNT = SystemDefault.booksNT;
+ public static int[][] lastVerseNT =
+ {
+ // Matthew
+ {
+ 0, 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,
+ 52, 33, 44, 37, 72, 47, 20,
+ },
+ // Luke
+ {
+ 0, 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,
+ 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
+ 31, 25,
+ },
+ // Acts
+ {
+ 0, 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,
+ 21, 36, 21, 14, 23, 33, 27,
+ },
+ // I Corinthians
+ {
+ 0, 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,
+ 18, 33, 21, 13,
+ },
+ // Galatians
+ {
+ 0, 24, 21, 29, 31, 26, 18,
+ },
+ // Ephesians
+ {
+ 0, 23, 22, 21, 32, 33, 24,
+ },
+ // Philippians
+ {
+ 0, 30, 30, 21, 23,
+ },
+ // Colossians
+ {
+ 0, 29, 23, 25, 18,
+ },
+ // I Thessalonians
+ {
+ 0, 10, 20, 13, 18, 28,
+ },
+ // II Thessalonians
+ {
+ 0, 12, 17, 18,
+ },
+ // I Timothy
+ {
+ 0, 20, 15, 16, 16, 25, 21,
+ },
+ // II Timothy
+ {
+ 0, 18, 26, 17, 22,
+ },
+ // Titus
+ {
+ 0, 16, 15, 15,
+ },
+ // Philemon
+ {
+ 0, 25,
+ },
+ // Hebrews
+ {
+ 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 39, 40, 29, 25,
+ },
+ // James
+ {
+ 0, 27, 26, 18, 17, 20,
+ },
+ // I Peter
+ {
+ 0, 25, 25, 22, 19, 14,
+ },
+ // II Peter
+ {
+ 0, 21, 22, 18,
+ },
+ // I John
+ {
+ 0, 10, 29, 24, 21, 21,
+ },
+ // II John
+ {
+ 0, 13,
+ },
+ // III John
+ {
+ 0, 15,
+ },
+ // Jude
+ {
+ 0, 25,
+ },
+ // Revelation of John
+ {
+ 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
+ 15, 27, 21,
+ },
+ };
+ public static BibleBook[] booksOT = SystemDefault.booksOT;
+ public static int[][] lastVerseOT =
+ {
+ // Genesis
+ {
+ 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 26,
+ },
+ // Exodus
+ {
+ 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 38,
+ },
+ // Leviticus
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 25,
+ },
+ // Ruth
+ {
+ 0, 22, 23, 18, 22,
+ },
+ // I Samuel
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 44,
+ },
+ // Nehemiah
+ {
+ 0, 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 40, 36, 47, 31,
+ },
+ // Esther
+ {
+ 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 3,
+ },
+ // Job
+ {
+ 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 32, 26, 17,
+ },
+ // Psalms
+ {
+ 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
+ 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
+ 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
+ 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
+ 23, 21, 11, 7, 9, 24, 14, 12, 12, 18,
+ 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
+ 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
+ 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
+ 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
+ 5, 8, 29, 22, 35, 45, 48, 43, 14, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
+ 6,
+ },
+ // Proverbs
+ {
+ 0, 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,
+ 20, 10, 14,
+ },
+ // Song of Solomon
+ {
+ 0, 17, 17, 11, 16, 16, 12, 14, 14,
+ },
+ // Isaiah
+ {
+ 0, 31, 22, 26, 6, 30, 13, 25, 23, 20,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 11, 25, 24,
+ },
+ // Jeremiah
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Lamentations
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Ezekiel
+ {
+ 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Daniel
+ {
+ 0, 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 45, 13,
+ },
+ // Hosea
+ {
+ 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 15, 11, 15, 15, 10,
+ },
+ // Joel
+ {
+ 0, 20, 27, 5, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ },
+ // Obadiah
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 16, 11, 10, 11,
+ },
+ // Micah
+ {
+ 0, 16, 13, 12, 14, 14, 16, 20,
+ },
+ // Nahum
+ {
+ 0, 14, 14, 19,
+ },
+ // Habakkuk
+ {
+ 0, 17, 20, 19,
+ },
+ // Zephaniah
+ {
+ 0, 18, 15, 20,
+ },
+ // Haggai
+ {
+ 0, 15, 23,
+ },
+ // Zechariah
+ {
+ 0, 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Malachi
+ {
+ 0, 14, 17, 24,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,785 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ * The KJV versification is the first implemented versification
+ * and is the default versification for JSword/SWORD.
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemKJV extends ReferenceSystem {
+ public static String name = "KJV";
+ public static BibleBook[] booksNT = SystemDefault.booksNT;
+
+ public static int[][] lastVerseNT =
+ {
+ // Matt
+ {
+ 0, 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,
+ 52, 33, 44, 37, 72, 47, 20,
+ },
+ // Luke
+ {
+ 0, 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,
+ 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
+ 31, 25,
+ },
+ // Acts
+ {
+ 0, 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,
+ 21, 36, 21, 14, 23, 33, 27,
+ },
+ // 1Cor
+ {
+ 0, 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,
+ 18, 33, 21, 14,
+ },
+ // Gal
+ {
+ 0, 24, 21, 29, 31, 26, 18,
+ },
+ // Eph
+ {
+ 0, 23, 22, 21, 32, 33, 24,
+ },
+ // Phil
+ {
+ 0, 30, 30, 21, 23,
+ },
+ // Col
+ {
+ 0, 29, 23, 25, 18,
+ },
+ // 1Thess
+ {
+ 0, 10, 20, 13, 18, 28,
+ },
+ // 2Thess
+ {
+ 0, 12, 17, 18,
+ },
+ // 1Tim
+ {
+ 0, 20, 15, 16, 16, 25, 21,
+ },
+ // 2Tim
+ {
+ 0, 18, 26, 17, 22,
+ },
+ // Titus
+ {
+ 0, 16, 15, 15,
+ },
+ // Phlm
+ {
+ 0, 25,
+ },
+ // Heb
+ {
+ 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 39, 40, 29, 25,
+ },
+ // Jas
+ {
+ 0, 27, 26, 18, 17, 20,
+ },
+ // 1Pet
+ {
+ 0, 25, 25, 22, 19, 14,
+ },
+ // 2Pet
+ {
+ 0, 21, 22, 18,
+ },
+ // 1John
+ {
+ 0, 10, 29, 24, 21, 21,
+ },
+ // 2John
+ {
+ 0, 13,
+ },
+ // 3John
+ {
+ 0, 14,
+ },
+ // Jude
+ {
+ 0, 25,
+ },
+ // Rev
+ {
+ 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 11, 19, 17, 18, 20, 8, 21, 18, 24, 21,
+ 15, 27, 21,
+ },
+ };
+
+ public static BibleBook[] booksOT = SystemDefault.booksOT;
+
+ /** Constant for the max verse number in each chapter */
+ public static final int[][] lastVerseOT =
+ {
+ // Gen
+ {
+ 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 55, 32, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 26,
+ },
+ // Exod
+ {
+ 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 36, 31, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 38,
+ },
+ // Lev
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 25,
+ },
+ // Ruth
+ {
+ 0, 22, 23, 18, 22,
+ },
+ // 1Sam
+ {
+ 0, 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,
+ 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,
+ 29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
+ 43, 29, 53,
+ },
+ // 2Kgs
+ {
+ 0, 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,
+ 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,
+ 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,
+ 44,
+ },
+ // Neh
+ {
+ 0, 11, 20, 32, 23, 19, 19, 73, 18, 38,
+ 39, 36, 47, 31,
+ },
+ // Esth
+ {
+ 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 3,
+ },
+ // Job
+ {
+ 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 24, 34, 17,
+ },
+ // Ps
+ {
+ 0, 6, 12, 8, 8, 12, 10, 17, 9, 20,
+ 18, 7, 8, 6, 7, 5, 11, 15, 50, 14,
+ 9, 13, 31, 6, 10, 22, 12, 14, 9, 11,
+ 12, 24, 11, 22, 22, 28, 12, 40, 22, 13,
+ 17, 13, 11, 5, 26, 17, 11, 9, 14, 20,
+ 23, 19, 9, 6, 7, 23, 13, 11, 11, 17,
+ 12, 8, 12, 11, 10, 13, 20, 7, 35, 36,
+ 5, 24, 20, 28, 23, 10, 12, 20, 72, 13,
+ 19, 16, 8, 18, 12, 13, 17, 7, 18, 52,
+ 17, 16, 15, 5, 23, 11, 13, 12, 9, 9,
+ 5, 8, 28, 22, 35, 45, 48, 43, 13, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 13, 10, 7, 12, 15, 21, 10, 20, 14, 9,
+ 6,
+ },
+ // Prov
+ {
+ 0, 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,
+ 20, 10, 14,
+ },
+ // Song
+ {
+ 0, 17, 17, 11, 16, 16, 13, 13, 14,
+ },
+ // Isa
+ {
+ 0, 31, 22, 26, 6, 30, 13, 25, 22, 21,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 12, 25, 24,
+ },
+ // Jer
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Lam
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Ezek
+ {
+ 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 49, 32, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Dan
+ {
+ 0, 21, 49, 30, 37, 31, 28, 28, 27, 27,
+ 21, 45, 13,
+ },
+ // Hos
+ {
+ 0, 11, 23, 5, 19, 15, 11, 16, 14, 17,
+ 15, 12, 14, 16, 9,
+ },
+ // Joel
+ {
+ 0, 20, 32, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ },
+ // Obad
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 17, 10, 10, 11,
+ },
+ // Mic
+ {
+ 0, 16, 13, 12, 13, 15, 16, 20,
+ },
+ // Nah
+ {
+ 0, 15, 13, 19,
+ },
+ // Hab
+ {
+ 0, 17, 20, 19,
+ },
+ // Zeph
+ {
+ 0, 18, 15, 20,
+ },
+ // Hag
+ {
+ 0, 15, 23,
+ },
+ // Zech
+ {
+ 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Mal
+ {
+ 0, 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
+ {
+ 0,
+ },
+ // Old Testament Introduction
+ {
+ 1,
+ },
+ // Gen
+ {
+ 2, 3, 35, 61, 86, 113, 146, 169, 194, 217,
+ 247, 280, 313, 334, 353, 378, 400, 417, 445, 479,
+ 518, 537, 572, 597, 618, 686, 721, 757, 804, 827,
+ 863, 907, 963, 996, 1017, 1049, 1079, 1123, 1160, 1191,
+ 1215, 1239, 1297, 1336, 1371, 1406, 1435, 1470, 1502, 1525,
+ 1559,
+ },
+ // Exod
+ {
+ 1586, 1587, 1610, 1636, 1659, 1691, 1715, 1746, 1772, 1805,
+ 1841, 1871, 1882, 1934, 1957, 1989, 2017, 2054, 2071, 2099,
+ 2125, 2152, 2189, 2221, 2255, 2274, 2315, 2353, 2375, 2419,
+ 2466, 2505, 2524, 2560, 2584, 2620, 2656, 2695, 2725, 2757,
+ 2801,
+ },
+ // Lev
+ {
+ 2840, 2841, 2859, 2876, 2894, 2930, 2950, 2981, 3020, 3057,
+ 3082, 3103, 3151, 3160, 3220, 3278, 3312, 3347, 3364, 3395,
+ 3433, 3461, 3486, 3520, 3565, 3589, 3645, 3692,
+ },
+ // Num
+ {
+ 3727, 3728, 3783, 3818, 3870, 3920, 3952, 3980, 4070, 4097,
+ 4121, 4158, 4194, 4211, 4245, 4291, 4333, 4384, 4398, 4431,
+ 4454, 4484, 4520, 4562, 4593, 4619, 4638, 4704, 4728, 4760,
+ 4801, 4818, 4873, 4916, 4973, 5003, 5038,
+ },
+ // Deut
+ {
+ 5052, 5053, 5100, 5138, 5168, 5218, 5252, 5278, 5305, 5326,
+ 5356, 5379, 5412, 5445, 5464, 5494, 5518, 5541, 5562, 5585,
+ 5607, 5628, 5652, 5683, 5709, 5732, 5752, 5772, 5799, 5868,
+ 5898, 5919, 5950, 6003, 6033,
+ },
+ // Josh
+ {
+ 6046, 6047, 6066, 6091, 6109, 6134, 6150, 6178, 6205, 6241,
+ 6269, 6313, 6337, 6362, 6396, 6412, 6476, 6487, 6506, 6535,
+ 6587, 6597, 6643, 6678, 6695,
+ },
+ // Judg
+ {
+ 6729, 6730, 6767, 6791, 6823, 6848, 6880, 6921, 6947, 6983,
+ 7041, 7060, 7101, 7117, 7143, 7164, 7185, 7217, 7231, 7263,
+ 7294, 7343,
+ },
+ // Ruth
+ {
+ 7369, 7370, 7393, 7417, 7436,
+ },
+ // 1Sam
+ {
+ 7459, 7460, 7489, 7526, 7548, 7571, 7584, 7606, 7624, 7647,
+ 7675, 7703, 7719, 7745, 7769, 7822, 7858, 7882, 7941, 7972,
+ 7997, 8040, 8056, 8080, 8110, 8133, 8178, 8204, 8217, 8243,
+ 8255, 8287,
+ },
+ // 2Sam
+ {
+ 8301, 8302, 8330, 8363, 8403, 8416, 8442, 8466, 8496, 8515,
+ 8529, 8549, 8577, 8609, 8649, 8683, 8721, 8745, 8775, 8809,
+ 8853, 8880, 8903, 8955, 8995,
+ },
+ // 1Kgs
+ {
+ 9021, 9022, 9076, 9123, 9152, 9187, 9206, 9245, 9297, 9364,
+ 9393, 9423, 9467, 9501, 9536, 9568, 9603, 9638, 9663, 9710,
+ 9732, 9776, 9806,
+ },
+ // 2Kgs
+ {
+ 9860, 9861, 9880, 9906, 9934, 9979, 10007, 10041, 10062, 10092,
+ 10130, 10167, 10189, 10211, 10237, 10267, 10306, 10327, 10369, 10407,
+ 10445, 10467, 10494, 10515, 10553, 10574,
+ },
+ // 1Chr
+ {
+ 10605, 10606, 10661, 10717, 10742, 10786, 10813, 10895, 10936, 10977,
+ 11022, 11037, 11085, 11126, 11141, 11159, 11189, 11233, 11261, 11279,
+ 11299, 11308, 11339, 11359, 11392, 11424, 11456, 11489, 11524, 11546,
+ },
+ // 2Chr
+ {
+ 11577, 11578, 11596, 11615, 11633, 11656, 11671, 11714, 11737, 11756,
+ 11788, 11808, 11832, 11849, 11872, 11888, 11908, 11923, 11943, 11978,
+ 11990, 12028, 12049, 12062, 12084, 12112, 12141, 12165, 12175, 12203,
+ 12240, 12268, 12290, 12324, 12350, 12384, 12412,
+ },
+ // Ezra
+ {
+ 12436, 12437, 12449, 12520, 12534, 12559, 12577, 12600, 12629, 12666,
+ 12682,
+ },
+ // Neh
+ {
+ 12727, 12728, 12740, 12761, 12794, 12818, 12838, 12858, 12932, 12951,
+ 12990, 13030, 13067, 13115,
+ },
+ // Esth
+ {
+ 13147, 13148, 13171, 13195, 13211, 13229, 13244, 13259, 13270, 13288,
+ 13321,
+ },
+ // Job
+ {
+ 13325, 13326, 13349, 13363, 13390, 13412, 13440, 13471, 13493, 13516,
+ 13552, 13575, 13596, 13622, 13651, 13674, 13710, 13733, 13750, 13772,
+ 13802, 13832, 13867, 13898, 13916, 13942, 13949, 13964, 13988, 14017,
+ 14043, 14075, 14116, 14139, 14173, 14211, 14228, 14262, 14287, 14329,
+ 14360, 14385, 14420,
+ },
+ // Ps
+ {
+ 14438, 14439, 14446, 14459, 14468, 14477, 14490, 14501, 14519, 14529,
+ 14550, 14569, 14577, 14586, 14593, 14601, 14607, 14619, 14635, 14686,
+ 14701, 14711, 14725, 14757, 14764, 14775, 14798, 14811, 14826, 14836,
+ 14848, 14861, 14886, 14898, 14921, 14944, 14973, 14986, 15027, 15050,
+ 15064, 15082, 15096, 15108, 15114, 15141, 15159, 15171, 15181, 15196,
+ 15217, 15241, 15261, 15271, 15278, 15286, 15310, 15324, 15336, 15348,
+ 15366, 15379, 15388, 15401, 15413, 15424, 15438, 15459, 15467, 15503,
+ 15540, 15546, 15571, 15592, 15621, 15645, 15656, 15669, 15690, 15763,
+ 15777, 15797, 15814, 15823, 15842, 15855, 15869, 15887, 15895, 15914,
+ 15967, 15985, 16002, 16018, 16024, 16048, 16060, 16074, 16087, 16097,
+ 16107, 16113, 16122, 16151, 16174, 16210, 16256, 16305, 16349, 16363,
+ 16395, 16403, 16414, 16425, 16435, 16444, 16463, 16483, 16486, 16516,
+ 16693, 16701, 16710, 16720, 16725, 16734, 16740, 16747, 16753, 16760,
+ 16769, 16778, 16782, 16801, 16805, 16809, 16831, 16858, 16868, 16877,
+ 16902, 16916, 16927, 16935, 16948, 16964, 16986, 16997, 17018, 17033,
+ 17043,
+ },
+ // Prov
+ {
+ 17050, 17051, 17085, 17108, 17144, 17172, 17196, 17232, 17260, 17297,
+ 17316, 17349, 17381, 17410, 17436, 17472, 17506, 17540, 17569, 17594,
+ 17624, 17655, 17687, 17717, 17753, 17788, 17817, 17846, 17874, 17903,
+ 17931, 17965,
+ },
+ // Eccl
+ {
+ 17997, 17998, 18017, 18044, 18067, 18084, 18105, 18118, 18148, 18166,
+ 18185, 18206, 18217,
+ },
+ // Song
+ {
+ 18232, 18233, 18251, 18269, 18281, 18298, 18315, 18329, 18343,
+ },
+ // Isa
+ {
+ 18358, 18359, 18391, 18414, 18441, 18448, 18479, 18493, 18519, 18542,
+ 18564, 18599, 18616, 18623, 18646, 18679, 18689, 18704, 18719, 18727,
+ 18753, 18760, 18778, 18804, 18823, 18847, 18860, 18882, 18896, 18926,
+ 18951, 18985, 18995, 19016, 19041, 19059, 19070, 19093, 19132, 19155,
+ 19164, 19196, 19226, 19252, 19281, 19310, 19336, 19350, 19366, 19389,
+ 19416, 19428, 19452, 19468, 19481, 19499, 19513, 19526, 19548, 19563,
+ 19585, 19608, 19620, 19633, 19653, 19666, 19692,
+ },
+ // Jer
+ {
+ 19717, 19718, 19738, 19776, 19802, 19834, 19866, 19897, 19932, 19955,
+ 19982, 20008, 20032, 20050, 20078, 20101, 20123, 20145, 20173, 20197,
+ 20213, 20232, 20247, 20278, 20319, 20330, 20369, 20394, 20417, 20435,
+ 20468, 20493, 20534, 20579, 20606, 20629, 20649, 20682, 20704, 20733,
+ 20752, 20769, 20788, 20811, 20825, 20856, 20862, 20891, 20899, 20947,
+ 20987, 21034, 21099,
+ },
+ // Lam
+ {
+ 21134, 21135, 21158, 21181, 21248, 21271,
+ },
+ // Ezek
+ {
+ 21294, 21295, 21324, 21335, 21363, 21381, 21399, 21414, 21442, 21461,
+ 21473, 21496, 21522, 21551, 21575, 21599, 21608, 21672, 21697, 21730,
+ 21745, 21795, 21828, 21860, 21910, 21938, 21956, 21978, 22015, 22042,
+ 22064, 22091, 22110, 22143, 22177, 22209, 22225, 22264, 22293, 22317,
+ 22347, 22397, 22424, 22445, 22473, 22505, 22531, 22556, 22580,
+ },
+ // Dan
+ {
+ 22616, 22617, 22639, 22689, 22720, 22758, 22790, 22819, 22848, 22876,
+ 22904, 22926, 22972,
+ },
+ // Hos
+ {
+ 22986, 22987, 22999, 23023, 23029, 23049, 23065, 23077, 23094, 23109,
+ 23127, 23143, 23156, 23171, 23188,
+ },
+ // Joel
+ {
+ 23198, 23199, 23220, 23253,
+ },
+ // Amos
+ {
+ 23275, 23276, 23292, 23309, 23325, 23339, 23367, 23382, 23400, 23415,
+ },
+ // Obad
+ {
+ 23431, 23432,
+ },
+ // Jonah
+ {
+ 23454, 23455, 23473, 23484, 23495,
+ },
+ // Mic
+ {
+ 23507, 23508, 23525, 23539, 23552, 23566, 23582, 23599,
+ },
+ // Nah
+ {
+ 23620, 23621, 23637, 23651,
+ },
+ // Hab
+ {
+ 23671, 23672, 23690, 23711,
+ },
+ // Zeph
+ {
+ 23731, 23732, 23751, 23767,
+ },
+ // Hag
+ {
+ 23788, 23789, 23805,
+ },
+ // Zech
+ {
+ 23829, 23830, 23852, 23866, 23877, 23892, 23904, 23920, 23935, 23959,
+ 23977, 23990, 24008, 24023, 24033,
+ },
+ // Mal
+ {
+ 24055, 24056, 24071, 24089, 24108,
+ },
+ // NT Testament Introduction
+ {
+ 24115,
+ },
+ // Matt
+ {
+ 24116, 24117, 24143, 24167, 24185, 24211, 24260, 24295, 24325, 24360,
+ 24399, 24442, 24473, 24524, 24583, 24620, 24660, 24689, 24717, 24753,
+ 24784, 24819, 24866, 24913, 24953, 25005, 25052, 25128, 25195,
+ },
+ // Mark
+ {
+ 25216, 25217, 25263, 25292, 25328, 25370, 25414, 25471, 25509, 25548,
+ 25599, 25652, 25686, 25731, 25769, 25842, 25890,
+ },
+ // Luke
+ {
+ 25911, 25912, 25993, 26046, 26085, 26130, 26170, 26220, 26271, 26328,
+ 26391, 26434, 26489, 26549, 26585, 26621, 26654, 26686, 26724, 26768,
+ 26817, 26865, 26904, 26976, 27033,
+ },
+ // John
+ {
+ 27087, 27088, 27140, 27166, 27203, 27258, 27306, 27378, 27432, 27492,
+ 27534, 27577, 27635, 27686, 27725, 27757, 27785, 27819, 27846, 27887,
+ 27930, 27962,
+ },
+ // Acts
+ {
+ 27988, 27989, 28016, 28064, 28091, 28129, 28172, 28188, 28249, 28290,
+ 28334, 28383, 28414, 28440, 28493, 28522, 28564, 28605, 28640, 28669,
+ 28711, 28750, 28791, 28822, 28858, 28886, 28914, 28947, 28992,
+ },
+ // Rom
+ {
+ 29024, 29025, 29058, 29088, 29120, 29146, 29168, 29192, 29218, 29258,
+ 29292, 29314, 29351, 29373, 29388, 29412, 29446,
+ },
+ // 1Cor
+ {
+ 29474, 29475, 29507, 29524, 29548, 29570, 29584, 29605, 29646, 29660,
+ 29688, 29722, 29757, 29789, 29803, 29844, 29903,
+ },
+ // 2Cor
+ {
+ 29928, 29929, 29954, 29972, 29991, 30010, 30032, 30051, 30068, 30093,
+ 30109, 30128, 30162, 30184,
+ },
+ // Gal
+ {
+ 30199, 30200, 30225, 30247, 30277, 30309, 30336,
+ },
+ // Eph
+ {
+ 30355, 30356, 30380, 30403, 30425, 30458, 30492,
+ },
+ // Phil
+ {
+ 30517, 30518, 30549, 30580, 30602,
+ },
+ // Col
+ {
+ 30626, 30627, 30657, 30681, 30707,
+ },
+ // 1Thess
+ {
+ 30726, 30727, 30738, 30759, 30773, 30792,
+ },
+ // 2Thess
+ {
+ 30821, 30822, 30835, 30853,
+ },
+ // 1Tim
+ {
+ 30872, 30873, 30894, 30910, 30927, 30944, 30970,
+ },
+ // 2Tim
+ {
+ 30992, 30993, 31012, 31039, 31057,
+ },
+ // Titus
+ {
+ 31080, 31081, 31098, 31114,
+ },
+ // Phlm
+ {
+ 31130, 31131,
+ },
+ // Heb
+ {
+ 31157, 31158, 31173, 31192, 31212, 31229, 31244, 31265, 31294, 31308,
+ 31337, 31377, 31418, 31448,
+ },
+ // Jas
+ {
+ 31474, 31475, 31503, 31530, 31549, 31567,
+ },
+ // 1Pet
+ {
+ 31588, 31589, 31615, 31641, 31664, 31684,
+ },
+ // 2Pet
+ {
+ 31699, 31700, 31722, 31745,
+ },
+ // 1John
+ {
+ 31764, 31765, 31776, 31806, 31831, 31853,
+ },
+ // 2John
+ {
+ 31875, 31876,
+ },
+ // 3John
+ {
+ 31890, 31891,
+ },
+ // Jude
+ {
+ 31906, 31907,
+ },
+ // Rev
+ {
+ 31933, 31934, 31955, 31985, 32008, 32020, 32035, 32053, 32071, 32085,
+ 32107, 32119, 32139, 32157, 32176, 32197, 32206, 32228, 32247, 32272,
+ 32294, 32310, 32338,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,405 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemKJVA extends ReferenceSystem {
+ public static String name = "KJVA";
+
+ public static BibleBook[] booksNT = SystemDefault.booksNT;
+ public static int[][] lastVerseNT = SystemKJV.lastVerseNT;
+
+ // SystemDefault.booksOT followed by
+ // deuterocanonical books
+ public static BibleBook[] booksOT =
+ {
+ BibleBook.GEN,
+ BibleBook.EXOD,
+ BibleBook.LEV,
+ BibleBook.NUM,
+ BibleBook.DEUT,
+ BibleBook.JOSH,
+ BibleBook.JUDG,
+ BibleBook.RUTH,
+ BibleBook.SAM1,
+ BibleBook.SAM2,
+ BibleBook.KGS1,
+ BibleBook.KGS2,
+ BibleBook.CHR1,
+ BibleBook.CHR2,
+ BibleBook.EZRA,
+ BibleBook.NEH,
+ BibleBook.ESTH,
+ BibleBook.JOB,
+ BibleBook.PS,
+ BibleBook.PROV,
+ BibleBook.ECCL,
+ BibleBook.SONG,
+ BibleBook.ISA,
+ BibleBook.JER,
+ BibleBook.LAM,
+ BibleBook.EZEK,
+ BibleBook.DAN,
+ BibleBook.HOS,
+ BibleBook.JOEL,
+ BibleBook.AMOS,
+ BibleBook.OBAD,
+ BibleBook.JONAH,
+ BibleBook.MIC,
+ BibleBook.NAH,
+ BibleBook.HAB,
+ BibleBook.ZEPH,
+ BibleBook.HAG,
+ BibleBook.ZECH,
+ BibleBook.MAL,
+ BibleBook.ESD1,
+ BibleBook.ESD2,
+ BibleBook.TOB,
+ BibleBook.JDT,
+ BibleBook.ADD_ESTH,
+ BibleBook.WIS,
+ BibleBook.SIR,
+ BibleBook.BAR,
+ BibleBook.PR_AZAR,
+ BibleBook.SUS,
+ BibleBook.BEL,
+ BibleBook.PR_MAN,
+ BibleBook.MACC1,
+ BibleBook.MACC2,
+ };
+
+ public static final int[][] lastVerseOT =
+ {
+ // Gen
+ {
+ 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 55, 32, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 26,
+ },
+ // Exod
+ {
+ 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 36, 31, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 38,
+ },
+ // Lev
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 25,
+ },
+ // Ruth
+ {
+ 0, 22, 23, 18, 22,
+ },
+ // 1Sam
+ {
+ 0, 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,
+ 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,
+ 29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
+ 43, 29, 53,
+ },
+ // 2Kgs
+ {
+ 0, 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,
+ 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,
+ 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,
+ 44,
+ },
+ // Neh
+ {
+ 0, 11, 20, 32, 23, 19, 19, 73, 18, 38,
+ 39, 36, 47, 31,
+ },
+ // Esth
+ {
+ 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 3,
+ },
+ // Job
+ {
+ 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 24, 34, 17,
+ },
+ // Ps
+ {
+ 0, 6, 12, 8, 8, 12, 10, 17, 9, 20,
+ 18, 7, 8, 6, 7, 5, 11, 15, 50, 14,
+ 9, 13, 31, 6, 10, 22, 12, 14, 9, 11,
+ 12, 24, 11, 22, 22, 28, 12, 40, 22, 13,
+ 17, 13, 11, 5, 26, 17, 11, 9, 14, 20,
+ 23, 19, 9, 6, 7, 23, 13, 11, 11, 17,
+ 12, 8, 12, 11, 10, 13, 20, 7, 35, 36,
+ 5, 24, 20, 28, 23, 10, 12, 20, 72, 13,
+ 19, 16, 8, 18, 12, 13, 17, 7, 18, 52,
+ 17, 16, 15, 5, 23, 11, 13, 12, 9, 9,
+ 5, 8, 28, 22, 35, 45, 48, 43, 13, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 13, 10, 7, 12, 15, 21, 10, 20, 14, 9,
+ 6,
+ },
+ // Prov
+ {
+ 0, 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,
+ 20, 10, 14,
+ },
+ // Song
+ {
+ 0, 17, 17, 11, 16, 16, 13, 13, 14,
+ },
+ // Isa
+ {
+ 0, 31, 22, 26, 6, 30, 13, 25, 22, 21,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 12, 25, 24,
+ },
+ // Jer
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Lam
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Ezek
+ {
+ 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 49, 32, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Dan
+ {
+ 0, 21, 49, 30, 37, 31, 28, 28, 27, 27,
+ 21, 45, 13,
+ },
+ // Hos
+ {
+ 0, 11, 23, 5, 19, 15, 11, 16, 14, 17,
+ 15, 12, 14, 16, 9,
+ },
+ // Joel
+ {
+ 0, 20, 32, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ },
+ // Obad
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 17, 10, 10, 11,
+ },
+ // Mic
+ {
+ 0, 16, 13, 12, 13, 15, 16, 20,
+ },
+ // Nah
+ {
+ 0, 15, 13, 19,
+ },
+ // Hab
+ {
+ 0, 17, 20, 19,
+ },
+ // Zeph
+ {
+ 0, 18, 15, 20,
+ },
+ // Hag
+ {
+ 0, 15, 23,
+ },
+ // Zech
+ {
+ 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Mal
+ {
+ 0, 14, 17, 18, 6,
+ },
+ // I Esdras
+ {
+ 0, 58, 30, 24, 63, 73, 34, 15, 96, 55,
+ },
+ // II Esdras
+ {
+ 0, 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,
+ 12, 19, 22, 18, 15,
+ },
+ // Judith
+ {
+ 0, 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,
+ 13, 12, 6, 18, 19, 16, 24,
+ },
+ // Wisdom
+ {
+ 0, 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,
+ 31, 34, 18, 26, 27, 20, 30, 32, 33, 30,
+ 32, 28, 27, 28, 34, 26, 29, 30, 26, 28,
+ 25, 31, 24, 31, 26, 20, 26, 31, 34, 35,
+ 30, 24, 25, 33, 22, 26, 20, 25, 25, 16,
+ 29, 30,
+ },
+ // Baruch
+ {
+ 0, 22, 35, 37, 37, 9, 73,
+ },
+ // Prayer of Azariah
+ {
+ 0, 68,
+ },
+ // Susanna
+ {
+ 0, 64,
+ },
+ // Bel and the Dragon
+ {
+ 0, 42,
+ },
+ // Prayer of Manasses
+ {
+ 0, 1,
+ },
+ // I Maccabees
+ {
+ 0, 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,
+ 38, 38, 45, 26, 46, 39,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,323 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ * The Leningrad Codex versification differs from the Masoretic Text (MT)
+ * versification only in the placement of 1 and 2 Chronicles.
+ * The Leningrad Codex places them between Malachi and Psalms,
+ * while the Masoretic Text puts it after Nehemiah at the end of the
+ * Old Testament.
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemLeningrad extends ReferenceSystem {
+ public static String name = "Leningrad";
+
+ public static BibleBook[] booksNT = SystemDefault.booksNone;
+
+ public static BibleBook[] booksOT =
+ {
+ BibleBook.GEN,
+ BibleBook.EXOD,
+ BibleBook.LEV,
+ BibleBook.NUM,
+ BibleBook.DEUT,
+ BibleBook.JOSH,
+ BibleBook.JUDG,
+ BibleBook.SAM1,
+ BibleBook.SAM2,
+ BibleBook.KGS1,
+ BibleBook.KGS2,
+ BibleBook.ISA,
+ BibleBook.JER,
+ BibleBook.EZEK,
+ BibleBook.HOS,
+ BibleBook.JOEL,
+ BibleBook.AMOS,
+ BibleBook.OBAD,
+ BibleBook.JONAH,
+ BibleBook.MIC,
+ BibleBook.NAH,
+ BibleBook.HAB,
+ BibleBook.ZEPH,
+ BibleBook.HAG,
+ BibleBook.ZECH,
+ BibleBook.MAL,
+ BibleBook.CHR1,
+ BibleBook.CHR2,
+ BibleBook.PS,
+ BibleBook.JOB,
+ BibleBook.PROV,
+ BibleBook.RUTH,
+ BibleBook.SONG,
+ BibleBook.ECCL,
+ BibleBook.LAM,
+ BibleBook.ESTH,
+ BibleBook.DAN,
+ BibleBook.EZRA,
+ BibleBook.NEH,
+ };
+ public static int lastVerseOT[][] =
+ {
+ // Genesis
+ {
+ 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 26,
+ },
+ // Exodus
+ {
+ 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 38,
+ },
+ // Leviticus
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 25,
+ },
+ // I Samuel
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 11, 25, 24,
+ },
+ // Jeremiah
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Ezekiel
+ {
+ 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Hosea
+ {
+ 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 15, 11, 15, 15, 10,
+ },
+ // Joel
+ {
+ 0, 20, 27, 5, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ },
+ // Obadiah
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 16, 11, 10, 11,
+ },
+ // Micah
+ {
+ 0, 16, 13, 12, 14, 14, 16, 20,
+ },
+ // Nahum
+ {
+ 0, 14, 14, 19,
+ },
+ // Habakkuk
+ {
+ 0, 17, 20, 19,
+ },
+ // Zephaniah
+ {
+ 0, 18, 15, 20,
+ },
+ // Haggai
+ {
+ 0, 15, 23,
+ },
+ // Zechariah
+ {
+ 0, 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Malachi
+ {
+ 0, 14, 17, 24,
+ },
+ // I Chronicles
+ {
+ 0, 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,
+ 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,
+ 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
+ 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
+ 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
+ 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
+ 23, 21, 11, 7, 9, 24, 14, 12, 12, 18,
+ 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
+ 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
+ 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
+ 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
+ 5, 8, 29, 22, 35, 45, 48, 43, 14, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
+ 6,
+ },
+ // Job
+ {
+ 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 32, 26, 17,
+ },
+ // Proverbs
+ {
+ 0, 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,
+ },
+ // Song of Solomon
+ {
+ 0, 17, 17, 11, 16, 16, 12, 14, 14,
+ },
+ // Ecclesiastes
+ {
+ 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 20, 10, 14,
+ },
+ // Lamentations
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Esther
+ {
+ 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 3,
+ },
+ // Daniel
+ {
+ 0, 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 45, 13,
+ },
+ // Ezra
+ {
+ 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 44,
+ },
+ // Nehemiah
+ {
+ 0, 11, 20, 38, 17, 19, 19, 72, 18, 37,
+ 40, 36, 47, 31,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,538 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemLuther extends ReferenceSystem {
+ public static String name = "Luther";
+
+ // Different ordering of SystemDefault.booksNT
+ public static BibleBook[] booksNT =
+ {
+ BibleBook.MATT,
+ BibleBook.MARK,
+ BibleBook.LUKE,
+ BibleBook.JOHN,
+ BibleBook.ACTS,
+ BibleBook.ROM,
+ BibleBook.COR1,
+ BibleBook.COR2,
+ BibleBook.GAL,
+ BibleBook.EPH,
+ BibleBook.PHIL,
+ BibleBook.COL,
+ BibleBook.THESS1,
+ BibleBook.THESS2,
+ BibleBook.TIM1,
+ BibleBook.TIM2,
+ BibleBook.TITUS,
+ BibleBook.PHLM,
+ BibleBook.PET1,
+ BibleBook.PET2,
+ BibleBook.JOHN1,
+ BibleBook.JOHN2,
+ BibleBook.JOHN3,
+ BibleBook.HEB,
+ BibleBook.JAS,
+ BibleBook.JUDE,
+ BibleBook.REV,
+ };
+ public static int[][] lastVerseNT =
+ {
+ // Matthew
+ {
+ 0, 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,
+ 52, 33, 44, 37, 72, 47, 20,
+ },
+ // Luke
+ {
+ 0, 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,
+ 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
+ 31, 25,
+ },
+ // Acts
+ {
+ 0, 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,
+ 21, 36, 21, 14, 23, 33, 27,
+ },
+ // I Corinthians
+ {
+ 0, 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,
+ 18, 33, 21, 13,
+ },
+ // Galatians
+ {
+ 0, 24, 21, 29, 31, 26, 18,
+ },
+ // Ephesians
+ {
+ 0, 23, 22, 21, 32, 33, 24,
+ },
+ // Philippians
+ {
+ 0, 30, 30, 21, 23,
+ },
+ // Colossians
+ {
+ 0, 29, 23, 25, 18,
+ },
+ // I Thessalonians
+ {
+ 0, 10, 20, 13, 18, 28,
+ },
+ // II Thessalonians
+ {
+ 0, 12, 17, 18,
+ },
+ // I Timothy
+ {
+ 0, 20, 15, 16, 16, 25, 21,
+ },
+ // II Timothy
+ {
+ 0, 18, 26, 17, 22,
+ },
+ // Titus
+ {
+ 0, 16, 15, 15,
+ },
+ // Philemon
+ {
+ 0, 25,
+ },
+ // I Peter
+ {
+ 0, 25, 25, 22, 19, 14,
+ },
+ // II Peter
+ {
+ 0, 21, 22, 18,
+ },
+ // I John
+ {
+ 0, 10, 29, 24, 21, 21,
+ },
+ // II John
+ {
+ 0, 13,
+ },
+ // III John
+ {
+ 0, 15,
+ },
+ // Hebrews
+ {
+ 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 39, 40, 29, 25,
+ },
+ // James
+ {
+ 0, 27, 26, 18, 17, 20,
+ },
+ // Jude
+ {
+ 0, 25,
+ },
+ // Revelation of John
+ {
+ 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
+ 15, 27, 21,
+ },
+ };
+
+ // Different ordering of SystemDefault.booksOT
+ // followed by deuterocanonical books
+ public static BibleBook[] booksOT =
+ {
+ BibleBook.GEN,
+ BibleBook.EXOD,
+ BibleBook.LEV,
+ BibleBook.NUM,
+ BibleBook.DEUT,
+ BibleBook.JOSH,
+ BibleBook.JUDG,
+ BibleBook.RUTH,
+ BibleBook.SAM1,
+ BibleBook.SAM2,
+ BibleBook.KGS1,
+ BibleBook.KGS2,
+ BibleBook.CHR1,
+ BibleBook.CHR2,
+ BibleBook.EZRA,
+ BibleBook.NEH,
+ BibleBook.ESTH,
+ BibleBook.JOB,
+ BibleBook.PS,
+ BibleBook.PROV,
+ BibleBook.ECCL,
+ BibleBook.SONG,
+ BibleBook.ISA,
+ BibleBook.JER,
+ BibleBook.LAM,
+ BibleBook.EZEK,
+ BibleBook.DAN,
+ BibleBook.HOS,
+ BibleBook.JOEL,
+ BibleBook.AMOS,
+ BibleBook.OBAD,
+ BibleBook.JONAH,
+ BibleBook.MIC,
+ BibleBook.NAH,
+ BibleBook.HAB,
+ BibleBook.ZEPH,
+ BibleBook.HAG,
+ BibleBook.ZECH,
+ BibleBook.MAL,
+ BibleBook.JDT,
+ BibleBook.WIS,
+ BibleBook.TOB,
+ BibleBook.SIR,
+ BibleBook.BAR,
+ BibleBook.MACC1,
+ BibleBook.MACC2,
+ BibleBook.ADD_ESTH,
+ BibleBook.ADD_DAN,
+ BibleBook.PR_MAN,
+ };
+ public static int[][] lastVerseOT =
+ {
+ // Genesis
+ {
+ 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 26,
+ },
+ // Exodus
+ {
+ 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 38,
+ },
+ // Leviticus
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 25,
+ },
+ // Ruth
+ {
+ 0, 22, 23, 18, 22,
+ },
+ // I Samuel
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 44,
+ },
+ // Nehemiah
+ {
+ 0, 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 40, 36, 47, 31,
+ },
+ // Esther
+ {
+ 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 3,
+ },
+ // Job
+ {
+ 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 32, 26, 17,
+ },
+ // Psalms
+ {
+ 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
+ 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
+ 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
+ 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
+ 23, 21, 11, 7, 9, 24, 14, 12, 12, 18,
+ 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
+ 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
+ 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
+ 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
+ 5, 8, 29, 22, 35, 45, 48, 43, 14, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
+ 6,
+ },
+ // Proverbs
+ {
+ 0, 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,
+ 20, 10, 14,
+ },
+ // Song of Solomon
+ {
+ 0, 17, 17, 11, 16, 16, 12, 14, 14,
+ },
+ // Isaiah
+ {
+ 0, 31, 22, 26, 6, 30, 13, 25, 23, 20,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 11, 25, 24,
+ },
+ // Jeremiah
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Lamentations
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Ezekiel
+ {
+ 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Daniel
+ {
+ 0, 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 45, 13,
+ },
+ // Hosea
+ {
+ 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 15, 11, 15, 15, 10,
+ },
+ // Joel
+ {
+ 0, 20, 27, 5, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ },
+ // Obadiah
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 16, 11, 10, 11,
+ },
+ // Micah
+ {
+ 0, 16, 13, 12, 14, 14, 16, 20,
+ },
+ // Nahum
+ {
+ 0, 14, 14, 19,
+ },
+ // Habakkuk
+ {
+ 0, 17, 20, 19,
+ },
+ // Zephaniah
+ {
+ 0, 18, 15, 20,
+ },
+ // Haggai
+ {
+ 0, 15, 23,
+ },
+ // Zechariah
+ {
+ 0, 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Malachi
+ {
+ 0, 14, 17, 24,
+ },
+ // Judith
+ {
+ 0, 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,
+ 21, 26, 27, 19, 31, 19, 29, 21, 25, 21,
+ },
+ // Tobit
+ {
+ 0, 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,
+ 34, 35, 19, 32, 27, 21, 30, 31, 33, 27,
+ 33, 31, 33, 37, 47, 34, 28, 33, 30, 35,
+ 27, 40, 28, 32, 31, 26, 28, 34, 39, 41,
+ 32, 29, 26, 37, 26, 32, 23, 31, 28, 20,
+ 31, 38,
+ },
+ // Baruch
+ {
+ 0, 22, 35, 38, 37, 9, 73,
+ },
+ // I Maccabees
+ {
+ 0, 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,
+ 38, 38, 46, 26, 46, 40,
+ },
+ // Additions to Esther
+ {
+ 0, 4, 8, 12, 12, 16, 9, 8,
+ },
+ // Additions to Daniel
+ {
+ 0, 64, 41, 66,
+ },
+ // Prayer of Manasses
+ {
+ 0, 16,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,325 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ * The Masoretic Text (MT) versification differs from the Leningrad Codex
+ * versification only in the placement of 1 and 2 Chronicles.
+ * The Masoretic Text puts it after Nehemiah at the end of the
+ * Old Testament, while the Leningrad Codex places them between
+ * Malachi and Psalms.
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemMT extends ReferenceSystem {
+ public static String name = "MT";
+
+ public static BibleBook[] booksNT = SystemDefault.booksNone;
+
+ // Different ordering of SystemDefault.booksOT
+ public static BibleBook[] booksOT =
+ {
+ BibleBook.GEN,
+ BibleBook.EXOD,
+ BibleBook.LEV,
+ BibleBook.NUM,
+ BibleBook.DEUT,
+ BibleBook.JOSH,
+ BibleBook.JUDG,
+ BibleBook.SAM1,
+ BibleBook.SAM2,
+ BibleBook.KGS1,
+ BibleBook.KGS2,
+ BibleBook.ISA,
+ BibleBook.JER,
+ BibleBook.EZEK,
+ BibleBook.HOS,
+ BibleBook.JOEL,
+ BibleBook.AMOS,
+ BibleBook.OBAD,
+ BibleBook.JONAH,
+ BibleBook.MIC,
+ BibleBook.NAH,
+ BibleBook.HAB,
+ BibleBook.ZEPH,
+ BibleBook.HAG,
+ BibleBook.ZECH,
+ BibleBook.MAL,
+ BibleBook.PS,
+ BibleBook.JOB,
+ BibleBook.PROV,
+ BibleBook.RUTH,
+ BibleBook.SONG,
+ BibleBook.ECCL,
+ BibleBook.LAM,
+ BibleBook.ESTH,
+ BibleBook.DAN,
+ BibleBook.EZRA,
+ BibleBook.NEH,
+ BibleBook.CHR1,
+ BibleBook.CHR2,
+ };
+
+ public static int lastVerseOT[][] =
+ {
+ // Genesis
+ {
+ 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 26,
+ },
+ // Exodus
+ {
+ 0, 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 38,
+ },
+ // Leviticus
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 25,
+ },
+ // I Samuel
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 11, 25, 24,
+ },
+ // Jeremiah
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Ezekiel
+ {
+ 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Hosea
+ {
+ 0, 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 15, 11, 15, 15, 10,
+ },
+ // Joel
+ {
+ 0, 20, 27, 5, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ },
+ // Obadiah
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 16, 11, 10, 11,
+ },
+ // Micah
+ {
+ 0, 16, 13, 12, 14, 14, 16, 20,
+ },
+ // Nahum
+ {
+ 0, 14, 14, 19,
+ },
+ // Habakkuk
+ {
+ 0, 17, 20, 19,
+ },
+ // Zephaniah
+ {
+ 0, 18, 15, 20,
+ },
+ // Haggai
+ {
+ 0, 15, 23,
+ },
+ // Zechariah
+ {
+ 0, 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Malachi
+ {
+ 0, 14, 17, 24,
+ },
+ // Psalms
+ {
+ 0, 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
+ 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
+ 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
+ 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
+ 23, 21, 11, 7, 9, 24, 14, 12, 12, 18,
+ 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
+ 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
+ 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
+ 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
+ 5, 8, 29, 22, 35, 45, 48, 43, 14, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
+ 6,
+ },
+ // Job
+ {
+ 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 32, 26, 17,
+ },
+ // Proverbs
+ {
+ 0, 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,
+ },
+ // Song of Solomon
+ {
+ 0, 17, 17, 11, 16, 16, 12, 14, 14,
+ },
+ // Ecclesiastes
+ {
+ 0, 18, 26, 22, 17, 19, 12, 29, 17, 18,
+ 20, 10, 14,
+ },
+ // Lamentations
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Esther
+ {
+ 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 3,
+ },
+ // Daniel
+ {
+ 0, 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 45, 13,
+ },
+ // Ezra
+ {
+ 0, 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 44,
+ },
+ // Nehemiah
+ {
+ 0, 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,
+ 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,
+ 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,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,170 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ * The NRSV Versification is nearly the same as the KJV versification.
+ * It differs in that 3 John has 15 verses not 14 and Revelation 12
+ * has 18 verses not 17.
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemNRSV extends ReferenceSystem {
+ public static String name = "NRSV";
+ public static BibleBook[] booksNT = SystemDefault.booksNT;
+
+ public static int[][] lastVerseNT =
+ {
+ // Matt
+ {
+ 0, 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,
+ 52, 33, 44, 37, 72, 47, 20,
+ },
+ // Luke
+ {
+ 0, 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,
+ 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
+ 31, 25,
+ },
+ // Acts
+ {
+ 0, 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,
+ 21, 36, 21, 14, 23, 33, 27,
+ },
+ // 1Cor
+ {
+ 0, 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,
+ 18, 33, 21, 14,
+ },
+ // Gal
+ {
+ 0, 24, 21, 29, 31, 26, 18,
+ },
+ // Eph
+ {
+ 0, 23, 22, 21, 32, 33, 24,
+ },
+ // Phil
+ {
+ 0, 30, 30, 21, 23,
+ },
+ // Col
+ {
+ 0, 29, 23, 25, 18,
+ },
+ // 1Thess
+ {
+ 0, 10, 20, 13, 18, 28,
+ },
+ // 2Thess
+ {
+ 0, 12, 17, 18,
+ },
+ // 1Tim
+ {
+ 0, 20, 15, 16, 16, 25, 21,
+ },
+ // 2Tim
+ {
+ 0, 18, 26, 17, 22,
+ },
+ // Titus
+ {
+ 0, 16, 15, 15,
+ },
+ // Phlm
+ {
+ 0, 25,
+ },
+ // Heb
+ {
+ 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 39, 40, 29, 25,
+ },
+ // Jas
+ {
+ 0, 27, 26, 18, 17, 20,
+ },
+ // 1Pet
+ {
+ 0, 25, 25, 22, 19, 14,
+ },
+ // 2Pet
+ {
+ 0, 21, 22, 18,
+ },
+ // 1John
+ {
+ 0, 10, 29, 24, 21, 21,
+ },
+ // 2John
+ {
+ 0, 13,
+ },
+ // 3John
+ {
+ 0, 15,
+ },
+ // Jude
+ {
+ 0, 25,
+ },
+ // Rev
+ {
+ 0, 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
+ 15, 27, 21,
+ },
+ };
+
+
+ public static BibleBook[] booksOT = SystemDefault.booksOT;
+ public static int[][] lastVerseOT = SystemKJV.lastVerseOT;
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,420 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemNRSVA extends ReferenceSystem {
+ public static String name = "NRSVA";
+
+ public static BibleBook[] booksNT = SystemDefault.booksNT;
+ public static int[][] lastVerseNT = SystemNRSV.lastVerseNT;
+
+ // SystemDefault.booksOT followed by
+ // deuterocanonical books
+ public static BibleBook[] booksOT =
+ {
+ BibleBook.GEN,
+ BibleBook.EXOD,
+ BibleBook.LEV,
+ BibleBook.NUM,
+ BibleBook.DEUT,
+ BibleBook.JOSH,
+ BibleBook.JUDG,
+ BibleBook.RUTH,
+ BibleBook.SAM1,
+ BibleBook.SAM2,
+ BibleBook.KGS1,
+ BibleBook.KGS2,
+ BibleBook.CHR1,
+ BibleBook.CHR2,
+ BibleBook.EZRA,
+ BibleBook.NEH,
+ BibleBook.ESTH,
+ BibleBook.JOB,
+ BibleBook.PS,
+ BibleBook.PROV,
+ BibleBook.ECCL,
+ BibleBook.SONG,
+ BibleBook.ISA,
+ BibleBook.JER,
+ BibleBook.LAM,
+ BibleBook.EZEK,
+ BibleBook.DAN,
+ BibleBook.HOS,
+ BibleBook.JOEL,
+ BibleBook.AMOS,
+ BibleBook.OBAD,
+ BibleBook.JONAH,
+ BibleBook.MIC,
+ BibleBook.NAH,
+ BibleBook.HAB,
+ BibleBook.ZEPH,
+ BibleBook.HAG,
+ BibleBook.ZECH,
+ BibleBook.MAL,
+ BibleBook.TOB,
+ BibleBook.JDT,
+ BibleBook.ESTH_GR,
+ BibleBook.WIS,
+ BibleBook.SIR,
+ BibleBook.BAR,
+ BibleBook.PR_AZAR,
+ BibleBook.SUS,
+ BibleBook.BEL,
+ BibleBook.MACC1,
+ BibleBook.MACC2,
+ BibleBook.ESD1,
+ BibleBook.PR_MAN,
+ BibleBook.ADD_PS,
+ BibleBook.MACC3,
+ BibleBook.ESD2,
+ BibleBook.MACC4,
+ };
+ public static final int[][] lastVerseOT =
+ {
+ // Gen
+ {
+ 0, 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 55, 32, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 26,
+ },
+ // Exod
+ {
+ 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 36, 31, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 38,
+ },
+ // Lev
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 25,
+ },
+ // Ruth
+ {
+ 0, 22, 23, 18, 22,
+ },
+ // 1Sam
+ {
+ 0, 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,
+ 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,
+ 29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
+ 43, 29, 53,
+ },
+ // 2Kgs
+ {
+ 0, 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,
+ 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,
+ 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,
+ 44,
+ },
+ // Neh
+ {
+ 0, 11, 20, 32, 23, 19, 19, 73, 18, 38,
+ 39, 36, 47, 31,
+ },
+ // Esth
+ {
+ 0, 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 3,
+ },
+ // Job
+ {
+ 0, 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 24, 34, 17,
+ },
+ // Ps
+ {
+ 0, 6, 12, 8, 8, 12, 10, 17, 9, 20,
+ 18, 7, 8, 6, 7, 5, 11, 15, 50, 14,
+ 9, 13, 31, 6, 10, 22, 12, 14, 9, 11,
+ 12, 24, 11, 22, 22, 28, 12, 40, 22, 13,
+ 17, 13, 11, 5, 26, 17, 11, 9, 14, 20,
+ 23, 19, 9, 6, 7, 23, 13, 11, 11, 17,
+ 12, 8, 12, 11, 10, 13, 20, 7, 35, 36,
+ 5, 24, 20, 28, 23, 10, 12, 20, 72, 13,
+ 19, 16, 8, 18, 12, 13, 17, 7, 18, 52,
+ 17, 16, 15, 5, 23, 11, 13, 12, 9, 9,
+ 5, 8, 28, 22, 35, 45, 48, 43, 13, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 13, 10, 7, 12, 15, 21, 10, 20, 14, 9,
+ 6,
+ },
+ // Prov
+ {
+ 0, 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,
+ 20, 10, 14,
+ },
+ // Song
+ {
+ 0, 17, 17, 11, 16, 16, 13, 13, 14,
+ },
+ // Isa
+ {
+ 0, 31, 22, 26, 6, 30, 13, 25, 22, 21,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 12, 25, 24,
+ },
+ // Jer
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Lam
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Ezek
+ {
+ 0, 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 49, 32, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Dan
+ {
+ 0, 21, 49, 30, 37, 31, 28, 28, 27, 27,
+ 21, 45, 13,
+ },
+ // Hos
+ {
+ 0, 11, 23, 5, 19, 15, 11, 16, 14, 17,
+ 15, 12, 14, 16, 9,
+ },
+ // Joel
+ {
+ 0, 20, 32, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 14, 17, 14, 15,
+ },
+ // Obad
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 17, 10, 10, 11,
+ },
+ // Mic
+ {
+ 0, 16, 13, 12, 13, 15, 16, 20,
+ },
+ // Nah
+ {
+ 0, 15, 13, 19,
+ },
+ // Hab
+ {
+ 0, 17, 20, 19,
+ },
+ // Zeph
+ {
+ 0, 18, 15, 20,
+ },
+ // Hag
+ {
+ 0, 15, 23,
+ },
+ // Zech
+ {
+ 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Mal
+ {
+ 0, 14, 17, 18, 6,
+ },
+ // Tobit
+ {
+ 0, 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,
+ 23, 23, 20, 20, 19, 43, 25,
+ },
+ // Esther (Greek)
+ {
+ 0, 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,
+ 21, 26, 27, 19, 31, 19, 29, 21, 25, 22,
+ },
+ // Sirach
+ {
+ 0, 30, 18, 31, 31, 15, 37, 36, 19, 18,
+ 31, 34, 18, 26, 27, 20, 30, 32, 33, 30,
+ 31, 28, 27, 27, 34, 26, 29, 30, 26, 28,
+ 25, 31, 24, 33, 31, 26, 31, 31, 34, 35,
+ 30, 22, 25, 33, 23, 26, 20, 25, 25, 16,
+ 29, 30,
+ },
+ // Baruch
+ {
+ 0, 22, 35, 37, 37, 9, 73,
+ },
+ // Prayer of Azariah
+ {
+ 0, 68,
+ },
+ // Susanna
+ {
+ 0, 64,
+ },
+ // Bel and the Dragon
+ {
+ 0, 42,
+ },
+ // I Maccabees
+ {
+ 0, 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,
+ 38, 38, 45, 26, 46, 39,
+ },
+ // I Esdras
+ {
+ 0, 58, 30, 24, 63, 73, 34, 15, 96, 55,
+ },
+ // Prayer of Manasses
+ {
+ 0, 15,
+ },
+ // Additional Psalm
+ {
+ 0, 7,
+ },
+ // III Maccabees
+ {
+ 0, 29, 33, 30, 21, 51, 41, 23,
+ },
+ // II Esdras
+ {
+ 0, 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,
+ 21, 27, 19, 27, 20, 32, 25, 24, 24,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,125 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemSynodal extends ReferenceSystem {
+ public static String name = "Synodal";
+
+ // The books are the SystemDefault.booksNT
+ // in a different order
+ public static BibleBook[] booksNT =
+ {
+ BibleBook.MATT,
+ BibleBook.MARK,
+ BibleBook.LUKE,
+ BibleBook.JOHN,
+ BibleBook.ACTS,
+ BibleBook.JAS,
+ BibleBook.PET1,
+ BibleBook.PET2,
+ BibleBook.JOHN1,
+ BibleBook.JOHN2,
+ BibleBook.JOHN3,
+ BibleBook.JUDE,
+ BibleBook.ROM,
+ BibleBook.COR1,
+ BibleBook.COR2,
+ BibleBook.GAL,
+ BibleBook.EPH,
+ BibleBook.PHIL,
+ BibleBook.COL,
+ BibleBook.THESS1,
+ BibleBook.THESS2,
+ BibleBook.TIM1,
+ BibleBook.TIM2,
+ BibleBook.TITUS,
+ BibleBook.PHLM,
+ BibleBook.HEB,
+ BibleBook.REV,
+ };
+
+ // Contains deuterocanonical books
+ public static BibleBook[] booksOT =
+ {
+ BibleBook.GEN,
+ BibleBook.EXOD,
+ BibleBook.LEV,
+ BibleBook.NUM,
+ BibleBook.DEUT,
+ BibleBook.JOSH,
+ BibleBook.JUDG,
+ BibleBook.RUTH,
+ BibleBook.SAM1,
+ BibleBook.SAM2,
+ BibleBook.KGS1,
+ BibleBook.KGS2,
+ BibleBook.CHR1,
+ BibleBook.CHR2,
+ BibleBook.PR_MAN,
+ BibleBook.EZRA,
+ BibleBook.NEH,
+ BibleBook.ESD1,
+ BibleBook.TOB,
+ BibleBook.JDT,
+ BibleBook.ESTH,
+ BibleBook.JOB,
+ BibleBook.PS,
+ BibleBook.PROV,
+ BibleBook.ECCL,
+ BibleBook.SONG,
+ BibleBook.WIS,
+ BibleBook.SIR,
+ BibleBook.ISA,
+ BibleBook.JER,
+ BibleBook.LAM,
+ BibleBook.EP_JER,
+ BibleBook.BAR,
+ BibleBook.EZEK,
+ BibleBook.DAN,
+ BibleBook.HOS,
+ BibleBook.JOEL,
+ BibleBook.AMOS,
+ BibleBook.OBAD,
+ BibleBook.JONAH,
+ BibleBook.MIC,
+ BibleBook.NAH,
+ BibleBook.HAB,
+ BibleBook.ZEPH,
+ BibleBook.HAG,
+ BibleBook.ZECH,
+ BibleBook.MAL,
+ BibleBook.MACC1,
+ BibleBook.MACC2,
+ BibleBook.MACC3,
+ BibleBook.ESD2,
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,38 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemSynodalP extends ReferenceSystem {
+ public static String name = "SynodalP";
+ public static BibleBook[] booksNT = SystemDefault.booksNT;
+ public static BibleBook[] booksOT = SystemDefault.booksOT;
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,552 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification.system;
+
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.ReferenceSystem;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class SystemVulg extends ReferenceSystem {
+ public static String name = "Vulg";
+
+ // Start with SystemDefault.booksNT
+ // and follow with additional deuterocanonical books
+ public static BibleBook[] booksNT =
+ {
+ BibleBook.MATT,
+ BibleBook.MARK,
+ BibleBook.LUKE,
+ BibleBook.JOHN,
+ BibleBook.ACTS,
+ BibleBook.ROM,
+ BibleBook.COR1,
+ BibleBook.COR2,
+ BibleBook.GAL,
+ BibleBook.EPH,
+ BibleBook.PHIL,
+ BibleBook.COL,
+ BibleBook.THESS1,
+ BibleBook.THESS2,
+ BibleBook.TIM1,
+ BibleBook.TIM2,
+ BibleBook.TITUS,
+ BibleBook.PHLM,
+ BibleBook.HEB,
+ BibleBook.JAS,
+ BibleBook.PET1,
+ BibleBook.PET2,
+ BibleBook.JOHN1,
+ BibleBook.JOHN2,
+ BibleBook.JOHN3,
+ BibleBook.JUDE,
+ BibleBook.REV,
+ // Additional books
+ BibleBook.PR_MAN,
+ BibleBook.ESD1,
+ BibleBook.ESD2,
+ BibleBook.ADD_PS,
+ BibleBook.EP_LAO,
+ };
+ public static int[][] lastVerseNT =
+ {
+ // Matthew
+ {
+ 0, 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,
+ 52, 33, 44, 37, 72, 47, 20,
+ },
+ // Luke
+ {
+ 0, 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,
+ 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
+ 31, 25,
+ },
+ // Acts
+ {
+ 0, 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,
+ 21, 36, 21, 14, 23, 33, 27,
+ },
+ // I Corinthians
+ {
+ 0, 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,
+ 18, 33, 21, 13,
+ },
+ // Galatians
+ {
+ 0, 24, 21, 29, 31, 26, 18,
+ },
+ // Ephesians
+ {
+ 0, 23, 22, 21, 32, 33, 24,
+ },
+ // Philippians
+ {
+ 0, 30, 30, 21, 23,
+ },
+ // Colossians
+ {
+ 0, 29, 23, 25, 18,
+ },
+ // I Thessalonians
+ {
+ 0, 10, 20, 13, 18, 28,
+ },
+ // II Thessalonians
+ {
+ 0, 12, 17, 18,
+ },
+ // I Timothy
+ {
+ 0, 20, 15, 16, 16, 25, 21,
+ },
+ // II Timothy
+ {
+ 0, 18, 26, 17, 22,
+ },
+ // Titus
+ {
+ 0, 16, 15, 15,
+ },
+ // Philemon
+ {
+ 0, 25,
+ },
+ // Hebrews
+ {
+ 0, 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 39, 40, 29, 25,
+ },
+ // James
+ {
+ 0, 27, 26, 18, 17, 20,
+ },
+ // I Peter
+ {
+ 0, 25, 25, 22, 19, 14,
+ },
+ // II Peter
+ {
+ 0, 21, 22, 18,
+ },
+ // I John
+ {
+ 0, 10, 29, 24, 21, 21,
+ },
+ // II John
+ {
+ 0, 13,
+ },
+ // III John
+ {
+ 0, 15,
+ },
+ // Jude
+ {
+ 0, 25,
+ },
+ // Revelation of John
+ {
+ 0, 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,
+ },
+ // I Esdras
+ {
+ 0, 58, 31, 24, 63, 73, 34, 15, 97, 56,
+ },
+ // II Esdras
+ {
+ 0, 40, 48, 36, 52, 56, 59, 140, 63, 47,
+ 60, 46, 51, 58, 48, 63, 78,
+ },
+ // Additional Psalm
+ {
+ 0, 7,
+ },
+ // Laodiceans
+ {
+ 0, 20,
+ }
+ };
+
+ // Has all the SystemDefault.booksOT
+ // with deuterocanonical books mixed into
+ // a very distinctive order
+ public static BibleBook[] booksOT =
+ {
+ BibleBook.GEN,
+ BibleBook.EXOD,
+ BibleBook.LEV,
+ BibleBook.NUM,
+ BibleBook.DEUT,
+ BibleBook.JOSH,
+ BibleBook.JUDG,
+ BibleBook.RUTH,
+ BibleBook.SAM1,
+ BibleBook.SAM2,
+ BibleBook.KGS1,
+ BibleBook.KGS2,
+ BibleBook.CHR1,
+ BibleBook.CHR2,
+ BibleBook.EZRA,
+ BibleBook.NEH,
+ BibleBook.TOB,
+ BibleBook.JDT,
+ BibleBook.ESTH,
+ BibleBook.JOB,
+ BibleBook.PS,
+ BibleBook.PROV,
+ BibleBook.ECCL,
+ BibleBook.SONG,
+ BibleBook.WIS,
+ BibleBook.SIR,
+ BibleBook.ISA,
+ BibleBook.JER,
+ BibleBook.LAM,
+ BibleBook.BAR,
+ BibleBook.EZEK,
+ BibleBook.DAN,
+ BibleBook.HOS,
+ BibleBook.JOEL,
+ BibleBook.AMOS,
+ BibleBook.OBAD,
+ BibleBook.JONAH,
+ BibleBook.MIC,
+ BibleBook.NAH,
+ BibleBook.HAB,
+ BibleBook.ZEPH,
+ BibleBook.HAG,
+ BibleBook.ZECH,
+ BibleBook.MAL,
+ BibleBook.MACC1,
+ BibleBook.MACC2,
+ };
+
+ public static int[][] lastVerseOT =
+ {
+ // Genesis
+ {
+ 0, 31, 25, 24, 26, 31, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 55, 32, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 32,
+ 25,
+ },
+ // Exodus
+ {
+ 0, 22, 25, 22, 31, 23, 30, 25, 32, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 36, 31, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 36,
+ },
+ // Leviticus
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 48, 24,
+ },
+ // Ruth
+ {
+ 0, 22, 23, 18, 22,
+ },
+ // I Samuel
+ {
+ 0, 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ 44,
+ },
+ // Nehemiah
+ {
+ 0, 11, 20, 31, 23, 19, 19, 73, 18, 38,
+ 39, 36, 46, 31,
+ },
+ // Tobit
+ {
+ 0, 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,
+ 20, 21, 20, 31, 18, 15, 31,
+ },
+ // Esther
+ {
+ 0, 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, 20, 25, 28, 22, 35, 23, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 35,
+ 28, 25, 16,
+ },
+ // Psalms
+ {
+ 0, 6, 13, 9, 10, 13, 11, 18, 10, 39,
+ 8, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+ 14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+ 25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+ 14, 12, 6, 26, 18, 12, 10, 15, 21, 23,
+ 21, 11, 7, 9, 24, 13, 12, 12, 18, 14,
+ 9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+ 24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+ 17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+ 16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+ 8, 29, 22, 35, 45, 48, 43, 14, 31, 7,
+ 10, 10, 9, 26, 9, 10, 2, 29, 176, 7,
+ 8, 9, 4, 8, 5, 7, 5, 6, 8, 8,
+ 3, 18, 3, 3, 21, 27, 9, 8, 24, 14,
+ 10, 8, 12, 15, 21, 10, 11, 9, 14, 9,
+ 6,
+ },
+ // Proverbs
+ {
+ 0, 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,
+ 20, 10, 14,
+ },
+ // Song of Solomon
+ {
+ 0, 16, 17, 11, 16, 17, 12, 13, 14,
+ },
+ // Wisdom
+ {
+ 0, 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,
+ 34, 36, 19, 32, 27, 22, 31, 31, 33, 28,
+ 33, 31, 33, 38, 47, 36, 28, 33, 30, 35,
+ 27, 42, 28, 33, 31, 26, 28, 34, 39, 41,
+ 32, 28, 26, 37, 27, 31, 23, 31, 28, 19,
+ 31, 38,
+ },
+ // Isaiah
+ {
+ 0, 31, 22, 26, 6, 30, 13, 25, 22, 21,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 26, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 22, 11, 12, 19, 12, 25, 24,
+ },
+ // Jeremiah
+ {
+ 0, 19, 37, 25, 31, 31, 30, 34, 22, 26,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 20, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 46, 64, 34,
+ },
+ // Lamentations
+ {
+ 0, 22, 22, 66, 22, 22,
+ },
+ // Baruch
+ {
+ 0, 22, 35, 38, 37, 9, 72,
+ },
+ // Ezekiel
+ {
+ 0, 28, 9, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 49, 32, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 49, 26, 20, 27, 31, 25, 24, 23, 35,
+ },
+ // Daniel
+ {
+ 0, 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,
+ 15, 12, 14, 15, 10,
+ },
+ // Joel
+ {
+ 0, 20, 32, 21,
+ },
+ // Amos
+ {
+ 0, 15, 16, 15, 13, 27, 15, 17, 14, 15,
+ },
+ // Obadiah
+ {
+ 0, 21,
+ },
+ // Jonah
+ {
+ 0, 16, 11, 10, 11,
+ },
+ // Micah
+ {
+ 0, 16, 13, 12, 13, 14, 16, 20,
+ },
+ // Nahum
+ {
+ 0, 15, 13, 19,
+ },
+ // Habakkuk
+ {
+ 0, 17, 20, 19,
+ },
+ // Zephaniah
+ {
+ 0, 18, 15, 20,
+ },
+ // Haggai
+ {
+ 0, 14, 24,
+ },
+ // Zechariah
+ {
+ 0, 21, 13, 10, 14, 11, 15, 14, 23, 17,
+ 12, 17, 14, 9, 21,
+ },
+ // Malachi
+ {
+ 0, 14, 17, 18, 6,
+ },
+ // I Maccabees
+ {
+ 0, 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,
+ 38, 38, 46, 26, 46, 40,
+ },
+ };
+}
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/versification/AllTests.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/versification/AllTests.java 2012-01-14 15:17:58 UTC (rev 2212)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/versification/AllTests.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -36,6 +36,10 @@
TestSuite suite = new TestSuite("Test for org.crosswire.jsword.versification");
// $JUnit-BEGIN$
suite.addTestSuite(BookNameTest.class);
+ suite.addTestSuite(BibleNamesTest.class);
+ suite.addTestSuite(BibleBookTest.class);
+ suite.addTestSuite(BibleBookListTest.class);
+ suite.addTestSuite(ReferenceSystemTest.class);
// $JUnit-END$
return suite;
}
Added: trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleBookListTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleBookListTest.java (rev 0)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleBookListTest.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,53 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class BibleBookListTest extends TestCase {
+
+ /**
+ * @param name
+ */
+ public BibleBookListTest(String name) {
+ super(name);
+ }
+
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+}
Property changes on: trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleBookListTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleBookTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleBookTest.java (rev 0)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleBookTest.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,85 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class BibleBookTest extends TestCase {
+
+ public BibleBookTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+ public void testGetBook() {
+ assertEquals(BibleBook.GEN, BibleBook.getBook("Genesis"));
+ assertEquals(BibleBook.GEN, BibleBook.getBook("Gene"));
+ assertEquals(BibleBook.GEN, BibleBook.getBook("Gen"));
+ assertEquals(BibleBook.GEN, BibleBook.getBook("G"));
+ assertEquals(BibleBook.GEN, BibleBook.getBook("g"));
+ assertEquals(BibleBook.GEN, BibleBook.getBook("GEN"));
+ assertEquals(BibleBook.GEN, BibleBook.getBook("genesis"));
+ assertEquals(BibleBook.PS, BibleBook.getBook("psa"));
+ assertEquals(BibleBook.PS, BibleBook.getBook("ps"));
+ assertEquals(BibleBook.PS, BibleBook.getBook("pss"));
+ assertEquals(BibleBook.PS, BibleBook.getBook("psalter"));
+ assertEquals(BibleBook.ECCL, BibleBook.getBook("ecc"));
+ assertEquals(BibleBook.ECCL, BibleBook.getBook("Qohelot"));
+ assertEquals(BibleBook.SONG, BibleBook.getBook("son"));
+ assertEquals(BibleBook.SONG, BibleBook.getBook("song"));
+ assertEquals(BibleBook.SONG, BibleBook.getBook("song of solomon"));
+ assertEquals(BibleBook.SONG, BibleBook.getBook("songofsolomon"));
+ assertEquals(BibleBook.SONG, BibleBook.getBook("ss"));
+ assertEquals(BibleBook.SONG, BibleBook.getBook("canticle"));
+ assertEquals(BibleBook.SONG, BibleBook.getBook("can"));
+ assertEquals(BibleBook.PHIL, BibleBook.getBook("phi"));
+ assertEquals(BibleBook.PHIL, BibleBook.getBook("phil"));
+ assertEquals(BibleBook.PHIL, BibleBook.getBook("phili"));
+ assertEquals(BibleBook.PHLM, BibleBook.getBook("phile"));
+ assertEquals(BibleBook.REV, BibleBook.getBook("revelations"));
+ assertEquals(BibleBook.REV, BibleBook.getBook("rev"));
+
+ assertEquals(null, BibleBook.getBook("1"));
+ }
+
+ public void testGetBookOSIS() throws Exception {
+ assertEquals("Gen", BibleBook.GEN.getOSIS());
+ assertEquals("Exod", BibleBook.EXOD.getOSIS());
+ assertEquals("Rev", BibleBook.REV.getOSIS());
+ }
+
+}
Property changes on: trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleBookTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Deleted: trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleInfoTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleInfoTest.java 2012-01-14 15:17:58 UTC (rev 2212)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleInfoTest.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -1,339 +0,0 @@
-/**
- * Distribution License:
- * JSword is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License, version 2.1 as published by
- * the Free Software Foundation. This program is distributed in the hope
- * that it will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
- *
- * The License is available on the internet at:
- * http://www.gnu.org/copyleft/lgpl.html
- * or by writing to:
- * Free Software Foundation, Inc.
- * 59 Temple Place - Suite 330
- * Boston, MA 02111-1307, USA
- *
- * Copyright: 2005
- * The copyright to this program is held by it's authors.
- *
- * ID: $Id$
- */
-package org.crosswire.jsword.versification;
-
-import java.util.EnumSet;
-
-import junit.framework.TestCase;
-
-import org.crosswire.jsword.book.CaseType;
-import org.crosswire.jsword.passage.NoSuchVerseException;
-import org.crosswire.jsword.passage.Verse;
-import org.crosswire.jsword.versification.BibleBook;
-import org.crosswire.jsword.versification.BibleInfo;
-import org.crosswire.jsword.versification.BookName;
-
-/**
- * JUnit Test.
- *
- * @see gnu.lgpl.License for license details.<br>
- * The copyright to this program is held by it's authors.
- * @author Joe Walker [joe at eireneh dot com]
- */
-public class BibleInfoTest extends TestCase {
- public BibleInfoTest(String s) {
- super(s);
- }
-
- private CaseType storedCase;
-
- @Override
- protected void setUp() {
- storedCase = BookName.getDefaultCase();
- }
-
- @Override
- protected void tearDown() {
- BookName.setCase(storedCase);
- }
-
- public void testCase() {
- BookName.setCase(CaseType.LOWER);
- assertEquals(CaseType.LOWER, BookName.getDefaultCase());
-
- BookName.setCase(CaseType.UPPER);
- assertEquals(CaseType.UPPER, BookName.getDefaultCase());
-
- BookName.setCase(CaseType.SENTENCE);
- assertEquals(CaseType.SENTENCE, BookName.getDefaultCase());
- }
-
- public void testGetLongBookName() throws Exception {
- BookName.setCase(CaseType.SENTENCE);
- assertEquals("Genesis", BibleBook.GEN.getLongName());
- assertEquals("Revelation of John", BibleBook.REV.getLongName());
-
- BookName.setCase(CaseType.LOWER);
- assertEquals("genesis", BibleBook.GEN.getLongName());
- assertEquals("revelation of john", BibleBook.REV.getLongName());
-
- BookName.setCase(CaseType.UPPER);
- assertEquals("GENESIS", BibleBook.GEN.getLongName());
- assertEquals("REVELATION OF JOHN", BibleBook.REV.getLongName());
-
- }
-
- public void testGetShortBookName() throws Exception {
- BookName.setCase(CaseType.SENTENCE);
- assertEquals("Gen", BibleBook.GEN.getShortName());
- assertEquals("Exo", BibleBook.EXOD.getShortName());
- assertEquals("Judg", BibleBook.JUDG.getShortName());
- assertEquals("Mal", BibleBook.MAL.getShortName());
- assertEquals("Mat", BibleBook.MATT.getShortName());
- assertEquals("Phili", BibleBook.PHIL.getShortName());
- assertEquals("Phile", BibleBook.PHLM.getShortName());
- assertEquals("Jude", BibleBook.JUDE.getShortName());
- assertEquals("Rev", BibleBook.REV.getShortName());
-
- BookName.setCase(CaseType.LOWER);
- assertEquals("gen", BibleBook.GEN.getShortName());
- assertEquals("exo", BibleBook.EXOD.getShortName());
- assertEquals("judg", BibleBook.JUDG.getShortName());
- assertEquals("mal", BibleBook.MAL.getShortName());
- assertEquals("mat", BibleBook.MATT.getShortName());
- assertEquals("phili", BibleBook.PHIL.getShortName());
- assertEquals("phile", BibleBook.PHLM.getShortName());
- assertEquals("jude", BibleBook.JUDE.getShortName());
- assertEquals("rev", BibleBook.REV.getShortName());
-
- BookName.setCase(CaseType.UPPER);
- assertEquals("GEN", BibleBook.GEN.getShortName());
- assertEquals("EXO", BibleBook.EXOD.getShortName());
- assertEquals("JUDG", BibleBook.JUDG.getShortName());
- assertEquals("MAL", BibleBook.MAL.getShortName());
- assertEquals("MAT", BibleBook.MATT.getShortName());
- assertEquals("PHILI", BibleBook.PHIL.getShortName());
- assertEquals("PHILE", BibleBook.PHLM.getShortName());
- assertEquals("JUDE", BibleBook.JUDE.getShortName());
- assertEquals("REV", BibleBook.REV.getShortName());
- }
-
- public void testGetBookJogger() throws Exception {
- assertEquals("Gen", BibleBook.GEN.getOSIS());
- assertEquals("Exod", BibleBook.EXOD.getOSIS());
- assertEquals("Rev", BibleBook.REV.getOSIS());
- }
-
- public void testGetBookNumber() {
- assertEquals(BibleBook.GEN, BibleBook.getBook("Genesis"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("Gene"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("Gen"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("G"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("g"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("GEN"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("genesis"));
- assertEquals(BibleBook.PS, BibleBook.getBook("psa"));
- assertEquals(BibleBook.PS, BibleBook.getBook("ps"));
- assertEquals(BibleBook.PS, BibleBook.getBook("pss"));
- assertEquals(BibleBook.PS, BibleBook.getBook("psalter"));
- assertEquals(BibleBook.ECCL, BibleBook.getBook("ecc"));
- assertEquals(BibleBook.ECCL, BibleBook.getBook("Qohelot"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("son"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("song"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("song of solomon"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("songofsolomon"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("ss"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("canticle"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("can"));
- assertEquals(BibleBook.PHIL, BibleBook.getBook("phi"));
- assertEquals(BibleBook.PHIL, BibleBook.getBook("phil"));
- assertEquals(BibleBook.PHIL, BibleBook.getBook("phili"));
- assertEquals(BibleBook.PHLM, BibleBook.getBook("phile"));
- assertEquals(BibleBook.REV, BibleBook.getBook("revelations"));
- assertEquals(BibleBook.REV, BibleBook.getBook("rev"));
-
- assertEquals(null, BibleBook.getBook("1"));
- }
-
- public void testIn() throws Exception {
- // Counts using loops
- int viw_c = 0;
- int ciw = 0;
-
- // For all the books
- // for (BibleBook b : BibleBook.values()) {
- for (BibleBook b: EnumSet.range(BibleBook.INTRO_BIBLE, BibleBook.REV)) {
-
- // Continue the verse counts for the whole Bible
- for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
- viw_c += BibleInfo.versesInChapter(b, c) + 1;
- }
-
- // Continue the chapter count for the whole Bible
- ciw += BibleInfo.chaptersInBook(b);
- }
-
- assertEquals(BibleInfo.maximumOrdinal() + 1, viw_c);
- assertEquals(BibleInfo.chaptersInBible(), ciw);
- assertEquals(BibleInfo.booksInBible(), 69);
- }
-
- public void testOrdinal() throws Exception {
- int first_verse_ord = 1;
- int last_verse_ord = 1;
- // for (BibleBook b : BibleBook.values()) {
- for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.MAL)) {
- for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
- first_verse_ord++; // chapter introduction
- last_verse_ord = first_verse_ord + BibleInfo.versesInChapter(b, c);
-
- Verse bc0 = new Verse(b, c, 0);
- assertEquals(bc0.getName(), first_verse_ord, BibleInfo.getOrdinal(bc0));
- assertEquals(bc0.getName(), bc0, BibleInfo.decodeOrdinal(first_verse_ord));
-
- if (c > 0) {
- Verse bc1 = new Verse(b, c, 1);
- assertEquals(bc1.getName(), first_verse_ord + 1, BibleInfo.getOrdinal(bc1));
- assertEquals(bc1.getName(), bc1, BibleInfo.decodeOrdinal(first_verse_ord + 1));
-
- Verse bc2 = new Verse(b, c, 2);
- assertEquals(bc2.getName(), first_verse_ord + 2, BibleInfo.getOrdinal(bc2));
- assertEquals(bc2.getName(), bc2, BibleInfo.decodeOrdinal(first_verse_ord + 2));
-
- Verse bclast = new Verse(b, c, BibleInfo.versesInChapter(b, c));
- assertEquals(bclast.getName(), last_verse_ord, BibleInfo.getOrdinal(bclast));
-// assertEquals(bclast.getName(), bclast, BibleInfo.decodeOrdinal(last_verse_ord));
- }
- first_verse_ord += BibleInfo.versesInChapter(b, c);
- }
- }
- first_verse_ord++; // NT Introduction
- for (BibleBook b: EnumSet.range(BibleBook.MATT, BibleBook.REV)) {
- first_verse_ord++; // book introduction
- for (int c = 1; c <= BibleInfo.chaptersInBook(b); c++) {
- first_verse_ord++; // chapter introduction
- last_verse_ord = first_verse_ord + BibleInfo.versesInChapter(b, c);
-
- assertEquals(first_verse_ord, BibleInfo.getOrdinal(new Verse(b, c, 0)));
- assertEquals(first_verse_ord + 1, BibleInfo.getOrdinal(new Verse(b, c, 1)));
- assertEquals(first_verse_ord + 2, BibleInfo.getOrdinal(new Verse(b, c, 2)));
- assertEquals(last_verse_ord, BibleInfo.getOrdinal(new Verse(b, c, BibleInfo.versesInChapter(b, c))));
-
- assertEquals(new Verse(b, c, 0), BibleInfo.decodeOrdinal(first_verse_ord));
- assertEquals(new Verse(b, c, 1), BibleInfo.decodeOrdinal(first_verse_ord + 1));
- assertEquals(new Verse(b, c, 2), BibleInfo.decodeOrdinal(first_verse_ord + 2));
- assertEquals(new Verse(b, c, BibleInfo.versesInChapter(b, c)), BibleInfo.decodeOrdinal(last_verse_ord));
-
- first_verse_ord += BibleInfo.versesInChapter(b, c);
- }
- }
- }
-
- public void testValidate() throws Exception {
- // for (BibleBook b : BibleBook.values()) {
- for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.REV)) {
- try {
- BibleInfo.validate(b, 0, 1);
- fail();
- } catch (NoSuchVerseException ex) {
- }
- if (b != BibleBook.INTRO_NT) {
- BibleInfo.validate(b, 1, 0);
- }
-
- for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
- BibleInfo.validate(b, c, 0);
-
- for (int v = 0; v <= BibleInfo.versesInChapter(b, c); v++) {
- BibleInfo.validate(b, c, v);
- }
- try {
- BibleInfo.validate(b, c, BibleInfo.versesInChapter(b, c) + 1);
- fail();
- } catch (NoSuchVerseException ex) {
- }
- }
- }
- }
-
- public void testPatch() throws Exception {
- int all = 1;
- // for (BibleBook b : BibleBook.values()) {
- for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.MAL)) {
- int cib = BibleInfo.chaptersInBook(b);
- for (int c = 1; c <= cib; c++) {
- int vic = BibleInfo.versesInChapter(b, c);
- for (int v = 1; v <= vic; v++) {
- Verse pv = BibleInfo.patch(BibleBook.GEN, 1, all);
-
- assertEquals(pv.getName(), b, pv.getBook());
- assertEquals(pv.getName(), c, pv.getChapter());
- assertEquals(pv.getName(), v, pv.getVerse());
- all++;
- }
- }
- }
- all = 1;
- for (BibleBook b: EnumSet.range(BibleBook.MATT, BibleBook.REV)) {
- int cib = BibleInfo.chaptersInBook(b);
- for (int c = 1; c <= cib; c++) {
- int vic = BibleInfo.versesInChapter(b, c);
- for (int v = 1; v <= vic; v++) {
- Verse pv = BibleInfo.patch(BibleBook.MATT, 1, all);
-
- assertEquals(pv.getName(), b, pv.getBook());
- assertEquals(pv.getName(), c, pv.getChapter());
- assertEquals(pv.getName(), v, pv.getVerse());
- all++;
- }
- }
- }
- Verse gen11 = new Verse(BibleBook.GEN, 1, 1);
- assertEquals(gen11, BibleInfo.patch(BibleBook.GEN, 1, 1));
-// assertEquals(gen11, BibleInfo.patch(BibleBook.GEN, 1, 0));
- assertEquals(gen11, BibleInfo.patch(BibleBook.GEN, 0, 1));
-// assertEquals(gen11, BibleInfo.patch(BibleBook.GEN, 0, 0));
- assertEquals(gen11, BibleInfo.patch(null, 1, 1));
-// assertEquals(gen11, BibleInfo.patch(null, 1, 0));
- assertEquals(gen11, BibleInfo.patch(null, 0, 1));
-// assertEquals(gen11, BibleInfo.patch(null, 0, 0));
- }
-
- public void testVerseCount() throws Exception {
- int count_up = 0;
- Verse gen00 = new Verse(BibleBook.GEN, 0, 0);
- Verse gen110 = new Verse(BibleBook.GEN, 1, 10);
- Verse rev99 = new Verse(BibleBook.REV, 22, 21);
- // for (BibleBook b : BibleBook.values()) {
- for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.REV)) {
- for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
- for (int v = 0; v <= BibleInfo.versesInChapter(b, c); v++) {
- Verse curVerse = new Verse(b, c, v);
- int up = curVerse.subtract(gen00) + 1;
- assertEquals(++count_up, up);
-// assertEquals(verseCountSlow(gen00, curVerse), up);
- }
- }
-
- }
- int count_down = BibleInfo.maximumOrdinal();
- assertEquals(rev99.getOrdinal(), count_down);
- count_down -= 2; // Subtract for the Module and OT intros
- for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.REV)) {
- for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
- for (int v = 0; v <= BibleInfo.versesInChapter(b, c); v++) {
- Verse curVerse = new Verse(b, c, v);
- int down = rev99.subtract(curVerse);
- assertEquals(count_down--, down);
- }
- }
-
- }
- assertEquals(11, gen110.subtract(gen00));
- }
-
- public void testNames() {
- assertEquals(2, BibleBook.GEN.ordinal());
- assertEquals(68, BibleBook.REV.ordinal());
- }
-
-}
Added: trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleNamesTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleNamesTest.java (rev 0)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleNamesTest.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,52 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2012
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
+public class BibleNamesTest extends TestCase {
+
+ /**
+ * @param name
+ */
+ public BibleNamesTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+}
Property changes on: trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleNamesTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/versification/BookNameTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/versification/BookNameTest.java 2012-01-14 15:17:58 UTC (rev 2212)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/versification/BookNameTest.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -122,35 +122,4 @@
assertEquals("Rev", BibleBook.REV.getOSIS());
}
- public void testGetBookNumber() {
- assertEquals(BibleBook.GEN, BibleBook.getBook("Genesis"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("Gene"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("Gen"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("G"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("g"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("GEN"));
- assertEquals(BibleBook.GEN, BibleBook.getBook("genesis"));
- assertEquals(BibleBook.PS, BibleBook.getBook("psa"));
- assertEquals(BibleBook.PS, BibleBook.getBook("ps"));
- assertEquals(BibleBook.PS, BibleBook.getBook("pss"));
- assertEquals(BibleBook.PS, BibleBook.getBook("psalter"));
- assertEquals(BibleBook.ECCL, BibleBook.getBook("ecc"));
- assertEquals(BibleBook.ECCL, BibleBook.getBook("Qohelot"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("son"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("song"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("song of solomon"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("songofsolomon"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("ss"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("canticle"));
- assertEquals(BibleBook.SONG, BibleBook.getBook("can"));
- assertEquals(BibleBook.PHIL, BibleBook.getBook("phi"));
- assertEquals(BibleBook.PHIL, BibleBook.getBook("phil"));
- assertEquals(BibleBook.PHIL, BibleBook.getBook("phili"));
- assertEquals(BibleBook.PHLM, BibleBook.getBook("phile"));
- assertEquals(BibleBook.REV, BibleBook.getBook("revelations"));
- assertEquals(BibleBook.REV, BibleBook.getBook("rev"));
-
- assertEquals(null, BibleBook.getBook("1"));
- }
-
}
Copied: trunk/jsword/src/test/java/org/crosswire/jsword/versification/ReferenceSystemTest.java (from rev 2210, trunk/jsword/src/test/java/org/crosswire/jsword/versification/BibleInfoTest.java)
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/versification/ReferenceSystemTest.java (rev 0)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/versification/ReferenceSystemTest.java 2012-01-16 04:15:17 UTC (rev 2213)
@@ -0,0 +1,241 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2005
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.versification;
+
+import java.util.EnumSet;
+
+import junit.framework.TestCase;
+
+import org.crosswire.jsword.book.CaseType;
+import org.crosswire.jsword.passage.NoSuchVerseException;
+import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleBook;
+import org.crosswire.jsword.versification.BibleInfo;
+import org.crosswire.jsword.versification.BookName;
+
+/**
+ * JUnit Test.
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author Joe Walker [joe at eireneh dot com]
+ */
+public class ReferenceSystemTest extends TestCase {
+ public ReferenceSystemTest(String s) {
+ super(s);
+ }
+
+ private CaseType storedCase;
+
+ @Override
+ protected void setUp() {
+ storedCase = BookName.getDefaultCase();
+ }
+
+ @Override
+ protected void tearDown() {
+ BookName.setCase(storedCase);
+ }
+
+ public void testIn() throws Exception {
+ // Counts using loops
+ int viw_c = 0;
+ int ciw = 0;
+
+ // For all the books
+ // for (BibleBook b : BibleBook.values()) {
+ for (BibleBook b: EnumSet.range(BibleBook.INTRO_BIBLE, BibleBook.REV)) {
+
+ // Continue the verse counts for the whole Bible
+ for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
+ viw_c += BibleInfo.versesInChapter(b, c) + 1;
+ }
+
+ // Continue the chapter count for the whole Bible
+ ciw += BibleInfo.chaptersInBook(b);
+ }
+
+ assertEquals(BibleInfo.maximumOrdinal() + 1, viw_c);
+ assertEquals(BibleInfo.chaptersInBible(), ciw);
+ assertEquals(BibleInfo.booksInBible(), 69);
+ }
+
+ public void testOrdinal() throws Exception {
+ int first_verse_ord = 1;
+ int last_verse_ord = 1;
+ // for (BibleBook b : BibleBook.values()) {
+ for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.MAL)) {
+ for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
+ first_verse_ord++; // chapter introduction
+ last_verse_ord = first_verse_ord + BibleInfo.versesInChapter(b, c);
+
+ Verse bc0 = new Verse(b, c, 0);
+ assertEquals(bc0.getName(), first_verse_ord, BibleInfo.getOrdinal(bc0));
+ assertEquals(bc0.getName(), bc0, BibleInfo.decodeOrdinal(first_verse_ord));
+
+ if (c > 0) {
+ Verse bc1 = new Verse(b, c, 1);
+ assertEquals(bc1.getName(), first_verse_ord + 1, BibleInfo.getOrdinal(bc1));
+ assertEquals(bc1.getName(), bc1, BibleInfo.decodeOrdinal(first_verse_ord + 1));
+
+ Verse bc2 = new Verse(b, c, 2);
+ assertEquals(bc2.getName(), first_verse_ord + 2, BibleInfo.getOrdinal(bc2));
+ assertEquals(bc2.getName(), bc2, BibleInfo.decodeOrdinal(first_verse_ord + 2));
+
+ Verse bclast = new Verse(b, c, BibleInfo.versesInChapter(b, c));
+ assertEquals(bclast.getName(), last_verse_ord, BibleInfo.getOrdinal(bclast));
+// assertEquals(bclast.getName(), bclast, BibleInfo.decodeOrdinal(last_verse_ord));
+ }
+ first_verse_ord += BibleInfo.versesInChapter(b, c);
+ }
+ }
+ first_verse_ord++; // NT Introduction
+ for (BibleBook b: EnumSet.range(BibleBook.MATT, BibleBook.REV)) {
+ first_verse_ord++; // book introduction
+ for (int c = 1; c <= BibleInfo.chaptersInBook(b); c++) {
+ first_verse_ord++; // chapter introduction
+ last_verse_ord = first_verse_ord + BibleInfo.versesInChapter(b, c);
+
+ assertEquals(first_verse_ord, BibleInfo.getOrdinal(new Verse(b, c, 0)));
+ assertEquals(first_verse_ord + 1, BibleInfo.getOrdinal(new Verse(b, c, 1)));
+ assertEquals(first_verse_ord + 2, BibleInfo.getOrdinal(new Verse(b, c, 2)));
+ assertEquals(last_verse_ord, BibleInfo.getOrdinal(new Verse(b, c, BibleInfo.versesInChapter(b, c))));
+
+ assertEquals(new Verse(b, c, 0), BibleInfo.decodeOrdinal(first_verse_ord));
+ assertEquals(new Verse(b, c, 1), BibleInfo.decodeOrdinal(first_verse_ord + 1));
+ assertEquals(new Verse(b, c, 2), BibleInfo.decodeOrdinal(first_verse_ord + 2));
+ assertEquals(new Verse(b, c, BibleInfo.versesInChapter(b, c)), BibleInfo.decodeOrdinal(last_verse_ord));
+
+ first_verse_ord += BibleInfo.versesInChapter(b, c);
+ }
+ }
+ }
+
+ public void testValidate() throws Exception {
+ // for (BibleBook b : BibleBook.values()) {
+ for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.REV)) {
+ try {
+ BibleInfo.validate(b, 0, 1);
+ fail();
+ } catch (NoSuchVerseException ex) {
+ }
+ if (b != BibleBook.INTRO_NT) {
+ BibleInfo.validate(b, 1, 0);
+ }
+
+ for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
+ BibleInfo.validate(b, c, 0);
+
+ for (int v = 0; v <= BibleInfo.versesInChapter(b, c); v++) {
+ BibleInfo.validate(b, c, v);
+ }
+ try {
+ BibleInfo.validate(b, c, BibleInfo.versesInChapter(b, c) + 1);
+ fail();
+ } catch (NoSuchVerseException ex) {
+ }
+ }
+ }
+ }
+
+ public void testPatch() throws Exception {
+ int all = 1;
+ // for (BibleBook b : BibleBook.values()) {
+ for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.MAL)) {
+ int cib = BibleInfo.chaptersInBook(b);
+ for (int c = 1; c <= cib; c++) {
+ int vic = BibleInfo.versesInChapter(b, c);
+ for (int v = 1; v <= vic; v++) {
+ Verse pv = BibleInfo.patch(BibleBook.GEN, 1, all);
+
+ assertEquals(pv.getName(), b, pv.getBook());
+ assertEquals(pv.getName(), c, pv.getChapter());
+ assertEquals(pv.getName(), v, pv.getVerse());
+ all++;
+ }
+ }
+ }
+ all = 1;
+ for (BibleBook b: EnumSet.range(BibleBook.MATT, BibleBook.REV)) {
+ int cib = BibleInfo.chaptersInBook(b);
+ for (int c = 1; c <= cib; c++) {
+ int vic = BibleInfo.versesInChapter(b, c);
+ for (int v = 1; v <= vic; v++) {
+ Verse pv = BibleInfo.patch(BibleBook.MATT, 1, all);
+
+ assertEquals(pv.getName(), b, pv.getBook());
+ assertEquals(pv.getName(), c, pv.getChapter());
+ assertEquals(pv.getName(), v, pv.getVerse());
+ all++;
+ }
+ }
+ }
+ Verse gen11 = new Verse(BibleBook.GEN, 1, 1);
+ assertEquals(gen11, BibleInfo.patch(BibleBook.GEN, 1, 1));
+// assertEquals(gen11, BibleInfo.patch(BibleBook.GEN, 1, 0));
+ assertEquals(gen11, BibleInfo.patch(BibleBook.GEN, 0, 1));
+// assertEquals(gen11, BibleInfo.patch(BibleBook.GEN, 0, 0));
+ assertEquals(gen11, BibleInfo.patch(null, 1, 1));
+// assertEquals(gen11, BibleInfo.patch(null, 1, 0));
+ assertEquals(gen11, BibleInfo.patch(null, 0, 1));
+// assertEquals(gen11, BibleInfo.patch(null, 0, 0));
+ }
+
+ public void testVerseCount() throws Exception {
+ int count_up = 0;
+ Verse gen00 = new Verse(BibleBook.GEN, 0, 0);
+ Verse gen110 = new Verse(BibleBook.GEN, 1, 10);
+ Verse rev99 = new Verse(BibleBook.REV, 22, 21);
+ // for (BibleBook b : BibleBook.values()) {
+ for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.REV)) {
+ for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
+ for (int v = 0; v <= BibleInfo.versesInChapter(b, c); v++) {
+ Verse curVerse = new Verse(b, c, v);
+ int up = curVerse.subtract(gen00) + 1;
+ assertEquals(++count_up, up);
+// assertEquals(verseCountSlow(gen00, curVerse), up);
+ }
+ }
+
+ }
+ int count_down = BibleInfo.maximumOrdinal();
+ assertEquals(rev99.getOrdinal(), count_down);
+ count_down -= 2; // Subtract for the Module and OT intros
+ for (BibleBook b: EnumSet.range(BibleBook.GEN, BibleBook.REV)) {
+ for (int c = 0; c <= BibleInfo.chaptersInBook(b); c++) {
+ for (int v = 0; v <= BibleInfo.versesInChapter(b, c); v++) {
+ Verse curVerse = new Verse(b, c, v);
+ int down = rev99.subtract(curVerse);
+ assertEquals(count_down--, down);
+ }
+ }
+
+ }
+ assertEquals(11, gen110.subtract(gen00));
+ }
+
+ public void testNames() {
+ assertEquals(2, BibleBook.GEN.ordinal());
+ assertEquals(68, BibleBook.REV.ordinal());
+ }
+
+}
More information about the jsword-svn
mailing list