From b5292d1d6c301302e234a465e362af9fcc557a46 Mon Sep 17 00:00:00 2001 From: danglassey Date: Sat, 14 Sep 2002 13:01:00 +0000 Subject: sync with crosswire 20020914-1300 --- Makefile.in | 2 +- examples/cmdline/Makefile | 14 ++++++------ src/keys/versekey.cpp | 14 ++++++------ src/modules/filters/gbfosis.cpp | 50 +++++++++++++++++++++++++++++------------ tests/Makefile.am | 3 ++- tests/Makefile.in | 49 ++++++++++++++++++++++++++-------------- utilities/mod2osis.cpp | 15 +++++-------- 7 files changed, 90 insertions(+), 57 deletions(-) diff --git a/Makefile.in b/Makefile.in index b5f2f2c..b421c00 100644 --- a/Makefile.in +++ b/Makefile.in @@ -168,7 +168,7 @@ testlib_SOURCES = testlib.cpp @ICU_TRUE@testlib_LDADD = -L./lib -lsword -licui18n -licuuc @ICU_FALSE@testlib_LDADD = -L./lib -lsword -localeDATA = locales.d/abbr.conf locales.d/cs.conf locales.d/da.conf locales.d/de.conf locales.d/de_abbrev.conf locales.d/es.conf locales.d/fr.conf locales.d/fr_FR.ISO-8859-1.conf locales.d/it.conf locales.d/la.conf locales.d/nl.conf locales.d/no.conf locales.d/pl.conf locales.d/pt.conf locales.d/id.conf locales.d/pt_BR.conf locales.d/sk.conf +localeDATA = locales.d/abbr.conf locales.d/cs.conf locales.d/da.conf locales.d/de.conf locales.d/de_abbrev.conf locales.d/es.conf locales.d/fr.conf locales.d/fr_FR.ISO-8859-1.conf locales.d/it.conf locales.d/la.conf locales.d/nl.conf locales.d/no.conf locales.d/pl.conf locales.d/pt.conf locales.d/id.conf locales.d/pt_BR.conf locales.d/sk.conf locales.d/ru.conf localedatadir = $(pkgdatadir)/locales.d @INSTCONF_TRUE@modsDATA = samples/mods.d/globals.conf diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index 951d05e..8375d0b 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -38,10 +38,10 @@ pkglibdir = $(libdir)/sword pkgincludedir = $(includedir)/sword top_builddir = ../.. -ACLOCAL = ${SHELL} /home/scribe/src/sword/missing --run aclocal-1.6 -AUTOCONF = ${SHELL} /home/scribe/src/sword/missing --run autoconf -AUTOMAKE = ${SHELL} /home/scribe/src/sword/missing --run automake-1.6 -AUTOHEADER = ${SHELL} /home/scribe/src/sword/missing --run autoheader +ACLOCAL = ${SHELL} /space/home/scribe/src/sword/missing --run aclocal-1.6 +AUTOCONF = ${SHELL} /space/home/scribe/src/sword/missing --run autoconf +AUTOMAKE = ${SHELL} /space/home/scribe/src/sword/missing --run automake-1.6 +AUTOHEADER = ${SHELL} /space/home/scribe/src/sword/missing --run autoheader am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = /usr/bin/install -c @@ -65,13 +65,13 @@ host_triplet = i686-pc-linux-gnu EXEEXT = OBJEXT = o PATH_SEPARATOR = : -AMTAR = ${SHELL} /home/scribe/src/sword/missing --run tar +AMTAR = ${SHELL} /space/home/scribe/src/sword/missing --run tar AS = @AS@ AWK = gawk CC = gcc CURL_CFLAGS = CURL_CONFIG = /usr/bin/curl-config -CURL_LIBS = -lssl -lcrypto -ldl +CURL_LIBS = -lcurl -lssl -lcrypto -ldl CXX = g++ DEPDIR = .deps DLLTOOL = @DLLTOOL@ @@ -94,7 +94,7 @@ am__quote = dir_confdef = no enable_debug = yes enable_profile = no -install_sh = /home/scribe/src/sword/install-sh +install_sh = /space/home/scribe/src/sword/install-sh target_cpu = i686 target_mingw32 = no target_os = linux-gnu diff --git a/src/keys/versekey.cpp b/src/keys/versekey.cpp index bab3c09..7368eeb 100644 --- a/src/keys/versekey.cpp +++ b/src/keys/versekey.cpp @@ -1441,18 +1441,18 @@ const char *VerseKey::getOSISRef() const { loop = 0; static char *osisotbooks[] = { - "Gen","Exod","Lev","Num","Deut","Josh","Judg","Ruth","_1Sam","_2Sam", - "_1Kgs","_2Kgs","_1Chr","_2Chr","Ezra","Neh","Esth","Job","Ps", + "Gen","Exod","Lev","Num","Deut","Josh","Judg","Ruth","1Sam","2Sam", + "1Kgs","2Kgs","1Chr","2Chr","Ezra","Neh","Esth","Job","Ps", "Prov", // added this. Was not in OSIS spec "Eccl", "Song","Isa","Jer","Lam","Ezek","Dan","Hos","Joel","Amos","Obad", "Jonah","Mic","Nah","Hab","Zeph","Hag","Zech","Mal","Bar","PrAzar", - "Bel","Sus","_1Esd","_2Esd","AddEsth","EpJer","Jdt","_1Macc","_2Macc","_3Macc", - "_4Macc","PrMan","Ps151","Sir","Tob","Wis"}; + "Bel","Sus","1Esd","2Esd","AddEsth","EpJer","Jdt","1Macc","2Macc","3Macc", + "4Macc","PrMan","Ps151","Sir","Tob","Wis"}; static char *osisntbooks[] = { - "Matt","Mark","Luke","John","Acts","Rom","_1Cor","_2Cor","Gal","Eph", - "Phil","Col","_1Thess","_2Thess","_1Tim","_2Tim","Titus","Phlm","Heb","Jas", - "_1Pet","_2Pet","_1John","_2John","_3John","Jude","Rev"}; + "Matt","Mark","Luke","John","Acts","Rom","1Cor","2Cor","Gal","Eph", + "Phil","Col","1Thess","2Thess","1Tim","2Tim","Titus","Phlm","Heb","Jas", + "1Pet","2Pet","1John","2John","3John","Jude","Rev"}; static char **osisbooks[] = { osisotbooks, osisntbooks }; if (Verse()) sprintf(buf[loop], "%s.%d.%d", osisbooks[Testament()-1][Book()-1], (int)Chapter(), (int)Verse()); diff --git a/src/modules/filters/gbfosis.cpp b/src/modules/filters/gbfosis.cpp index ec20675..ef5f92a 100644 --- a/src/modules/filters/gbfosis.cpp +++ b/src/modules/filters/gbfosis.cpp @@ -80,7 +80,7 @@ char GBFOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu while (wordStart < (text+maxlen)) { // if (strchr(" ,;.?!()'\"", *wordStart)) - if (strchr(";, .:?!()'\"", *wordStart)) + if (strchr(";, .:?!()'\"", *wordStart) && wordStart[0] && wordStart[1]) wordStart++; else break; } @@ -100,21 +100,20 @@ char GBFOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu tmp = ""; tmp.append(textStart, (int)(textEnd - textStart)+1); pushString(&to, convertToOSIS(tmp.c_str(), key)); + lastspace = false; suspendTextPassThru = false; } // Footnote if (!strcmp(token, "RF")) { // pushString(buf, ""); newText = true; + lastspace = false; } else if (!strcmp(token, "Rf")) { - tmp = ""; - tmp.append(textStart, (int)(textEnd - textStart)+1); - tmp += ""; - pushString(&to, tmp.c_str()); - suspendTextPassThru = false; + pushString(&to, ""); + lastspace = false; } // Figure @@ -140,6 +139,7 @@ char GBFOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu *to++ = *c; pushString(&to, "\" />"); + lastspace = false; return true; } @@ -153,18 +153,29 @@ char GBFOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu // normal strongs number strstrip(val); if (!strncmp(wordStart, ""); + char *attStart = strstr(wordStart, "lemma"); + if (attStart) { + attStart += 7; + sprintf(buf, "x-Strongs:%s|", val); + } + else { + attStart = wordStart + 3; + sprintf(buf, "lemma=\"x-Strongs:%s\" ", val); + } + wordStart[strlen(wordStart)] = '>'; + memmove(attStart+strlen(buf), attStart, (to-attStart)+1); + memcpy(attStart, buf, strlen(buf)); to+=strlen(buf); } else { - sprintf(buf, "", val); + sprintf(buf, "", val); memmove(wordStart+strlen(buf), wordStart, (to-wordStart)+1); memcpy(wordStart, buf, strlen(buf)); to+=strlen(buf); pushString(&to, ""); module->getEntryAttributes()["Word"][wordstr]["Strongs"] = val; + lastspace = false; } } } @@ -177,9 +188,19 @@ char GBFOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu *valto = 0; strstrip(val); if (!strncmp(wordStart, ""); + char *attStart = strstr(wordStart, "morph"); + if (attStart) { + attStart += 7; + sprintf(buf, "x-%s:%s|", "StrongsMorph", val); + } + else { + attStart = wordStart + 3; + sprintf(buf, "morph=\"x-%s:%s\" ", "StrongsMorph", val); + } + wordStart[strlen(wordStart)] = '>'; + memmove(attStart+strlen(buf), attStart, (to-attStart)+1); + memcpy(attStart, buf, strlen(buf)); to+=strlen(buf); } else { @@ -188,6 +209,7 @@ char GBFOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu memcpy(wordStart, buf, strlen(buf)); to+=strlen(buf); pushString(&to, ""); + lastspace = false; } } diff --git a/tests/Makefile.am b/tests/Makefile.am index bcbc03c..4cf7a44 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,7 @@ LDADD = -L$(top_builddir)/lib -lsword noinst_PROGRAMS = keytest mgrtest parsekey listtest casttest modtest \ compnone complzss localetest keycast introtest indextest configtest \ -romantest testblocks filtertest lextest swaptest genbooktest treeidxtest +romantest testblocks filtertest rawldidxtest lextest swaptest genbooktest treeidxtest if ICU ICUPROG = icutest translittest tlitmgrtest @@ -52,6 +52,7 @@ romantest_SOURCES = romantest.cpp testblocks_SOURCES = testblocks.cpp filtertest_SOURCES = filtertest.cpp lextest_SOURCES = lextest.cpp +rawldidxtest_SOURCES = rawldidxtest.cpp swaptest_SOURCES = swaptest.cpp treeidxtest_SOURCES = treeidxtest.cpp genbooktest_SOURCES = genbooktest.cpp diff --git a/tests/Makefile.in b/tests/Makefile.in index fc632df..2d056ac 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -109,7 +109,7 @@ LDADD = -L$(top_builddir)/lib -lsword noinst_PROGRAMS = keytest mgrtest parsekey listtest casttest modtest \ compnone complzss localetest keycast introtest indextest configtest \ -romantest testblocks filtertest lextest swaptest genbooktest treeidxtest\ +romantest testblocks filtertest rawldidxtest lextest swaptest genbooktest treeidxtest\ $(ICUPROG) $(ZLIBPROG) @ICU_TRUE@ICUPROG = icutest translittest tlitmgrtest @@ -142,6 +142,7 @@ romantest_SOURCES = romantest.cpp testblocks_SOURCES = testblocks.cpp filtertest_SOURCES = filtertest.cpp lextest_SOURCES = lextest.cpp +rawldidxtest_SOURCES = rawldidxtest.cpp swaptest_SOURCES = swaptest.cpp treeidxtest_SOURCES = treeidxtest.cpp genbooktest_SOURCES = genbooktest.cpp @@ -157,9 +158,10 @@ CONFIG_CLEAN_FILES = @ICU_FALSE@@ZLIB_TRUE@ keycast$(EXEEXT) introtest$(EXEEXT) \ @ICU_FALSE@@ZLIB_TRUE@ indextest$(EXEEXT) configtest$(EXEEXT) \ @ICU_FALSE@@ZLIB_TRUE@ romantest$(EXEEXT) testblocks$(EXEEXT) \ -@ICU_FALSE@@ZLIB_TRUE@ filtertest$(EXEEXT) lextest$(EXEEXT) \ -@ICU_FALSE@@ZLIB_TRUE@ swaptest$(EXEEXT) genbooktest$(EXEEXT) \ -@ICU_FALSE@@ZLIB_TRUE@ treeidxtest$(EXEEXT) compzip$(EXEEXT) +@ICU_FALSE@@ZLIB_TRUE@ filtertest$(EXEEXT) rawldidxtest$(EXEEXT) \ +@ICU_FALSE@@ZLIB_TRUE@ lextest$(EXEEXT) swaptest$(EXEEXT) \ +@ICU_FALSE@@ZLIB_TRUE@ genbooktest$(EXEEXT) treeidxtest$(EXEEXT) \ +@ICU_FALSE@@ZLIB_TRUE@ compzip$(EXEEXT) @ICU_FALSE@@ZLIB_FALSE@noinst_PROGRAMS = keytest$(EXEEXT) \ @ICU_FALSE@@ZLIB_FALSE@ mgrtest$(EXEEXT) parsekey$(EXEEXT) \ @ICU_FALSE@@ZLIB_FALSE@ listtest$(EXEEXT) casttest$(EXEEXT) \ @@ -168,7 +170,8 @@ CONFIG_CLEAN_FILES = @ICU_FALSE@@ZLIB_FALSE@ keycast$(EXEEXT) introtest$(EXEEXT) \ @ICU_FALSE@@ZLIB_FALSE@ indextest$(EXEEXT) configtest$(EXEEXT) \ @ICU_FALSE@@ZLIB_FALSE@ romantest$(EXEEXT) testblocks$(EXEEXT) \ -@ICU_FALSE@@ZLIB_FALSE@ filtertest$(EXEEXT) lextest$(EXEEXT) \ +@ICU_FALSE@@ZLIB_FALSE@ filtertest$(EXEEXT) \ +@ICU_FALSE@@ZLIB_FALSE@ rawldidxtest$(EXEEXT) lextest$(EXEEXT) \ @ICU_FALSE@@ZLIB_FALSE@ swaptest$(EXEEXT) genbooktest$(EXEEXT) \ @ICU_FALSE@@ZLIB_FALSE@ treeidxtest$(EXEEXT) @ICU_TRUE@@ZLIB_TRUE@noinst_PROGRAMS = keytest$(EXEEXT) mgrtest$(EXEEXT) \ @@ -179,10 +182,11 @@ CONFIG_CLEAN_FILES = @ICU_TRUE@@ZLIB_TRUE@ introtest$(EXEEXT) indextest$(EXEEXT) \ @ICU_TRUE@@ZLIB_TRUE@ configtest$(EXEEXT) romantest$(EXEEXT) \ @ICU_TRUE@@ZLIB_TRUE@ testblocks$(EXEEXT) filtertest$(EXEEXT) \ -@ICU_TRUE@@ZLIB_TRUE@ lextest$(EXEEXT) swaptest$(EXEEXT) \ -@ICU_TRUE@@ZLIB_TRUE@ genbooktest$(EXEEXT) treeidxtest$(EXEEXT) \ -@ICU_TRUE@@ZLIB_TRUE@ icutest$(EXEEXT) translittest$(EXEEXT) \ -@ICU_TRUE@@ZLIB_TRUE@ tlitmgrtest$(EXEEXT) compzip$(EXEEXT) +@ICU_TRUE@@ZLIB_TRUE@ rawldidxtest$(EXEEXT) lextest$(EXEEXT) \ +@ICU_TRUE@@ZLIB_TRUE@ swaptest$(EXEEXT) genbooktest$(EXEEXT) \ +@ICU_TRUE@@ZLIB_TRUE@ treeidxtest$(EXEEXT) icutest$(EXEEXT) \ +@ICU_TRUE@@ZLIB_TRUE@ translittest$(EXEEXT) tlitmgrtest$(EXEEXT) \ +@ICU_TRUE@@ZLIB_TRUE@ compzip$(EXEEXT) @ICU_TRUE@@ZLIB_FALSE@noinst_PROGRAMS = keytest$(EXEEXT) \ @ICU_TRUE@@ZLIB_FALSE@ mgrtest$(EXEEXT) parsekey$(EXEEXT) \ @ICU_TRUE@@ZLIB_FALSE@ listtest$(EXEEXT) casttest$(EXEEXT) \ @@ -191,10 +195,10 @@ CONFIG_CLEAN_FILES = @ICU_TRUE@@ZLIB_FALSE@ keycast$(EXEEXT) introtest$(EXEEXT) \ @ICU_TRUE@@ZLIB_FALSE@ indextest$(EXEEXT) configtest$(EXEEXT) \ @ICU_TRUE@@ZLIB_FALSE@ romantest$(EXEEXT) testblocks$(EXEEXT) \ -@ICU_TRUE@@ZLIB_FALSE@ filtertest$(EXEEXT) lextest$(EXEEXT) \ -@ICU_TRUE@@ZLIB_FALSE@ swaptest$(EXEEXT) genbooktest$(EXEEXT) \ -@ICU_TRUE@@ZLIB_FALSE@ treeidxtest$(EXEEXT) icutest$(EXEEXT) \ -@ICU_TRUE@@ZLIB_FALSE@ translittest$(EXEEXT) \ +@ICU_TRUE@@ZLIB_FALSE@ filtertest$(EXEEXT) rawldidxtest$(EXEEXT) \ +@ICU_TRUE@@ZLIB_FALSE@ lextest$(EXEEXT) swaptest$(EXEEXT) \ +@ICU_TRUE@@ZLIB_FALSE@ genbooktest$(EXEEXT) treeidxtest$(EXEEXT) \ +@ICU_TRUE@@ZLIB_FALSE@ icutest$(EXEEXT) translittest$(EXEEXT) \ @ICU_TRUE@@ZLIB_FALSE@ tlitmgrtest$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) @@ -288,6 +292,11 @@ parsekey_OBJECTS = $(am_parsekey_OBJECTS) parsekey_LDADD = $(LDADD) parsekey_DEPENDENCIES = parsekey_LDFLAGS = +am_rawldidxtest_OBJECTS = rawldidxtest.$(OBJEXT) +rawldidxtest_OBJECTS = $(am_rawldidxtest_OBJECTS) +rawldidxtest_LDADD = $(LDADD) +rawldidxtest_DEPENDENCIES = +rawldidxtest_LDFLAGS = am_romantest_OBJECTS = romantest.$(OBJEXT) romantest_OBJECTS = $(am_romantest_OBJECTS) romantest_LDADD = $(LDADD) @@ -335,6 +344,7 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/lextest.Po ./$(DEPDIR)/listtest.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/localetest.Po ./$(DEPDIR)/mgrtest.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/modtest.Po ./$(DEPDIR)/parsekey.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/rawldidxtest.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/romantest.Po ./$(DEPDIR)/swaptest.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/testblocks.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/tlitmgrtest.Po \ @@ -355,11 +365,12 @@ DIST_SOURCES = $(casttest_SOURCES) $(complzss_SOURCES) \ $(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) \ $(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) \ $(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) \ - $(parsekey_SOURCES) $(romantest_SOURCES) $(swaptest_SOURCES) \ - $(testblocks_SOURCES) $(tlitmgrtest_SOURCES) \ - $(translittest_SOURCES) $(treeidxtest_SOURCES) + $(parsekey_SOURCES) $(rawldidxtest_SOURCES) \ + $(romantest_SOURCES) $(swaptest_SOURCES) $(testblocks_SOURCES) \ + $(tlitmgrtest_SOURCES) $(translittest_SOURCES) \ + $(treeidxtest_SOURCES) DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(casttest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) $(compzip_SOURCES) $(configtest_SOURCES) $(filtertest_SOURCES) $(genbooktest_SOURCES) $(icutest_SOURCES) $(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) $(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) $(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) $(parsekey_SOURCES) $(romantest_SOURCES) $(swaptest_SOURCES) $(testblocks_SOURCES) $(tlitmgrtest_SOURCES) $(translittest_SOURCES) $(treeidxtest_SOURCES) +SOURCES = $(casttest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) $(compzip_SOURCES) $(configtest_SOURCES) $(filtertest_SOURCES) $(genbooktest_SOURCES) $(icutest_SOURCES) $(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) $(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) $(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) $(parsekey_SOURCES) $(rawldidxtest_SOURCES) $(romantest_SOURCES) $(swaptest_SOURCES) $(testblocks_SOURCES) $(tlitmgrtest_SOURCES) $(translittest_SOURCES) $(treeidxtest_SOURCES) all: all-am @@ -431,6 +442,9 @@ modtest$(EXEEXT): $(modtest_OBJECTS) $(modtest_DEPENDENCIES) parsekey$(EXEEXT): $(parsekey_OBJECTS) $(parsekey_DEPENDENCIES) @rm -f parsekey$(EXEEXT) $(CXXLINK) $(parsekey_LDFLAGS) $(parsekey_OBJECTS) $(parsekey_LDADD) $(LIBS) +rawldidxtest$(EXEEXT): $(rawldidxtest_OBJECTS) $(rawldidxtest_DEPENDENCIES) + @rm -f rawldidxtest$(EXEEXT) + $(CXXLINK) $(rawldidxtest_LDFLAGS) $(rawldidxtest_OBJECTS) $(rawldidxtest_LDADD) $(LIBS) romantest$(EXEEXT): $(romantest_OBJECTS) $(romantest_DEPENDENCIES) @rm -f romantest$(EXEEXT) $(CXXLINK) $(romantest_LDFLAGS) $(romantest_OBJECTS) $(romantest_LDADD) $(LIBS) @@ -474,6 +488,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mgrtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsekey.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawldidxtest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/romantest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swaptest.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testblocks.Po@am__quote@ diff --git a/utilities/mod2osis.cpp b/utilities/mod2osis.cpp index ff8c9d8..e9327e4 100644 --- a/utilities/mod2osis.cpp +++ b/utilities/mod2osis.cpp @@ -91,8 +91,9 @@ int main(int argc, char **argv) else cout << "encoding=\"UTF-8\" "; cout << "?>\n\n"; + cout << "\n\n"; cout << "\n"; cout << "\t\tName() << "\">\n"; - cout << "\t\t\t" << inModule->Name() << "\n"; cout << "\t\t\t" << inModule->Description() << "\n"; + cout << "\t\t\t" << inModule->Name() << "\n"; if (inModule->Lang()) { if (strlen(inModule->Lang())) cout << "\t\t\t" << inModule->Lang() << "\n"; } - cout << "\t\t\tBible.KJV\n"; + cout << "\t\t\tBible.KJV\n"; cout << "\t\t\n"; cout << "\t\t\n"; - cout << "\t\t\tBible.KJV\n"; + cout << "\t\t\tBible.KJV\n"; cout << "\t\t\n"; cout << "\t\n\n"; @@ -133,8 +134,6 @@ int main(int argc, char **argv) opentest = true; } if (vkey->Book() != lastHeading.Book()) { - if (openbook) - cout << "\t\n"; buf = new char [205]; lastHeading = *vkey; lastHeading.Chapter(0); @@ -168,10 +167,6 @@ int main(int argc, char **argv) */ cout << inModule->RenderText() << endl; } - if (openchap) - cout << "\t\n"; - if (openbook) - cout << "\t\n"; if (opentest) cout << "\t\n"; cout << "\t\n"; -- cgit