[sword-svn] r2153 - in trunk: . locales.d src/modules/common src/modules/filters
scribe at www.crosswire.org
scribe at www.crosswire.org
Sun May 11 18:54:41 MST 2008
Author: scribe
Date: 2008-05-11 18:54:41 -0700 (Sun, 11 May 2008)
New Revision: 2153
Added:
trunk/locales.d/fr_abbrev-utf8.conf
trunk/locales.d/fr_abbrev.conf
Modified:
trunk/ChangeLog
trunk/locales.d/fa-utf8.conf
trunk/locales.d/fr-utf8.conf
trunk/locales.d/fr.conf
trunk/src/modules/common/rawstr.cpp
trunk/src/modules/common/rawstr4.cpp
trunk/src/modules/filters/osishtmlhref.cpp
trunk/src/modules/filters/osisplain.cpp
Log:
Applied patch to better handle x-refs in notes
-Ben Morgan <benpmorgan at gmail dot com>
Applied patch to better output OSIS in plaintext
-Ben Morgan <benpmorgan at gmail dot com>
Updated rawstr and rawstr4 to work consistently
with buffer sizes
Updated French locales and added french abbrev
locales from Dominique Corbex
<dominique dot corbex at gmail dot com>
Updated Farsi locales from Peter von Kaehne
<refdoc at gmx dot net>
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-04 03:52:06 UTC (rev 2152)
+++ trunk/ChangeLog 2008-05-12 01:54:41 UTC (rev 2153)
@@ -1,5 +1,18 @@
API ChangeLog
+11-May-2008 Troy A. Griffitts <scribe at crosswire.org>
+ Applied patch to better handle x-refs in notes
+ -Ben Morgan <benpmorgan at gmail dot com>
+ Applied patch to better output OSIS in plaintext
+ -Ben Morgan <benpmorgan at gmail dot com>
+ Updated rawstr and rawstr4 to work consistently
+ with buffer sizes
+ Updated French locales and added french abbrev
+ locales from Dominique Corbex
+ <dominique dot corbex at gmail dot com>
+ Updated Farsi locales from Peter von Kaehne
+ <refdoc at gmx dot net>
+
16-Oct-2007 Troy A. Griffitts <scribe at crosswire.org>
Implemented a basic TreeKeyIdx::remove() method
Modified: trunk/locales.d/fa-utf8.conf
===================================================================
--- trunk/locales.d/fa-utf8.conf 2008-05-04 03:52:06 UTC (rev 2152)
+++ trunk/locales.d/fa-utf8.conf 2008-05-12 01:54:41 UTC (rev 2153)
@@ -16,8 +16,8 @@
Joshua=یوشع
Judges=داوران
Ruth=روت
-I Samuel=اول سمو‌ییل
-II Samuel=دوم سموییل
+I Samuel=اول سموئیل
+II Samuel=دوم سموئیل
I Kings=اول پادشاهان
II Kings=دوم پادشاهان
I Chronicles=اول تواریخ
@@ -29,7 +29,7 @@
Psalms=مزامیر
Proverbs=امثال سلیمان
Ecclesiastes=جامعه
-Song of Solomon=غزل غزلها
+Song of Solomon=غزل غزلهای سلیمان
Isaiah=اشعیا
Jeremiah=ارمیا
Lamentations=مراثی ارمیا
@@ -61,8 +61,8 @@
Colossians=کولسیان
I Thessalonians=اول تسالونکیان
II Thessalonians=دوم تسالونکیان
-I Timothy=اول تیموتایوس
-II Timothy=اوم تیموتایوس
+I Timothy=اول تیموتاو‌ٔس
+II Timothy=اوم تیموتاو‌ٔس
Titus=تیطوس
Philemon=Ùلیمون
Hebrews=عبرانیان
@@ -73,7 +73,7 @@
II John=دوم یوØنا
III John=سوم یوØنا
Jude=یهودا
-Revelation of John=مکاشÙÙ‡
+Revelation of John=مکاشÙÙ‡ یوØنا
[Book Abbrevs]
1 C=46
Modified: trunk/locales.d/fr-utf8.conf
===================================================================
--- trunk/locales.d/fr-utf8.conf 2008-05-04 03:52:06 UTC (rev 2152)
+++ trunk/locales.d/fr-utf8.conf 2008-05-12 01:54:41 UTC (rev 2153)
@@ -26,7 +26,7 @@
Proverbs=Proverbes
Ecclesiastes=Ecclésiaste
Song of Solomon=Cantique des cantiques
-Isaiah=Esaïe
+Isaiah=Ésaïe
Jeremiah=Jérémie
Lamentations=Lamentations de Jérémie
Ezekiel=Ézéchiel
@@ -52,7 +52,7 @@
I Corinthians=1 Corinthiens
II Corinthians=2 Corinthiens
Galatians=Galates
-Ephesians=Ephésiens
+Ephesians=Éphésiens
Philippians=Philippiens
Colossians=Colossiens
I Thessalonians=1 Thessaloniciens
@@ -134,7 +134,7 @@
D=5
DANIEL=27
DEUTERONOMY=5
-E=49
+E=2
ECCLESIASTES=21
EPHESIANS=49
ESTER=17
@@ -325,114 +325,118 @@
APOCALYPSE=66
1 C=46
+1C=46
1 CH=13
+1CH=13
1 CHR=13
+1CHR=13
1 CHRO=13
+1CHRO=13
1 CO=46
+1CO=46
1 COR=46
+1COR=46
1 J=62
+1J=62
1 JE=62
+1JE=62
1 JEA=62
+1JEA=62
1 JN=62
+1JN=62
1 P=60
+1P=60
1 PI=60
+1PI=60
1 PIE=60
+1PIE=60
1 R=11
+1R=11
1 RO=11
+1RO=11
1 ROI=11
+1ROI=11
1 S=9
+1S=9
1 SA=9
+1SA=9
1 SAM=9
+1SAM=9
1 T=52
+1T=52
1 TH=52
+1TH=52
1 THE=52
+1THE=52
1 TI=54
+1TI=54
1 TIM=54
-1 TIMOTHEE=52
-1C=46
-1CH=13
-1CHR=13
-1CHRO=13
-1CO=46
-1COR=46
-1J=62
-1JE=62
-1JEA=62
-1JN=62
-1P=60
-1PI=60
-1PIE=60
-1R=11
-1RO=11
-1ROI=11
-1S=9
-1SA=9
-1SAM=9
-1T=52
-1TH=52
-1THE=52
-1TI=54
1TIM=54
-1TIMOTHEE=52
+1 TIMOTHEE=54
+1TIMOTHEE=54
+1 TM=54
+1TM=54
2 C=47
+2C=47
2 CH=14
+2CH=14
2 CHR=14
+2CHR=14
2 CHRO=14
+2CHRO=14
2 CO=47
+2CO=47
2 COR=47
+2COR=47
2 J=63
+2J=63
2 JE=63
+2JE=63
2 JEA=63
+2JEA=63
2 JN=63
+2JN=63
2 P=61
+2P=61
2 PI=61
+2PI=61
2 PIE=61
+2PIE=61
2 R=12
+2R=12
2 RO=12
+2RO=12
2 ROI=12
+2ROI=12
2 S=10
+2S=10
2 SA=10
+2SA=10
2 SAM=10
+2SAM=10
2 T=53
+2T=53
2 TH=53
+2TH=53
2 THE=53
+2THE=53
2 TI=55
+2TI=55
2 TIM=55
-2 TIMOTHEE=53
-2C=47
-2CH=14
-2CHR=14
-2CHRO=14
-2CO=47
-2COR=47
-2J=63
-2JE=63
-2JEA=63
-2JN=63
-2P=61
-2PI=61
-2PIE=61
-2R=12
-2RO=12
-2ROI=12
-2S=10
-2SA=10
-2SAM=10
-2T=53
-2TH=53
-2THE=53
-2TI=55
2TIM=55
-2TIMOTHEE=53
+2 TIMOTHEE=55
+2TIMOTHEE=55
+2 TM=55
+2TM=55
3 J=64
+3J=64
3 JE=64
+3JE=64
3 JEA=64
+3JEA=64
3 JN=64
-3J=64
-3JE=64
-3JEA=64
3JN=64
-A=30
+A=44
AB=31
ABD=31
ABDI=31
@@ -449,7 +453,7 @@
AP=66
APO=66
APOC=66
-C=22
+B=58
CA=22
CAN=22
CANT=22
@@ -458,7 +462,6 @@
COL=51
COLO=51
CT=22
-D=5
DA=27
DAN=27
DANI=27
@@ -467,42 +470,58 @@
DEUT=5
DEUTERONOME=5
DN=27
+DT=5
E=2
+É=49
EC=21
ECC=21
ECCL=21
ECCLESIASTE=21
+ÉC=21
+ÉCC=21
+ÉCCL=21
+ECL=21
+ÉCL=21
EP=49
ÉP=49
EPH=49
ÉPH=49
EPHE=49
+ÉPHE=49
EPHÉ=49
-ÉPHE=49
-ÉPHÉ=49
+ÉPHÉ=49
EPHESIENS=49
+ÉPHÉSIENS=49
ES=23
+ÉS=23
ESA=23
+ÉSA=23
ESAI=23
ESAÃ=23
+ÉSAÃ=23
ESAIE=23
+ÉSAIE=23
+ÉSAÃE=23
ESD=15
ESDR=15
+ÉSD=15
EST=17
ESTH=17
+ÉST=17
EX=2
EXO=2
EXOD=2
EZ=26
EZE=26
+ÉZE=26
EZÉ=26
-ÉZE=26
ÉZÉ=26
EZEC=26
+ÉZEC=26
EZÉC=26
-ÉZEC=26
ÉZÉC=26
EZECHIEL=26
+F=49
G=1
GA=48
GAL=48
@@ -512,6 +531,8 @@
GENE=1
GENÈ=1
GENESE=1
+GÉ=1
+GÉN=1
GN=1
H=35
HA=35
@@ -534,15 +555,17 @@
JA=59
JAC=59
JACQ=59
+JB=18
JC=59
+JD=65
+JÉ=24
JE=43
-JÉ=24
JEA=43
JER=24
JÉR=24
JERE=24
+JÉRE=24
JERÉ=24
-JÉRE=24
JÉRÉ=24
JEREMIE=24
JG=7
@@ -557,10 +580,12 @@
JOS=6
JOSUE=6
JR=24
+JS=6
JU=7
JUD=65
JUG=7
JUGE=7
+K=35
L=3
LA=25
LAM=25
@@ -578,7 +603,7 @@
LU=42
LUC=42
LV=3
-M=33
+M=40
MA=39
MAL=39
MALA=39
@@ -597,13 +622,14 @@
NA=34
NAH=34
NAHU=35
+NB=4
NE=16
NÉ=16
NEH=16
NÉH=16
NEHE=16
+NÉHE=16
NEHÉ=16
-NÉHE=16
NÉHÉ=16
NEHEMIE=16
NO=4
@@ -633,14 +659,14 @@
PSA=19
PSAU=19
QO=21
-R=8
+R=45
RE=66
RÉ=66
REV=66
RÉV=66
REVE=66
+RÉVE=66
REVÉ=66
-RÉVE=66
RÉVÉ=66
RM=45
RO=45
@@ -656,6 +682,8 @@
TI=56
TIT=56
TT=56
+U=7
+V=3
Z=38
ZA=38
ZAC=38
Modified: trunk/locales.d/fr.conf
===================================================================
--- trunk/locales.d/fr.conf 2008-05-04 03:52:06 UTC (rev 2152)
+++ trunk/locales.d/fr.conf 2008-05-12 01:54:41 UTC (rev 2153)
@@ -24,7 +24,7 @@
Job=Job
Psalms=Psaumes
Proverbs=Proverbes
-Ecclesiastes=Ecclésiaste
+Ecclesiastes=Écclésiaste
Song of Solomon=Cantique des cantiques
Isaiah=Esaïe
Jeremiah=Jérémie
@@ -52,7 +52,7 @@
I Corinthians=1 Corinthiens
II Corinthians=2 Corinthiens
Galatians=Galates
-Ephesians=Ephésiens
+Ephesians=Éphésiens
Philippians=Philippiens
Colossians=Colossiens
I Thessalonians=1 Thessaloniciens
@@ -134,7 +134,7 @@
D=5
DANIEL=27
DEUTERONOMY=5
-E=49
+E=2
ECCLESIASTES=21
EPHESIANS=49
ESTER=17
@@ -325,114 +325,118 @@
APOCALYPSE=66
1 C=46
+1C=46
1 CH=13
+1CH=13
1 CHR=13
+1CHR=13
1 CHRO=13
+1CHRO=13
1 CO=46
+1CO=46
1 COR=46
+1COR=46
1 J=62
+1J=62
1 JE=62
+1JE=62
1 JEA=62
+1JEA=62
1 JN=62
+1JN=62
1 P=60
+1P=60
1 PI=60
+1PI=60
1 PIE=60
+1PIE=60
1 R=11
+1R=11
1 RO=11
+1RO=11
1 ROI=11
+1ROI=11
1 S=9
+1S=9
1 SA=9
+1SA=9
1 SAM=9
+1SAM=9
1 T=52
+1T=52
1 TH=52
+1TH=52
1 THE=52
+1THE=52
1 TI=54
+1TI=54
1 TIM=54
-1 TIMOTHEE=52
-1C=46
-1CH=13
-1CHR=13
-1CHRO=13
-1CO=46
-1COR=46
-1J=62
-1JE=62
-1JEA=62
-1JN=62
-1P=60
-1PI=60
-1PIE=60
-1R=11
-1RO=11
-1ROI=11
-1S=9
-1SA=9
-1SAM=9
-1T=52
-1TH=52
-1THE=52
-1TI=54
1TIM=54
-1TIMOTHEE=52
+1 TIMOTHEE=54
+1TIMOTHEE=54
+1 TM=54
+1TM=54
2 C=47
+2C=47
2 CH=14
+2CH=14
2 CHR=14
+2CHR=14
2 CHRO=14
+2CHRO=14
2 CO=47
+2CO=47
2 COR=47
+2COR=47
2 J=63
+2J=63
2 JE=63
+2JE=63
2 JEA=63
+2JEA=63
2 JN=63
+2JN=63
2 P=61
+2P=61
2 PI=61
+2PI=61
2 PIE=61
+2PIE=61
2 R=12
+2R=12
2 RO=12
+2RO=12
2 ROI=12
+2ROI=12
2 S=10
+2S=10
2 SA=10
+2SA=10
2 SAM=10
+2SAM=10
2 T=53
+2T=53
2 TH=53
+2TH=53
2 THE=53
+2THE=53
2 TI=55
+2TI=55
2 TIM=55
-2 TIMOTHEE=53
-2C=47
-2CH=14
-2CHR=14
-2CHRO=14
-2CO=47
-2COR=47
-2J=63
-2JE=63
-2JEA=63
-2JN=63
-2P=61
-2PI=61
-2PIE=61
-2R=12
-2RO=12
-2ROI=12
-2S=10
-2SA=10
-2SAM=10
-2T=53
-2TH=53
-2THE=53
-2TI=55
2TIM=55
-2TIMOTHEE=53
+2 TIMOTHEE=55
+2TIMOTHEE=55
+2 TM=55
+2TM=55
3 J=64
+3J=64
3 JE=64
+3JE=64
3 JEA=64
+3JEA=64
3 JN=64
-3J=64
-3JE=64
-3JEA=64
3JN=64
-A=30
+A=44
AB=31
ABD=31
ABDI=31
@@ -449,7 +453,7 @@
AP=66
APO=66
APOC=66
-C=22
+B=58
CA=22
CAN=22
CANT=22
@@ -458,7 +462,6 @@
COL=51
COLO=51
CT=22
-D=5
DA=27
DAN=27
DANI=27
@@ -467,42 +470,56 @@
DEUT=5
DEUTERONOME=5
DN=27
+DT=5
E=2
+É=49
EC=21
ECC=21
ECCL=21
ECCLESIASTE=21
+ÉC=21
+ÉCC=21
+ÉCCL=21
+ECL=21
+ÉCL=21
EP=49
ÉP=49
EPH=49
ÉPH=49
EPHE=49
+ÉPHE=49
EPHÉ=49
-ÉPHE=49
ÉPHÉ=49
EPHESIENS=49
ES=23
+ÉS=23
ESA=23
+ÉSA=23
ESAI=23
ESAÏ=23
+ÉSAÏ=23
ESAIE=23
+ÉSAIE=23
ESD=15
ESDR=15
+ÉSD=15
EST=17
ESTH=17
+ÉST=17
EX=2
EXO=2
EXOD=2
EZ=26
EZE=26
+ÉZE=26
EZÉ=26
-ÉZE=26
ÉZÉ=26
EZEC=26
+ÉZEC=26
EZÉC=26
-ÉZEC=26
ÉZÉC=26
EZECHIEL=26
+F=49
G=1
GA=48
GAL=48
@@ -512,6 +529,8 @@
GENE=1
GENÈ=1
GENESE=1
+GÉ=1
+GÉN=1
GN=1
H=35
HA=35
@@ -534,15 +553,17 @@
JA=59
JAC=59
JACQ=59
+JB=18
JC=59
+JD=65
+JÉ=24
JE=43
-JÉ=24
JEA=43
JER=24
JÉR=24
JERE=24
+JÉRE=24
JERÉ=24
-JÉRE=24
JÉRÉ=24
JEREMIE=24
JG=7
@@ -557,10 +578,12 @@
JOS=6
JOSUE=6
JR=24
+JS=6
JU=7
JUD=65
JUG=7
JUGE=7
+K=35
L=3
LA=25
LAM=25
@@ -578,7 +601,7 @@
LU=42
LUC=42
LV=3
-M=33
+M=40
MA=39
MAL=39
MALA=39
@@ -597,13 +620,14 @@
NA=34
NAH=34
NAHU=35
+NB=4
NE=16
NÉ=16
NEH=16
NÉH=16
NEHE=16
+NÉHE=16
NEHÉ=16
-NÉHE=16
NÉHÉ=16
NEHEMIE=16
NO=4
@@ -633,14 +657,14 @@
PSA=19
PSAU=19
QO=21
-R=8
+R=45
RE=66
RÉ=66
REV=66
RÉV=66
REVE=66
+RÉVE=66
REVÉ=66
-RÉVE=66
RÉVÉ=66
RM=45
RO=45
@@ -656,6 +680,8 @@
TI=56
TIT=56
TT=56
+U=7
+V=3
Z=38
ZA=38
ZAC=38
Added: trunk/locales.d/fr_abbrev-utf8.conf
===================================================================
--- trunk/locales.d/fr_abbrev-utf8.conf (rev 0)
+++ trunk/locales.d/fr_abbrev-utf8.conf 2008-05-12 01:54:41 UTC (rev 2153)
@@ -0,0 +1,333 @@
+#
+# French Bible bookname abbreviations -- derived from the "Louis Segond 1910"
+# Corrections & Contributions welcome
+#
+# Dominique Corbex domcox at users.sf.net
+#
+
+[Meta]
+Name=fr_abbrev
+Description=French abbreviations (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Ge
+Exodus=Ex
+Leviticus=Lé
+Numbers=No
+Deuteronomy=De
+Joshua=Jos
+Judges=Jg
+Ruth=Ru
+I Samuel=1 S
+II Samuel=2 S
+I Kings=1 R
+II Kings=2 R
+I Chronicles=1 Ch
+II Chronicles=2 Ch
+Ezra=Esd
+Nehemiah=Né
+Esther=Est
+Job=Job
+Psalms=Ps
+Proverbs=Pr
+Ecclesiastes=Ec
+Song of Solomon=Ca
+Isaiah=Es
+Jeremiah=Jé
+Lamentations=La
+Ezekiel=Ez
+Daniel=Da
+Hosea=Os
+Joel=Joë
+Amos=Am
+Obadiah=Ab
+Jonah=Jon
+Micah=Mi
+Nahum=Na
+Habakkuk=Ha
+Zephaniah=So
+Haggai=Ag
+Zechariah=Za
+Malachi=Mal
+Matthew=Mt
+Mark=Mc
+Luke=Lu
+John=Jn
+Acts=Ac
+Romans=Ro
+I Corinthians=1 Co
+II Corinthians=2 Co
+Galatians=Ga
+Ephesians=Ep
+Philippians=Ph
+Colossians=Col
+I Thessalonians=1 Th
+II Thessalonians=2 Th
+I Timothy=1 Ti
+II Timothy=2 Ti
+Titus=Tit
+Philemon=Phm
+Hebrews=Hé
+James=Ja
+I Peter=1 Pi
+II Peter=2 Pi
+I John=1 Jn
+II John=2 Jn
+III John=3 Jn
+Jude=Jud
+Revelation of John=Ap
+
+[Book Abbrevs]
+1 C=46
+1 CHRONICLES=13
+1 CORINTHIANS=46
+1 JN=62
+1 JOHN=62
+1 KGS=11
+1 KINGS=11
+1 PETER=60
+1 PTR=60
+1 SAMUEL=9
+1 THESSALONIANS=52
+1 TIMOTHY=54
+1C=46
+1CHRONICLES=13
+1CORINTHIANS=46
+1JN=62
+1JOHN=62
+1KGS=11
+1KINGS=11
+1PETER=60
+1PTR=60
+1SAMUEL=9
+1THESSALONIANS=52
+1TIMOTHY=54
+2 C=47
+2 CHRONICLES=14
+2 CORINTHIANS=47
+2 JN=63
+2 JOHN=63
+2 KGS=12
+2 KINGS=12
+2 PETER=61
+2 PTR=61
+2 SAMUEL=10
+2 THESSALONIANS=53
+2 TIMOTHY=55
+2C=47
+2CHRONICLES=14
+2CORINTHIANS=47
+2JN=63
+2JOHN=63
+2KGS=12
+2KINGS=12
+2PETER=61
+2PTR=61
+2SAMUEL=10
+2THESSALONIANS=53
+2TIMOTHY=55
+3 JN=64
+3 JOHN=64
+3JN=64
+3JOHN=64
+ACTS=44
+AMOS=30
+APOCALYPSE OF ST. JOHN=66
+C=51
+CANTICLE OF CANTICLES=22
+COC=22
+COLOSSIANS=51
+D=5
+DANIEL=27
+DEUTERONOMY=5
+E=49
+ECCLESIASTES=21
+EPHESIANS=49
+ESTER=17
+ESTHER=17
+EXODUS=2
+EZEKIEL=26
+EZRA=15
+G=1
+GALATIANS=48
+GENESIS=1
+H=58
+HABAKKUK=35
+HAGGAI=37
+HEBREWS=58
+HOSEA=28
+I C=46
+I CHRONICLES=13
+I CORINTHIANS=46
+I JN=62
+I JOHN=62
+I KGS=11
+I KINGS=11
+I PETER=60
+I PTR=60
+I SAMUEL=9
+I THESSALONIANS=52
+I TIMOTHY=54
+IC=46
+ICHRONICLES=13
+ICORINTHIANS=46
+II C=47
+II CHRONICLES=14
+II CORINTHIANS=47
+II JN=63
+II JOHN=63
+II KGS=12
+II KINGS=12
+II PETER=61
+II PTR=61
+II SAMUEL=10
+II THESSALONIANS=53
+II TIMOTHY=55
+IIC=47
+IICHRONICLES=14
+IICORINTHIANS=47
+III JN=64
+III JOHN=64
+IIIJN=64
+IIIJOHN=64
+IIJN=63
+IIJOHN=63
+IIKGS=12
+IIKINGS=12
+IIPETER=61
+IIPTR=61
+IISAMUEL=10
+IITHESSALONIANS=53
+IITIMOTHY=55
+IJN=62
+IJOHN=62
+IKGS=11
+IKINGS=11
+IPETER=60
+IPTR=60
+ISA=23
+ISAIAH=23
+ISAMUEL=9
+ITHESSALONIANS=52
+ITIMOTHY=54
+J=43
+JAMES=59
+JAS=59
+JEREMIAH=24
+JN=43
+JO=43
+JOB=18
+JOEL=29
+JOHN=43
+JONAH=32
+JOSHUA=6
+JUD=7
+JUDE=65
+JUDGES=7
+L=42
+LAMENTATIONS=25
+LEVITICUS=3
+LK=42
+LUKE=42
+MA=40
+MALACHI=39
+MARK=41
+MATTHEW=40
+MICAH=33
+MK=41
+MR=41
+MT=40
+N=4
+NAHUM=34
+NEHEMIAH=16
+NUMBERS=4
+OBADIAH=31
+P=19
+PH=50
+PHILEMON=57
+PHILIPPIANS=50
+PHLM=57
+PHM=57
+PHP=50
+PROVERBS=20
+PSALMS=19
+PSM=19
+PSS=19
+REVELATION OF JOHN=66
+ROMANS=45
+RUTH=8
+SONG OF SOLOMON=22
+SONG OF SONGS=22
+SOS=22
+TITUS=56
+ZECHARIAH=38
+ZEPHANIAH=36
+
+GN=1
+EX=2
+LV=3
+NB=4
+DT=5
+JOS=6
+JG=7
+RT=8
+1S=9
+2S=10
+1R=11
+2R=12
+1CH=13
+2CH=14
+ESD=15
+NE=16
+EST=17
+JB=18
+PS=19
+PR=20
+ECC=21
+CT=22
+ÉS=23
+JR=24
+LM=25
+EZ=26
+DN=27
+OS=28
+JL=29
+AM=30
+AB=31
+JON=32
+MI=33
+NA=34
+HA=35
+SO=36
+AG=37
+ZA=38
+ML=39
+MT=40
+MC=41
+LC=42
+JN=43
+AC=44
+RM=45
+1CO=46
+2CO=47
+GA=48
+ÉPH=49
+PH=50
+COL=51
+1TH=52
+2TH=53
+1TM=54
+2TM=55
+TT=56
+PHM=57
+HE=58
+JC=59
+1P=60
+2P=61
+1JN=62
+2JN=63
+3JN=64
+JD=65
+AP=66
+
Added: trunk/locales.d/fr_abbrev.conf
===================================================================
--- trunk/locales.d/fr_abbrev.conf (rev 0)
+++ trunk/locales.d/fr_abbrev.conf 2008-05-12 01:54:41 UTC (rev 2153)
@@ -0,0 +1,333 @@
+#
+# French Bible bookname abbreviations -- derived from the "Louis Segond 1910"
+# Corrections & Contributions welcome
+#
+# Dominique Corbex domcox at users.sf.net
+#
+
+[Meta]
+Name=fr_abbrev
+Description=French abbreviations
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Ge
+Exodus=Ex
+Leviticus=Lé
+Numbers=No
+Deuteronomy=De
+Joshua=Jos
+Judges=Jg
+Ruth=Ru
+I Samuel=1 S
+II Samuel=2 S
+I Kings=1 R
+II Kings=2 R
+I Chronicles=1 Ch
+II Chronicles=2 Ch
+Ezra=Esd
+Nehemiah=Né
+Esther=Est
+Job=Job
+Psalms=Ps
+Proverbs=Pr
+Ecclesiastes=Ec
+Song of Solomon=Ca
+Isaiah=Es
+Jeremiah=Jé
+Lamentations=La
+Ezekiel=Ez
+Daniel=Da
+Hosea=Os
+Joel=Joë
+Amos=Am
+Obadiah=Ab
+Jonah=Jon
+Micah=Mi
+Nahum=Na
+Habakkuk=Ha
+Zephaniah=So
+Haggai=Ag
+Zechariah=Za
+Malachi=Mal
+Matthew=Mt
+Mark=Mc
+Luke=Lu
+John=Jn
+Acts=Ac
+Romans=Ro
+I Corinthians=1 Co
+II Corinthians=2 Co
+Galatians=Ga
+Ephesians=Ep
+Philippians=Ph
+Colossians=Col
+I Thessalonians=1 Th
+II Thessalonians=2 Th
+I Timothy=1 Ti
+II Timothy=2 Ti
+Titus=Tit
+Philemon=Phm
+Hebrews=Hé
+James=Ja
+I Peter=1 Pi
+II Peter=2 Pi
+I John=1 Jn
+II John=2 Jn
+III John=3 Jn
+Jude=Jud
+Revelation of John=Ap
+
+[Book Abbrevs]
+1 C=46
+1 CHRONICLES=13
+1 CORINTHIANS=46
+1 JN=62
+1 JOHN=62
+1 KGS=11
+1 KINGS=11
+1 PETER=60
+1 PTR=60
+1 SAMUEL=9
+1 THESSALONIANS=52
+1 TIMOTHY=54
+1C=46
+1CHRONICLES=13
+1CORINTHIANS=46
+1JN=62
+1JOHN=62
+1KGS=11
+1KINGS=11
+1PETER=60
+1PTR=60
+1SAMUEL=9
+1THESSALONIANS=52
+1TIMOTHY=54
+2 C=47
+2 CHRONICLES=14
+2 CORINTHIANS=47
+2 JN=63
+2 JOHN=63
+2 KGS=12
+2 KINGS=12
+2 PETER=61
+2 PTR=61
+2 SAMUEL=10
+2 THESSALONIANS=53
+2 TIMOTHY=55
+2C=47
+2CHRONICLES=14
+2CORINTHIANS=47
+2JN=63
+2JOHN=63
+2KGS=12
+2KINGS=12
+2PETER=61
+2PTR=61
+2SAMUEL=10
+2THESSALONIANS=53
+2TIMOTHY=55
+3 JN=64
+3 JOHN=64
+3JN=64
+3JOHN=64
+ACTS=44
+AMOS=30
+APOCALYPSE OF ST. JOHN=66
+C=51
+CANTICLE OF CANTICLES=22
+COC=22
+COLOSSIANS=51
+D=5
+DANIEL=27
+DEUTERONOMY=5
+E=49
+ECCLESIASTES=21
+EPHESIANS=49
+ESTER=17
+ESTHER=17
+EXODUS=2
+EZEKIEL=26
+EZRA=15
+G=1
+GALATIANS=48
+GENESIS=1
+H=58
+HABAKKUK=35
+HAGGAI=37
+HEBREWS=58
+HOSEA=28
+I C=46
+I CHRONICLES=13
+I CORINTHIANS=46
+I JN=62
+I JOHN=62
+I KGS=11
+I KINGS=11
+I PETER=60
+I PTR=60
+I SAMUEL=9
+I THESSALONIANS=52
+I TIMOTHY=54
+IC=46
+ICHRONICLES=13
+ICORINTHIANS=46
+II C=47
+II CHRONICLES=14
+II CORINTHIANS=47
+II JN=63
+II JOHN=63
+II KGS=12
+II KINGS=12
+II PETER=61
+II PTR=61
+II SAMUEL=10
+II THESSALONIANS=53
+II TIMOTHY=55
+IIC=47
+IICHRONICLES=14
+IICORINTHIANS=47
+III JN=64
+III JOHN=64
+IIIJN=64
+IIIJOHN=64
+IIJN=63
+IIJOHN=63
+IIKGS=12
+IIKINGS=12
+IIPETER=61
+IIPTR=61
+IISAMUEL=10
+IITHESSALONIANS=53
+IITIMOTHY=55
+IJN=62
+IJOHN=62
+IKGS=11
+IKINGS=11
+IPETER=60
+IPTR=60
+ISA=23
+ISAIAH=23
+ISAMUEL=9
+ITHESSALONIANS=52
+ITIMOTHY=54
+J=43
+JAMES=59
+JAS=59
+JEREMIAH=24
+JN=43
+JO=43
+JOB=18
+JOEL=29
+JOHN=43
+JONAH=32
+JOSHUA=6
+JUD=7
+JUDE=65
+JUDGES=7
+L=42
+LAMENTATIONS=25
+LEVITICUS=3
+LK=42
+LUKE=42
+MA=40
+MALACHI=39
+MARK=41
+MATTHEW=40
+MICAH=33
+MK=41
+MR=41
+MT=40
+N=4
+NAHUM=34
+NEHEMIAH=16
+NUMBERS=4
+OBADIAH=31
+P=19
+PH=50
+PHILEMON=57
+PHILIPPIANS=50
+PHLM=57
+PHM=57
+PHP=50
+PROVERBS=20
+PSALMS=19
+PSM=19
+PSS=19
+REVELATION OF JOHN=66
+ROMANS=45
+RUTH=8
+SONG OF SOLOMON=22
+SONG OF SONGS=22
+SOS=22
+TITUS=56
+ZECHARIAH=38
+ZEPHANIAH=36
+
+GN=1
+EX=2
+LV=3
+NB=4
+DT=5
+JOS=6
+JG=7
+RT=8
+1S=9
+2S=10
+1R=11
+2R=12
+1CH=13
+2CH=14
+ESD=15
+NE=16
+EST=17
+JB=18
+PS=19
+PR=20
+ECC=21
+CT=22
+ÉS=23
+JR=24
+LM=25
+EZ=26
+DN=27
+OS=28
+JL=29
+AM=30
+AB=31
+JON=32
+MI=33
+NA=34
+HA=35
+SO=36
+AG=37
+ZA=38
+ML=39
+MT=40
+MC=41
+LC=42
+JN=43
+AC=44
+RM=45
+1CO=46
+2CO=47
+GA=48
+ÉPH=49
+PH=50
+COL=51
+1TH=52
+2TH=53
+1TM=54
+2TM=55
+TT=56
+PHM=57
+HE=58
+JC=59
+1P=60
+2P=61
+1JN=62
+2JN=63
+3JN=64
+JD=65
+AP=66
+
Modified: trunk/src/modules/common/rawstr.cpp
===================================================================
--- trunk/src/modules/common/rawstr.cpp 2008-05-04 03:52:06 UTC (rev 2152)
+++ trunk/src/modules/common/rawstr.cpp 2008-05-12 01:54:41 UTC (rev 2153)
@@ -332,6 +332,7 @@
do {
if (*idxbuf)
delete [] *idxbuf;
+
buf = "";
buf.setFillByte(0);
buf.setSize(++(*isize));
Modified: trunk/src/modules/common/rawstr4.cpp
===================================================================
--- trunk/src/modules/common/rawstr4.cpp 2008-05-04 03:52:06 UTC (rev 2152)
+++ trunk/src/modules/common/rawstr4.cpp 2008-05-12 01:54:41 UTC (rev 2153)
@@ -340,11 +340,13 @@
do {
if (*idxbuf)
delete [] *idxbuf;
- *idxbuf = new char [ (*isize) ];
buf = "";
buf.setFillByte(0);
- buf.setSize(*isize);
+ buf.setSize(++(*isize));
+
+ *idxbuf = new char [ (*isize) ];
+
datfd->seek(start, SEEK_SET);
datfd->read(buf.getRawData(), (int)((*isize) - 1));
@@ -364,7 +366,6 @@
}
}
findOffset(buf.c_str() + 6, &start, isize);
-
}
else break;
}
Modified: trunk/src/modules/filters/osishtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/osishtmlhref.cpp 2008-05-04 03:52:06 UTC (rev 2152)
+++ trunk/src/modules/filters/osishtmlhref.cpp 2008-05-12 01:54:41 UTC (rev 2153)
@@ -226,7 +226,7 @@
SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
VerseKey *vkey = NULL;
char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
- u->inXRefNote = (ch == 'x');
+ u->inXRefNote = true; // Any note can have references in, so we need to set this to true for all notes
// see if we have a VerseKey * or descendant
SWTRY {
vkey = SWDYNAMIC_CAST(VerseKey, u->key);
@@ -279,7 +279,7 @@
else if (!strcmp(tag.getName(), "reference")) {
if (!u->inXRefNote) { // only show these if we're not in an xref note
if ((!tag.isEndTag()) && (!tag.isEmpty())) {
- u->suspendTextPassThru = true;
+ u->suspendTextPassThru = (++u->suspendLevel);
}
if (tag.isEndTag()) {
if (!u->BiblicalText) {
@@ -312,7 +312,7 @@
}
}
- u->suspendTextPassThru = false;
+ u->suspendTextPassThru = (--u->suspendLevel);
}
}/*
if (tag.isEndTag()) {
Modified: trunk/src/modules/filters/osisplain.cpp
===================================================================
--- trunk/src/modules/filters/osisplain.cpp 2008-05-04 03:52:06 UTC (rev 2152)
+++ trunk/src/modules/filters/osisplain.cpp 2008-05-12 01:54:41 UTC (rev 2153)
@@ -18,6 +18,7 @@
#include <osisplain.h>
#include <ctype.h>
#include <versekey.h>
+#include <stringmgr.h>
SWORD_NAMESPACE_START
@@ -160,6 +161,16 @@
userData->supressAdjacentWhitespace = true;
buf.append('\n');
}
+ else if (!strncmp(token, "l", 1) && strstr(token, "eID")) {
+ userData->supressAdjacentWhitespace = true;
+ buf.append('\n');
+ }
+ else if (!strncmp(token, "/divineName", 11)) {
+ // Get the end portion of the string, and upper case it
+ char* end = buf.getRawData();
+ end += buf.size() - u->lastTextNode.size();
+ toupperstr(end);
+ }
// <milestone type="line"/>
else if (!strncmp(token, "milestone", 9)) {
More information about the sword-cvs
mailing list