summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Diaspora/Diaspora.bpr15
-rw-r--r--Diaspora/Diaspora.cpp18
-rw-r--r--Diaspora/Main.cpp41
-rw-r--r--Diaspora/Main.h17
4 files changed, 75 insertions, 16 deletions
diff --git a/Diaspora/Diaspora.bpr b/Diaspora/Diaspora.bpr
index b07460b..b2b05d0 100644
--- a/Diaspora/Diaspora.bpr
+++ b/Diaspora/Diaspora.bpr
@@ -4,7 +4,7 @@
<MACROS>
<VERSION value="BCB.05.03"/>
<PROJECT value="Diaspora.exe"/>
- <OBJFILES value="Diaspora.obj Main.obj"/>
+ <OBJFILES value="Diaspora.obj Main.obj thmlpbr.obj"/>
<RESFILES value="Diaspora.res"/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
@@ -25,7 +25,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value=""/>
+ <USERDEFINES value="_DEBUG"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="Diaspora.cpp"/>
<INCLUDEPATH value="$(BCB)\include;$(BCB)\include\vcl;..\..\sword\include"/>
@@ -34,12 +34,13 @@
</MACROS>
<OPTIONS>
<IDLCFLAGS value="-I$(BCB)\include -I$(BCB)\include\vcl -I..\..\sword\include -src_suffix
- cpp -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tW -tWM"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ cpp -D_DEBUG -boa"/>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c
+ -tW -tWM"/>
+ <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D&quot;&quot; -aa -Tpe -x -Gn"/>
+ <AFLAGS value="/mx /w2 /zi"/>
+ <LFLAGS value="-D&quot;&quot; -aa -Tpe -x -Gn -v"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0w32.obj sysinit.obj $(OBJFILES)"/>
diff --git a/Diaspora/Diaspora.cpp b/Diaspora/Diaspora.cpp
index 74e063b..7fde538 100644
--- a/Diaspora/Diaspora.cpp
+++ b/Diaspora/Diaspora.cpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
//---------------------------------------------------------------------------
#include <vcl.h>
@@ -5,6 +22,7 @@
USERES("Diaspora.res");
USELIB("swordlib.lib");
USEFORM("Main.cpp", MainForm);
+USEUNIT("thmlpbr.cpp");
//---------------------------------------------------------------------------
WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
{
diff --git a/Diaspora/Main.cpp b/Diaspora/Main.cpp
index 7de2bfc..e97ae8e 100644
--- a/Diaspora/Main.cpp
+++ b/Diaspora/Main.cpp
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
//---------------------------------------------------------------------------
#include <vcl\vcl.h>
#pragma hdrstop
@@ -9,6 +26,8 @@
#include <thmlgbf.h>
#include <thmlolb.h>
#include <thmlplain.h>
+#include "thmlpbr.h"
+
#include <localemgr.h>
#include <rawtext.h>
@@ -188,6 +207,7 @@ void __fastcall TMainForm::outputClick(TObject *Sender)
static ThMLOLB olboutputfilter;
static ThMLGBF gbfoutputfilter;
static ThMLPlain plainoutputfilter;
+ static ThMLPBR pbroutputfilter;
int format;
if (fmtOLB->Checked) format = OLB;
@@ -235,9 +255,9 @@ void __fastcall TMainForm::outputClick(TObject *Sender)
if (optRoman->Checked){}
- if (format == OLB) {
+ if (format == OLB)
manager->setGlobalOption("Headings","Off");
- }
+
for (int i = 0; i < modlist->Items->Count; i++) {
if (modlist->Checked[i]) {
@@ -833,12 +853,12 @@ void __fastcall TMainForm::outputClick(TObject *Sender)
}
}
fprintf(ofile, "<ZZ>\n");
- mod->RemoveRenderFilter(&gbfoutputfilter);
+ mod->RemoveRenderFilter(&gbfoutputfilter);
}
}
else if (format == PBR) {
if (!strcmp(mod->Type(), "Biblical Texts") || !strcmp(mod->Type(), "Commentaries")) {
- mod->AddRenderFilter(&plainoutputfilter);
+ mod->AddRenderFilter(&pbroutputfilter);
LocaleMgr::systemLocaleMgr.setDefaultLocaleName(lang);
fprintf(ofile, "<PARSERINFO ENCODE=\"iso-8859-1\" WORDTYPE=\"SPCSEP\">\n\n");
fprintf(ofile, "<BIBLE NAME=\"%s\" INFO=\"%s\" ALIGN=\"%s\">\n", (char*)mod->Name(), (char*)mod->Description(), rtl ? "RIGHT" : "LEFT");
@@ -906,7 +926,7 @@ void __fastcall TMainForm::outputClick(TObject *Sender)
int len = 2 * strlen(vkey2->books[testament - 1][book - 1].name);
char* localname = new char[len];
strcpy (localname, vkey2->books[testament - 1][book - 1].name);
- latin1filter.ProcessText(localname, len, NULL);
+ //latin1filter.ProcessText(localname, len, NULL);
fprintf (ofile, "<BOOK NAME=\"%s\" NUMBER=\"%d\" SHORTCUT=\"%s\">\n", localname, palmbooks[book + (39 * (testament - 1))], palmbooknames[book + (39 * (testament - 1))]);
delete localname;
@@ -938,13 +958,13 @@ void __fastcall TMainForm::outputClick(TObject *Sender)
int len = 2 * strlen(vkey->books[testament - 1][book - 1].name);
char* localname = new char[len];
strcpy (localname, vkey->books[testament - 1][book - 1].name);
- latin1filter.ProcessText(localname, len, NULL);
+ //latin1filter.ProcessText(localname, len, NULL);
fprintf(ofile, "<BOOKTEXT>%s", localname);
delete localname;
}
- fprintf (ofile, "<CHAPTEXT>Chapter %d<VERSTEXT>", chapter);
+ fprintf (ofile, "<CHAPTEXT>Chapter %d", chapter);
}
fprintf (ofile, "%s<\/VERSE>\n", text);
@@ -989,7 +1009,7 @@ void __fastcall TMainForm::outputClick(TObject *Sender)
}
fprintf(ofile, "<\/CHAPTER>\n<\/BOOK>\n<\/BIBLE>\n");
- mod->RemoveRenderFilter(&plainoutputfilter);
+ mod->RemoveRenderFilter(&pbroutputfilter);
}
}
@@ -997,7 +1017,10 @@ void __fastcall TMainForm::outputClick(TObject *Sender)
feedback->Lines->Add(modlist->Items->Strings[i] + " - Complete");
}
}
- feedback->Lines->Add("All Modules Complete");
+ feedback->Lines->Add("Cleaning up...");
+ delete manager;
+ manager = new SWMgr();
+ feedback->Lines->Add("Finished");
}
//---------------------------------------------------------------------------
diff --git a/Diaspora/Main.h b/Diaspora/Main.h
index 4bd6d6d..1636682 100644
--- a/Diaspora/Main.h
+++ b/Diaspora/Main.h
@@ -1,3 +1,20 @@
+/*
+ *
+ * Copyright 2001 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ 85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ */
//---------------------------------------------------------------------------
#ifndef MainH
#define MainH
generated by cgit (git 2.34.1) at 2024-11-10 08:08:17 +0000