[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/readings s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Tue Jan 3 06:25:36 MST 2006
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings
In directory www.crosswire.org:/tmp/cvs-serv24436/java/jsword/org/crosswire/jsword/book/readings
Modified Files:
ReadingsBookDriver.java ot1nt2.properties ReadingsBook.java
ReadingsKey.java
Log Message:
Unify Daily Devotions and Readings into a single behavior.
Index: ot1nt2.properties
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ot1nt2.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ot1nt2.properties 12 Jun 2005 02:39:28 -0000 1.2
--- ot1nt2.properties 3 Jan 2006 13:25:34 -0000 1.3
***************
*** 3,370 ****
# standard OSIS internal names. These will be translated into the appropriate
# language using BookInfo.
! readings.1.1=Gen 1, 2, Pss 1, 2, Matt 1, 2
! readings.1.2=Gen 3, 4, Pss 3, 5, Matt 3, 4
! readings.1.3=Gen 5, 6, Pss 6, 8, Matt 5
! readings.1.4=Gen 7, 8, Pss 9, 10, Matt 6
! readings.1.5=Gen 9, 10, Pss 11, 13, Matt 7
! readings.1.6=Gen 11, 12, Pss 14, 16, Matt 8
! readings.1.7=Gen 13, 14, Pss 17, Matt 9
! readings.1.8=Gen 15, 16, Pss 18, Matt 10
! readings.1.9=Gen 17, 18, Pss 19, 21, Matt 11
! readings.1.10=Gen 19, Pss 22, Matt 12
! readings.1.11=Gen 20, 21, Pss 23, 25, Matt 13
! readings.1.12=Gen 22, 23, Pss 26, 28, Matt 14
! readings.1.13=Gen 24, Pss 29, 30, Matt 15
! readings.1.14=Gen 25, 26, Pss 31, Matt 16
! readings.1.15=Gen 27, Pss 32, Matt 17
! readings.1.16=Gen 28, 29, Pss 33, Matt 18
! readings.1.17=Gen 30, Pss 34, Matt 19
! readings.1.18=Gen 31, Pss 35, Matt 20
! readings.1.19=Gen 32, 33, Pss 36, Matt 21
! readings.1.20=Gen 34, 35, Pss 37, Matt 22
! readings.1.21=Gen 36, Pss 38, Matt 23
! readings.1.22=Gen 37, Pss 39, 40, Matt 24
! readings.1.23=Gen 38, Pss 41, 43, Matt 25
! readings.1.24=Gen 39, 40, Pss 44, Matt 26
! readings.1.25=Gen 41, Pss 45, Matt 27
! readings.1.26=Gen 42, 43, Pss 46, 48, Matt 28
! readings.1.27=Gen 44, 45, Pss 49, Rom 1, 2
! readings.1.28=Gen 46, 47, Pss 50, Rom 3, 4
! readings.1.29=Gen 48, 50, Pss 51, 52, Rom 5, 6
! readings.1.30=Exod 1, 2, Pss 53, 55, Rom 7, 8
! readings.1.31=Exod 3, 4, Pss 56, 57, Rom 9
! readings.2.1=Exod 5, 6, Pss 58, 59, Rom 10, 11
! readings.2.2=Exod 7, 8, Pss 60, 61, Rom 12
! readings.2.3=Exod 9, Pss 62, 63, Rom 12, 14
! readings.2.4=Exod 10, Pss 64, 65, Rom 15, 16
! readings.2.5=Exod 11, 12, Pss 66, 67, Mark 1
! readings.2.6=Exod 13, 14, Pss 68, Mark 2
! readings.2.7=Exod 15, Pss 69, Mark 3
! readings.2.8=Exod 16, Pss 70, 71, Mark 4
! readings.2.9=Exod 17, 18, Pss 72, Mark 5
! readings.2.10=Exod 19, 20, Pss 73, Mark 6
! readings.2.11=Exod 21, Pss 74, Mark 7
! readings.2.12=Exod 22, Pss 75, 76, Mark 8
! readings.2.13=Exod 23, Pss 77, Mark 9
! readings.2.14=Exod 24, 25, Pss 78, Mark 10
! readings.2.15=Exod 26, Pss 79, 80, Mark 11
! readings.2.16=Exod 27, Pss 81, 82, Mark 12
! readings.2.17=Exod 28, Pss 83, 84, Mark 13
! readings.2.18=Exod 29, Pss 85, 86, Mark 14
! readings.2.19=Exod 30, Pss 87, 88, Mark 15, 16
! readings.2.20=Exod 31, 32, Pss 89, 1Cor 1, 2
! readings.2.21=Exod 33, 34, Pss 90, 91, 1Cor 3
! readings.2.22=Exod 35, Pss 92, 93, 1Cor 4, 5
! readings.2.23=Exod 36, Pss 94, 95, 1Cor 6
! readings.2.24=Exod 37, Pss 96, 99, 1Cor 7
! readings.2.25=Exod 38, Pss 100, 101, 1Cor 8, 9
! readings.2.26=Exod 39, 40, Pss 102, 1Cor 10
! readings.2.27=Lev 1, 2, Pss 103, 1Cor 11
! readings.2.28=Lev 3, 4, Pss 104, 1Cor 12, 13
! readings.2.29=Lev 4, Pss 104, 1Cor 13
! readings.3.1=Lev 5, 6, Pss 105, 1Cor 14
! readings.3.2=Lev 7, Pss 106, 1Cor 15
! readings.3.3=Lev 8, Pss 107, 1Cor 16
! readings.3.4=Lev 9, 10, Pss 108, 109, 2Cor 1, 2
! readings.3.5=Lev 11, Pss 110 - 112, 2Cor 3, 4
! readings.3.6=Lev 12, 13, Pss 113, 114, 2Cor 5 - 7
! readings.3.7=Lev 14, Pss 115, 116, 2Cor 8, 9
! readings.3.8=Lev 15, Pss 117, 118, 2Cor 10, 11
! readings.3.9=Lev 16, Pss 119:1 - 40, 2Cor 12, 13
! readings.3.10=Lev 17, 18, Pss 119:41 - 80, Luke 1
! readings.3.11=Lev 19, Pss 119:81 - 128, Luke 2
! readings.3.12=Lev 20, Pss 119:129 - 176, Luke 3
! readings.3.13=Lev 21, Pss 120 - 124, Luke 4
! readings.3.14=Lev 22, Pss 125 - 127, Luke 5
! readings.3.15=Lev 23, Pss 128 - 130, Luke 6
! readings.3.16=Lev 24, Pss 131 - 134, Luke 7
! readings.3.17=Lev 25, Pss 135, 136, Luke 8
! readings.3.18=Lev 26, Pss 137 - 139, Luke 9
! readings.3.19=Lev 27, Pss 140 - 142, Luke 10
! readings.3.20=Num 1, Pss 143, 144, Luke 11
! readings.3.21=Num 2, Pss 145 - 147, Luke 12
! readings.3.22=Num 3, Pss 148 - 150, Luke 13, 14
! readings.3.23=Num 4, Prov 1, Luke 15
! readings.3.24=Num 5, Prov 2, Luke 16
! readings.3.25=Num 6, Prov 3, Luke 17
! readings.3.26=Num 7, Prov 4, Luke 18
! readings.3.27=Num 8, 9, Prov 5, Luke 19
! readings.3.28=Num 10, Prov 6, Luke 20
! readings.3.29=Num 11, Prov 7, Luke 21
! readings.3.30=Num 12, 13, Prov 8, 9, Luke 22
! readings.3.31=Num 14, Prov 10, Luke 23
! readings.4.1=Num 15, Prov 11, Luke 24
! readings.4.2=Num 16, Prov 12, Gal 1, 2
! readings.4.3=Num 17, 18, Prov 13, Gal 3, 4
! readings.4.4=Num 19, Prov 14, Gal 5, 6
! readings.4.5=Num 20, 21, Prov 15, Eph 1, 2
! readings.4.6=Num 22, 23, Prov 16, Eph 3, 4
! readings.4.7=Num 24, 25, Prov 17, Eph 5, 6
! readings.4.8=Num 26, Prov 18, Phil 1, 2
! readings.4.9=Num 27, Prov 19, Phil 3, 4
! readings.4.10=Num 28, Prov 20, John 1
! readings.4.11=Num 29, 30, Prov 21, John 2, 3
! readings.4.12=Num 31, Prov 22, John 4
! readings.4.13=Num 32, Prov 23, John 5
! readings.4.14=Num 33, Prov 24, John 6
! readings.4.15=Num 34, Prov 25, John 7
! readings.4.16=Num 35, Prov 26, John 8
! readings.4.17=Num 36, Prov 27, John 9, 10
! readings.4.18=Deut 1, Prov 28, John 11
! readings.4.19=Deut 2, Prov 29, John 12
! readings.4.20=Deut 3, Prov 30, John 13, 14
! readings.4.21=Deut 4, Prov 31, John 15, 16
! readings.4.22=Deut 5, Eccl 1, John 17, 18
! readings.4.23=Deut 6, 7, Eccl 2, John 19
! readings.4.24=Deut 8, 9, Eccl 3, John 20, 21
! readings.4.25=Deut 10, 11, Eccl 4, Acts 1
! readings.4.26=Deut 12, Eccl 5, Acts 2
! readings.4.27=Deut 13, 14, Eccl 6, Acts 3, 4
! readings.4.28=Deut 15, Eccl 7, Acts 5, 6
! readings.4.29=Deut 16, Eccl 8, Acts 7
! readings.4.30=Deut 17, Eccl 9, Acts 8
! readings.5.1=Deut 18, Eccl 10, Acts 9
! readings.5.2=Deut 19, Eccl 11, Acts 10
! readings.5.3=Deut 20, Eccl 12, Acts 11, 12
! readings.5.4=Deut 21, Song 1, Acts 13
! readings.5.5=Deut 22, Song 2, Acts 14, 15
! readings.5.6=Deut 23, Song 3, Acts 16, 17
! readings.5.7=Deut 24, Song 4, Acts 18, 19
! readings.5.8=Deut 25, Song 5, Acts 20
! readings.5.9=Deut 26, Song 6, Acts 21, 22
! readings.5.10=Deut 27, Song 7, Acts 23, 24
! readings.5.11=Deut 28, Song 8, Acts 25, 26
! readings.5.12=Deut 29, Isa 1, Acts 27
! readings.5.13=Deut 30, Isa 2, Acts 28
! readings.5.14=Deut 31, Isa 3, 4, Col 1
! readings.5.15=Deut 32, Isa 5, Col 2
! readings.5.16=Deut 33, 34, Isa 6, Col 3, 4
! readings.5.17=Josh 1, Isa 7, 1Thess 1, 2
! readings.5.18=Josh 2, Isa 8, 1Thess 3, 4
! readings.5.19=Josh 3, 4, Isa 9, 1Thess 5
! readings.5.20=Josh 5, 6, Isa 10, 2Thess 1, 2
! readings.5.21=Josh 7, Isa 11, 2Thess 3
! readings.5.22=Josh 8, Isa 12, 1Tim 1 - 3
! readings.5.23=Josh 9, Isa 13, 1Tim 4, 5
! readings.5.24=Josh 10, Isa 14, 1Tim 6
! readings.5.25=Josh 11, Isa 15, 2Tim 1
! readings.5.26=Josh 12, Isa 16, 2Tim 2
! readings.5.27=Josh 13, Isa 17, 18, 2Tim 3, 4
! readings.5.28=Josh 14, Isa 19, Titus
! readings.5.29=Josh 15, Isa 20, 21, Phlm
! readings.5.30=Josh 16, Isa 22, Heb 1, 2
! readings.5.31=Josh 17, Isa 23, Heb 3 - 5
! readings.6.1=Josh 18, Isa 24, Heb 6, 7
! readings.6.2=Josh 19, Isa 25, Heb 8, 9
! readings.6.3=Josh 20, 21, Isa 26, 27, Heb 10
! readings.6.4=Josh 22, Isa 28, Heb 11
! readings.6.5=Josh 23, 24, Isa 29, Heb 12
! readings.6.6=Judg 1, Isa 30, Heb 13
! readings.6.7=Judg 2, 3, Isa 31, Jas 1
! readings.6.8=Judg 4, 5, Isa 32, Jas 2
! readings.6.9=Judg 6, Isa 33, Jas 3, 4
! readings.6.10=Judg 7, 8, Isa 34, Jas 5
! readings.6.11=Judg 9, Isa 35, 1Pet 1
! readings.6.12=Judg 10, 11, Isa 36, 1Pet 2
! readings.6.13=Judg 12, 13, Isa 37, 1Pet 3 - 5
! readings.6.14=Judg 14, 15, Isa 38, 2Pet 1, 2
! readings.6.15=Judg 16, Isa 39, 2Pet 3
! readings.6.16=Judg 17, 18, Isa 40, 1John 1, 2
! readings.6.17=Judg 19, Isa 41, 1John 3, 4
! readings.6.18=Judg 20, Isa 42, 1John 5
! readings.6.19=Judg 21, Isa 43, 2John, 3John
! readings.6.20=Ruth 1, 2, Isa 44, Jude
! readings.6.21=Ruth 3, 4, Isa 45, Rev 1, 2
! readings.6.22=1Sam 1, Isa 46, 47, Rev 3, 4
! readings.6.23=1Sam 2, Isa 48, Rev 5, 6
! readings.6.24=1Sam 3, Isa 49, Rev 7 - 9
! readings.6.25=1Sam 4, Isa 50, Rev 10, 11
! readings.6.26=1Sam 5, 6, Isa 51, Rev 12, 13
! readings.6.27=1Sam 7, 8, Isa 52, Rev 14
! readings.6.28=1Sam 9, Isa 53, Rev 15, 16
! readings.6.29=1Sam 10, Isa 54, Rev 17, 18
! readings.6.30=1Sam 11, 12, Isa 55, Rev 19, 20
! readings.7.1=1Sam 13, Isa 56, 57, Rev 21, 22
! readings.7.2=1Sam 14, Isa 58, Matt 1, 2
! readings.7.3=1Sam 15, Isa 59, Matt 3, 4
! readings.7.4=1Sam 16, Isa 60, Matt 5
! readings.7.5=1Sam 17, Isa 61, Matt 6
! readings.7.6=1Sam 18, Isa 62, Matt 7
! readings.7.7=1Sam 19, Isa 63, Matt 8
! readings.7.8=1Sam 20, Isa 64, Matt 9
! readings.7.9=1Sam 21, 22, Isa 65, Matt 10
! readings.7.10=1Sam 23, Isa 66, Matt 11
! readings.7.11=1Sam 24, Jer 1, Matt 12
! readings.7.12=1Sam 25, Jer 2, Matt 13
! readings.7.13=1Sam 26, 27, Jer 3, Matt 14
! readings.7.14=1Sam 28, Jer 4, Matt 15
! readings.7.15=1Sam 29, 30, Jer 5, Matt 16
! readings.7.16=1Sam 31, Jer 6, Matt 17
! readings.7.17=2Sam 1, Jer 7, Matt 18
! readings.7.18=2Sam 2, Jer 8, Matt 19
! readings.7.19=2Sam 3, Jer 9, Matt 20
! readings.7.20=2Sam 4, 5, Jer 10, Matt 21
! readings.7.21=2Sam 6, Jer 11, Matt 22
! readings.7.22=2Sam 7, Jer 12, Matt 23
! readings.7.23=2Sam 8, 9, Jer 13, Matt 24
! readings.7.24=2Sam 10, Jer 14, Matt 25
! readings.7.25=2Sam 11, Jer 15, Matt 26
! readings.7.26=2Sam 12, Jer 16, Matt 27
! readings.7.27=2Sam 13, Jer 17, Matt 28
! readings.7.28=2Sam 14, Jer 18, Rom 1, 2
! readings.7.29=2Sam 15, Jer 19, Rom 3, 4
! readings.7.30=2Sam 16, Jer 20, Rom 5, 6
! readings.7.31=2Sam 17, Jer 21, Rom 7, 8
! readings.8.1=2Sam 18, Jer 22, Rom 9
! readings.8.2=2Sam 19, Jer 23, Rom 10, 11
! readings.8.3=2Sam 20, 21, Jer 24, Rom 12
! readings.8.4=2Sam 22, Jer 25, Rom 12, 14
! readings.8.5=2Sam 23, Jer 26, Rom 15, 16
! readings.8.6=2Sam 24, Jer 27, Mark 1
! readings.8.7=1Kgs 1, Jer 28, Mark 2
! readings.8.8=1Kgs 2, Jer 29, Mark 3
! readings.8.9=1Kgs 3, Jer 30, Mark 4
! readings.8.10=1Kgs 4, 5, Jer 31, Mark 5
! readings.8.11=1Kgs 6, Jer 32, Mark 6
! readings.8.12=1Kgs 7, Jer 33, Mark 7
! readings.8.13=1Kgs 8, Jer 34, Mark 8
! readings.8.14=1Kgs 9, Jer 35, Mark 9
! readings.8.15=1Kgs 10, Jer 36, Mark 10
! readings.8.16=1Kgs 11, Jer 37, Mark 11
! readings.8.17=1Kgs 12, Jer 38, Mark 12
! readings.8.18=1Kgs 13, Jer 39, Mark 13
! readings.8.19=1Kgs 14, Jer 40, Mark 14
! readings.8.20=1Kgs 15, Jer 41, Mark 15
! readings.8.21=1Kgs 16, Jer 42, Mark 16
! readings.8.22=1Kgs 17, Jer 43, 1Cor 1, 2
! readings.8.23=1Kgs 18, Jer 44, 1Cor 3
! readings.8.24=1Kgs 19, Jer 45, 46, 1Cor 4, 5
! readings.8.25=1Kgs 20, Jer 47, 1Cor 6
! readings.8.26=1Kgs 21, Jer 48, 1Cor 7
! readings.8.27=1Kgs 22, Jer 49, 1Cor 8, 9
! readings.8.28=2Kgs 1, 2, Jer 50, 1Cor 10
! readings.8.29=2Kgs 3, Jer 51, 1Cor 11
! readings.8.30=2Kgs 4, Jer 52, 1Cor 12, 13
! readings.8.31=2Kgs 5, Lam 1, 1Cor 14
! readings.9.1=2Kgs 6, Lam 2, 1Cor 15
! readings.9.2=2Kgs 7, Lam 3, 1Cor 16
! readings.9.3=2Kgs 8, Lam 4, 2Cor 1, 2
! readings.9.4=2Kgs 9, Lam 5, 2Cor 3, 4
! readings.9.5=2Kgs 10, Ezek 1, 2Cor 5 - 7
! readings.9.6=2Kgs 11, 12, Ezek 2, 2Cor 8, 9
! readings.9.7=2Kgs 13, Ezek 3, 2Cor 10, 11
! readings.9.8=2Kgs 14, Ezek 4, 2Cor 12, 13
! readings.9.9=2Kgs 15, Ezek 5, Luke 1
! readings.9.10=2Kgs 16, Ezek 6, Luke 2
! readings.9.11=2Kgs 17, Ezek 7, Luke 3
! readings.9.12=2Kgs 18, Ezek 8, Luke 4
! readings.9.13=2Kgs 19, Ezek 9, Luke 5
! readings.9.14=2Kgs 20, Ezek 10, Luke 6
! readings.9.15=2Kgs 21, Ezek 11, Luke 7
! readings.9.16=2Kgs 22, 23, Ezek 12, Luke 8
! readings.9.17=2Kgs 24, 25, Ezek 13, Luke 9
! readings.9.18=1Chr 1, Ezek 14, Luke 10
! readings.9.19=1Chr 2, Ezek 15, Luke 11
! readings.9.20=1Chr 3, Ezek 16, Luke 12
! readings.9.21=1Chr 4, Ezek 17, Luke 13, 14
! readings.9.22=1Chr 5, Ezek 18, Luke 15
! readings.9.23=1Chr 6, Ezek 19, Luke 16
! readings.9.24=1Chr 7, Ezek 20, Luke 17
! readings.9.25=1Chr 8, Ezek 21, Luke 18
! readings.9.26=1Chr 9, Ezek 22, Luke 19
! readings.9.27=1Chr 10, Ezek 23, Luke 20
! readings.9.28=1Chr 11, Ezek 24, Luke 21
! readings.9.29=1Chr 12, Ezek 25, Luke 22
! readings.9.30=1Chr 13, 14, Ezek 26, Luke 23
! readings.10.1=1Chr 15, Ezek 27, Luke 24
! readings.10.2=1Chr 16, Ezek 28, Gal 1, 2
! readings.10.3=1Chr 17, Ezek 29, Gal 3, 4
! readings.10.4=1Chr 18, 19, Ezek 30, Gal 5, 6
! readings.10.5=1Chr 20, 21, Ezek 31, Eph 1, 2
! readings.10.6=1Chr 22, Ezek 32, Eph 3, 4
! readings.10.7=1Chr 23, Ezek 33, Eph 5, 6
! readings.10.8=1Chr 24, 25, Ezek 34, Phil 1, 2
! readings.10.9=1Chr 26, Ezek 35, Phil 3, 4
! readings.10.10=1Chr 27, Ezek 36, John 1
! readings.10.11=1Chr 28, Ezek 37, John 2, 3
! readings.10.12=1Chr 29, Ezek 38, John 4
! readings.10.13=2Chr 1, 2, Ezek 39, John 5
! readings.10.14=2Chr 3, 4, Ezek 40, John 6
! readings.10.15=2Chr 5, 6, Ezek 41, John 7
! readings.10.16=2Chr 7, Ezek 42, John 8
! readings.10.17=2Chr 8, Ezek 43, John 9, 10
! readings.10.18=2Chr 9, Ezek 44, John 11
! readings.10.19=2Chr 10, 11, Ezek 45, John 12
! readings.10.20=2Chr 12, 13, Ezek 46, John 13, 14
! readings.10.21=2Chr 14, 15, Ezek 47, John 15, 16
! readings.10.22=2Chr 16, 17, Ezek 48, John 17, 18
! readings.10.23=2Chr 18, 19, Dan 1, John 19
! readings.10.24=2Chr 20, Dan 2, John 20, 21
! readings.10.25=2Chr 21, 22, Dan 3, Acts 1
! readings.10.26=2Chr 23, Dan 4, Acts 2
! readings.10.27=2Chr 24, Dan 5, Acts 3, 4
! readings.10.28=2Chr 25, Dan 6, Acts 5, 6
! readings.10.29=2Chr 26, 27, Dan 7, Acts 7
! readings.10.30=2Chr 28, Dan 8, Acts 8
! readings.10.31=2Chr 29, Dan 9, Acts 9
! readings.11.1=2Chr 30, Dan 10, Acts 10
! readings.11.2=2Chr 31, Dan 11, Acts 11, 12
! readings.11.3=2Chr 32, Dan 12, Acts 13
! readings.11.4=2Chr 33, Hos 1, Acts 14, 15
! readings.11.5=2Chr 34, Hos 2, Acts 16, 17
! readings.11.6=2Chr 35, Hos 3, Acts 18, 19
! readings.11.7=2Chr 36, Hos 4, Acts 20
! readings.11.8=Ezra 1, 2, Hos 5, Acts 21, 22
! readings.11.9=Ezra 3, 4, Hos 6, Acts 23, 24
! readings.11.10=Ezra 5, 6, Hos 7, Acts 25, 26
! readings.11.11=Ezra 7, Hos 8, Acts 27
! readings.11.12=Ezra 8, Hos 9, Acts 28
! readings.11.13=Ezra 9, Hos 10, Col 1
! readings.11.14=Ezra 10, Hos 11, Col 2
! readings.11.15=Neh 1, 2, Hos 12, Col 3, 4
! readings.11.16=Neh 3, Hos 13, 1Thess 1, 2
! readings.11.17=Neh 4, Hos 14, 1Thess 3, 4
! readings.11.18=Neh 5, 6, Joel 1, 1Thess 5
! readings.11.19=Neh 7, Joel 2, 2Thess 1, 2
! readings.11.20=Neh 8, Joel 3, 2Thess 3
! readings.11.21=Neh 9, Amos 1, 1Tim 1, 2, 3
! readings.11.22=Neh 10, Amos 2, 1Tim 4, 5
! readings.11.23=Neh 11, Amos 3, 1Tim 6
! readings.11.24=Neh 12, Amos 4, 2Tim 1
! readings.11.25=Neh 13, Amos 5, 2Tim 2
! readings.11.26=Esth 1, Amos 6, 2Tim 3, 4
! readings.11.27=Esth 2, Amos 7, Titus 1 - 3
! readings.11.28=Esth 3, 4, Amos 8, Phlm 1
! readings.11.29=Esth 5, 6, Amos 9, Heb 1, 2
! readings.11.30=Esth 7, 8, Obad, Heb 3 - 5
! readings.12.1=Esth 9, 10, Jonah 1, Heb 6, 7
! readings.12.2=Job 1-2, Jonah 2, 3, Heb 8, 9
! readings.12.3=Job 3-4, Jonah 4, Heb 10
! readings.12.4=Job 5, Mic 1, Heb 11
! readings.12.5=Job 6-7, Mic 2, Heb 12
! readings.12.6=Job 8, Mic 3, 4, Heb 13
! readings.12.7=Job 9, Mic 5, Jas 1
! readings.12.8=Job 10, Mic 6, Jas 2
! readings.12.9=Job 11, Mic 7, Jas 3, 4
! readings.12.10=Job 12, Nah 1, 2, Jas 5
! readings.12.11=Job 13, Nah 3, 1Pet 1
! readings.12.12=Job 14, Hab 1, 1Pet 2
! readings.12.13=Job 15, Hab 2, 1Pet 3 - 5
! readings.12.14=Job 16-17, Hab 3, 2Pet 1, 2
! readings.12.15=Job 18-19, Zeph 1, 2Pet 3
! readings.12.16=Job 20, Zeph 2, 1John 1, 2
! readings.12.17=Job 21, Zeph 3, 1John 3, 4
! readings.12.18=Job 22, Hag 1, 2, 1John 5
! readings.12.19=Job 23-24, Zech 1, 2John, 3John
! readings.12.20=Job 24-26, Zech 2, 3, Jude
! readings.12.21=Job 28, Zech 4, 5, Rev 1, 2
! readings.12.22=Job 29, 30, Zech 6, 7, Rev 3, 4
! readings.12.23=Job 31, 32, Zech 8, Rev 5, 6
! readings.12.24=Job 33, Zech 9, Rev 7 - 9
! readings.12.25=Job 34, Zech 10, Rev 10, 11
! readings.12.26=Job 35, 36, Zech 11, Rev 12, 13
! readings.12.27=Job 37, Zech 12, Rev 14
! readings.12.28=Job 38, Zech 13, 14, Rev 15, 16
! readings.12.29=Job 39, Mal 1, Rev 17, 18
! readings.12.30=Job 40, Mal 2, Rev 19, 20
! readings.12.31=Job 41, 42, Mal 3, 4, Rev 21, 22
--- 3,370 ----
# standard OSIS internal names. These will be translated into the appropriate
# language using BookInfo.
! 01.01=Gen 1, 2, Pss 1, 2, Matt 1, 2
! 01.02=Gen 3, 4, Pss 3, 5, Matt 3, 4
! 01.03=Gen 5, 6, Pss 6, 8, Matt 5
! 01.04=Gen 7, 8, Pss 9, 10, Matt 6
! 01.05=Gen 9, 10, Pss 11, 13, Matt 7
! 01.06=Gen 11, 12, Pss 14, 16, Matt 8
! 01.07=Gen 13, 14, Pss 17, Matt 9
! 01.08=Gen 15, 16, Pss 18, Matt 10
! 01.09=Gen 17, 18, Pss 19, 21, Matt 11
! 01.10=Gen 19, Pss 22, Matt 12
! 01.11=Gen 20, 21, Pss 23, 25, Matt 13
! 01.12=Gen 22, 23, Pss 26, 28, Matt 14
! 01.13=Gen 24, Pss 29, 30, Matt 15
! 01.14=Gen 25, 26, Pss 31, Matt 16
! 01.15=Gen 27, Pss 32, Matt 17
! 01.16=Gen 28, 29, Pss 33, Matt 18
! 01.17=Gen 30, Pss 34, Matt 19
! 01.18=Gen 31, Pss 35, Matt 20
! 01.19=Gen 32, 33, Pss 36, Matt 21
! 01.20=Gen 34, 35, Pss 37, Matt 22
! 01.21=Gen 36, Pss 38, Matt 23
! 01.22=Gen 37, Pss 39, 40, Matt 24
! 01.23=Gen 38, Pss 41, 43, Matt 25
! 01.24=Gen 39, 40, Pss 44, Matt 26
! 01.25=Gen 41, Pss 45, Matt 27
! 01.26=Gen 42, 43, Pss 46, 48, Matt 28
! 01.27=Gen 44, 45, Pss 49, Rom 1, 2
! 01.28=Gen 46, 47, Pss 50, Rom 3, 4
! 01.29=Gen 48, 50, Pss 51, 52, Rom 5, 6
! 01.30=Exod 1, 2, Pss 53, 55, Rom 7, 8
! 01.31=Exod 3, 4, Pss 56, 57, Rom 9
! 02.01=Exod 5, 6, Pss 58, 59, Rom 10, 11
! 02.02=Exod 7, 8, Pss 60, 61, Rom 12
! 02.03=Exod 9, Pss 62, 63, Rom 12, 14
! 02.04=Exod 10, Pss 64, 65, Rom 15, 16
! 02.05=Exod 11, 12, Pss 66, 67, Mark 1
! 02.06=Exod 13, 14, Pss 68, Mark 2
! 02.07=Exod 15, Pss 69, Mark 3
! 02.08=Exod 16, Pss 70, 71, Mark 4
! 02.09=Exod 17, 18, Pss 72, Mark 5
! 02.10=Exod 19, 20, Pss 73, Mark 6
! 02.11=Exod 21, Pss 74, Mark 7
! 02.12=Exod 22, Pss 75, 76, Mark 8
! 02.13=Exod 23, Pss 77, Mark 9
! 02.14=Exod 24, 25, Pss 78, Mark 10
! 02.15=Exod 26, Pss 79, 80, Mark 11
! 02.16=Exod 27, Pss 81, 82, Mark 12
! 02.17=Exod 28, Pss 83, 84, Mark 13
! 02.18=Exod 29, Pss 85, 86, Mark 14
! 02.19=Exod 30, Pss 87, 88, Mark 15, 16
! 02.20=Exod 31, 32, Pss 89, 1Cor 1, 2
! 02.21=Exod 33, 34, Pss 90, 91, 1Cor 3
! 02.22=Exod 35, Pss 92, 93, 1Cor 4, 5
! 02.23=Exod 36, Pss 94, 95, 1Cor 6
! 02.24=Exod 37, Pss 96, 99, 1Cor 7
! 02.25=Exod 38, Pss 100, 101, 1Cor 8, 9
! 02.26=Exod 39, 40, Pss 102, 1Cor 10
! 02.27=Lev 1, 2, Pss 103, 1Cor 11
! 02.28=Lev 3, 4, Pss 104, 1Cor 12, 13
! 02.29=Lev 4, Pss 104, 1Cor 13
! 03.01=Lev 5, 6, Pss 105, 1Cor 14
! 03.02=Lev 7, Pss 106, 1Cor 15
! 03.03=Lev 8, Pss 107, 1Cor 16
! 03.04=Lev 9, 10, Pss 108, 109, 2Cor 1, 2
! 03.05=Lev 11, Pss 110 - 112, 2Cor 3, 4
! 03.06=Lev 12, 13, Pss 113, 114, 2Cor 5 - 7
! 03.07=Lev 14, Pss 115, 116, 2Cor 8, 9
! 03.08=Lev 15, Pss 117, 118, 2Cor 10, 11
! 03.09=Lev 16, Pss 119:1 - 40, 2Cor 12, 13
! 03.10=Lev 17, 18, Pss 119:41 - 80, Luke 1
! 03.11=Lev 19, Pss 119:81 - 128, Luke 2
! 03.12=Lev 20, Pss 119:129 - 176, Luke 3
! 03.13=Lev 21, Pss 120 - 124, Luke 4
! 03.14=Lev 22, Pss 125 - 127, Luke 5
! 03.15=Lev 23, Pss 128 - 130, Luke 6
! 03.16=Lev 24, Pss 131 - 134, Luke 7
! 03.17=Lev 25, Pss 135, 136, Luke 8
! 03.18=Lev 26, Pss 137 - 139, Luke 9
! 03.19=Lev 27, Pss 140 - 142, Luke 10
! 03.20=Num 1, Pss 143, 144, Luke 11
! 03.21=Num 2, Pss 145 - 147, Luke 12
! 03.22=Num 3, Pss 148 - 150, Luke 13, 14
! 03.23=Num 4, Prov 1, Luke 15
! 03.24=Num 5, Prov 2, Luke 16
! 03.25=Num 6, Prov 3, Luke 17
! 03.26=Num 7, Prov 4, Luke 18
! 03.27=Num 8, 9, Prov 5, Luke 19
! 03.28=Num 10, Prov 6, Luke 20
! 03.29=Num 11, Prov 7, Luke 21
! 03.30=Num 12, 13, Prov 8, 9, Luke 22
! 03.31=Num 14, Prov 10, Luke 23
! 04.01=Num 15, Prov 11, Luke 24
! 04.02=Num 16, Prov 12, Gal 1, 2
! 04.03=Num 17, 18, Prov 13, Gal 3, 4
! 04.04=Num 19, Prov 14, Gal 5, 6
! 04.05=Num 20, 21, Prov 15, Eph 1, 2
! 04.06=Num 22, 23, Prov 16, Eph 3, 4
! 04.07=Num 24, 25, Prov 17, Eph 5, 6
! 04.08=Num 26, Prov 18, Phil 1, 2
! 04.09=Num 27, Prov 19, Phil 3, 4
! 04.10=Num 28, Prov 20, John 1
! 04.11=Num 29, 30, Prov 21, John 2, 3
! 04.12=Num 31, Prov 22, John 4
! 04.13=Num 32, Prov 23, John 5
! 04.14=Num 33, Prov 24, John 6
! 04.15=Num 34, Prov 25, John 7
! 04.16=Num 35, Prov 26, John 8
! 04.17=Num 36, Prov 27, John 9, 10
! 04.18=Deut 1, Prov 28, John 11
! 04.19=Deut 2, Prov 29, John 12
! 04.20=Deut 3, Prov 30, John 13, 14
! 04.21=Deut 4, Prov 31, John 15, 16
! 04.22=Deut 5, Eccl 1, John 17, 18
! 04.23=Deut 6, 7, Eccl 2, John 19
! 04.24=Deut 8, 9, Eccl 3, John 20, 21
! 04.25=Deut 10, 11, Eccl 4, Acts 1
! 04.26=Deut 12, Eccl 5, Acts 2
! 04.27=Deut 13, 14, Eccl 6, Acts 3, 4
! 04.28=Deut 15, Eccl 7, Acts 5, 6
! 04.29=Deut 16, Eccl 8, Acts 7
! 04.30=Deut 17, Eccl 9, Acts 8
! 05.01=Deut 18, Eccl 10, Acts 9
! 05.02=Deut 19, Eccl 11, Acts 10
! 05.03=Deut 20, Eccl 12, Acts 11, 12
! 05.04=Deut 21, Song 1, Acts 13
! 05.05=Deut 22, Song 2, Acts 14, 15
! 05.06=Deut 23, Song 3, Acts 16, 17
! 05.07=Deut 24, Song 4, Acts 18, 19
! 05.08=Deut 25, Song 5, Acts 20
! 05.09=Deut 26, Song 6, Acts 21, 22
! 05.10=Deut 27, Song 7, Acts 23, 24
! 05.11=Deut 28, Song 8, Acts 25, 26
! 05.12=Deut 29, Isa 1, Acts 27
! 05.13=Deut 30, Isa 2, Acts 28
! 05.14=Deut 31, Isa 3, 4, Col 1
! 05.15=Deut 32, Isa 5, Col 2
! 05.16=Deut 33, 34, Isa 6, Col 3, 4
! 05.17=Josh 1, Isa 7, 1Thess 1, 2
! 05.18=Josh 2, Isa 8, 1Thess 3, 4
! 05.19=Josh 3, 4, Isa 9, 1Thess 5
! 05.20=Josh 5, 6, Isa 10, 2Thess 1, 2
! 05.21=Josh 7, Isa 11, 2Thess 3
! 05.22=Josh 8, Isa 12, 1Tim 1 - 3
! 05.23=Josh 9, Isa 13, 1Tim 4, 5
! 05.24=Josh 10, Isa 14, 1Tim 6
! 05.25=Josh 11, Isa 15, 2Tim 1
! 05.26=Josh 12, Isa 16, 2Tim 2
! 05.27=Josh 13, Isa 17, 18, 2Tim 3, 4
! 05.28=Josh 14, Isa 19, Titus
! 05.29=Josh 15, Isa 20, 21, Phlm
! 05.30=Josh 16, Isa 22, Heb 1, 2
! 05.31=Josh 17, Isa 23, Heb 3 - 5
! 06.01=Josh 18, Isa 24, Heb 6, 7
! 06.02=Josh 19, Isa 25, Heb 8, 9
! 06.03=Josh 20, 21, Isa 26, 27, Heb 10
! 06.04=Josh 22, Isa 28, Heb 11
! 06.05=Josh 23, 24, Isa 29, Heb 12
! 06.06=Judg 1, Isa 30, Heb 13
! 06.07=Judg 2, 3, Isa 31, Jas 1
! 06.08=Judg 4, 5, Isa 32, Jas 2
! 06.09=Judg 6, Isa 33, Jas 3, 4
! 06.10=Judg 7, 8, Isa 34, Jas 5
! 06.11=Judg 9, Isa 35, 1Pet 1
! 06.12=Judg 10, 11, Isa 36, 1Pet 2
! 06.13=Judg 12, 13, Isa 37, 1Pet 3 - 5
! 06.14=Judg 14, 15, Isa 38, 2Pet 1, 2
! 06.15=Judg 16, Isa 39, 2Pet 3
! 06.16=Judg 17, 18, Isa 40, 1John 1, 2
! 06.17=Judg 19, Isa 41, 1John 3, 4
! 06.18=Judg 20, Isa 42, 1John 5
! 06.19=Judg 21, Isa 43, 2John, 3John
! 06.20=Ruth 1, 2, Isa 44, Jude
! 06.21=Ruth 3, 4, Isa 45, Rev 1, 2
! 06.22=1Sam 1, Isa 46, 47, Rev 3, 4
! 06.23=1Sam 2, Isa 48, Rev 5, 6
! 06.24=1Sam 3, Isa 49, Rev 7 - 9
! 06.25=1Sam 4, Isa 50, Rev 10, 11
! 06.26=1Sam 5, 6, Isa 51, Rev 12, 13
! 06.27=1Sam 7, 8, Isa 52, Rev 14
! 06.28=1Sam 9, Isa 53, Rev 15, 16
! 06.29=1Sam 10, Isa 54, Rev 17, 18
! 06.30=1Sam 11, 12, Isa 55, Rev 19, 20
! 07.01=1Sam 13, Isa 56, 57, Rev 21, 22
! 07.02=1Sam 14, Isa 58, Matt 1, 2
! 07.03=1Sam 15, Isa 59, Matt 3, 4
! 07.04=1Sam 16, Isa 60, Matt 5
! 07.05=1Sam 17, Isa 61, Matt 6
! 07.06=1Sam 18, Isa 62, Matt 7
! 07.07=1Sam 19, Isa 63, Matt 8
! 07.08=1Sam 20, Isa 64, Matt 9
! 07.09=1Sam 21, 22, Isa 65, Matt 10
! 07.10=1Sam 23, Isa 66, Matt 11
! 07.11=1Sam 24, Jer 1, Matt 12
! 07.12=1Sam 25, Jer 2, Matt 13
! 07.13=1Sam 26, 27, Jer 3, Matt 14
! 07.14=1Sam 28, Jer 4, Matt 15
! 07.15=1Sam 29, 30, Jer 5, Matt 16
! 07.16=1Sam 31, Jer 6, Matt 17
! 07.17=2Sam 1, Jer 7, Matt 18
! 07.18=2Sam 2, Jer 8, Matt 19
! 07.19=2Sam 3, Jer 9, Matt 20
! 07.20=2Sam 4, 5, Jer 10, Matt 21
! 07.21=2Sam 6, Jer 11, Matt 22
! 07.22=2Sam 7, Jer 12, Matt 23
! 07.23=2Sam 8, 9, Jer 13, Matt 24
! 07.24=2Sam 10, Jer 14, Matt 25
! 07.25=2Sam 11, Jer 15, Matt 26
! 07.26=2Sam 12, Jer 16, Matt 27
! 07.27=2Sam 13, Jer 17, Matt 28
! 07.28=2Sam 14, Jer 18, Rom 1, 2
! 07.29=2Sam 15, Jer 19, Rom 3, 4
! 07.30=2Sam 16, Jer 20, Rom 5, 6
! 07.31=2Sam 17, Jer 21, Rom 7, 8
! 08.01=2Sam 18, Jer 22, Rom 9
! 08.02=2Sam 19, Jer 23, Rom 10, 11
! 08.03=2Sam 20, 21, Jer 24, Rom 12
! 08.04=2Sam 22, Jer 25, Rom 12, 14
! 08.05=2Sam 23, Jer 26, Rom 15, 16
! 08.06=2Sam 24, Jer 27, Mark 1
! 08.07=1Kgs 1, Jer 28, Mark 2
! 08.08=1Kgs 2, Jer 29, Mark 3
! 08.09=1Kgs 3, Jer 30, Mark 4
! 08.10=1Kgs 4, 5, Jer 31, Mark 5
! 08.11=1Kgs 6, Jer 32, Mark 6
! 08.12=1Kgs 7, Jer 33, Mark 7
! 08.13=1Kgs 8, Jer 34, Mark 8
! 08.14=1Kgs 9, Jer 35, Mark 9
! 08.15=1Kgs 10, Jer 36, Mark 10
! 08.16=1Kgs 11, Jer 37, Mark 11
! 08.17=1Kgs 12, Jer 38, Mark 12
! 08.18=1Kgs 13, Jer 39, Mark 13
! 08.19=1Kgs 14, Jer 40, Mark 14
! 08.20=1Kgs 15, Jer 41, Mark 15
! 08.21=1Kgs 16, Jer 42, Mark 16
! 08.22=1Kgs 17, Jer 43, 1Cor 1, 2
! 08.23=1Kgs 18, Jer 44, 1Cor 3
! 08.24=1Kgs 19, Jer 45, 46, 1Cor 4, 5
! 08.25=1Kgs 20, Jer 47, 1Cor 6
! 08.26=1Kgs 21, Jer 48, 1Cor 7
! 08.27=1Kgs 22, Jer 49, 1Cor 8, 9
! 08.28=2Kgs 1, 2, Jer 50, 1Cor 10
! 08.29=2Kgs 3, Jer 51, 1Cor 11
! 08.30=2Kgs 4, Jer 52, 1Cor 12, 13
! 08.31=2Kgs 5, Lam 1, 1Cor 14
! 09.01=2Kgs 6, Lam 2, 1Cor 15
! 09.02=2Kgs 7, Lam 3, 1Cor 16
! 09.03=2Kgs 8, Lam 4, 2Cor 1, 2
! 09.04=2Kgs 9, Lam 5, 2Cor 3, 4
! 09.05=2Kgs 10, Ezek 1, 2Cor 5 - 7
! 09.06=2Kgs 11, 12, Ezek 2, 2Cor 8, 9
! 09.07=2Kgs 13, Ezek 3, 2Cor 10, 11
! 09.08=2Kgs 14, Ezek 4, 2Cor 12, 13
! 09.09=2Kgs 15, Ezek 5, Luke 1
! 09.10=2Kgs 16, Ezek 6, Luke 2
! 09.11=2Kgs 17, Ezek 7, Luke 3
! 09.12=2Kgs 18, Ezek 8, Luke 4
! 09.13=2Kgs 19, Ezek 9, Luke 5
! 09.14=2Kgs 20, Ezek 10, Luke 6
! 09.15=2Kgs 21, Ezek 11, Luke 7
! 09.16=2Kgs 22, 23, Ezek 12, Luke 8
! 09.17=2Kgs 24, 25, Ezek 13, Luke 9
! 09.18=1Chr 1, Ezek 14, Luke 10
! 09.19=1Chr 2, Ezek 15, Luke 11
! 09.20=1Chr 3, Ezek 16, Luke 12
! 09.21=1Chr 4, Ezek 17, Luke 13, 14
! 09.22=1Chr 5, Ezek 18, Luke 15
! 09.23=1Chr 6, Ezek 19, Luke 16
! 09.24=1Chr 7, Ezek 20, Luke 17
! 09.25=1Chr 8, Ezek 21, Luke 18
! 09.26=1Chr 9, Ezek 22, Luke 19
! 09.27=1Chr 10, Ezek 23, Luke 20
! 09.28=1Chr 11, Ezek 24, Luke 21
! 09.29=1Chr 12, Ezek 25, Luke 22
! 09.30=1Chr 13, 14, Ezek 26, Luke 23
! 10.01=1Chr 15, Ezek 27, Luke 24
! 10.02=1Chr 16, Ezek 28, Gal 1, 2
! 10.03=1Chr 17, Ezek 29, Gal 3, 4
! 10.04=1Chr 18, 19, Ezek 30, Gal 5, 6
! 10.05=1Chr 20, 21, Ezek 31, Eph 1, 2
! 10.06=1Chr 22, Ezek 32, Eph 3, 4
! 10.07=1Chr 23, Ezek 33, Eph 5, 6
! 10.08=1Chr 24, 25, Ezek 34, Phil 1, 2
! 10.09=1Chr 26, Ezek 35, Phil 3, 4
! 10.10=1Chr 27, Ezek 36, John 1
! 10.11=1Chr 28, Ezek 37, John 2, 3
! 10.12=1Chr 29, Ezek 38, John 4
! 10.13=2Chr 1, 2, Ezek 39, John 5
! 10.14=2Chr 3, 4, Ezek 40, John 6
! 10.15=2Chr 5, 6, Ezek 41, John 7
! 10.16=2Chr 7, Ezek 42, John 8
! 10.17=2Chr 8, Ezek 43, John 9, 10
! 10.18=2Chr 9, Ezek 44, John 11
! 10.19=2Chr 10, 11, Ezek 45, John 12
! 10.20=2Chr 12, 13, Ezek 46, John 13, 14
! 10.21=2Chr 14, 15, Ezek 47, John 15, 16
! 10.22=2Chr 16, 17, Ezek 48, John 17, 18
! 10.23=2Chr 18, 19, Dan 1, John 19
! 10.24=2Chr 20, Dan 2, John 20, 21
! 10.25=2Chr 21, 22, Dan 3, Acts 1
! 10.26=2Chr 23, Dan 4, Acts 2
! 10.27=2Chr 24, Dan 5, Acts 3, 4
! 10.28=2Chr 25, Dan 6, Acts 5, 6
! 10.29=2Chr 26, 27, Dan 7, Acts 7
! 10.30=2Chr 28, Dan 8, Acts 8
! 10.31=2Chr 29, Dan 9, Acts 9
! 11.01=2Chr 30, Dan 10, Acts 10
! 11.02=2Chr 31, Dan 11, Acts 11, 12
! 11.03=2Chr 32, Dan 12, Acts 13
! 11.04=2Chr 33, Hos 1, Acts 14, 15
! 11.05=2Chr 34, Hos 2, Acts 16, 17
! 11.06=2Chr 35, Hos 3, Acts 18, 19
! 11.07=2Chr 36, Hos 4, Acts 20
! 11.08=Ezra 1, 2, Hos 5, Acts 21, 22
! 11.09=Ezra 3, 4, Hos 6, Acts 23, 24
! 11.10=Ezra 5, 6, Hos 7, Acts 25, 26
! 11.11=Ezra 7, Hos 8, Acts 27
! 11.12=Ezra 8, Hos 9, Acts 28
! 11.13=Ezra 9, Hos 10, Col 1
! 11.14=Ezra 10, Hos 11, Col 2
! 11.15=Neh 1, 2, Hos 12, Col 3, 4
! 11.16=Neh 3, Hos 13, 1Thess 1, 2
! 11.17=Neh 4, Hos 14, 1Thess 3, 4
! 11.18=Neh 5, 6, Joel 1, 1Thess 5
! 11.19=Neh 7, Joel 2, 2Thess 1, 2
! 11.20=Neh 8, Joel 3, 2Thess 3
! 11.21=Neh 9, Amos 1, 1Tim 1, 2, 3
! 11.22=Neh 10, Amos 2, 1Tim 4, 5
! 11.23=Neh 11, Amos 3, 1Tim 6
! 11.24=Neh 12, Amos 4, 2Tim 1
! 11.25=Neh 13, Amos 5, 2Tim 2
! 11.26=Esth 1, Amos 6, 2Tim 3, 4
! 11.27=Esth 2, Amos 7, Titus 1 - 3
! 11.28=Esth 3, 4, Amos 8, Phlm 1
! 11.29=Esth 5, 6, Amos 9, Heb 1, 2
! 11.30=Esth 7, 8, Obad, Heb 3 - 5
! 12.01=Esth 9, 10, Jonah 1, Heb 6, 7
! 12.02=Job 1-2, Jonah 2, 3, Heb 8, 9
! 12.03=Job 3-4, Jonah 4, Heb 10
! 12.04=Job 5, Mic 1, Heb 11
! 12.05=Job 6-7, Mic 2, Heb 12
! 12.06=Job 8, Mic 3, 4, Heb 13
! 12.07=Job 9, Mic 5, Jas 1
! 12.08=Job 10, Mic 6, Jas 2
! 12.09=Job 11, Mic 7, Jas 3, 4
! 12.10=Job 12, Nah 1, 2, Jas 5
! 12.11=Job 13, Nah 3, 1Pet 1
! 12.12=Job 14, Hab 1, 1Pet 2
! 12.13=Job 15, Hab 2, 1Pet 3 - 5
! 12.14=Job 16-17, Hab 3, 2Pet 1, 2
! 12.15=Job 18-19, Zeph 1, 2Pet 3
! 12.16=Job 20, Zeph 2, 1John 1, 2
! 12.17=Job 21, Zeph 3, 1John 3, 4
! 12.18=Job 22, Hag 1, 2, 1John 5
! 12.19=Job 23-24, Zech 1, 2John, 3John
! 12.20=Job 24-26, Zech 2, 3, Jude
! 12.21=Job 28, Zech 4, 5, Rev 1, 2
! 12.22=Job 29, 30, Zech 6, 7, Rev 3, 4
! 12.23=Job 31, 32, Zech 8, Rev 5, 6
! 12.24=Job 33, Zech 9, Rev 7 - 9
! 12.25=Job 34, Zech 10, Rev 10, 11
! 12.26=Job 35, 36, Zech 11, Rev 12, 13
! 12.27=Job 37, Zech 12, Rev 14
! 12.28=Job 38, Zech 13, 14, Rev 15, 16
! 12.29=Job 39, Mal 1, Rev 17, 18
! 12.30=Job 40, Mal 2, Rev 19, 20
! 12.31=Job 41, 42, Mal 3, 4, Rev 21, 22
Index: ReadingsBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ReadingsBook.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ReadingsBook.java 13 Aug 2005 14:41:41 -0000 1.33
--- ReadingsBook.java 3 Jan 2006 13:25:34 -0000 1.34
***************
*** 88,104 ****
// We use 1972 because it is a leap year.
! GregorianCalendar greg = new GregorianCalendar(1972, Calendar.JANUARY, 1);
while (greg.get(Calendar.YEAR) == 1972)
{
! String key = KEYBASE + (1 + greg.get(Calendar.MONTH)) + "." + greg.get(Calendar.DATE); //$NON-NLS-1$
String readings = ""; //$NON-NLS-1$
try
{
! readings = prop.getString(key);
}
catch (MissingResourceException e)
{
! log.warn("Missing resource: " + key + " while parsing: " + setname); //$NON-NLS-1$ //$NON-NLS-2$
}
--- 88,104 ----
// We use 1972 because it is a leap year.
! Calendar greg = new GregorianCalendar(1972, Calendar.JANUARY, 1);
while (greg.get(Calendar.YEAR) == 1972)
{
! String internalKey = ReadingsKey.external2internal(greg);
String readings = ""; //$NON-NLS-1$
try
{
! readings = prop.getString(internalKey);
}
catch (MissingResourceException e)
{
! log.warn("Missing resource: " + internalKey + " while parsing: " + setname); //$NON-NLS-1$ //$NON-NLS-2$
}
***************
*** 245,253 ****
/**
- * The base for the keys in the properties file.
- */
- private static final String KEYBASE = "readings."; //$NON-NLS-1$
-
- /**
* The store of keys and data
*/
--- 245,248 ----
Index: ReadingsKey.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ReadingsKey.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ReadingsKey.java 27 Jul 2005 23:25:47 -0000 1.15
--- ReadingsKey.java 3 Jan 2006 13:25:34 -0000 1.16
***************
*** 23,28 ****
--- 23,30 ----
import java.text.DateFormat;
+ import java.text.MessageFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+ import java.util.Calendar;
import java.util.Date;
***************
*** 128,131 ****
--- 130,141 ----
}
+ public static String external2internal(Calendar externalKey)
+ {
+ Object[] objs = {new Integer(1 + externalKey.get(Calendar.MONTH)),
+ new Integer(externalKey.get(Calendar.DATE))};
+ return KEY_FORMAT.format(objs);
+
+ }
+
/**
* The day of the year for the readings
***************
*** 142,144 ****
--- 152,156 ----
NAME_DF.setLenient(true);
}
+
+ private static final MessageFormat KEY_FORMAT = new MessageFormat("{0,number,00}.{1,number,00}"); //$NON-NLS-1$
}
Index: ReadingsBookDriver.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ReadingsBookDriver.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ReadingsBookDriver.java 27 Jul 2005 23:25:47 -0000 1.20
--- ReadingsBookDriver.java 3 Jan 2006 13:25:34 -0000 1.21
***************
*** 49,53 ****
books = new Book[]
{
! new ReadingsBook(this, BookCategory.DICTIONARY),
};
}
--- 49,53 ----
books = new Book[]
{
! new ReadingsBook(this, BookCategory.DAILY_DEVOTIONS),
};
}
More information about the jsword-svn
mailing list