summaryrefslogtreecommitdiff
path: root/examples/cmdline
diff options
context:
space:
mode:
Diffstat (limited to 'examples/cmdline')
-rw-r--r--examples/cmdline/CMakeLists.txt1
-rw-r--r--examples/cmdline/Makefile.am3
-rw-r--r--examples/cmdline/Makefile.in20
-rw-r--r--examples/cmdline/bcppmake/cmdline.bpg162
-rw-r--r--examples/cmdline/bcppmake/listoptions.bpf20
-rw-r--r--examples/cmdline/bcppmake/listoptions.bpr192
-rw-r--r--examples/cmdline/bcppmake/lookup.bpf20
-rw-r--r--examples/cmdline/bcppmake/lookup.bpr192
-rw-r--r--examples/cmdline/bcppmake/outplain.bpf20
-rw-r--r--examples/cmdline/bcppmake/outplain.bpr192
-rw-r--r--examples/cmdline/bcppmake/outrender.bpf20
-rw-r--r--examples/cmdline/bcppmake/outrender.bpr192
-rw-r--r--examples/cmdline/bcppmake/search.bpf22
-rw-r--r--examples/cmdline/bcppmake/search.bpr192
-rw-r--r--examples/cmdline/bcppmake/threaded_search.bpf20
-rw-r--r--examples/cmdline/bcppmake/threaded_search.bpr192
-rw-r--r--examples/cmdline/bcppmake/verserangeparse.bpf20
-rw-r--r--examples/cmdline/bcppmake/verserangeparse.bpr192
-rw-r--r--examples/cmdline/lookup.cpp16
-rw-r--r--examples/cmdline/search.cpp51
-rw-r--r--examples/cmdline/stripaccents.cpp80
21 files changed, 966 insertions, 853 deletions
diff --git a/examples/cmdline/CMakeLists.txt b/examples/cmdline/CMakeLists.txt
index bfbb995..a6c8c73 100644
--- a/examples/cmdline/CMakeLists.txt
+++ b/examples/cmdline/CMakeLists.txt
@@ -11,6 +11,7 @@ SET(example_PROGRAMS
outrender
search
verserangeparse
+ stripaccents
)
FOREACH(DEMO ${example_PROGRAMS})
diff --git a/examples/cmdline/Makefile.am b/examples/cmdline/Makefile.am
index 1b14b67..1e1444e 100644
--- a/examples/cmdline/Makefile.am
+++ b/examples/cmdline/Makefile.am
@@ -5,10 +5,11 @@ AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
endif
LDADD = $(top_builddir)/lib/libsword.la
-noinst_PROGRAMS = lookup search threaded_search listoptions verserangeparse outplain outrender
+noinst_PROGRAMS = lookup search threaded_search listoptions verserangeparse outplain outrender stripaccents
lookup_SOURCES = lookup.cpp
search_SOURCES = search.cpp
+stripaccents_SOURCES = stripaccents.cpp
listoptions_SOURCES = listoptions.cpp
verserangeparse_SOURCES = verserangeparse.cpp
threaded_search_SOURCES = threaded_search.cpp
diff --git a/examples/cmdline/Makefile.in b/examples/cmdline/Makefile.in
index a6fa444..6d8cded 100644
--- a/examples/cmdline/Makefile.in
+++ b/examples/cmdline/Makefile.in
@@ -82,7 +82,8 @@ target_triplet = @target@
@USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex
noinst_PROGRAMS = lookup$(EXEEXT) search$(EXEEXT) \
threaded_search$(EXEEXT) listoptions$(EXEEXT) \
- verserangeparse$(EXEEXT) outplain$(EXEEXT) outrender$(EXEEXT)
+ verserangeparse$(EXEEXT) outplain$(EXEEXT) outrender$(EXEEXT) \
+ stripaccents$(EXEEXT)
subdir = examples/cmdline
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
@@ -123,6 +124,10 @@ am_search_OBJECTS = search.$(OBJEXT)
search_OBJECTS = $(am_search_OBJECTS)
search_LDADD = $(LDADD)
search_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_stripaccents_OBJECTS = stripaccents.$(OBJEXT)
+stripaccents_OBJECTS = $(am_stripaccents_OBJECTS)
+stripaccents_LDADD = $(LDADD)
+stripaccents_DEPENDENCIES = $(top_builddir)/lib/libsword.la
am_threaded_search_OBJECTS = threaded_search.$(OBJEXT)
threaded_search_OBJECTS = $(am_threaded_search_OBJECTS)
threaded_search_DEPENDENCIES = $(LDADD)
@@ -165,11 +170,12 @@ am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
SOURCES = $(listoptions_SOURCES) $(lookup_SOURCES) $(outplain_SOURCES) \
- $(outrender_SOURCES) $(search_SOURCES) \
+ $(outrender_SOURCES) $(search_SOURCES) $(stripaccents_SOURCES) \
$(threaded_search_SOURCES) $(verserangeparse_SOURCES)
DIST_SOURCES = $(listoptions_SOURCES) $(lookup_SOURCES) \
$(outplain_SOURCES) $(outrender_SOURCES) $(search_SOURCES) \
- $(threaded_search_SOURCES) $(verserangeparse_SOURCES)
+ $(stripaccents_SOURCES) $(threaded_search_SOURCES) \
+ $(verserangeparse_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -348,15 +354,18 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+with_bzip2 = @with_bzip2@
with_conf = @with_conf@
with_icu = @with_icu@
with_icusword = @with_icusword@
+with_xz = @with_xz@
with_zlib = @with_zlib@
AUTOMAKE_OPTIONS = 1.6
AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1)
LDADD = $(top_builddir)/lib/libsword.la
lookup_SOURCES = lookup.cpp
search_SOURCES = search.cpp
+stripaccents_SOURCES = stripaccents.cpp
listoptions_SOURCES = listoptions.cpp
verserangeparse_SOURCES = verserangeparse.cpp
threaded_search_SOURCES = threaded_search.cpp
@@ -427,6 +436,10 @@ search$(EXEEXT): $(search_OBJECTS) $(search_DEPENDENCIES) $(EXTRA_search_DEPENDE
@rm -f search$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(search_OBJECTS) $(search_LDADD) $(LIBS)
+stripaccents$(EXEEXT): $(stripaccents_OBJECTS) $(stripaccents_DEPENDENCIES) $(EXTRA_stripaccents_DEPENDENCIES)
+ @rm -f stripaccents$(EXEEXT)
+ $(AM_V_CXXLD)$(CXXLINK) $(stripaccents_OBJECTS) $(stripaccents_LDADD) $(LIBS)
+
threaded_search$(EXEEXT): $(threaded_search_OBJECTS) $(threaded_search_DEPENDENCIES) $(EXTRA_threaded_search_DEPENDENCIES)
@rm -f threaded_search$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(threaded_search_OBJECTS) $(threaded_search_LDADD) $(LIBS)
@@ -446,6 +459,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outplain.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outrender.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripaccents.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threaded_search.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verserangeparse.Po@am__quote@
diff --git a/examples/cmdline/bcppmake/cmdline.bpg b/examples/cmdline/bcppmake/cmdline.bpg
index 943790e..756b532 100644
--- a/examples/cmdline/bcppmake/cmdline.bpg
+++ b/examples/cmdline/bcppmake/cmdline.bpg
@@ -1,81 +1,81 @@
-#------------------------------------------------------------------------------
-VERSION = BWS.01
-#------------------------------------------------------------------------------
-!ifndef ROOT
-ROOT = $(MAKEDIR)\..
-!endif
-#------------------------------------------------------------------------------
-MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
-DCC = $(ROOT)\bin\dcc32.exe $**
-BRCC = $(ROOT)\bin\brcc32.exe $**
-#------------------------------------------------------------------------------
-PROJECTS = icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib \
- listoptions.exe lookup.exe outplain.exe outrender.exe search.exe \
- verserangeparse.exe threaded_search.exe
-#------------------------------------------------------------------------------
-default: $(PROJECTS)
-#------------------------------------------------------------------------------
-
-libsword.lib: ..\..\..\lib\bcppmake\libsword.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-icuuc.lib: ..\..\..\..\icu-sword\as_is\borland\icuuc.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-icuin.lib: ..\..\..\..\icu-sword\as_is\borland\icuin.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-xml2gbs.exe: xml2gbs.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-osis2mod.exe: osis2mod.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-tei2mod.exe: tei2mod.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-installmgr.exe: installmgr.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-clucene.lib: ..\..\..\..\biblecs\clucene\clucene.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-libcurl.lib: ..\..\..\..\biblecs\apps\InstallMgr\libcurl.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-verserangeparse.exe: verserangeparse.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-threaded_search.exe: threaded_search.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-search.exe: search.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-outrender.exe: outrender.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-outplain.exe: outplain.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-lookup.exe: lookup.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
-listoptions.exe: listoptions.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+#------------------------------------------------------------------------------
+VERSION = BWS.01
+#------------------------------------------------------------------------------
+!ifndef ROOT
+ROOT = $(MAKEDIR)\..
+!endif
+#------------------------------------------------------------------------------
+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+DCC = $(ROOT)\bin\dcc32.exe $**
+BRCC = $(ROOT)\bin\brcc32.exe $**
+#------------------------------------------------------------------------------
+PROJECTS = icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib \
+ listoptions.exe lookup.exe outplain.exe outrender.exe search.exe \
+ verserangeparse.exe threaded_search.exe
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+libsword.lib: ..\..\..\lib\bcppmake\libsword.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+icuuc.lib: ..\..\..\..\icu-sword\as_is\borland\icuuc.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+icuin.lib: ..\..\..\..\icu-sword\as_is\borland\icuin.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+xml2gbs.exe: xml2gbs.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+osis2mod.exe: osis2mod.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+tei2mod.exe: tei2mod.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+installmgr.exe: installmgr.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+clucene.lib: ..\..\..\..\biblecs\clucene\clucene.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+libcurl.lib: ..\..\..\..\biblecs\apps\InstallMgr\libcurl.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+verserangeparse.exe: verserangeparse.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+threaded_search.exe: threaded_search.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+search.exe: search.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+outrender.exe: outrender.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+outplain.exe: outplain.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+lookup.exe: lookup.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+listoptions.exe: listoptions.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
diff --git a/examples/cmdline/bcppmake/listoptions.bpf b/examples/cmdline/bcppmake/listoptions.bpf
index 9e2ee47..64148ce 100644
--- a/examples/cmdline/bcppmake/listoptions.bpf
+++ b/examples/cmdline/bcppmake/listoptions.bpf
@@ -1,11 +1,11 @@
-USEUNIT("..\listoptions.cpp");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
-USELIB("..\..\..\lib\libsword.lib");
-USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
-//---------------------------------------------------------------------------
-This file is used by the project manager only and should be treated like the project file
-
-
+USEUNIT("..\listoptions.cpp");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\lib\libsword.lib");
+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
main \ No newline at end of file
diff --git a/examples/cmdline/bcppmake/listoptions.bpr b/examples/cmdline/bcppmake/listoptions.bpr
index 753553e..18ec3f1 100644
--- a/examples/cmdline/bcppmake/listoptions.bpr
+++ b/examples/cmdline/bcppmake/listoptions.bpr
@@ -1,96 +1,96 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="listoptions.exe"/>
- <OBJFILES value="..\listoptions.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="listoptions.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=1033
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="listoptions.exe"/>
+ <OBJFILES value="..\listoptions.obj"/>
+ <RESFILES value=""/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
+ ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
+ ..\..\..\..\biblecs\clucene\clucene.lib"/>
+ <LIBRARIES value=""/>
+ <SPARELIBS value=""/>
+ <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
+ ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
+ VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
+ dclocx50.bpi bcb2kaxserver50.bpi"/>
+ <PATHCPP value=".;.."/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="tlink32"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
+ <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+ <MAINSOURCE value="listoptions.bpf"/>
+ <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
+ <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w-par"/>
+ </MACROS>
+ <OPTIONS>
+ <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
+ -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
+ -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
+ -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ </LINKER>
+ <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=./nasb nasb.xml
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+ </IDEOPTIONS>
+</PROJECT>
diff --git a/examples/cmdline/bcppmake/lookup.bpf b/examples/cmdline/bcppmake/lookup.bpf
index d7722c5..f0f4680 100644
--- a/examples/cmdline/bcppmake/lookup.bpf
+++ b/examples/cmdline/bcppmake/lookup.bpf
@@ -1,11 +1,11 @@
-USEUNIT("..\lookup.cpp");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
-USELIB("..\..\..\lib\libsword.lib");
-USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
-//---------------------------------------------------------------------------
-This file is used by the project manager only and should be treated like the project file
-
-
+USEUNIT("..\lookup.cpp");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\lib\libsword.lib");
+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
main \ No newline at end of file
diff --git a/examples/cmdline/bcppmake/lookup.bpr b/examples/cmdline/bcppmake/lookup.bpr
index 4b642c3..2db34e2 100644
--- a/examples/cmdline/bcppmake/lookup.bpr
+++ b/examples/cmdline/bcppmake/lookup.bpr
@@ -1,96 +1,96 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="lookup.exe"/>
- <OBJFILES value="..\lookup.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="lookup.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=1033
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="lookup.exe"/>
+ <OBJFILES value="..\lookup.obj"/>
+ <RESFILES value=""/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
+ ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
+ ..\..\..\..\biblecs\clucene\clucene.lib"/>
+ <LIBRARIES value=""/>
+ <SPARELIBS value=""/>
+ <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
+ ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
+ VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
+ dclocx50.bpi bcb2kaxserver50.bpi"/>
+ <PATHCPP value=".;.."/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="tlink32"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
+ <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+ <MAINSOURCE value="lookup.bpf"/>
+ <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
+ <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w-par"/>
+ </MACROS>
+ <OPTIONS>
+ <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
+ -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
+ -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
+ -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ </LINKER>
+ <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=./nasb nasb.xml
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+ </IDEOPTIONS>
+</PROJECT>
diff --git a/examples/cmdline/bcppmake/outplain.bpf b/examples/cmdline/bcppmake/outplain.bpf
index edce864..9995991 100644
--- a/examples/cmdline/bcppmake/outplain.bpf
+++ b/examples/cmdline/bcppmake/outplain.bpf
@@ -1,11 +1,11 @@
-USEUNIT("..\outplain.cpp");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
-USELIB("..\..\..\lib\libsword.lib");
-USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
-//---------------------------------------------------------------------------
-This file is used by the project manager only and should be treated like the project file
-
-
+USEUNIT("..\outplain.cpp");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\lib\libsword.lib");
+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
main \ No newline at end of file
diff --git a/examples/cmdline/bcppmake/outplain.bpr b/examples/cmdline/bcppmake/outplain.bpr
index 089d890..cdc38b9 100644
--- a/examples/cmdline/bcppmake/outplain.bpr
+++ b/examples/cmdline/bcppmake/outplain.bpr
@@ -1,96 +1,96 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="outplain.exe"/>
- <OBJFILES value="..\outplain.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="outplain.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=1033
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="outplain.exe"/>
+ <OBJFILES value="..\outplain.obj"/>
+ <RESFILES value=""/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
+ ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
+ ..\..\..\..\biblecs\clucene\clucene.lib"/>
+ <LIBRARIES value=""/>
+ <SPARELIBS value=""/>
+ <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
+ ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
+ VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
+ dclocx50.bpi bcb2kaxserver50.bpi"/>
+ <PATHCPP value=".;.."/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="tlink32"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
+ <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+ <MAINSOURCE value="outplain.bpf"/>
+ <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
+ <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w-par"/>
+ </MACROS>
+ <OPTIONS>
+ <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
+ -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
+ -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
+ -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ </LINKER>
+ <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=./nasb nasb.xml
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+ </IDEOPTIONS>
+</PROJECT>
diff --git a/examples/cmdline/bcppmake/outrender.bpf b/examples/cmdline/bcppmake/outrender.bpf
index 0ca9e33..6ff21ee 100644
--- a/examples/cmdline/bcppmake/outrender.bpf
+++ b/examples/cmdline/bcppmake/outrender.bpf
@@ -1,11 +1,11 @@
-USEUNIT("..\outrender.cpp");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
-USELIB("..\..\..\lib\libsword.lib");
-USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
-//---------------------------------------------------------------------------
-This file is used by the project manager only and should be treated like the project file
-
-
+USEUNIT("..\outrender.cpp");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\lib\libsword.lib");
+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
main \ No newline at end of file
diff --git a/examples/cmdline/bcppmake/outrender.bpr b/examples/cmdline/bcppmake/outrender.bpr
index 6c2438a..609e1ec 100644
--- a/examples/cmdline/bcppmake/outrender.bpr
+++ b/examples/cmdline/bcppmake/outrender.bpr
@@ -1,96 +1,96 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="outrender.exe"/>
- <OBJFILES value="..\outrender.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="outrender.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=1033
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="outrender.exe"/>
+ <OBJFILES value="..\outrender.obj"/>
+ <RESFILES value=""/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
+ ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
+ ..\..\..\..\biblecs\clucene\clucene.lib"/>
+ <LIBRARIES value=""/>
+ <SPARELIBS value=""/>
+ <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
+ ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
+ VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
+ dclocx50.bpi bcb2kaxserver50.bpi"/>
+ <PATHCPP value=".;.."/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="tlink32"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
+ <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+ <MAINSOURCE value="outrender.bpf"/>
+ <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
+ <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w-par"/>
+ </MACROS>
+ <OPTIONS>
+ <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
+ -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
+ -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
+ -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ </LINKER>
+ <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=./nasb nasb.xml
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+ </IDEOPTIONS>
+</PROJECT>
diff --git a/examples/cmdline/bcppmake/search.bpf b/examples/cmdline/bcppmake/search.bpf
index 438ee60..b85f692 100644
--- a/examples/cmdline/bcppmake/search.bpf
+++ b/examples/cmdline/bcppmake/search.bpf
@@ -1,11 +1,11 @@
-USEUNIT("..\search.cpp");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
-USELIB("..\..\..\lib\libsword.lib");
-USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
-//---------------------------------------------------------------------------
-This file is used by the project manager only and should be treated like the project file
-
-
-main
+USEUNIT("..\search.cpp");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\lib\libsword.lib");
+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
diff --git a/examples/cmdline/bcppmake/search.bpr b/examples/cmdline/bcppmake/search.bpr
index 23a79ca..13417b3 100644
--- a/examples/cmdline/bcppmake/search.bpr
+++ b/examples/cmdline/bcppmake/search.bpr
@@ -1,96 +1,96 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="search.exe"/>
- <OBJFILES value="..\search.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="search.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=1033
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="search.exe"/>
+ <OBJFILES value="..\search.obj"/>
+ <RESFILES value=""/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
+ ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
+ ..\..\..\..\biblecs\clucene\clucene.lib"/>
+ <LIBRARIES value=""/>
+ <SPARELIBS value=""/>
+ <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
+ ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
+ VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
+ dclocx50.bpi bcb2kaxserver50.bpi"/>
+ <PATHCPP value=".;.."/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="tlink32"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
+ <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+ <MAINSOURCE value="search.bpf"/>
+ <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
+ <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w-par"/>
+ </MACROS>
+ <OPTIONS>
+ <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
+ -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
+ -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
+ -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ </LINKER>
+ <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=./nasb nasb.xml
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+ </IDEOPTIONS>
+</PROJECT>
diff --git a/examples/cmdline/bcppmake/threaded_search.bpf b/examples/cmdline/bcppmake/threaded_search.bpf
index f69800a..8871afd 100644
--- a/examples/cmdline/bcppmake/threaded_search.bpf
+++ b/examples/cmdline/bcppmake/threaded_search.bpf
@@ -1,11 +1,11 @@
-USEUNIT("..\threaded_search.cpp");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
-USELIB("..\..\..\lib\libsword.lib");
-USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
-//---------------------------------------------------------------------------
-This file is used by the project manager only and should be treated like the project file
-
-
+USEUNIT("..\threaded_search.cpp");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\lib\libsword.lib");
+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
main \ No newline at end of file
diff --git a/examples/cmdline/bcppmake/threaded_search.bpr b/examples/cmdline/bcppmake/threaded_search.bpr
index a666afa..5459afd 100644
--- a/examples/cmdline/bcppmake/threaded_search.bpr
+++ b/examples/cmdline/bcppmake/threaded_search.bpr
@@ -1,96 +1,96 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="threaded_search.exe"/>
- <OBJFILES value="..\threaded_search.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="threaded_search.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=1033
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="threaded_search.exe"/>
+ <OBJFILES value="..\threaded_search.obj"/>
+ <RESFILES value=""/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
+ ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
+ ..\..\..\..\biblecs\clucene\clucene.lib"/>
+ <LIBRARIES value=""/>
+ <SPARELIBS value=""/>
+ <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
+ ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
+ VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
+ dclocx50.bpi bcb2kaxserver50.bpi"/>
+ <PATHCPP value=".;.."/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="tlink32"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
+ <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+ <MAINSOURCE value="threaded_search.bpf"/>
+ <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
+ <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w-par"/>
+ </MACROS>
+ <OPTIONS>
+ <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
+ -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
+ -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
+ -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ </LINKER>
+ <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=./nasb nasb.xml
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+ </IDEOPTIONS>
+</PROJECT>
diff --git a/examples/cmdline/bcppmake/verserangeparse.bpf b/examples/cmdline/bcppmake/verserangeparse.bpf
index 6e2bc5a..b237e62 100644
--- a/examples/cmdline/bcppmake/verserangeparse.bpf
+++ b/examples/cmdline/bcppmake/verserangeparse.bpf
@@ -1,11 +1,11 @@
-USEUNIT("..\verserangeparse.cpp");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
-USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
-USELIB("..\..\..\lib\libsword.lib");
-USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
-//---------------------------------------------------------------------------
-This file is used by the project manager only and should be treated like the project file
-
-
+USEUNIT("..\verserangeparse.cpp");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\lib\libsword.lib");
+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
main \ No newline at end of file
diff --git a/examples/cmdline/bcppmake/verserangeparse.bpr b/examples/cmdline/bcppmake/verserangeparse.bpr
index 89de5ae..aa2a4e2 100644
--- a/examples/cmdline/bcppmake/verserangeparse.bpr
+++ b/examples/cmdline/bcppmake/verserangeparse.bpr
@@ -1,96 +1,96 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!-- C++Builder XML Project -->
-<PROJECT>
- <MACROS>
- <VERSION value="BCB.05.03"/>
- <PROJECT value="verserangeparse.exe"/>
- <OBJFILES value="..\verserangeparse.obj"/>
- <RESFILES value=""/>
- <IDLFILES value=""/>
- <IDLGENFILES value=""/>
- <DEFFILE value=""/>
- <RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
- ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
- ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
- ..\..\..\..\biblecs\clucene\clucene.lib"/>
- <LIBRARIES value=""/>
- <SPARELIBS value=""/>
- <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
- ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
- VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
- dclocx50.bpi bcb2kaxserver50.bpi"/>
- <PATHCPP value=".;.."/>
- <PATHPAS value=".;"/>
- <PATHRC value=".;"/>
- <PATHASM value=".;"/>
- <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
- <RELEASELIBPATH value="$(BCB)\lib\release"/>
- <LINKER value="tlink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
- <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
- <MAINSOURCE value="verserangeparse.bpf"/>
- <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
- <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
- <WARNINGS value="-w-par"/>
- </MACROS>
- <OPTIONS>
- <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
- -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
- -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
- -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
- </OPTIONS>
- <LINKER>
- <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
- <ALLRES value="$(RESFILES)"/>
- <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
- </LINKER>
- <IDEOPTIONS>
-[Version Info]
-IncludeVerInfo=0
-AutoIncBuild=0
-MajorVer=1
-MinorVer=0
-Release=0
-Build=0
-Debug=0
-PreRelease=0
-Special=0
-Private=0
-DLL=0
-Locale=1033
-CodePage=1252
-
-[Version Info Keys]
-CompanyName=
-FileDescription=
-FileVersion=1.0.0.0
-InternalName=
-LegalCopyright=
-LegalTrademarks=
-OriginalFilename=
-ProductName=
-ProductVersion=1.0.0.0
-Comments=
-
-[Debugging]
-DebugSourceDirs=$(BCB)\source\vcl
-
-[Parameters]
-RunParams=./nasb nasb.xml
-HostApplication=
-RemoteHost=
-RemotePath=
-RemoteDebug=0
-
-[Language]
-ActiveLang=
-ProjectLang=
-RootDir=
- </IDEOPTIONS>
-</PROJECT>
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+ <MACROS>
+ <VERSION value="BCB.05.03"/>
+ <PROJECT value="verserangeparse.exe"/>
+ <OBJFILES value="..\verserangeparse.obj"/>
+ <RESFILES value=""/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
+ <DEFFILE value=""/>
+ <RESDEPEN value="$(RESFILES)"/>
+ <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\..\icu-sword\as_is\borland\icudatab.lib
+ ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib
+ ..\..\..\..\biblecs\clucene\clucene.lib"/>
+ <LIBRARIES value=""/>
+ <SPARELIBS value=""/>
+ <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
+ ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi
+ VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi
+ dclocx50.bpi bcb2kaxserver50.bpi"/>
+ <PATHCPP value=".;.."/>
+ <PATHPAS value=".;"/>
+ <PATHRC value=".;"/>
+ <PATHASM value=".;"/>
+ <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+ <RELEASELIBPATH value="$(BCB)\lib\release"/>
+ <LINKER value="tlink32"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
+ <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+ <MAINSOURCE value="verserangeparse.bpf"/>
+ <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>
+ <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <WARNINGS value="-w-par"/>
+ </MACROS>
+ <OPTIONS>
+ <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl
+ -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n
+ -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
+ -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>
+ <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <RFLAGS value=""/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+ </OPTIONS>
+ <LINKER>
+ <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+ <ALLRES value="$(RESFILES)"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ </LINKER>
+ <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=./nasb nasb.xml
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+ </IDEOPTIONS>
+</PROJECT>
diff --git a/examples/cmdline/lookup.cpp b/examples/cmdline/lookup.cpp
index 2ff80c8..e328143 100644
--- a/examples/cmdline/lookup.cpp
+++ b/examples/cmdline/lookup.cpp
@@ -3,7 +3,7 @@
* lookup.cpp - Simple example of how to retrieve an entry from a
* SWORD module
*
- * $Id: lookup.cpp 3187 2014-04-17 04:34:03Z greg.hellings $
+ * $Id: lookup.cpp 3483 2017-06-25 15:19:34Z scribe $
*
* Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
@@ -29,6 +29,7 @@
#include <swfilter.h>
#include <markupfiltmgr.h>
#include <versekey.h>
+//#include "../../bindings/corba/orbitcpp/webmgr.hpp"
using sword::SWMgr;
@@ -36,7 +37,9 @@ using sword::MarkupFilterMgr;
using sword::SWModule;
using sword::FMT_WEBIF;
using sword::FMT_HTMLHREF;
+using sword::FMT_XHTML;
using sword::FMT_RTF;
+using sword::FMT_LATEX;
using sword::ModMap;
using sword::AttributeTypeList;
using sword::AttributeList;
@@ -48,8 +51,13 @@ using sword::FilterList;
int main(int argc, char **argv)
{
- SWMgr manager(new MarkupFilterMgr(FMT_WEBIF));
-// SWMgr manager(new MarkupFilterMgr(FMT_HTMLHREF));
+// for testing webmgr
+// WebMgr manager((const char *)0);
+// manager.setJavascript(true);
+//
+ SWMgr manager(new MarkupFilterMgr(FMT_XHTML));
+// SWMgr manager(new MarkupFilterMgr(FMT_WEBIF));
+
SWModule *target;
if (argc != 3) {
@@ -71,7 +79,7 @@ int main(int argc, char **argv)
// turn all filters to default values
manager.setGlobalOption("Headings", "On");
- manager.setGlobalOption("Strong's Numbers", "On");
+ manager.setGlobalOption("Strong's Numbers", "Off");
manager.setGlobalOption("Lemmas", "Off");
// manager.setGlobalOption("Greek Accents", "Off");
diff --git a/examples/cmdline/search.cpp b/examples/cmdline/search.cpp
index f437430..1a3b098 100644
--- a/examples/cmdline/search.cpp
+++ b/examples/cmdline/search.cpp
@@ -6,7 +6,7 @@
*
* search KJV "swift hear slow speak"
*
- * $Id: search.cpp 2980 2013-09-14 21:51:47Z scribe $
+ * $Id: search.cpp 3515 2017-11-01 11:38:09Z scribe $
*
* Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
* CrossWire Bible Society
@@ -36,15 +36,23 @@
using namespace sword;
#endif
-/*
- * >=0 - regex
- * -1 - phrase
- * -2 - multiword
- * -3 - entryAttrib (eg. Word//Lemma/G1234/)
- * -4 - Lucene
- */
+// FROM swmodule.h
+ /*
+ * >=0 - regex; (for backward compat, if > 0 then used as additional REGEX FLAGS)
+ * -1 - phrase
+ * -2 - multiword
+ * -3 - entryAttrib (eg. Word//Lemma./G1234/) (Lemma with dot means check components (Lemma.[1-9]) also)
+ * -4 - Lucene
+ * -5 - multilemma window; set 'flags' param to window size (NOT DONE)
+ */
char SEARCH_TYPE=-2;
+int flags = 0
+// for case insensitivity
+| REG_ICASE
+// for use with entryAttrib search type to match whole entry to value, e.g., G1234 and not G12345
+//| SEARCHFLAG_MATCHWHOLEENTRY
+;
char printed = 0;
void percentUpdate(char percent, void *userData) {
@@ -68,7 +76,7 @@ int main(int argc, char **argv)
SWMgr manager;
SWModule *target;
ListKey listkey;
- ListKey scope;
+ ListKey *scope = 0;
ModMap::iterator it;
if ((argc < 3) || (argc > 5)) {
@@ -81,7 +89,7 @@ int main(int argc, char **argv)
SWBuf searchTerm = argv[2];
manager.setGlobalOption("Greek Accents", "Off");
- manager.setGlobalOption("Strong's Numbers", "On");
+ manager.setGlobalOption("Strong's Numbers", "Off");
manager.setGlobalOption("Hebrew Vowel Points", "Off");
manager.filterText("Greek Accents", searchTerm);
@@ -96,32 +104,33 @@ int main(int argc, char **argv)
target = (*it).second;
+ ListKey maybeScope;
if (argc > 3) { // if min / max specified
SWKey *k = target->getKey();
VerseKey *parser = SWDYNAMIC_CAST(VerseKey, k);
VerseKey kjvParser;
if (!parser) parser = &kjvParser; // use standard KJV parsing as fallback
- scope = parser->parseVerseList(argv[3], *parser, true);
- scope.setPersist(true);
- target->setKey(scope);
+ maybeScope = parser->parseVerseList(argv[3], *parser, true);
+ scope = &maybeScope;
}
std::cerr << "[0=================================50===============================100]\n ";
char lineLen = 70;
- listkey = target->search(searchTerm.c_str(), SEARCH_TYPE, /*SEARCHFLAG_MATCHWHOLEENTRY*/ REG_ICASE, 0, 0, &percentUpdate, &lineLen);
+ listkey = target->search(searchTerm.c_str(), SEARCH_TYPE, flags, scope, 0, &percentUpdate, &lineLen);
std::cerr << std::endl;
- if (argc > 4) { // if min / max specified
- scope = listkey;
- scope.setPersist(true);
- target->setKey(scope);
+ if (argc > 4) { // example: if a second search term is supplied, search again for a second search term, limiting to previous results
+ scope = &listkey;
printed = 0;
std::cerr << " ";
- listkey = target->search(argv[4], SEARCH_TYPE, /*SEARCHFLAG_MATCHWHOLEENTRY*/ REG_ICASE, 0, 0, &percentUpdate, &lineLen);
+ listkey = target->search(argv[4], SEARCH_TYPE, flags, scope, 0, &percentUpdate, &lineLen);
std::cerr << std::endl;
}
- listkey.sort();
+// we don't want to sort by verse if we've been given scores
+// listkey.sort();
while (!listkey.popError()) {
- std::cout << (const char *)listkey << std::endl;
+ std::cout << (const char *)listkey;
+ if (listkey.getElement()->userData) std::cout << " : " << (__u64)listkey.getElement()->userData << "%";
+ std::cout << std::endl;
listkey++;
}
diff --git a/examples/cmdline/stripaccents.cpp b/examples/cmdline/stripaccents.cpp
new file mode 100644
index 0000000..34061d5
--- /dev/null
+++ b/examples/cmdline/stripaccents.cpp
@@ -0,0 +1,80 @@
+/******************************************************************************
+ *
+ * stripaccents.cpp - This simple example shows how to strip diacritical marks from a stringa
+ * using the SWORD library. It amounts to a simple commandline
+ * tool with a usage like:
+ *
+ * stripaccents 4 "וְהָאָ֗רֶץ הָיְתָ֥ה תֹ֙הוּ֙ וָבֹ֔הוּ וְחֹ֖שֶׁךְ עַל־פְּנֵ֣י תְהֹ֑ום וְר֣וּחַ "
+ *
+ *
+ * $Id: stripaccents.cpp 3382 2015-09-01 22:57GMT refdoc $
+ *
+ * Copyright 1997-2013 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 <stdio.h>
+#include <cstdlib>
+#include <swmgr.h>
+#include <markupfiltmgr.h>
+#include <iostream>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int usage()
+{
+ fprintf(stderr, "\nusage: stripaccents <n=1-15> <text-to-be-stripped> \n");
+ fprintf(stderr, "\n n=1 \t strip Greek accents");
+ fprintf(stderr, "\n n=2 \t strip Arabic vowel points");
+ fprintf(stderr, "\n n=4 \t strip Hebrew vowel points");
+ fprintf(stderr, "\n n=8 \t strip Hebrew Cantillation marks\n");
+ fprintf(stderr, "\n several of the above filters can be engaged by adding the values\n");
+ exit(0);
+}
+
+int main(int argc, char **argv)
+{
+// SWMgr manager(0, 0, true, new MarkupFilterMgr(FMT_RTF, ENC_RTF));
+ SWMgr manager;
+
+ if ((argc < 3) || (argc > 3)) {
+ usage();
+ exit(-1);
+ }
+
+ int stripFilters = atoi(argv[1]);
+
+ if ((stripFilters < 1) || (stripFilters > 15)) {
+ usage();
+ exit(-1);
+ }
+ SWBuf stripTerm = argv[2];
+
+ manager.setGlobalOption("Greek Accents", "Off");
+ manager.setGlobalOption("Arabic Vowel Points", "Off");
+ manager.setGlobalOption("Hebrew Vowel Points", "Off");
+ manager.setGlobalOption("Hebrew Cantillation", "Off");
+
+ if (stripFilters & (1 << 3)) manager.filterText("Hebrew Cantillation", stripTerm);
+ if (stripFilters & (1 << 2)) manager.filterText("Hebrew Vowel Points", stripTerm);
+ if (stripFilters & (1 << 1)) manager.filterText("Arabic Vowel Points", stripTerm);
+ if (stripFilters & (1 << 0)) manager.filterText("Greek Accents", stripTerm);
+
+ fprintf(stdout,"%s\n",stripTerm.c_str());
+ return 0;
+
+}