[sword-svn] r485 - in branches/BCB5: . TntUnicodeControls.attic/BCB5 apps/InstallMgr clucene stage
scribe at www.crosswire.org
scribe at www.crosswire.org
Sat May 17 20:42:37 MST 2008
Author: scribe
Date: 2008-05-17 20:42:37 -0700 (Sat, 17 May 2008)
New Revision: 485
Modified:
branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk
branches/BCB5/apps/InstallMgr/InstallManager.bpr
branches/BCB5/apps/InstallMgr/InstallManager.res
branches/BCB5/apps/InstallMgr/libcurl.bpr
branches/BCB5/clucene/clucene.bpr
branches/BCB5/paraldisp.cpp
branches/BCB5/searchfrm.dfm
branches/BCB5/stage/layout.conf
branches/BCB5/sword.bpr
branches/BCB5/sword.res
branches/BCB5/swordprj.bpg
Log:
fixed parallel Display
Modified: branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk
===================================================================
--- branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk 2008-05-17 18:57:14 UTC (rev 484)
+++ branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk 2008-05-18 03:42:37 UTC (rev 485)
@@ -28,22 +28,21 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value="_DEBUG"/>
+ <USERDEFINES value=""/>
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="TntLibR.cpp"/>
- <INCLUDEPATH value="..;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..\;..;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..\;..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par"/>
</MACROS>
<OPTIONS>
<IDLCFLAGS value="-I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/>
- <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -4 -b- -k -y -v -vi-
- -c -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -4 -b- -k- -vi -c -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
+ <AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value="-D"Tnt Unicode VCL Components for BCB5 (Runtime)" -aa -Tpp -Gpr -x -Gn -Gl
- -Gi -v"/>
+ -Gi"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
Modified: branches/BCB5/apps/InstallMgr/InstallManager.bpr
===================================================================
--- branches/BCB5/apps/InstallMgr/InstallManager.bpr 2008-05-17 18:57:14 UTC (rev 484)
+++ branches/BCB5/apps/InstallMgr/InstallManager.bpr 2008-05-18 03:42:37 UTC (rev 485)
@@ -30,7 +30,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY;_DEBUG"/>
+ <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="InstallManager.cpp"/>
<INCLUDEPATH value="curl\lib;..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include"/>
@@ -46,12 +46,12 @@
-Icurl\include -I$(BCB)\include -I$(BCB)\include\vcl
-I..\..\..\sword\include -src_suffix cpp -DVCL -D_ICU_ -D_ICUSWORD_
-DCURLAVAILABLE -DUSBINARY -boa"/>
- <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -r-
- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8
+ -4 -b- -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-D"" -aa -Tpe -x -Gn -v"/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D"" -aa -Tpe -x -Gn"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0w32.obj sysinit.obj $(OBJFILES)"/>
@@ -65,7 +65,7 @@
MajorVer=1
MinorVer=5
Release=11
-Build=2
+Build=3
Debug=0
PreRelease=0
Special=0
@@ -77,7 +77,7 @@
[Version Info Keys]
CompanyName=CrossWire Bible Society
FileDescription=SWORD Installation Manager
-FileVersion=1.5.11.2
+FileVersion=1.5.11.3
InternalName=InstallMgr
LegalCopyright=Copyright 1990-2008 by CrossWire Bible Society
LegalTrademarks=
@@ -120,8 +120,8 @@
[HistoryLists\hlConditionals]
Count=12
-Item0=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY;_DEBUG
-Item1=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY
+Item0=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY
+Item1=VCL;_ICU_;_ICUSWORD_;CURLAVAILABLE;USBINARY;_DEBUG
Item2=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG
Item3=VCL;_ICU_;_ICUSWORD_;USBINARY
Item4=VCL
Modified: branches/BCB5/apps/InstallMgr/InstallManager.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/apps/InstallMgr/libcurl.bpr
===================================================================
--- branches/BCB5/apps/InstallMgr/libcurl.bpr 2008-05-17 18:57:14 UTC (rev 484)
+++ branches/BCB5/apps/InstallMgr/libcurl.bpr 2008-05-18 03:42:37 UTC (rev 485)
@@ -31,7 +31,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="_DEBUG"/>
+ <USERDEFINES value=""/>
<SYSDEFINES value="_RTLDLL;NO_STRICT"/>
<MAINSOURCE value="libcurl.bpf"/>
<INCLUDEPATH value="curl\curlcpp;curl\lib;curl\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -42,10 +42,9 @@
<OPTIONS>
<IDLCFLAGS value="-Icurl\curlcpp -Icurl\lib -Icurl\include -I$(BCB)\include
-I$(BCB)\include\vcl -src_suffix cpp -boa"/>
- <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -4 -b- -k -y -v -vi-
- -c -tW -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zi"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value="/P32"/>
</OPTIONS>
<LINKER>
Modified: branches/BCB5/clucene/clucene.bpr
===================================================================
--- branches/BCB5/clucene/clucene.bpr 2008-05-17 18:57:14 UTC (rev 484)
+++ branches/BCB5/clucene/clucene.bpr 2008-05-18 03:42:37 UTC (rev 485)
@@ -18,7 +18,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT;_DEBUG"/>
+ <USERDEFINES value="MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT"/>
<SYSDEFINES value="_RTLDLL;NO_STRICT"/>
<MAINSOURCE value="clucene.bpf"/>
<INCLUDEPATH value="src\CLucene;src;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -30,9 +30,9 @@
<IDLCFLAGS value="-Isrc\CLucene -Isrc -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp
-DMAX_PATH=256 -DUNICODE -D_WIN32 -D_CL_DISABLE_MULTITHREADING
-DLUCENE_ENABLE_REFCOUNT -boa"/>
- <CFLAG1 value="-Od -Q -w- -Vx -VF -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zi"/>
+ <CFLAG1 value="-O2 -Q -w- -Vx -VF -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value="/P256"/>
</OPTIONS>
<LINKER>
@@ -96,8 +96,8 @@
[HistoryLists\hlConditionals]
Count=17
-Item0=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT;_DEBUG
-Item1=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT
+Item0=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT
+Item1=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT;_DEBUG
Item2=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING
Item3=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
Item4=UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING
Modified: branches/BCB5/paraldisp.cpp
===================================================================
--- branches/BCB5/paraldisp.cpp 2008-05-17 18:57:14 UTC (rev 484)
+++ branches/BCB5/paraldisp.cpp 2008-05-18 03:42:37 UTC (rev 485)
@@ -178,7 +178,7 @@
newtext += "{\\ltrch\\loch\\f0 ";
*/
-/*
+/*
if (mods[z]->Direction() == DIRECTION_RTL) {
newtext = newtext + "\\qr ";
}
@@ -186,10 +186,13 @@
newtext = newtext + "\\rtlpar ";
}
-*/
+*/
tmptext = "{\\b ";
tmptext += mods[z]->Name();
tmptext += ": } ";
+
+ makeBracketsEven(tmptext);
+
lastEntry = mods[z]->getRawEntry();
for (const char *loop = (const char *)(*mods[z]); *loop; loop++) {
if (*loop == '\n') {
@@ -204,7 +207,9 @@
SWBuf preverseHeading = module->getEntryAttributes()["Heading"]["Preverse"][buf].c_str();
uToRTF.processText(preverseHeading);
if (preverseHeading.length()) {
- newtext += ((AnsiString)"\\par\\par {\\i1\\b1 ") + preverseHeading.c_str() + "\\par}";
+ AnsiString pvHeading = preverseHeading.c_str();
+ makeBracketsEven(pvHeading);
+ newtext += ((AnsiString)"\\par\\par {\\i1\\b1 ") + pvHeading + "\\par}";
}
else break;
} while (true);
@@ -241,14 +246,14 @@
if (z < (realModCount-1))
newtext += "\\par{\\super _______}\\par ";
else newtext += "\\par\\par ";
-
+
// if (z < (realModCount-1))
// newtext += "\\cell\\pard\\plain ";
// else newtext += "\\cell\\row\\pard ";
}
- makeBracketsEven(newtext);
+// makeBracketsEven(newtext); // we can't call here because we'll close all our RTFHeader open brackets
(*mods[0])++;
}
@@ -260,7 +265,7 @@
newtext = newtext + RTFTrailer;
- makeBracketsEven(newtext);
+ makeBracketsEven(newtext); // just for good measure. We could probably remove this
key->Verse(1); //{ When setting chapter: if (verse <> new chapter range) don't autonormalize. (we could've just turned the autonormalize option off then back on, but this is cooler) }
key->Chapter(1);
Modified: branches/BCB5/searchfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/stage/layout.conf
===================================================================
--- branches/BCB5/stage/layout.conf 2008-05-17 18:57:14 UTC (rev 484)
+++ branches/BCB5/stage/layout.conf 2008-05-18 03:42:37 UTC (rev 485)
@@ -42,17 +42,17 @@
LastComModule=NETnotesfree
LastLDKey=DAVID
LastLDModule=ImageSampler
-LastParaMod01=ASV
+LastParaMod01=ESV
LastParaMod02=ASV
-LastParaMod03=ESV
+LastParaMod03=NETtext
LastTextModule=PARALLEL
-LastVerse=James 1:4
+LastVerse=James 1:1
LookupSaveCount=5
+LookupText=James 1:1
+LookupText=James 3:1
+LookupText=James 1:5
LookupText=James 1:4
LookupText=James 1:2
-LookupText=James 1:1
-LookupText=Psalms 5:1
-LookupText=Ephesians 1:1
SearchSaveCount=5
SearchText=the sword
SearchText=God love +world
@@ -192,8 +192,8 @@
la_en=
[ModuleOptions]
-Cross-references=On
-Footnotes=On
+Cross-references=Off
+Footnotes=Off
Headings=On
Hebrew Cantillation=Off
Hebrew Vowel Points=On
Modified: branches/BCB5/sword.bpr
===================================================================
--- branches/BCB5/sword.bpr 2008-05-17 18:57:14 UTC (rev 484)
+++ branches/BCB5/sword.bpr 2008-05-18 03:42:37 UTC (rev 485)
@@ -46,7 +46,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="sword.cpp"/>
<INCLUDEPATH value="..\sword\src\modules\filters;D:\;TntUnicodeControls.attic;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -60,11 +60,11 @@
-I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_
-D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE
-D_CL_DISABLE_MULTITHREADING"/>
- <CFLAG1 value="-Od -Vx -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/>
+ <CFLAG1 value="-O2 -Vx -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn -v"/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0w32.obj $(OBJFILES)"/>
@@ -78,7 +78,7 @@
MajorVer=1
MinorVer=5
Release=11
-Build=3
+Build=5
Debug=0
PreRelease=0
Special=0
@@ -90,7 +90,7 @@
[Version Info Keys]
CompanyName=CrossWire Bible Society
FileDescription=Windows User Interface to The SWORD Project
-FileVersion=1.5.11.3
+FileVersion=1.5.11.5
InternalName=biblecs
LegalCopyright=(c) 1990-2008 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
@@ -146,8 +146,8 @@
[HistoryLists\hlConditionals]
Count=16
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
-Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
+Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
Modified: branches/BCB5/sword.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/swordprj.bpg
===================================================================
--- branches/BCB5/swordprj.bpg 2008-05-17 18:57:14 UTC (rev 484)
+++ branches/BCB5/swordprj.bpg 2008-05-18 03:42:37 UTC (rev 485)
@@ -39,12 +39,12 @@
$(ROOT)\bin\bpr2mak $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+libcurl.lib: apps\InstallMgr\libcurl.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
InstallManager.exe: apps\InstallMgr\InstallManager.bpr
$(ROOT)\bin\bpr2mak $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-libcurl.lib: apps\InstallMgr\libcurl.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
More information about the sword-cvs
mailing list