[sword-svn] r2752 - in trunk: src/keys tests/testsuite
scribe at crosswire.org
scribe at crosswire.org
Sat Dec 22 12:17:06 MST 2012
Author: scribe
Date: 2012-12-22 12:17:06 -0700 (Sat, 22 Dec 2012)
New Revision: 2752
Modified:
trunk/src/keys/versekey.cpp
trunk/tests/testsuite/verseparsing.good
trunk/tests/testsuite/verseparsing.sh
Log:
Added fix for BK.CH.VSf. syntax bug and cleaned up some {} problems which would have been avoided had we adhered to coding style (nudge)
Modified: trunk/src/keys/versekey.cpp
===================================================================
--- trunk/src/keys/versekey.cpp 2012-12-19 19:45:45 UTC (rev 2751)
+++ trunk/src/keys/versekey.cpp 2012-12-22 19:17:06 UTC (rev 2752)
@@ -544,8 +544,11 @@
if (buf[1] != ' ') { // for silly "Mat 1:1: this verse...."
number[tonumber] = 0;
tonumber = 0;
- if (*number)
- chap = atoi(number);
+ if (*number) {
+ if (chap >= 0)
+ verse = atoi(number);
+ else chap = atoi(number);
+ }
*number = 0;
comma = 0;
break;
@@ -774,19 +777,23 @@
case '}':
break;
case '.':
- if (buf > orig) // ignore (break) if preceeding char is not a digit
+ if (buf > orig) { // ignore (break) if preceeding char is not a digit
for (notAllDigits = tobook; notAllDigits; notAllDigits--) {
if ((!isdigit(book[notAllDigits-1])) && (!strchr(" .", book[notAllDigits-1])))
break;
}
if (!notAllDigits && !isdigit(buf[1]))
break;
+ }
number[tonumber] = 0;
tonumber = 0;
- if (*number)
- chap = atoi(number);
- *number = 0;
+ if (*number) {
+ if (chap >= 0)
+ verse = atoi(number);
+ else chap = atoi(number);
+ *number = 0;
+ }
break;
default:
@@ -830,7 +837,7 @@
if (*number) {
if (chap >= 0)
verse = atoi(number);
- else chap = atoi(number);
+ else chap = atoi(number);
}
*number = 0;
book[tobook] = 0;
Modified: trunk/tests/testsuite/verseparsing.good
===================================================================
--- trunk/tests/testsuite/verseparsing.good 2012-12-19 19:45:45 UTC (rev 2751)
+++ trunk/tests/testsuite/verseparsing.good 2012-12-22 19:17:06 UTC (rev 2752)
@@ -1,258 +1,265 @@
-jn.1.1-2.5,9,3;7.9 en KJV ge 1: John 1:1-John 2:5; John 2:9; John 2:3; John 7:9
-jn.1.1-2.5 en KJV ge 1: John 1:1-John 2:5
-1jn.2.3 en KJV ge 1: I John 2:3
-1 jn.2.3 en KJV ge 1: I John 2:3
-Ijn.2.3 en KJV ge 1: I John 2:3
-I jn.2.3 en KJV ge 1: I John 2:3
-1jn 2.3 en KJV ge 1: I John 2:3
-1 jn 2.3 en KJV ge 1: I John 2:3
-Ijn 2.3 en KJV ge 1: I John 2:3
-I jn 2.3 en KJV ge 1: I John 2:3
-1jn.2:3 en KJV ge 1: I John 2:3
-1 jn.2:3 en KJV ge 1: I John 2:3
-Ijn.2:3 en KJV ge 1: I John 2:3
-I jn.2:3 en KJV ge 1: I John 2:3
-1jn 2:3 en KJV ge 1: I John 2:3
-1 jn 2:3 en KJV ge 1: I John 2:3
-Ijn 2:3 en KJV ge 1: I John 2:3
-I jn 2:3 en KJV ge 1: I John 2:3
-1.jn.2.3 en KJV ge 1: I John 2:3
-1. jn.2.3 en KJV ge 1: I John 2:3
-I.jn.2.3 en KJV ge 1: I John 2:3
-I. jn.2.3 en KJV ge 1: I John 2:3
-1.jn 2.3 en KJV ge 1: I John 2:3
-1. jn 2.3 en KJV ge 1: I John 2:3
-I.jn 2.3 en KJV ge 1: I John 2:3
-I. jn 2.3 en KJV ge 1: I John 2:3
-1.jn.2:3 en KJV ge 1: I John 2:3
-1. jn.2:3 en KJV ge 1: I John 2:3
-I.jn.2:3 en KJV ge 1: I John 2:3
-I. jn.2:3 en KJV ge 1: I John 2:3
-1.jn 2:3 en KJV ge 1: I John 2:3
-1. jn 2:3 en KJV ge 1: I John 2:3
-I.jn 2:3 en KJV ge 1: I John 2:3
-I. jn 2:3 en KJV ge 1: I John 2:3
-1. Johannes 2:3 de KJV ge 1: 1. Johannes 2:3
-1. Johannes 1:1-3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
-1. Joh 1:1-3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
-1Jn 1:1-3:10 en KJV ge 1: I John 1:1-I John 3:10
-1. Johannes 1:1 - 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
-1. Joh 1:1 - 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
-1Jn 1:1 - 3:10 en KJV ge 1: I John 1:1-I John 3:10
-1. Johannes 1:1 -3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
-1. Joh 1:1 -3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
-1Jn 1:1 -3:10 en KJV ge 1: I John 1:1-I John 3:10
-1. Johannes 1:1- 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
-1. Joh 1:1- 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
-1Jn 1:1- 3:10 en KJV ge 1: I John 1:1-I John 3:10
-1Jn 1:1 3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1 3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1,3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1, 3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1 ,3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1 , 3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1;3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1; 3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1 ;3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1 ; 3:10 en KJV ge 1: I John 1:1; I John 3:10
-1Jn 1:1a ; 3:10b en KJV ge 1: I John 1:1a; I John 3:10b
-1Jn 1:1-2a; 3:10b-11 en KJV ge 1: I John 1:1-I John 1:2a; I John 3:10b-I John 3:11
-1Jn 1:1c;3:10d-12e,13 en KJV ge 1: I John 1:1c; I John 3:10d-I John 3:12e; I John 3:13
-Luke 2:45b-3:1a;3:1b-7;3:8-14;3:15-21a en KJV ge 1: Luke 2:45b-Luke 3:1a; Luke 3:1b-Luke 3:7; Luke 3:8-Luke 3:14; Luke 3:15-Luke 3:21a
-1Jn1.1f; 3:10ff en KJV ge 1: I John 1:1-I John 1:2; I John 3:10-I John 3:24
-1Jn1.1ff;3:10f en KJV ge 1: I John 1:1-I John 1:10; I John 3:10-I John 3:11
-1Jn1.1,8ff; 3:10-12,14f,17ff en KJV ge 1: I John 1:1; I John 1:8-I John 1:10; I John 3:10-I John 3:12; I John 3:14-I John 3:15; I John 3:17-I John 3:24
-Song of 3:5 en KJV ge 1: Song of Solomon 3:5
-Song of Sol 3:5 en KJV ge 1: Song of Solomon 3:5
-Revelation of John 1:1 en KJV ge 1: Revelation of John 1:1
-Gen en KJV ge 1: Genesis 1:1-Genesis 50:26
-Genes en KJV ge 1: Genesis 1:1-Genesis 50:26
-Exod en KJV ge 1: Exodus 1:1-Exodus 40:38
-Ex en KJV ge 1: Exodus 1:1-Exodus 40:38
-Exo en KJV ge 1: Exodus 1:1-Exodus 40:38
-Lev en KJV ge 1: Leviticus 1:1-Leviticus 27:34
-Le en KJV ge 1: Leviticus 1:1-Leviticus 27:34
-Levi en KJV ge 1: Leviticus 1:1-Leviticus 27:34
-Num en KJV ge 1: Numbers 1:1-Numbers 36:13
-Nu en KJV ge 1: Numbers 1:1-Numbers 36:13
-Numb en KJV ge 1: Numbers 1:1-Numbers 36:13
-Deut en KJV ge 1: Deuteronomy 1:1-Deuteronomy 34:12
-Deu en KJV ge 1: Deuteronomy 1:1-Deuteronomy 34:12
-De en KJV ge 1: Deuteronomy 1:1-Deuteronomy 34:12
-Josh en KJV ge 1: Joshua 1:1-Joshua 24:33
-Jos en KJV ge 1: Joshua 1:1-Joshua 24:33
-Joshu en KJV ge 1: Joshua 1:1-Joshua 24:33
-Judg en KJV ge 1: Judges 1:1-Judges 21:25
-Jdg en KJV ge 1: Judges 1:1-Judges 21:25
-Judge en KJV ge 1: Judges 1:1-Judges 21:25
-Ruth en KJV ge 1: Ruth 1:1-Ruth 4:22
-Ru en KJV ge 1: Ruth 1:1-Ruth 4:22
-Rut en KJV ge 1: Ruth 1:1-Ruth 4:22
-1Sam en KJV ge 1: I Samuel 1:1-I Samuel 31:13
-1Sa en KJV ge 1: I Samuel 1:1-I Samuel 31:13
-1Samu en KJV ge 1: I Samuel 1:1-I Samuel 31:13
-2Sam en KJV ge 1: II Samuel 1:1-II Samuel 24:25
-2Sa en KJV ge 1: II Samuel 1:1-II Samuel 24:25
-2Samu en KJV ge 1: II Samuel 1:1-II Samuel 24:25
-1Kgs en KJV ge 1: I Kings 1:1-I Kings 22:53
-1Ki en KJV ge 1: I Kings 1:1-I Kings 22:53
-1King en KJV ge 1: I Kings 1:1-I Kings 22:53
-2Kgs en KJV ge 1: II Kings 1:1-II Kings 25:30
-2Ki en KJV ge 1: II Kings 1:1-II Kings 25:30
-2King en KJV ge 1: II Kings 1:1-II Kings 25:30
-1Chr en KJV ge 1: I Chronicles 1:1-I Chronicles 29:30
-1Chron en KJV ge 1: I Chronicles 1:1-I Chronicles 29:30
-1Ch en KJV ge 1: I Chronicles 1:1-I Chronicles 29:30
-2Chr en KJV ge 1: II Chronicles 1:1-II Chronicles 36:23
-2Chron en KJV ge 1: II Chronicles 1:1-II Chronicles 36:23
-2Ch en KJV ge 1: II Chronicles 1:1-II Chronicles 36:23
-Ezra en KJV ge 1: Ezra 1:1-Ezra 10:44
-Ezr en KJV ge 1: Ezra 1:1-Ezra 10:44
-Neh en KJV ge 1: Nehemiah 1:1-Nehemiah 13:31
-Ne en KJV ge 1: Nehemiah 1:1-Nehemiah 13:31
-Nehe en KJV ge 1: Nehemiah 1:1-Nehemiah 13:31
-Esth en KJV ge 1: Esther 1:1-Esther 10:3
-Es en KJV ge 1: Esther 1:1-Esther 10:3
-Est en KJV ge 1: Esther 1:1-Esther 10:3
-Job en KJV ge 1: Job 1:1-Job 42:17
-Ps en KJV ge 1: Psalms 1:1-Psalms 150:6
-Psa en KJV ge 1: Psalms 1:1-Psalms 150:6
-Psalm en KJV ge 1: Psalms 1:1-Psalms 150:6
-Prov en KJV ge 1: Proverbs 1:1-Proverbs 31:31
-Pr en KJV ge 1: Proverbs 1:1-Proverbs 31:31
-Pro en KJV ge 1: Proverbs 1:1-Proverbs 31:31
-Eccl en KJV ge 1: Ecclesiastes 1:1-Ecclesiastes 12:14
-Ec en KJV ge 1: Ecclesiastes 1:1-Ecclesiastes 12:14
-Ecc en KJV ge 1: Ecclesiastes 1:1-Ecclesiastes 12:14
-Song en KJV ge 1: Song of Solomon 1:1-Song of Solomon 8:14
-So en KJV ge 1: Song of Solomon 1:1-Song of Solomon 8:14
-Son en KJV ge 1: Song of Solomon 1:1-Song of Solomon 8:14
-Isa en KJV ge 1: Isaiah 1:1-Isaiah 66:24
-Is en KJV ge 1: Isaiah 1:1-Isaiah 66:24
-Isai en KJV ge 1: Isaiah 1:1-Isaiah 66:24
-Jer en KJV ge 1: Jeremiah 1:1-Jeremiah 52:34
-Jere en KJV ge 1: Jeremiah 1:1-Jeremiah 52:34
-Je en KJV ge 1: Jeremiah 1:1-Jeremiah 52:34
-Lam en KJV ge 1: Lamentations 1:1-Lamentations 5:22
-La en KJV ge 1: Lamentations 1:1-Lamentations 5:22
-Lament en KJV ge 1: Lamentations 1:1-Lamentations 5:22
-Ezek en KJV ge 1: Ezekiel 1:1-Ezekiel 48:35
-Ez en KJV ge 1: Ezekiel 1:1-Ezekiel 48:35
-Eze en KJV ge 1: Ezekiel 1:1-Ezekiel 48:35
-Dan en KJV ge 1: Daniel 1:1-Daniel 12:13
-Dan en KJV ge 1: Daniel 1:1-Daniel 12:13
-Da en KJV ge 1: Daniel 1:1-Daniel 12:13
-Hos en KJV ge 1: Hosea 1:1-Hosea 14:9
-Hos en KJV ge 1: Hosea 1:1-Hosea 14:9
-Hose en KJV ge 1: Hosea 1:1-Hosea 14:9
-Joel en KJV ge 1: Joel 1:1-Joel 3:21
-Joe en KJV ge 1: Joel 1:1-Joel 3:21
-Amos en KJV ge 1: Amos 1:1-Amos 9:15
-Am en KJV ge 1: Amos 1:1-Amos 9:15
-Amo en KJV ge 1: Amos 1:1-Amos 9:15
-Obad en KJV ge 1: Obadiah 1:1-Obadiah 1:21
-Ob en KJV ge 1: Obadiah 1:1-Obadiah 1:21
-Oba en KJV ge 1: Obadiah 1:1-Obadiah 1:21
-Jonah en KJV ge 1: Jonah 1:1-Jonah 4:11
-Jon en KJV ge 1: Jonah 1:1-Jonah 4:11
-Jona en KJV ge 1: Jonah 1:1-Jonah 4:11
-Mic en KJV ge 1: Micah 1:1-Micah 7:20
-Mi en KJV ge 1: Micah 1:1-Micah 7:20
-Mica en KJV ge 1: Micah 1:1-Micah 7:20
-Nah en KJV ge 1: Nahum 1:1-Nahum 3:19
-Na en KJV ge 1: Nahum 1:1-Nahum 3:19
-Nahu en KJV ge 1: Nahum 1:1-Nahum 3:19
-Hab en KJV ge 1: Habakkuk 1:1-Habakkuk 3:19
-Haba en KJV ge 1: Habakkuk 1:1-Habakkuk 3:19
-Ha en KJV ge 1: Habakkuk 1:1-Habakkuk 3:19
-Zeph en KJV ge 1: Zephaniah 1:1-Zephaniah 3:20
-Zep en KJV ge 1: Zephaniah 1:1-Zephaniah 3:20
-Hag en KJV ge 1: Haggai 1:1-Haggai 2:23
-Hagg en KJV ge 1: Haggai 1:1-Haggai 2:23
-Zech en KJV ge 1: Zechariah 1:1-Zechariah 14:21
-Ze en KJV ge 1: Zechariah 1:1-Zechariah 14:21
-Zecha en KJV ge 1: Zechariah 1:1-Zechariah 14:21
-Mal en KJV ge 1: Malachi 1:1-Malachi 4:6
-Mala en KJV ge 1: Malachi 1:1-Malachi 4:6
-Matt en KJV ge 1: Matthew 1:1-Matthew 28:20
-Mt en KJV ge 1: Matthew 1:1-Matthew 28:20
-Mat en KJV ge 1: Matthew 1:1-Matthew 28:20
-Mark en KJV ge 1: Mark 1:1-Mark 16:20
-Mar en KJV ge 1: Mark 1:1-Mark 16:20
-Ma en KJV ge 1: Matthew 1:1-Matthew 28:20
-Luke en KJV ge 1: Luke 1:1-Luke 24:53
-Lk en KJV ge 1: Luke 1:1-Luke 24:53
-Luk en KJV ge 1: Luke 1:1-Luke 24:53
-John en KJV ge 1: John 1:1-John 21:25
-Joh en KJV ge 1: John 1:1-John 21:25
-Jn en KJV ge 1: John 1:1-John 21:25
-Acts en KJV ge 1: Acts 1:1-Acts 28:31
-Ac en KJV ge 1: Acts 1:1-Acts 28:31
-A en KJV ge 1: Acts 1:1-Acts 28:31
-Rom en KJV ge 1: Romans 1:1-Romans 16:27
-Ro en KJV ge 1: Romans 1:1-Romans 16:27
-Roma en KJV ge 1: Romans 1:1-Romans 16:27
-1Cor en KJV ge 1: I Corinthians 1:1-I Corinthians 16:24
-1Co en KJV ge 1: I Corinthians 1:1-I Corinthians 16:24
-1Cori en KJV ge 1: I Corinthians 1:1-I Corinthians 16:24
-2Cor en KJV ge 1: II Corinthians 1:1-II Corinthians 13:14
-2Co en KJV ge 1: II Corinthians 1:1-II Corinthians 13:14
-2Cori en KJV ge 1: II Corinthians 1:1-II Corinthians 13:14
-Gal en KJV ge 1: Galatians 1:1-Galatians 6:18
-Ga en KJV ge 1: Galatians 1:1-Galatians 6:18
-Gala en KJV ge 1: Galatians 1:1-Galatians 6:18
-Eph en KJV ge 1: Ephesians 1:1-Ephesians 6:24
-Ep en KJV ge 1: Ephesians 1:1-Ephesians 6:24
-Ephes en KJV ge 1: Ephesians 1:1-Ephesians 6:24
-Ph en KJV ge 1: Philippians 1:1-Philippians 4:23
-Phi en KJV ge 1: Philippians 1:1-Philippians 4:23
-Phil en KJV ge 1: Philippians 1:1-Philippians 4:23
-Phili en KJV ge 1: Philippians 1:1-Philippians 4:23
-Philip en KJV ge 1: Philippians 1:1-Philippians 4:23
-Col en KJV ge 1: Colossians 1:1-Colossians 4:18
-Co en KJV ge 1: Colossians 1:1-Colossians 4:18
-Colo en KJV ge 1: Colossians 1:1-Colossians 4:18
-1Thess en KJV ge 1: I Thessalonians 1:1-I Thessalonians 5:28
-1Th en KJV ge 1: I Thessalonians 1:1-I Thessalonians 5:28
-1Thes en KJV ge 1: I Thessalonians 1:1-I Thessalonians 5:28
-2Thess en KJV ge 1: II Thessalonians 1:1-II Thessalonians 3:18
-2Th en KJV ge 1: II Thessalonians 1:1-II Thessalonians 3:18
-2Thes en KJV ge 1: II Thessalonians 1:1-II Thessalonians 3:18
-1Tim en KJV ge 1: I Timothy 1:1-I Timothy 6:21
-1Ti en KJV ge 1: I Timothy 1:1-I Timothy 6:21
-1Timo en KJV ge 1: I Timothy 1:1-I Timothy 6:21
-2Tim en KJV ge 1: II Timothy 1:1-II Timothy 4:22
-2Ti en KJV ge 1: II Timothy 1:1-II Timothy 4:22
-2Timo en KJV ge 1: II Timothy 1:1-II Timothy 4:22
-Titus en KJV ge 1: Titus 1:1-Titus 3:15
-Tit en KJV ge 1: Titus 1:1-Titus 3:15
-Titu en KJV ge 1: Titus 1:1-Titus 3:15
-Phlm en KJV ge 1: Philemon 1:1-Philemon 1:25
-Phile en KJV ge 1: Philemon 1:1-Philemon 1:25
-Heb en KJV ge 1: Hebrews 1:1-Hebrews 13:25
-Hebrews en KJV ge 1: Hebrews 1:1-Hebrews 13:25
-Hebr en KJV ge 1: Hebrews 1:1-Hebrews 13:25
-Jas en KJV ge 1: James 1:1-James 5:20
-James en KJV ge 1: James 1:1-James 5:20
-Jam en KJV ge 1: James 1:1-James 5:20
-1Pet en KJV ge 1: I Peter 1:1-I Peter 5:14
-1Pe en KJV ge 1: I Peter 1:1-I Peter 5:14
-1Pete en KJV ge 1: I Peter 1:1-I Peter 5:14
-2Pet en KJV ge 1: II Peter 1:1-II Peter 3:18
-2Pe en KJV ge 1: II Peter 1:1-II Peter 3:18
-2Pete en KJV ge 1: II Peter 1:1-II Peter 3:18
-1John en KJV ge 1: I John 1:1-I John 5:21
-1Jn en KJV ge 1: I John 1:1-I John 5:21
-1J en KJV ge 1: I John 1:1-I John 5:21
-2John en KJV ge 1: II John 1:1-II John 1:13
-2Jn en KJV ge 1: II John 1:1-II John 1:13
-2J en KJV ge 1: II John 1:1-II John 1:13
-3John en KJV ge 1: III John 1:1-III John 1:14
-3Jn en KJV ge 1: III John 1:1-III John 1:14
-3J en KJV ge 1: III John 1:1-III John 1:14
-Jude en KJV ge 1: Jude 1:1-Jude 1:25
-Jud en KJV ge 1: Jude 1:1-Jude 1:25
-Ju en KJV ge 1: Jude 1:1-Jude 1:25
-Rev en KJV ge 1: Revelation of John 1:1-Revelation of John 22:21
-Re en KJV ge 1: Revelation of John 1:1-Revelation of John 22:21
-Reve en KJV ge 1: Revelation of John 1:1-Revelation of John 22:21
+Script failed at: (- bad output; + should have been)
+--- verseparsing.try 2012-12-22 12:11:04.507088412 -0700
++++ verseparsing.good 2012-12-22 12:11:04.519088517 -0700
+@@ -1,260 +1 @@
+-jn.1.1-2.5,9,3;7.9 en KJV ge 1: John 1:1-John 2:5; John 2:9; John 2:3; John 7:9
+-jn.1.1-2.5 en KJV ge 1: John 1:1-John 2:5
+-1jn.2.3 en KJV ge 1: I John 2:3
+-1 jn.2.3 en KJV ge 1: I John 2:3
+-Ijn.2.3 en KJV ge 1: I John 2:3
+-I jn.2.3 en KJV ge 1: I John 2:3
+-1jn 2.3 en KJV ge 1: I John 2:3
+-1 jn 2.3 en KJV ge 1: I John 2:3
+-Ijn 2.3 en KJV ge 1: I John 2:3
+-I jn 2.3 en KJV ge 1: I John 2:3
+-1jn.2:3 en KJV ge 1: I John 2:3
+-1 jn.2:3 en KJV ge 1: I John 2:3
+-Ijn.2:3 en KJV ge 1: I John 2:3
+-I jn.2:3 en KJV ge 1: I John 2:3
+-1jn 2:3 en KJV ge 1: I John 2:3
+-1 jn 2:3 en KJV ge 1: I John 2:3
+-Ijn 2:3 en KJV ge 1: I John 2:3
+-I jn 2:3 en KJV ge 1: I John 2:3
+-1.jn.2.3 en KJV ge 1: I John 2:3
+-1. jn.2.3 en KJV ge 1: I John 2:3
+-I.jn.2.3 en KJV ge 1: I John 2:3
+-I. jn.2.3 en KJV ge 1: I John 2:3
+-1.jn 2.3 en KJV ge 1: I John 2:3
+-1. jn 2.3 en KJV ge 1: I John 2:3
+-I.jn 2.3 en KJV ge 1: I John 2:3
+-I. jn 2.3 en KJV ge 1: I John 2:3
+-1.jn.2:3 en KJV ge 1: I John 2:3
+-1. jn.2:3 en KJV ge 1: I John 2:3
+-I.jn.2:3 en KJV ge 1: I John 2:3
+-I. jn.2:3 en KJV ge 1: I John 2:3
+-1.jn 2:3 en KJV ge 1: I John 2:3
+-1. jn 2:3 en KJV ge 1: I John 2:3
+-I.jn 2:3 en KJV ge 1: I John 2:3
+-I. jn 2:3 en KJV ge 1: I John 2:3
+-1. Johannes 2:3 de KJV ge 1: 1. Johannes 2:3
+-1. Johannes 1:1-3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+-1. Joh 1:1-3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+-1Jn 1:1-3:10 en KJV ge 1: I John 1:1-I John 3:10
+-1. Johannes 1:1 - 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+-1. Joh 1:1 - 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+-1Jn 1:1 - 3:10 en KJV ge 1: I John 1:1-I John 3:10
+-1. Johannes 1:1 -3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+-1. Joh 1:1 -3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+-1Jn 1:1 -3:10 en KJV ge 1: I John 1:1-I John 3:10
+-1. Johannes 1:1- 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+-1. Joh 1:1- 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+-1Jn 1:1- 3:10 en KJV ge 1: I John 1:1-I John 3:10
+-1Jn 1:1 3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1 3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1,3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1, 3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1 ,3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1 , 3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1;3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1; 3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1 ;3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1 ; 3:10 en KJV ge 1: I John 1:1; I John 3:10
+-1Jn 1:1a ; 3:10b en KJV ge 1: I John 1:1a; I John 3:10b
+-1Jn 1:1-2a; 3:10b-11 en KJV ge 1: I John 1:1-I John 1:2a; I John 3:10b-I John 3:11
+-1Jn 1:1c;3:10d-12e,13 en KJV ge 1: I John 1:1c; I John 3:10d-I John 3:12e; I John 3:13
+-Luke 2:45b-3:1a;3:1b-7;3:8-14;3:15-21a en KJV ge 1: Luke 2:45b-Luke 3:1a; Luke 3:1b-Luke 3:7; Luke 3:8-Luke 3:14; Luke 3:15-Luke 3:21a
+-1Jn1.1f; 3:10ff en KJV ge 1: I John 1:1-I John 1:2; I John 3:10-I John 3:24
+-1Jn1.1ff;3:10f en KJV ge 1: I John 1:1-I John 1:10; I John 3:10-I John 3:11
+-1Jn1.1,8ff; 3:10-12,14f,17ff en KJV ge 1: I John 1:1; I John 1:8-I John 1:10; I John 3:10-I John 3:12; I John 3:14-I John 3:15; I John 3:17-I John 3:24
+-1Jn2.3f. en KJV ge 1: I John 2:3-I John 2:4
+-1Jn2.3ff. en KJV ge 1: I John 2:3-I John 2:29
+-Song of 3:5 en KJV ge 1: Song of Solomon 3:5
+-Song of Sol 3:5 en KJV ge 1: Song of Solomon 3:5
+-Revelation of John 1:1 en KJV ge 1: Revelation of John 1:1
+-Gen en KJV ge 1: Genesis 1:1-Genesis 50:26
+-Genes en KJV ge 1: Genesis 1:1-Genesis 50:26
+-Exod en KJV ge 1: Exodus 1:1-Exodus 40:38
+-Ex en KJV ge 1: Exodus 1:1-Exodus 40:38
+-Exo en KJV ge 1: Exodus 1:1-Exodus 40:38
+-Lev en KJV ge 1: Leviticus 1:1-Leviticus 27:34
+-Le en KJV ge 1: Leviticus 1:1-Leviticus 27:34
+-Levi en KJV ge 1: Leviticus 1:1-Leviticus 27:34
+-Num en KJV ge 1: Numbers 1:1-Numbers 36:13
+-Nu en KJV ge 1: Numbers 1:1-Numbers 36:13
+-Numb en KJV ge 1: Numbers 1:1-Numbers 36:13
+-Deut en KJV ge 1: Deuteronomy 1:1-Deuteronomy 34:12
+-Deu en KJV ge 1: Deuteronomy 1:1-Deuteronomy 34:12
+-De en KJV ge 1: Deuteronomy 1:1-Deuteronomy 34:12
+-Josh en KJV ge 1: Joshua 1:1-Joshua 24:33
+-Jos en KJV ge 1: Joshua 1:1-Joshua 24:33
+-Joshu en KJV ge 1: Joshua 1:1-Joshua 24:33
+-Judg en KJV ge 1: Judges 1:1-Judges 21:25
+-Jdg en KJV ge 1: Judges 1:1-Judges 21:25
+-Judge en KJV ge 1: Judges 1:1-Judges 21:25
+-Ruth en KJV ge 1: Ruth 1:1-Ruth 4:22
+-Ru en KJV ge 1: Ruth 1:1-Ruth 4:22
+-Rut en KJV ge 1: Ruth 1:1-Ruth 4:22
+-1Sam en KJV ge 1: I Samuel 1:1-I Samuel 31:13
+-1Sa en KJV ge 1: I Samuel 1:1-I Samuel 31:13
+-1Samu en KJV ge 1: I Samuel 1:1-I Samuel 31:13
+-2Sam en KJV ge 1: II Samuel 1:1-II Samuel 24:25
+-2Sa en KJV ge 1: II Samuel 1:1-II Samuel 24:25
+-2Samu en KJV ge 1: II Samuel 1:1-II Samuel 24:25
+-1Kgs en KJV ge 1: I Kings 1:1-I Kings 22:53
+-1Ki en KJV ge 1: I Kings 1:1-I Kings 22:53
+-1King en KJV ge 1: I Kings 1:1-I Kings 22:53
+-2Kgs en KJV ge 1: II Kings 1:1-II Kings 25:30
+-2Ki en KJV ge 1: II Kings 1:1-II Kings 25:30
+-2King en KJV ge 1: II Kings 1:1-II Kings 25:30
+-1Chr en KJV ge 1: I Chronicles 1:1-I Chronicles 29:30
+-1Chron en KJV ge 1: I Chronicles 1:1-I Chronicles 29:30
+-1Ch en KJV ge 1: I Chronicles 1:1-I Chronicles 29:30
+-2Chr en KJV ge 1: II Chronicles 1:1-II Chronicles 36:23
+-2Chron en KJV ge 1: II Chronicles 1:1-II Chronicles 36:23
+-2Ch en KJV ge 1: II Chronicles 1:1-II Chronicles 36:23
+-Ezra en KJV ge 1: Ezra 1:1-Ezra 10:44
+-Ezr en KJV ge 1: Ezra 1:1-Ezra 10:44
+-Neh en KJV ge 1: Nehemiah 1:1-Nehemiah 13:31
+-Ne en KJV ge 1: Nehemiah 1:1-Nehemiah 13:31
+-Nehe en KJV ge 1: Nehemiah 1:1-Nehemiah 13:31
+-Esth en KJV ge 1: Esther 1:1-Esther 10:3
+-Es en KJV ge 1: Esther 1:1-Esther 10:3
+-Est en KJV ge 1: Esther 1:1-Esther 10:3
+-Job en KJV ge 1: Job 1:1-Job 42:17
+-Ps en KJV ge 1: Psalms 1:1-Psalms 150:6
+-Psa en KJV ge 1: Psalms 1:1-Psalms 150:6
+-Psalm en KJV ge 1: Psalms 1:1-Psalms 150:6
+-Prov en KJV ge 1: Proverbs 1:1-Proverbs 31:31
+-Pr en KJV ge 1: Proverbs 1:1-Proverbs 31:31
+-Pro en KJV ge 1: Proverbs 1:1-Proverbs 31:31
+-Eccl en KJV ge 1: Ecclesiastes 1:1-Ecclesiastes 12:14
+-Ec en KJV ge 1: Ecclesiastes 1:1-Ecclesiastes 12:14
+-Ecc en KJV ge 1: Ecclesiastes 1:1-Ecclesiastes 12:14
+-Song en KJV ge 1: Song of Solomon 1:1-Song of Solomon 8:14
+-So en KJV ge 1: Song of Solomon 1:1-Song of Solomon 8:14
+-Son en KJV ge 1: Song of Solomon 1:1-Song of Solomon 8:14
+-Isa en KJV ge 1: Isaiah 1:1-Isaiah 66:24
+-Is en KJV ge 1: Isaiah 1:1-Isaiah 66:24
+-Isai en KJV ge 1: Isaiah 1:1-Isaiah 66:24
+-Jer en KJV ge 1: Jeremiah 1:1-Jeremiah 52:34
+-Jere en KJV ge 1: Jeremiah 1:1-Jeremiah 52:34
+-Je en KJV ge 1: Jeremiah 1:1-Jeremiah 52:34
+-Lam en KJV ge 1: Lamentations 1:1-Lamentations 5:22
+-La en KJV ge 1: Lamentations 1:1-Lamentations 5:22
+-Lament en KJV ge 1: Lamentations 1:1-Lamentations 5:22
+-Ezek en KJV ge 1: Ezekiel 1:1-Ezekiel 48:35
+-Ez en KJV ge 1: Ezekiel 1:1-Ezekiel 48:35
+-Eze en KJV ge 1: Ezekiel 1:1-Ezekiel 48:35
+-Dan en KJV ge 1: Daniel 1:1-Daniel 12:13
+-Dan en KJV ge 1: Daniel 1:1-Daniel 12:13
+-Da en KJV ge 1: Daniel 1:1-Daniel 12:13
+-Hos en KJV ge 1: Hosea 1:1-Hosea 14:9
+-Hos en KJV ge 1: Hosea 1:1-Hosea 14:9
+-Hose en KJV ge 1: Hosea 1:1-Hosea 14:9
+-Joel en KJV ge 1: Joel 1:1-Joel 3:21
+-Joe en KJV ge 1: Joel 1:1-Joel 3:21
+-Amos en KJV ge 1: Amos 1:1-Amos 9:15
+-Am en KJV ge 1: Amos 1:1-Amos 9:15
+-Amo en KJV ge 1: Amos 1:1-Amos 9:15
+-Obad en KJV ge 1: Obadiah 1:1-Obadiah 1:21
+-Ob en KJV ge 1: Obadiah 1:1-Obadiah 1:21
+-Oba en KJV ge 1: Obadiah 1:1-Obadiah 1:21
+-Jonah en KJV ge 1: Jonah 1:1-Jonah 4:11
+-Jon en KJV ge 1: Jonah 1:1-Jonah 4:11
+-Jona en KJV ge 1: Jonah 1:1-Jonah 4:11
+-Mic en KJV ge 1: Micah 1:1-Micah 7:20
+-Mi en KJV ge 1: Micah 1:1-Micah 7:20
+-Mica en KJV ge 1: Micah 1:1-Micah 7:20
+-Nah en KJV ge 1: Nahum 1:1-Nahum 3:19
+-Na en KJV ge 1: Nahum 1:1-Nahum 3:19
+-Nahu en KJV ge 1: Nahum 1:1-Nahum 3:19
+-Hab en KJV ge 1: Habakkuk 1:1-Habakkuk 3:19
+-Haba en KJV ge 1: Habakkuk 1:1-Habakkuk 3:19
+-Ha en KJV ge 1: Habakkuk 1:1-Habakkuk 3:19
+-Zeph en KJV ge 1: Zephaniah 1:1-Zephaniah 3:20
+-Zep en KJV ge 1: Zephaniah 1:1-Zephaniah 3:20
+-Hag en KJV ge 1: Haggai 1:1-Haggai 2:23
+-Hagg en KJV ge 1: Haggai 1:1-Haggai 2:23
+-Zech en KJV ge 1: Zechariah 1:1-Zechariah 14:21
+-Ze en KJV ge 1: Zechariah 1:1-Zechariah 14:21
+-Zecha en KJV ge 1: Zechariah 1:1-Zechariah 14:21
+-Mal en KJV ge 1: Malachi 1:1-Malachi 4:6
+-Mala en KJV ge 1: Malachi 1:1-Malachi 4:6
+-Matt en KJV ge 1: Matthew 1:1-Matthew 28:20
+-Mt en KJV ge 1: Matthew 1:1-Matthew 28:20
+-Mat en KJV ge 1: Matthew 1:1-Matthew 28:20
+-Mark en KJV ge 1: Mark 1:1-Mark 16:20
+-Mar en KJV ge 1: Mark 1:1-Mark 16:20
+-Ma en KJV ge 1: Matthew 1:1-Matthew 28:20
+-Luke en KJV ge 1: Luke 1:1-Luke 24:53
+-Lk en KJV ge 1: Luke 1:1-Luke 24:53
+-Luk en KJV ge 1: Luke 1:1-Luke 24:53
+-John en KJV ge 1: John 1:1-John 21:25
+-Joh en KJV ge 1: John 1:1-John 21:25
+-Jn en KJV ge 1: John 1:1-John 21:25
+-Acts en KJV ge 1: Acts 1:1-Acts 28:31
+-Ac en KJV ge 1: Acts 1:1-Acts 28:31
+-A en KJV ge 1: Acts 1:1-Acts 28:31
+-Rom en KJV ge 1: Romans 1:1-Romans 16:27
+-Ro en KJV ge 1: Romans 1:1-Romans 16:27
+-Roma en KJV ge 1: Romans 1:1-Romans 16:27
+-1Cor en KJV ge 1: I Corinthians 1:1-I Corinthians 16:24
+-1Co en KJV ge 1: I Corinthians 1:1-I Corinthians 16:24
+-1Cori en KJV ge 1: I Corinthians 1:1-I Corinthians 16:24
+-2Cor en KJV ge 1: II Corinthians 1:1-II Corinthians 13:14
+-2Co en KJV ge 1: II Corinthians 1:1-II Corinthians 13:14
+-2Cori en KJV ge 1: II Corinthians 1:1-II Corinthians 13:14
+-Gal en KJV ge 1: Galatians 1:1-Galatians 6:18
+-Ga en KJV ge 1: Galatians 1:1-Galatians 6:18
+-Gala en KJV ge 1: Galatians 1:1-Galatians 6:18
+-Eph en KJV ge 1: Ephesians 1:1-Ephesians 6:24
+-Ep en KJV ge 1: Ephesians 1:1-Ephesians 6:24
+-Ephes en KJV ge 1: Ephesians 1:1-Ephesians 6:24
+-Ph en KJV ge 1: Philippians 1:1-Philippians 4:23
+-Phi en KJV ge 1: Philippians 1:1-Philippians 4:23
+-Phil en KJV ge 1: Philippians 1:1-Philippians 4:23
+-Phili en KJV ge 1: Philippians 1:1-Philippians 4:23
+-Philip en KJV ge 1: Philippians 1:1-Philippians 4:23
+-Col en KJV ge 1: Colossians 1:1-Colossians 4:18
+-Co en KJV ge 1: Colossians 1:1-Colossians 4:18
+-Colo en KJV ge 1: Colossians 1:1-Colossians 4:18
+-1Thess en KJV ge 1: I Thessalonians 1:1-I Thessalonians 5:28
+-1Th en KJV ge 1: I Thessalonians 1:1-I Thessalonians 5:28
+-1Thes en KJV ge 1: I Thessalonians 1:1-I Thessalonians 5:28
+-2Thess en KJV ge 1: II Thessalonians 1:1-II Thessalonians 3:18
+-2Th en KJV ge 1: II Thessalonians 1:1-II Thessalonians 3:18
+-2Thes en KJV ge 1: II Thessalonians 1:1-II Thessalonians 3:18
+-1Tim en KJV ge 1: I Timothy 1:1-I Timothy 6:21
+-1Ti en KJV ge 1: I Timothy 1:1-I Timothy 6:21
+-1Timo en KJV ge 1: I Timothy 1:1-I Timothy 6:21
+-2Tim en KJV ge 1: II Timothy 1:1-II Timothy 4:22
+-2Ti en KJV ge 1: II Timothy 1:1-II Timothy 4:22
+-2Timo en KJV ge 1: II Timothy 1:1-II Timothy 4:22
+-Titus en KJV ge 1: Titus 1:1-Titus 3:15
+-Tit en KJV ge 1: Titus 1:1-Titus 3:15
+-Titu en KJV ge 1: Titus 1:1-Titus 3:15
+-Phlm en KJV ge 1: Philemon 1:1-Philemon 1:25
+-Phile en KJV ge 1: Philemon 1:1-Philemon 1:25
+-Heb en KJV ge 1: Hebrews 1:1-Hebrews 13:25
+-Hebrews en KJV ge 1: Hebrews 1:1-Hebrews 13:25
+-Hebr en KJV ge 1: Hebrews 1:1-Hebrews 13:25
+-Jas en KJV ge 1: James 1:1-James 5:20
+-James en KJV ge 1: James 1:1-James 5:20
+-Jam en KJV ge 1: James 1:1-James 5:20
+-1Pet en KJV ge 1: I Peter 1:1-I Peter 5:14
+-1Pe en KJV ge 1: I Peter 1:1-I Peter 5:14
+-1Pete en KJV ge 1: I Peter 1:1-I Peter 5:14
+-2Pet en KJV ge 1: II Peter 1:1-II Peter 3:18
+-2Pe en KJV ge 1: II Peter 1:1-II Peter 3:18
+-2Pete en KJV ge 1: II Peter 1:1-II Peter 3:18
+-1John en KJV ge 1: I John 1:1-I John 5:21
+-1Jn en KJV ge 1: I John 1:1-I John 5:21
+-1J en KJV ge 1: I John 1:1-I John 5:21
+-2John en KJV ge 1: II John 1:1-II John 1:13
+-2Jn en KJV ge 1: II John 1:1-II John 1:13
+-2J en KJV ge 1: II John 1:1-II John 1:13
+-3John en KJV ge 1: III John 1:1-III John 1:14
+-3Jn en KJV ge 1: III John 1:1-III John 1:14
+-3J en KJV ge 1: III John 1:1-III John 1:14
+-Jude en KJV ge 1: Jude 1:1-Jude 1:25
+-Jud en KJV ge 1: Jude 1:1-Jude 1:25
+-Ju en KJV ge 1: Jude 1:1-Jude 1:25
+-Rev en KJV ge 1: Revelation of John 1:1-Revelation of John 22:21
+-Re en KJV ge 1: Revelation of John 1:1-Revelation of John 22:21
+-Reve en KJV ge 1: Revelation of John 1:1-Revelation of John 22:21
++Script failed at: (- bad output; + should have been)
Modified: trunk/tests/testsuite/verseparsing.sh
===================================================================
--- trunk/tests/testsuite/verseparsing.sh 2012-12-19 19:45:45 UTC (rev 2751)
+++ trunk/tests/testsuite/verseparsing.sh 2012-12-22 19:17:06 UTC (rev 2752)
@@ -93,6 +93,8 @@
../parsekey "1Jn1.1f; 3:10ff" en KJV ge 1
../parsekey "1Jn1.1ff;3:10f" en KJV ge 1
../parsekey "1Jn1.1,8ff; 3:10-12,14f,17ff" en KJV ge 1
+../parsekey "1Jn2.3f." en KJV ge 1
+../parsekey "1Jn2.3ff." en KJV ge 1
### check for 'f' in book name which might trigger 'and following'
../parsekey "Song of 3:5" en KJV ge 1
More information about the sword-cvs
mailing list