Skip to content

Commit

Permalink
Added missing Apocryphal books for mapping
Browse files Browse the repository at this point in the history 
Added 1Meq, 2Meq, 3Meq, 3Bar to BibleBook enumeration.
Added 1Meq, 2Meq, 3Meq, 3Bar to Bible Names properties file.
Added the missing Apocrypha to the System Default versification.
Added Apocrypha chapter verses counts to KJV versification. This should only affect the mapping logic.
  • Loading branch information
@sabdelmalik
sabdelmalik committed Dec 17, 2024
1 parent c80bb3c commit 5907e6f
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/main/java/org/crosswire/jsword/versification/BibleBook.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,12 @@ public enum BibleBook {
// Other books
ADD_DAN("AddDan"),
ADD_PS("AddPs"),
ESTH_GR("EsthGr");
ESTH_GR("EsthGr"),
// SM - Added based on Dr, David's input
MEQ1("1Meq"),
MEQ2("2Meq"),
MEQ3("3Meq"),
BAR3("3Bar");

BibleBook(String osis, boolean shortBook) {
this(osis);
Expand Down
18 changes: 17 additions & 1 deletion src/main/java/org/crosswire/jsword/versification/system/SystemDefault.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public class SystemDefault extends Versification {
BibleBook.ESD2,
BibleBook.TOB,
BibleBook.JDT,
BibleBook.ESTH_GR,
BibleBook.ADD_ESTH,
BibleBook.WIS,
BibleBook.SIR,
BibleBook.BAR,
Expand All @@ -131,6 +131,22 @@ public class SystemDefault extends Versification {
BibleBook.PR_MAN,
BibleBook.MACC1,
BibleBook.MACC2,
BibleBook.ESTH_GR,
BibleBook.PSALM_SOL,
BibleBook.MACC3,
BibleBook.MACC4,
BibleBook.ADD_PS,
BibleBook.EN1,
BibleBook.ODES,
BibleBook.MEQ1,
BibleBook.MEQ2,
BibleBook.MEQ3,
BibleBook.T12PATR,
BibleBook.JUBS,
BibleBook.BAR2,
BibleBook.BAR3,
BibleBook.BAR4,
BibleBook.EP_LAO,
};

/* protected */ static final BibleBook[] BOOKS_OT =
Expand Down
98 changes: 98 additions & 0 deletions src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,104 @@ public class SystemKJV extends Versification {
36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
38, 45, 26, 46, 39,
},
// Greek Esther
{
22, 23, 15, 17, 14, 14, 10, 17, 32, 13,
12, 6, 18, 19, 16, 24,
},
// Psalms of Solomon
{
8, 37, 12, 25, 19, 6, 10, 34, 11, 8,
9, 6, 12, 10, 13, 15, 46, 12,
},
// III Maccabees
{
29, 33, 30, 21, 51, 41, 23,
},
// IV Maccabees
{
35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
27, 19, 27, 20, 32, 25, 24, 24,
},
// Additional Psalms
{
7, 6, 6, 20, 21,
},
// 1 Enoch
{
9, 3, 9, 1, 10, 8, 6, 4, 11, 22,
2, 6, 10, 25, 12, 4, 8, 16, 3, 8,
10, 14, 4, 6, 7, 6, 5, 3, 2, 3,
3, 6, 4, 3, 1, 4, 6, 6, 14, 10,
9, 3, 4, 1, 6, 8, 4, 10, 4, 5,
5, 9, 7, 10, 4, 8, 3, 6, 3, 25,
13, 16, 12, 2, 12, 3, 13, 5, 30, 4,
17, 37, 8, 17, 9, 14, 9, 17, 6, 8,
10, 20, 11, 6, 10, 6, 4, 3, 77, 43,
19, 17, 14, 11, 7, 8, 10, 16, 16, 13,
9, 11, 15, 13, 2, 19, 3, 15,
},
// Odes
{
19, 43, 10, 20, 20, 19, 45, 88, 79, 88,
55, 32, 79, 46,
},
// 1 Meqabyan
{
28, 28, 38, 37, 39, 38, 33, 35, 10, 8,
8, 44, 27, 23, 20, 9, 8, 12, 17, 4,
31, 10, 7, 22, 18, 5, 20, 49, 17, 16,
7, 4, 11, 18, 8, 46,
},
// 2 Meqabyan
{
13, 11, 29, 32, 18, 24, 8, 24, 27, 28,
25, 15, 14, 36, 21, 15, 12, 14, 15, 14,
28,
},
// 3 Meqabyan
{
24, 23, 11, 36, 16, 16, 5, 12, 36,
29,
},
// Testament of 12 Patriarchs
{
7, 9, 19, 26, 7, 10, 7, 9, 8, 8,
20, 12,
},
// Jubilees
{
29, 33, 35, 33, 32, 38, 39, 30, 14, 36,
24, 31, 29, 24, 34, 31, 18, 19, 31, 13,
26, 30, 32, 33, 23, 35, 27, 30, 20, 26,
32, 34, 23, 21, 27, 24, 25, 24, 18, 13,
28, 25, 24, 34, 16, 16, 12, 19, 23, 13
},
// 2 Baruch
{
5, 1, 9, 7, 7, 9, 1, 5, 2, 19,
7, 5, 12, 19, 8, 1, 4, 2, 8, 6,
26, 8, 7, 4, 4, 1, 15, 7, 8, 5,
5, 9, 3, 1, 4, 11, 1, 4, 8, 4,
6, 8, 3, 15, 2, 7, 2, 50, 3, 4,
16, 7, 12, 22, 8, 16, 3, 2, 12, 2,
8, 8, 11, 10, 2, 8, 9, 8, 5, 10,
2, 6, 7, 4, 8, 5, 26, 7, 4, 7,
4, 9, 23, 11, 15, 1, 1,
},
// 3 Baruch
{
10, 7, 8, 17, 3, 16, 6, 7, 8, 9,
9, 8, 5, 2, 4, 8, 4,
},
// 4 Baruch
{
12, 10, 22, 12, 35, 25, 37, 12, 32,
},
// Epistle to Laodicea
{
20,
},
};


Expand Down
14 changes: 13 additions & 1 deletion src/main/resources/BibleNames.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,19 @@ AddPs.Alt=
EsthGr.Full=Esther (Greek)
EsthGr.Short=EsthGr
EsthGr.Alt=

// SM Added for Mapping
1Meq.Full= 1 Meqabyan
1Meq.Short= 1 Meq
1Meq.Alt=
2Meq.Full= 2 Meqabyan
2Meq.Short= 2 Meq
2Meq.Alt=
3Meq.Full= 3 Meqabyan
3Meq.Short= 3 Meq
3Meq.Alt=
3Bar.Full= 3 Baruch
3Bar.Short= 3 Bar
3Bar.Alt=

# Introduction titles for the book as a whole, the OT and the NT.
Intro.Bible.Full=Bible Introduction
Expand Down

0 comments on commit 5907e6f

Please sign in to comment.