sync with crosswire 20020818-1300

11 files changed, 193 insertions, 141 deletions

diff --git a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
index c0b9b7e..0422970 100644
--- a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
@@ -102,7 +102,7 @@ object AboutBox: TAboutBox
       Width = 213

       Height = 21

       AutoSize = False

-      Caption = 'v1.5.4betaX'

+      Caption = 'v1.5.4betaY'

       IsControl = True

     end

     object Copyright: TLabel

diff --git a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
index 58f0e80..48db473 100644
--- a/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp
@@ -569,11 +569,20 @@ void TRxRichEditX::getDisplayPrefs(DISP_ATTRIBS *attribs, SWModule *module /*, c
 	if (attribs->fontName == "")
 		attribs->fontName = "MS Sans Serif";
 
-	string keyFontSize = (string)getType().c_str() + "FontSize";
-	string fontSize = Form1->optionsconf->Sections["Appearance"][keyFontSize];
+
+	// If the module uses it's own font size load that else we will try the config file else we will use the default
+     AnsiString fontSize;
+	eit = module->getConfig().find("FontSize");
+	if (eit != module->getConfig().end())
+		fontSize = (*eit).second.c_str();
+	else {
+		string keyFontSize = (string)getType().c_str() + "FontSize";
+		fontSize = (AnsiString)Form1->optionsconf->Sections["Appearance"][keyFontSize].c_str();
+	}
+	// If we still have no size we will set it to a default value
 	if (fontSize == "")
 		attribs->fontSize = 10;
-	else attribs->fontSize = StrToInt((AnsiString)fontSize.c_str());
+	else attribs->fontSize = StrToInt(fontSize);
 
 	string entryColor = Form1->optionsconf->Sections["Appearance"]["CurrentVSColor"];
 	if (entryColor == "")
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
index 32b4aff..fccaaab 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
@@ -2006,8 +2006,10 @@ void __fastcall TForm1::ApplicationEvents1ShowHint(AnsiString &HintStr,
 	bool selected = false;
 	bool link = false;
 	static WideString lastWord = "";
+	static String lastHint = "yoyo";
 	String verseList = "";
 	WideString targetWord;
+	THintInfo saveHintInfo = HintInfo;
 	// assert we are in a sword module rtf window and we're not grinding
 	if (HintInfo.HintControl == searchForm->resultsLV) {
 		HintStr = "";
@@ -2017,7 +2019,11 @@ void __fastcall TForm1::ApplicationEvents1ShowHint(AnsiString &HintStr,
 			(strncmp(HintInfo.HintControl->Name.c_str(), "LexDictRTF", 10))) {
 		return;
 	}
-
+	char *modName = 0;
+	stdstr(&modName, HintInfo.HintControl->Name.c_str());
+	SWModule *module = mainmgr->Modules[(strstr(modName, "RTF")+3)];
+	delete [] modName;
+		
 //	Application->HintHidePause = HintDisplayTime;
 	HintInfo.HintWindowClass = __classid(THintWindow);
 
@@ -2203,8 +2209,18 @@ void __fastcall TForm1::ApplicationEvents1ShowHint(AnsiString &HintStr,
 			}
 			HintStr = "";
 		} while (false);
-		if (!HintStr.Length())
+		if (!HintStr.Length()) {
+//			HintInfo = saveHintInfo;
+			HintInfo.HintWindowClass = __classid(THintWindow);
+				
+			if (module)
+				HintStr = module->Description();
+			if (lastHint == HintStr)
+				HintStr = "";
+			lastHint = HintStr;
 			lastWord = "";
+		}
+		lastHint = HintStr;
 	}
 }
 //---------------------------------------------------------------------------
@@ -2309,7 +2325,6 @@ void __fastcall TRTFHintWindow::Paint(void)
 	}
 
 //	RTFHintForm->rtfDrawer->PaintTo(Canvas->Handle, 4, 4);
-	
 //	RTFHintForm->Repaint();
 //	RTFHintForm->rtfDrawer->Repaint();
 //	Graphics::TBitmap *hintBit = RTFHintForm->GetFormImage();
@@ -2449,11 +2464,14 @@ void TForm1::ClipOrCenterRectToMonitor(LPRECT prc, UINT flags) {
     RECT        rc;
     int         w = prc->right  - prc->left;
     int         h = prc->bottom - prc->top;
-
+    rc.left = prc->left;
+    rc.right = prc->left+1;
+    rc.top = prc->top;
+    rc.bottom = prc->top+1;
     //
     // get the nearest monitor to the passed rect.
     //
-    hMonitor = MonitorFromRect(prc, MONITOR_DEFAULTTONEAREST);
+    hMonitor = MonitorFromRect(&rc, MONITOR_DEFAULTTONEAREST);
 
     //
     // get the work area or entire monitor rect.
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm b/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
index 7a30ec1..0688f42 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
@@ -1,6 +1,6 @@
 object Form1: TForm1

-  Left = 414

-  Top = 117

+  Left = 412

+  Top = 100

   Width = 686

   Height = 510

   Caption = 'The SWORD Project'

diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
index 84b9763..2aeec2e 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
@@ -37,6 +37,9 @@ void __fastcall TOptionsfrm::btnCurrVerseClick(TObject *Sender)
 }
 //---------------------------------------------------------------------------
 
+//TODO 1 -cOptions: add per module font size selection
+//TODO 1 -cOptions: add 'general' dictionary besides strongs for lookups of words
+//TODO 1 -cOptions: add per module 'general' dictionary
 
 void __fastcall TOptionsfrm::FormCreate(TObject *Sender)
 {
@@ -153,7 +156,7 @@ void __fastcall TOptionsfrm::cmbSchemeSelectChange(TObject *Sender)
 }
 //---------------------------------------------------------------------------
 
-// TODO 1 -cOptions: Change to use RxRichEditX somehow, so we're consistent with look and feel of real control
+// TODO 1 -cOptions: Change preview to use RxRichEditX, so we're consistent with look and feel of real control
 void TOptionsfrm::UpdatePreview()
 {
 	char buffTemp[512], buffFinal[512], font[64];
@@ -720,80 +723,76 @@ void TOptionsfrm::extractSettings(SWConfig* config) {
 	string tmpval;
 
 	emap = config->Sections["Appearance"];
-	emap.erase("AutoVSColor"); emap.insert(ConfigEntMap::value_type("AutoVSColor", IntToStr((Optionsfrm->AutoVSColor->Checked)?1:0).c_str()));
-	emap.erase("CurrentVSColor"); emap.insert(ConfigEntMap::value_type("CurrentVSColor", IntToStr(Optionsfrm->ColorDialogVS->Color).c_str()));
-	emap.erase("StrongsColor"); emap.insert(ConfigEntMap::value_type("StrongsColor", IntToStr(Optionsfrm->ColorDialogStrongs->Color).c_str()));
-	emap.erase("MorphColor"); emap.insert(ConfigEntMap::value_type("MorphColor", IntToStr(Optionsfrm->ColorDialogMorph->Color).c_str()));
-	emap.erase("VSNumberColor"); emap.insert(ConfigEntMap::value_type("VSNumberColor", IntToStr(Optionsfrm->ColorDialogVerseNum->Color).c_str()));
-	emap.erase("FieldColor"); emap.insert(ConfigEntMap::value_type("FieldColor", IntToStr(Optionsfrm->ColorDialogField->Color).c_str()));
-
-	emap.erase("TextBackColor"); emap.insert(ConfigEntMap::value_type("TextBackColor", IntToStr(Optionsfrm->FontDialogText->BackColor).c_str()));
-	emap.erase("CommentBackColor"); emap.insert(ConfigEntMap::value_type("CommentBackColor", IntToStr(Optionsfrm->FontDialogComment->BackColor).c_str()));
-	emap.erase("LDBackColor"); emap.insert(ConfigEntMap::value_type("LDBackColor", IntToStr(Optionsfrm->FontDialogLD->BackColor).c_str()));
-	emap.erase("PopupBackColor"); emap.insert(ConfigEntMap::value_type("PopupBackColor", IntToStr(Optionsfrm->FontDialogPopup->BackColor).c_str()));
-
-	emap.erase("TextFontName"); emap.insert(ConfigEntMap::value_type("TextFontName", (Optionsfrm->FontDialogText->Font->Name).c_str()));
-	emap.erase("CommentFontName"); emap.insert(ConfigEntMap::value_type("CommentFontName", (Optionsfrm->FontDialogComment->Font->Name).c_str()));
-	emap.erase("LDFontName"); emap.insert(ConfigEntMap::value_type("LDFontName", (Optionsfrm->FontDialogLD->Font->Name).c_str()));
-	emap.erase("PopupFontName"); emap.insert(ConfigEntMap::value_type("PopupFontName", (Optionsfrm->FontDialogPopup->Font->Name).c_str()));
-
-	emap.erase("TextFontSize"); emap.insert(ConfigEntMap::value_type("TextFontSize", IntToStr(Optionsfrm->FontDialogText->Font->Size).c_str()));
-	emap.erase("CommentFontSize"); emap.insert(ConfigEntMap::value_type("CommentFontSize", IntToStr(Optionsfrm->FontDialogComment->Font->Size).c_str()));
-	emap.erase("LDFontSize"); emap.insert(ConfigEntMap::value_type("LDFontSize", IntToStr(Optionsfrm->FontDialogLD->Font->Size).c_str()));
-	emap.erase("PopupFontSize"); emap.insert(ConfigEntMap::value_type("PopupFontSize", IntToStr(Optionsfrm->FontDialogPopup->Font->Size).c_str()));
-
-	emap.erase("TextFontColor"); emap.insert(ConfigEntMap::value_type("TextFontColor", IntToStr(Optionsfrm->FontDialogText->Font->Color).c_str()));
-	emap.erase("CommentFontColor"); emap.insert(ConfigEntMap::value_type("CommentFontColor", IntToStr(Optionsfrm->FontDialogComment->Font->Color).c_str()));
-	emap.erase("LDFontColor"); emap.insert(ConfigEntMap::value_type("LDFontColor", IntToStr(Optionsfrm->FontDialogLD->Font->Color).c_str()));
-	emap.erase("PopupFontColor"); emap.insert(ConfigEntMap::value_type("PopupFontColor", IntToStr(Optionsfrm->FontDialogPopup->Font->Color).c_str()));
-
-	emap.erase("locale"); emap.insert(ConfigEntMap::value_type("locale", (const char *)Optionsfrm->localeCB->Items->Objects[Optionsfrm->localeCB->ItemIndex]));
+	emap["AutoVSColor"]      = IntToStr((Optionsfrm->AutoVSColor->Checked)?1:0).c_str();
+	emap["CurrentVSColor"]   = IntToStr(Optionsfrm->ColorDialogVS->Color).c_str();
+	emap["StrongsColor"]     = IntToStr(Optionsfrm->ColorDialogStrongs->Color).c_str();
+	emap["MorphColor"]       = IntToStr(Optionsfrm->ColorDialogMorph->Color).c_str();
+	emap["VSNumberColor"]    = IntToStr(Optionsfrm->ColorDialogVerseNum->Color).c_str();
+	emap["FieldColor"]       = IntToStr(Optionsfrm->ColorDialogField->Color).c_str();
+	    
+	emap["TextBackColor"]    = IntToStr(Optionsfrm->FontDialogText->BackColor).c_str();
+	emap["CommentBackColor"] = IntToStr(Optionsfrm->FontDialogComment->BackColor).c_str();
+	emap["LDBackColor"]      = IntToStr(Optionsfrm->FontDialogLD->BackColor).c_str();
+	emap["PopupBackColor"]   = IntToStr(Optionsfrm->FontDialogPopup->BackColor).c_str();
+	    
+	emap["TextFontName"]     = (Optionsfrm->FontDialogText->Font->Name).c_str();
+	emap["CommentFontName"]  = (Optionsfrm->FontDialogComment->Font->Name).c_str();
+	emap["LDFontName"]       = (Optionsfrm->FontDialogLD->Font->Name).c_str();
+	emap["PopupFontName"]    = (Optionsfrm->FontDialogPopup->Font->Name).c_str();
+
+	emap["TextFontSize"]     = IntToStr(Optionsfrm->FontDialogText->Font->Size).c_str();
+	emap["CommentFontSize"]  = IntToStr(Optionsfrm->FontDialogComment->Font->Size).c_str();
+	emap["LDFontSize"]       = IntToStr(Optionsfrm->FontDialogLD->Font->Size).c_str();
+	emap["PopupFontSize"]    = IntToStr(Optionsfrm->FontDialogPopup->Font->Size).c_str();
+	    
+	emap["TextFontColor"]    = IntToStr(Optionsfrm->FontDialogText->Font->Color).c_str();
+	emap["CommentFontColor"] = IntToStr(Optionsfrm->FontDialogComment->Font->Color).c_str();
+	emap["LDFontColor"]      = IntToStr(Optionsfrm->FontDialogLD->Font->Color).c_str();
+	emap["PopupFontColor"]   = IntToStr(Optionsfrm->FontDialogPopup->Font->Color).c_str();
+	    
+	emap["locale"]           = (const char *)Optionsfrm->localeCB->Items->Objects[Optionsfrm->localeCB->ItemIndex];
+
 	config->Sections["Appearance"] = emap;
 
 	emap = config->Sections["ModDefaults"];
 
 	if (Optionsfrm->greekDefCB->ItemIndex > -1) {
-		emap.erase("GreekDef"); emap.insert(ConfigEntMap::value_type("GreekDef", (const char *)Optionsfrm->greekDefCB->Items->Objects[Optionsfrm->greekDefCB->ItemIndex]));
+		emap["GreekDef"]       = (const char *)Optionsfrm->greekDefCB->Items->Objects[Optionsfrm->greekDefCB->ItemIndex];
 	}
 	if (Optionsfrm->greekParseCB->ItemIndex > -1) {
-		emap.erase("GreekParse"); emap.insert(ConfigEntMap::value_type("GreekParse", (const char *)Optionsfrm->greekParseCB->Items->Objects[Optionsfrm->greekParseCB->ItemIndex]));
+		emap["GreekParse"]     = (const char *)Optionsfrm->greekParseCB->Items->Objects[Optionsfrm->greekParseCB->ItemIndex];
 	}
 	if (Optionsfrm->hebrewDefCB->ItemIndex > -1) {
-		emap.erase("HebrewDef"); emap.insert(ConfigEntMap::value_type("HebrewDef", (const char *)Optionsfrm->hebrewDefCB->Items->Objects[Optionsfrm->hebrewDefCB->ItemIndex]));
+		emap["HebrewDef"]      = (const char *)Optionsfrm->hebrewDefCB->Items->Objects[Optionsfrm->hebrewDefCB->ItemIndex];
 	}
 	if (Optionsfrm->hebrewParseCB->ItemIndex > -1) {
-		emap.erase("HebrewParse"); emap.insert(ConfigEntMap::value_type("HebrewParse", (const char *)Optionsfrm->hebrewParseCB->Items->Objects[Optionsfrm->hebrewParseCB->ItemIndex]));
+		emap["HebrewParse"]    = (const char *)Optionsfrm->hebrewParseCB->Items->Objects[Optionsfrm->hebrewParseCB->ItemIndex];
 	}
 	if (Optionsfrm->dailyDefaultCB->ItemIndex > -1) {
-		emap.erase("DailyDevotion"); emap.insert(ConfigEntMap::value_type("DailyDevotion", (const char *)Optionsfrm->dailyDefaultCB->Items->Objects[Optionsfrm->dailyDefaultCB->ItemIndex]));
+		emap["DailyDevotion"]  = (const char *)Optionsfrm->dailyDefaultCB->Items->Objects[Optionsfrm->dailyDefaultCB->ItemIndex];
 	}
 	if (Optionsfrm->strongsNumsCB->ItemIndex > -1) {
-		emap.erase("StrongsNumbers"); emap.insert(ConfigEntMap::value_type("StrongsNumbers", (const char *)Optionsfrm->strongsNumsCB->Items->Objects[Optionsfrm->strongsNumsCB->ItemIndex]));
+		emap["StrongsNumbers"] = (const char *)Optionsfrm->strongsNumsCB->Items->Objects[Optionsfrm->strongsNumsCB->ItemIndex];
 	}
 	config->Sections["ModDefaults"] = emap;
 
 
 	emap = config->Sections["Bookmarks"];
-	emap.erase("AutoSavePersonal"); emap.insert(ConfigEntMap::value_type("AutoSavePersonal", IntToStr((Optionsfrm->AutoBMPersonal->Checked)?1:0).c_str()));
-	emap.erase("AutoSaveOther"); emap.insert(ConfigEntMap::value_type("AutoSaveOther", IntToStr((Optionsfrm->AutoBMOther->Checked)?1:0).c_str()));
+	emap["AutoSavePersonal"] = IntToStr((Optionsfrm->AutoBMPersonal->Checked)?1:0).c_str();
+	emap["AutoSaveOther"]    = IntToStr((Optionsfrm->AutoBMOther->Checked)?1:0).c_str();
 	config->Sections["Bookmarks"] = emap;
 
-	emap = config->Sections["Layout"];
-	emap.erase("AutoSaveLayout"); emap.insert(ConfigEntMap::value_type("AutoSaveLayout", IntToStr((Optionsfrm->AutoLayout->Checked)?1:0).c_str()));
-	config->Sections["Layout"] = emap;
+	config->Sections["Layout"]["AutoSaveLayout"] = IntToStr((Optionsfrm->AutoLayout->Checked)?1:0).c_str();
 
-	emap = config->Sections["Hints"];
-	emap.erase("On"); emap.insert(ConfigEntMap::value_type("On", IntToStr((Optionsfrm->HintPopups->Checked)?1:0).c_str()));
-	config->Sections["Hints"] = emap;
+	config->Sections["Hints"]["On"] = IntToStr((Optionsfrm->HintPopups->Checked)?1:0).c_str();
 
-	emap = config->Sections["HintStrongs"];
-	emap.erase("On"); emap.insert(ConfigEntMap::value_type("On", IntToStr((Optionsfrm->HintStrongs->Checked)?1:0).c_str()));
-	config->Sections["HintStrongs"] = emap;
+	config->Sections["HintStrongs"]["On"] = IntToStr((Optionsfrm->HintStrongs->Checked)?1:0).c_str();
 
 	emap = config->Sections["General"];
-	emap.erase("TipOfTheDay"); emap.insert(ConfigEntMap::value_type("TipOfTheDay", (Optionsfrm->devSplashCB->Checked)?"Devotional":""));
-	emap.erase("DevsAsDicts"); emap.insert(ConfigEntMap::value_type("DevsAsDicts", (Optionsfrm->devsAsDictsCB->Checked)?"true":"false"));
-	emap.erase("GlosAsDicts"); emap.insert(ConfigEntMap::value_type("GlosAsDicts", (Optionsfrm->glosAsDictsCB->Checked)?"true":"false"));
+	emap["TipOfTheDay"] = (Optionsfrm->devSplashCB->Checked)?"Devotional":"";
+	emap["DevsAsDicts"] = (Optionsfrm->devsAsDictsCB->Checked)?"true":"false";
+	emap["GlosAsDicts"] = (Optionsfrm->glosAsDictsCB->Checked)?"true":"false";
+
 	config->Sections["General"] = emap;
 }
 
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr
index 1d25d17..a5665b0 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr
@@ -25,8 +25,8 @@
       versesel.dfm RangeMaintFrm.dfm ModVisFrm.dfm DevOfTheDay.dfm 
       SplashPage.dfm FontSel.dfm StudyProfessor.dfm rtfhintfrm.dfm 
       PreviewForm.dfm PrintFrm.dfm"/>
-    <LIBFILES value="swordlib.lib ..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib 
-      ..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib 
+    <LIBFILES value="swordlib.lib ..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib 
       ..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib"/>
     <LIBRARIES value="bcbie50.lib vcljpg50.lib nmfast50.lib vclbde50.lib vcldb50.lib vclx50.lib 
       vcl50.lib"/>
@@ -43,7 +43,7 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_;_DEBUG"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="sword.cpp"/>
     <INCLUDEPATH value="TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -55,16 +55,16 @@
     <IDLCFLAGS value="-I..\.. -I..\..\..\..\..\icu-sword\source\common 
       -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include 
       -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/>
-    <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -RT- -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 -Ve -RT- -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&quot;&quot; -aa -Tpe -GD -s -Gn -v"/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0w32.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -73,7 +73,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=5
 Release=3
-Build=105
+Build=108
 Debug=0
 PreRelease=0
 Special=0
@@ -85,13 +85,13 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=CrossWire Software &amp; Bible Society
 FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.3.105
+FileVersion=1.5.3.108
 InternalName=biblecs
 LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License
 LegalTrademarks=
 OriginalFilename=
 ProductName=The SWORD Project
-ProductVersion=1.5.4betaX
+ProductVersion=1.5.4betaY
 Comments=Seek Him and you will find Him
 
 [HistoryLists\hlIncludePath]
@@ -125,8 +125,8 @@ Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
 Count=5
-Item0=_ICU_;_ICUSWORD_;_DEBUG
-Item1=_ICU_;_ICUSWORD_
+Item0=_ICU_;_ICUSWORD_
+Item1=_ICU_;_ICUSWORD_;_DEBUG
 Item2=_ICU_
 Item3=_ICU_;_DEBUG
 Item4=_DEBUG
@@ -156,7 +156,7 @@ RemoteDebug=0
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
 
 [Language]
 ActiveLang=
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.cpp b/apps/windoze/CBuilder5/BibleCS/sword.cpp
index 3686c59..cda6edf 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/sword.cpp
@@ -31,9 +31,7 @@ USEOBJ("rxlib\Vclutils.obj");
 USEOBJ("rxlib\Rxcconst.obj");
 USEOBJ("rxlib\Rxconst.obj");
 USEFORM("StudyProfessor.cpp", Form3);
-USELIB("..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib");
 USELIB("..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib");
 USEOBJ("rxlib\RxRichEd.obj");
 USEOBJ("rxlib\Maxmin.obj");
 USEUNIT("TModuleFonts.cpp");
@@ -46,6 +44,8 @@ USEOBJ("TntUnicodeControls\TntControls.obj");
 USEOBJ("TntUnicodeControls\TntForms.obj");
 USEOBJ("TntUnicodeControls\TntStdCtrls.obj");
 USEOBJ("TntUnicodeControls\TntClasses.obj");
+USELIB("..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib");
+USELIB("..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib");
 //---------------------------------------------------------------------------
 WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
 
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res
index d637bd6..d5e7e15 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.res
+++ b/apps/windoze/CBuilder5/BibleCS/sword.res
diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
index 7fd20ec..52ae339 100644
--- a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
@@ -78,7 +78,7 @@
     <DEBUGLIBPATH value=""/>
     <RELEASELIBPATH value=""/>
     <LINKER value="TLib"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_;_DEBUG"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
     <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
     <MAINSOURCE value="swordlib.cpp"/>
     <INCLUDEPATH value="..\..;..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook;..\..\..\..\src\modules\lexdict\zld;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..;..\..\..\..\utilfuns;..\..\..\framework;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\include;..\..\..\..\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -107,11 +107,11 @@
       -I..\..\..\..\src\modules\comments\rawcom -I..\..\..\..\src\mgr 
       -I..\..\..\..\src\keys -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix 
       cpp -D_ICU_ -D_DEBUG"/>
-    <CFLAG1 value="-vGc -vGt -vGd -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 -g0 -tWM"/>
-    <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y+ -$W -$O- -v -M -JPHNE"/>
+    <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 
+      -4 -b- -k- -vi -c -g0 -tWM"/>
+    <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y- -$L- -$D- -v -M -JPHNE"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zi"/>
+    <AFLAGS value="/mx /w2 /zn"/>
     <LFLAGS value="/P512"/>
   </OPTIONS>
   <LINKER>
@@ -159,8 +159,8 @@ Item5=..\..\..\..\src\modules\lexdict\zld;..\..;..\..\..\..\src\utilfuns\zlib;..
 
 [HistoryLists\hlConditionals]
 Count=5
-Item0=_ICU_;_ICUSWORD_;_DEBUG
-Item1=_ICU_;_ICUSWORD_
+Item0=_ICU_;_ICUSWORD_
+Item1=_ICU_;_ICUSWORD_;_DEBUG
 Item2=_ICU_
 Item3=_ICU_;_DEBUG
 Item4=_DEBUG
@@ -193,7 +193,7 @@ RemoteDebug=0
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
 
 [Language]
 ActiveLang=
diff --git a/apps/windoze/CBuilder6/BibleCS/sword.bpr b/apps/windoze/CBuilder6/BibleCS/sword.bpr
index e941b25..6cce630 100644
--- a/apps/windoze/CBuilder6/BibleCS/sword.bpr
+++ b/apps/windoze/CBuilder6/BibleCS/sword.bpr
@@ -3,13 +3,14 @@
 <PROJECT>
   <MACROS>
     <VERSION value="BCB.06.00"/>
-    <PROJECT value="&quot;C:\Documents and Settings\dtrotzjr\My Documents\My Projects\The Sword Project\Stage_Sword\sword.exe&quot;"/>
+    <PROJECT value="stage\sword.exe"/>
     <OBJFILES value="obj\sword.obj obj\swdisprtfchap.obj obj\swdisprtf.obj obj\AboutBoxfrm.obj 
       obj\biblecsmgr.obj obj\bookmarkfrm.obj obj\DevOfTheDay.obj 
       obj\editentryfrm.obj obj\FontSel.obj obj\mainfrm.obj obj\ModInstForm.obj 
       obj\ModVisFrm.obj obj\newbmfilefrm.obj obj\optionfrm.obj 
       obj\RangeMaintFrm.obj obj\searchfrm.obj obj\splashfrm.obj 
-      obj\SplashPage.obj obj\StudyProfessor.obj obj\versesel.obj obj\vrslstfrm.obj"/>
+      obj\SplashPage.obj obj\StudyProfessor.obj obj\versesel.obj 
+      obj\vrslstfrm.obj obj\TModuleFonts.obj"/>
     <RESFILES value="..\..\CBuilder5\BibleCS\sword.res"/>
     <IDLFILES value=""/>
     <IDLGENFILES value=""/>
@@ -28,16 +29,26 @@
       ..\..\CBuilder5\BibleCS\splashfrm.dfm ..\..\CBuilder5\BibleCS\SplashPage.dfm 
       ..\..\CBuilder5\BibleCS\StudyProfessor.dfm 
       ..\..\CBuilder5\BibleCS\versesel.dfm ..\..\CBuilder5\BibleCS\vrslstfrm.dfm"/>
-    <LIBFILES value="swordlib.lib C:\icu-sword\as_is\borland\icucommon.lib 
-      C:\icu-sword\as_is\borland\icudatab.lib 
-      C:\icu-sword\as_is\borland\icui18n.lib"/>
-    <LIBRARIES value="bcbie.lib nmfast.lib bdertl.lib vcldb.lib dbrtl.lib vclx.lib vcl.lib rtl.lib"/>
-    <SPARELIBS value="rtl.lib vcl.lib vclx.lib dbrtl.lib vcldb.lib bdertl.lib nmfast.lib bcbie.lib"/>
+    <LIBFILES value="swordlib.lib ..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib 
+      ..\..\..\..\..\icu-sword\as_is\borland\i18n.lib 
+      ..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib 
+      ..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\..\..\icu-sword\as_is\borland\common.lib"/>
+    <LIBRARIES value="bcb2kaxserver.lib indy.lib dbxcds.lib dclocx.lib soaprtl.lib dbexpress.lib 
+      inetdbxpress.lib inetdbbde.lib bcbsmp.lib dsnapcon.lib dsnapcrba.lib 
+      visualdbclx.lib teeqr.lib dss.lib tee.lib teedb.lib teeui.lib qrpt.lib 
+      bdecds.lib cds.lib ibxpress.lib vcldbx.lib adortl.lib bcbie.lib nmfast.lib 
+      bdertl.lib vcldb.lib dbrtl.lib vclx.lib vcl.lib rtl.lib"/>
+    <SPARELIBS value="rtl.lib vcl.lib vclx.lib dbrtl.lib vcldb.lib bdertl.lib nmfast.lib 
+      bcbie.lib adortl.lib vcldbx.lib ibxpress.lib cds.lib bdecds.lib qrpt.lib 
+      teeui.lib teedb.lib tee.lib dss.lib teeqr.lib visualdbclx.lib 
+      dsnapcrba.lib dsnapcon.lib bcbsmp.lib inetdbbde.lib inetdbxpress.lib 
+      dbexpress.lib soaprtl.lib dclocx.lib dbxcds.lib indy.lib bcb2kaxserver.lib"/>
     <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 
       bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 
       ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 
       bcb2kaxserver.bpi"/>
-    <PATHCPP value=".;..\..;..\..;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS"/>
+    <PATHCPP value=".;..\..;..\..;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS;..\..\CBuilder5\BibleCS"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
@@ -47,18 +58,17 @@
     <USERDEFINES value="_USE_OLD_RW_STL;_DEBUG"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="sword.cpp"/>
-    <INCLUDEPATH value="..\..;..\..\..\..\include;C:\sword\apps\windoze\CBuilder5\BibleCS;&quot;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units&quot;;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\include;$(BCB)\include\vcl"/>
-    <LIBPATH value="..\..\CBuilder5\BibleCS;obj;&quot;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units&quot;;..\..;..\..\..\..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="&quot;D:\Program Files\RxLib\Units&quot;;..\..\CBuilder5\BibleCS;..\..;..\..\..\..\include;rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="&quot;D:\Program Files\RxLib\Units&quot;;..\..\CBuilder5\BibleCS;obj;rxlib;..\..;..\..\..\..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par -w-8027 -w-8026"/>
     <WARNOPTSTR value=""/>
     <OTHERFILES value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\..\..\..\..\icu-sword\source\common 
-      -I..\..\..\..\..\icu-sword\source\i18n -I..\.. 
-      -I&quot;C:\Program Files\Borland\CBuilder5\RX\Units\.&quot; -I..\..\..\..\include 
-      -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_ 
-      -D_DEBUG"/>
+    <IDLCFLAGS value="-I&quot;D:\Program Files\RxLib\Units&quot; -I..\..\CBuilder5\BibleCS -I..\.. 
+      -I..\..\..\..\include -Irxlib -I..\..\..\..\..\icu-sword\source\common 
+      -I..\..\..\..\..\icu-sword\source\i18n -I$(BCB)\include 
+      -I$(BCB)\include\vcl -src_suffix cpp -D_USE_OLD_RW_STL -D_DEBUG"/>
     <CFLAG1 value="-Od -Vx -Ve -X- -r- -a8 -5 -b- -k -y -v -vi- -c -tW -tWM"/>
     <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -M -JPHNE"/>
     <RFLAGS value=""/>
@@ -77,9 +87,6 @@
       <FILE FILENAME="swordlib.lib" FORMNAME="" UNITNAME="swordlib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\swdisprtfchap.cpp" FORMNAME="" UNITNAME="swdisprtfchap" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\swdisprtf.cpp" FORMNAME="" UNITNAME="swdisprtf" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="C:\icu-sword\as_is\borland\icucommon.lib" FORMNAME="" UNITNAME="icucommon" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="C:\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="C:\icu-sword\as_is\borland\icui18n.lib" FORMNAME="" UNITNAME="icui18n" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\CBuilder5\BibleCS\AboutBoxfrm.cpp" FORMNAME="AboutBox" UNITNAME="AboutBoxfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\CBuilder5\BibleCS\biblecsmgr.cpp" FORMNAME="" UNITNAME="biblecsmgr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\CBuilder5\BibleCS\bookmarkfrm.cpp" FORMNAME="Bookmarksfrm" UNITNAME="bookmarkfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
@@ -99,13 +106,19 @@
       <FILE FILENAME="..\..\CBuilder5\BibleCS\versesel.cpp" FORMNAME="VerseSelFrm" UNITNAME="versesel" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\CBuilder5\BibleCS\vrslstfrm.cpp" FORMNAME="VerseListFrm" UNITNAME="vrslstfrm" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\CBuilder5\BibleCS\sword.res" FORMNAME="" UNITNAME="sword.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib" FORMNAME="" UNITNAME="icui18n.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\..\..\..\icu-sword\as_is\borland\i18n.lib" FORMNAME="" UNITNAME="i18n.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib" FORMNAME="" UNITNAME="icucommon.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\..\..\..\icu-sword\as_is\borland\common.lib" FORMNAME="" UNITNAME="common.lib" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\CBuilder5\BibleCS\TModuleFonts.cpp" FORMNAME="" UNITNAME="TModuleFonts" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
   </FILELIST>
   <BUILDTOOLS>
   </BUILDTOOLS>
 
   <IDEOPTIONS>
 [Version Info]
-IncludeVerInfo=1
+IncludeVerInfo=0
 AutoIncBuild=1
 MajorVer=1
 MinorVer=5
@@ -131,40 +144,49 @@ ProductName=The SWORD Project
 ProductVersion=1.5.3
 Comments=Seek Him and you will find Him
 
+[Excluded Packages]
+d:\program files\borland\cbuilder6\Bin\dclite60.bpl=Borland Integrated Translation Environment
+
 [HistoryLists\hlIncludePath]
-Count=16
-Item0=..\..;..\..\..\..\include;C:\sword\apps\windoze\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\include;$(BCB)\include\vcl
-Item1=..\..;C:\sword\apps\windoze\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item2=..\..;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item3=C:\Program Files\Borland\CBuilder6\Projects\Rx6\Units;..\..;C:\sword\apps\windoze\CBuilder6\BibleCS\rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item4=..\..;C:\sword\apps\windoze\CBuilder6\BibleCS\rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;C:\Program Files\Borland\CBuilder6\Projects\Rx6\Units
-Item5=..\..;C:\sword\apps\windoze\CBuilder6\BibleCS\rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item6=..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item7=..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item8=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
-Item9=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item10=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib;C:\Program Files\Borland\CBuilder6\Projects\Rx6\Units
-Item11=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item12=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item13=..\..\..\..\..\icu-sword\source\common\;..\..\..\..\..\icu-sword\source\i18n\;..\..;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item14=C:\icu-sword\source\common\;C:\icu-sword\source\i18n\;..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item15=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Count=20
+Item0=..\..\CBuilder5\BibleCS;..\..;..\..\..\..\include;rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\..\CBuilder5\BibleCS;..\..;..\..\..\..\include;..\..\..\..\apps\windoze\CBuilder5\BibleCS\rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\include;$(BCB)\include\vcl
+Item2=..\..\CBuilder5\BibleCS;..\..;..\..\..\..\include;..\..\..\..\apps\windoze\CBuilder5\BibleCS;..\..\..\..\apps\windoze\CBuilder5\BibleCS\rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\CBuilder5\BibleCS;..\..;..\..\..\..\include;C:\sword\apps\windoze\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\include;$(BCB)\include\vcl
+Item4=..\..;..\..\..\..\include;C:\sword\apps\windoze\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\include;$(BCB)\include\vcl
+Item5=..\..;C:\sword\apps\windoze\CBuilder5\BibleCS;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item6=..\..;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item7=C:\Program Files\Borland\CBuilder6\Projects\Rx6\Units;..\..;C:\sword\apps\windoze\CBuilder6\BibleCS\rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item8=..\..;C:\sword\apps\windoze\CBuilder6\BibleCS\rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;C:\Program Files\Borland\CBuilder6\Projects\Rx6\Units
+Item9=..\..;C:\sword\apps\windoze\CBuilder6\BibleCS\rxlib;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item10=..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item11=..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item12=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item13=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item14=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib;C:\Program Files\Borland\CBuilder6\Projects\Rx6\Units
+Item15=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item16=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item17=..\..\..\..\..\icu-sword\source\common\;..\..\..\..\..\icu-sword\source\i18n\;..\..;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item18=C:\icu-sword\source\common\;C:\icu-sword\source\i18n\;..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item19=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
 
 [HistoryLists\hlLibraryPath]
-Count=13
-Item0=..\..\CBuilder5\BibleCS;obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..;..\..\..\..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item1=obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..;..\..\..\..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\..\CBuilder5\BibleCS;..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item3=..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item4=..\..;C:\sword\apps\windoze\CBuilder6\BibleCS\rxlib;..\..\..\..\lib;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item5=..\..;$(BCB)\Projects\Rx6\Units;..\..\..\..\lib;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item6=..\..;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\lib;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item7=$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\lib;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item8=..\..\..\windoze;..\..\..\..\lib;$(BCB)\Projects\Rx6\Units;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item9=..\..\..\windoze;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item10=..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item11=..\..;..\..\..\..\lib\;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item12=..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Count=15
+Item0=..\..\CBuilder5\BibleCS;obj;rxlib;..\..;..\..\..\..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\..\CBuilder5\BibleCS;obj;..\..\..\..\apps\windoze\CBuilder5\BibleCS\rxlib;..\..;..\..\..\..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\CBuilder5\BibleCS;obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..;..\..\..\..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item3=obj;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;..\..;..\..\..\..\lib;$(BCB)\Projects\Lib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\CBuilder5\BibleCS;..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item5=..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder6\Projects\RxLib\Units;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item6=..\..;C:\sword\apps\windoze\CBuilder6\BibleCS\rxlib;..\..\..\..\lib;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item7=..\..;$(BCB)\Projects\Rx6\Units;..\..\..\..\lib;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item8=..\..;$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\lib;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item9=$(BCB)\Projects\Rx6\Units;..\..\..\windoze;..\..\..\..\lib;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item10=..\..\..\windoze;..\..\..\..\lib;$(BCB)\Projects\Rx6\Units;$(BCB)\Projects\Lib;..\InstallMgr;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item11=..\..\..\windoze;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item12=..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item13=..\..;..\..\..\..\lib\;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item14=..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
@@ -186,9 +208,9 @@ Item1=C:\sword\apps\windoze\CBuilder5\BibleCS\obj
 
 [HistoryLists\hlFinalOutputDir]
 Count=6
-Item0=C:\Documents and Settings\dtrotzjr\My Documents\My Projects\The Sword Project\Stage_Sword\
-Item1=C:\Documents and Settings\dtrotzjr\My Documents\My Projects\The Sword Project\Stage_Sword
-Item2=stage\
+Item0=stage\
+Item1=C:\Documents and Settings\dtrotzjr\My Documents\My Projects\The Sword Project\Stage_Sword\
+Item2=C:\Documents and Settings\dtrotzjr\My Documents\My Projects\The Sword Project\Stage_Sword
 Item3=C:\Documents and Settings\Michelle Trotz\My Documents\My Projects\The Sword Project\Stage_Sword\
 Item4=C:\Documents and Settings\Michelle Trotz\My Documents\My Projects\The Sword Project\Stage_Sword
 Item5=C:\sword\apps\windoze\CBuilder5\BibleCS\stage
@@ -213,9 +235,9 @@ ShowInfoMsgs=0
 LinkDebugVcl=0
 LinkCGLIB=0
 
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
   </IDEOPTIONS>
 </PROJECT>
\ No newline at end of file
diff --git a/apps/windoze/CBuilder6/BibleCS/sword.cpp b/apps/windoze/CBuilder6/BibleCS/sword.cpp
index f474a29..9d560aa 100644
--- a/apps/windoze/CBuilder6/BibleCS/sword.cpp
+++ b/apps/windoze/CBuilder6/BibleCS/sword.cpp
@@ -131,3 +131,7 @@ WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, in
 	return 0;
 }
 //---------------------------------------------------------------------------
+
+
+
+