node-sword-interface 1.0.2 → 1.0.4

package/binding.gyp

@@ -112,8 +112,7 @@
                 ],
                 "libraries": [
                     '<(module_root_dir)/sword_build/libsword.a',
-                    '<!@(pkg-config --libs libcurl)',
-                    '<!@(PKG_CONFIG_PATH="/opt/homebrew/opt/icu4c/lib/pkgconfig:/usr/local/opt/icu4c/lib/pkgconfig" pkg-config --libs icu-uc icu-io icu-i18n)'
+                    '<!@(pkg-config --libs libcurl)'
                 ],
                 "dependencies": [
                     "<!(node -p \"require('node-addon-api').gyp\")",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",
@@ -28,7 +28,7 @@
     "url": "https://github.com/ezra-project/node-sword-interface.git"
   },
   "devDependencies": {
-    "jsdoc-to-markdown": "^7.1.0",
+    "jsdoc-to-markdown": "^8.0.0",
     "node-gyp": "^8.0.0"
   }
 }

package/scripts/build_sword.sh

@@ -34,18 +34,11 @@ git clone https://github.com/bibletime/crosswire-sword-mirror sword
 git -C sword checkout 1460f9
 patch --batch --forward -d sword -p 0 < patch/sword_globconf.patch
 
-
 # PATCHES
 case "$(uname -s)" in
-#    Linux)
-#    # We only apply the Sword ICU patch on Linux
-#        patch --batch --forward -d sword -p 0 < patch/sword_icu.patch
-#    ;;
     Darwin)
     # We only apply the following patch on macOS
         export MACOSX_DEPLOYMENT_TARGET=10.10
-        export CMAKE_PREFIX_PATH=/usr/local/opt/icu4c
-#        patch --batch --forward -d sword -p 0 < patch/sword_mac.patch
     ;;
 esac
 

package/src/napi_module/node_sword_interface.cpp

@@ -187,7 +187,7 @@ int NodeSwordInterface::validateParams(const Napi::CallbackInfo& info, vector<Pa
     Napi::Env env = info.Env();
 
     if (info.Length() != paramSpec.size()) {
-        string paramCountError = "Expected " + to_string(paramSpec.size()) + " parameters, but got " += to_string(info.Length()) + "!";
+        string paramCountError = "Expected " + to_string(paramSpec.size()) + " parameters, but got " + to_string(info.Length()) + "!";
         Napi::TypeError::New(env, paramCountError).ThrowAsJavaScriptException();
         return -1;
     } else {

package/src/sword_backend/module_helper.cpp

@@ -210,9 +210,9 @@ bool ModuleHelper::isBrokenMarkupModule(std::string moduleName)
                      moduleName) != this->_brokenMarkupModules.end();
 }
 
-bool ModuleHelper::isDuplicateClosingEndDivModule(std::string moduleName)
+bool ModuleHelper::isInconsistentClosingEndDivModule(std::string moduleName)
 {
-    return std::find(this->_duplicateClosingEndDivModules.begin(),
-                     this->_duplicateClosingEndDivModules.end(),
-                     moduleName) != this->_duplicateClosingEndDivModules.end();
+    return std::find(this->_inconsistentClosingEndDivModules.begin(),
+                     this->_inconsistentClosingEndDivModules.end(),
+                     moduleName) != this->_inconsistentClosingEndDivModules.end();
 }

package/src/sword_backend/module_helper.hpp

@@ -34,8 +34,8 @@ public:
         // For modules in this list we will enforce the stripped version of the text and not use the markup
         this->_brokenMarkupModules = { "ASV" };
 
-        // For modules in this list we will remove the duplicate closing end divs from the markup
-        this->_duplicateClosingEndDivModules = { "NETtext" };
+        // For modules in this list we will balance the closing end divs in the markup
+        this->_inconsistentClosingEndDivModules = { "NETtext", "NASB" };
     }
 
     virtual ~ModuleHelper(){}
@@ -50,13 +50,13 @@ public:
     int getChapterVerseCount(std::string moduleName, std::string bookCode, int chapter);
     std::map<std::string, int> getAbsoluteVerseNumberMap(sword::SWModule* module, std::vector<std::string> bookList={});
     bool isBrokenMarkupModule(std::string moduleName);
-    bool isDuplicateClosingEndDivModule(std::string moduleName);
+    bool isInconsistentClosingEndDivModule(std::string moduleName);
 
 private:
     bool moduleHasKeyValuePair(sword::SWModule* module, std::string key, std::string value);
     ModuleStore& _moduleStore;
     std::vector<std::string> _brokenMarkupModules;
-    std::vector<std::string> _duplicateClosingEndDivModules;
+    std::vector<std::string> _inconsistentClosingEndDivModules;
 };
 
 #endif // _MODULE_HELPER

package/src/sword_backend/text_processor.cpp

@@ -43,9 +43,8 @@ TextProcessor::TextProcessor(ModuleStore& moduleStore, ModuleHelper& moduleHelpe
     this->_rawMarkupEnabled = false;
 }
 
-string TextProcessor::getFilteredText(const string& text, int chapter, int verseNr, bool hasStrongs, bool hasDuplicateClosingEndDivs)
+string TextProcessor::getFilteredText(const string& text, int chapter, int verseNr, bool hasStrongs, bool hasInconsistentClosingEndDivs)
 {
-    //static regex schlachterMarkupFilter = regex("<H.*> ");
     static string chapterFilter = "<chapter";
     static regex pbElement = regex("<pb .*?/> ");
 
@@ -71,12 +70,10 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
     static string quoteEndElementFilter = "</q>";
     static string titleStartElementFilter = "<title";
     static string titleEndElementFilter = "</title>";
-    static string segStartElementFilter = "<seg>";
     static string segEndElementFilter = "</seg>";
     static string divTitleElementFilter = "<div class=\"title\"";
     static string secHeadClassFilter = "class=\"sechead\"";
     static string divMilestoneFilter = "<div type=\"x-milestone\"";
-    static string milestoneFilter = "<milestone";
     static string xBrFilter = "x-br\"/>";
     static string divSIDFilter = "<div sID=";
     static string divEIDFilter = "<div eID=";
@@ -84,6 +81,8 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
     static string divineNameEndElement = "</divineName>";
     static string strongsWElement = "<w lemma=";
 
+    static regex milestoneFilter = regex("<milestone.*?/>");
+    static regex segStartElementFilter = regex("<seg.*?>");
     static regex divSectionElementFilter = regex("<div type=\"section\".*?>");
     static regex selfClosingElement = regex("(<)([wdiv]{1,3}) ([\\w:=\"\\- ]*?)(/>)");
 
@@ -106,7 +105,6 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
         filteredText.replace(0, noteTypeVariant.length(), "");
     }
 
-    //filteredText = regex_replace(filteredText, schlachterMarkupFilter, "");
     this->findAndReplaceAll(filteredText, chapterFilter, "<chapter class=\"sword-markup sword-chapter\"");
     this->findAndReplaceAll(filteredText, lbBeginParagraph, "");
     this->findAndReplaceAll(filteredText, lbEndParagraph, "&nbsp;<div class=\"sword-markup sword-paragraph-end\"><br></div>");
@@ -125,6 +123,8 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
     this->findAndReplaceAll(filteredText, rtxtStartElementFilter2, "<div class=\"sword-markup sword-rtxt\" rend=");
     this->findAndReplaceAll(filteredText, rtxtEndElementFilter, "</div>");
     this->findAndReplaceAll(filteredText, pbElementFilter, "<pb class=\"sword-markup sword-pb\"");
+    filteredText = regex_replace(filteredText, milestoneFilter, "");
+    filteredText = regex_replace(filteredText, segStartElementFilter, "");
     filteredText = regex_replace(filteredText, divSectionElementFilter, "");
 
     stringstream sectionTitleElement;
@@ -148,10 +148,8 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
     }
 
     this->findAndReplaceAll(filteredText, titleEndElementFilter, "</div>");
-    this->findAndReplaceAll(filteredText, segStartElementFilter, "");
     this->findAndReplaceAll(filteredText, segEndElementFilter, "");
     this->findAndReplaceAll(filteredText, divMilestoneFilter, "<div class=\"sword-markup sword-x-milestone\"");
-    this->findAndReplaceAll(filteredText, milestoneFilter, "<div class=\"sword-markup sword-milestone\"");
     this->findAndReplaceAll(filteredText, xBrFilter, "x-br\"/> ");
     this->findAndReplaceAll(filteredText, divSIDFilter, "<div class=\"sword-markup sword-sid\" sID=");
     this->findAndReplaceAll(filteredText, divEIDFilter, "<div class=\"sword-markup sword-eid\" eID=");
@@ -171,15 +169,30 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
     this->findAndReplaceAll(filteredText, semiColonWithoutSpace, "; <");
     this->findAndReplaceAll(filteredText, colonWithoutSpace, ": <");
 
-    if (hasDuplicateClosingEndDivs) {
+    if (hasInconsistentClosingEndDivs) {
         int numberOfOpeningDivs = StringHelper::numberOfSubstrings(filteredText, "<div");
         int numberOfClosingDivs = StringHelper::numberOfSubstrings(filteredText, "</div>");
 
-        // Remove the last closing div if the number of closing divs is higher than the number of opening divs
+        // Remove the last closing div(s) if the number of closing divs is higher than the number of opening divs
         if (numberOfClosingDivs > numberOfOpeningDivs) {
             const string closingDiv = "</div>";
-            size_t lastClosingDivOffset = filteredText.rfind(closingDiv);
-            filteredText.replace(lastClosingDivOffset, closingDiv.length(), "");
+            unsigned int diff = numberOfClosingDivs - numberOfOpeningDivs;
+
+            for (unsigned int i = 0; i < diff; i++) {
+                size_t lastClosingDivOffset = filteredText.rfind(closingDiv);
+                filteredText.erase(lastClosingDivOffset, closingDiv.length());
+            }
+        }
+
+        // Add closing div(s) if the number of closing divs is smaller than the number of opening divs
+        if (numberOfClosingDivs < numberOfOpeningDivs) {
+            const string closingDiv = "</div>";
+            unsigned int diff = numberOfOpeningDivs - numberOfClosingDivs;
+
+            for (unsigned int i = 0; i < diff; i++) {
+                size_t lastClosingDivOffset = filteredText.rfind(closingDiv);
+                filteredText.insert(lastClosingDivOffset + closingDiv.length(), closingDiv);
+            }
         }
     }
 
@@ -226,7 +239,7 @@ string TextProcessor::getCurrentChapterHeading(sword::SWModule* module)
     return chapterHeading;
 }
 
-string TextProcessor::getCurrentVerseText(sword::SWModule* module, bool hasStrongs, bool hasDuplicateClosingEndDivs, bool forceNoMarkup)
+string TextProcessor::getCurrentVerseText(sword::SWModule* module, bool hasStrongs, bool hasInconsistentClosingEndDivs, bool forceNoMarkup)
 {
     string verseText;
     string filteredText;
@@ -240,7 +253,7 @@ string TextProcessor::getCurrentVerseText(sword::SWModule* module, bool hasStron
         filteredText = verseText;
 
         if (!this->_rawMarkupEnabled) {
-            filteredText = this->getFilteredText(verseText, currentChapter, currentVerseNr, hasStrongs, hasDuplicateClosingEndDivs);
+            filteredText = this->getFilteredText(verseText, currentChapter, currentVerseNr, hasStrongs, hasInconsistentClosingEndDivs);
         }
     } else {
         verseText = string(module->stripText());
@@ -302,7 +315,7 @@ vector<Verse> TextProcessor::getVersesFromReferences(string moduleName, vector<s
     vector<string> bookList = this->getBookListFromReferences(references);
     map<string, int> absoluteVerseNumbers = this->_moduleHelper.getAbsoluteVerseNumberMap(module, bookList);
     bool moduleMarkupIsBroken = this->_moduleHelper.isBrokenMarkupModule(moduleName);
-    bool hasDuplicateClosingEndDivs = this->_moduleHelper.isDuplicateClosingEndDivModule(moduleName);
+    bool hasInconsistentClosingEndDivs = this->_moduleHelper.isInconsistentClosingEndDivModule(moduleName);
 
     for (unsigned int i = 0; i < references.size(); i++) {
         string currentReference = references[i];
@@ -312,7 +325,7 @@ vector<Verse> TextProcessor::getVersesFromReferences(string moduleName, vector<s
         bool entryExisting = module->hasEntry(module->getKey());
 
         if (entryExisting) {
-          currentVerseText = this->getCurrentVerseText(module, false, hasDuplicateClosingEndDivs, moduleMarkupIsBroken);
+          currentVerseText = this->getCurrentVerseText(module, false, hasInconsistentClosingEndDivs, moduleMarkupIsBroken);
         }
 
         Verse currentVerse;
@@ -350,7 +363,7 @@ vector<Verse> TextProcessor::getText(string moduleName, string key, QueryLimit q
     int lastChapter = -1;
     bool currentBookExisting = true;
     bool moduleMarkupIsBroken = this->_moduleHelper.isBrokenMarkupModule(moduleName);
-    bool hasDuplicateClosingEndDivs = this->_moduleHelper.isDuplicateClosingEndDivModule(moduleName);
+    bool hasInconsistentClosingEndDivs = this->_moduleHelper.isInconsistentClosingEndDivModule(moduleName);
 
     // This holds the text that we will return
     vector<Verse> text;
@@ -403,7 +416,7 @@ vector<Verse> TextProcessor::getText(string moduleName, string key, QueryLimit q
             // Current verse text
             verseText += this->getCurrentVerseText(module,
                                                    hasStrongs,
-                                                   hasDuplicateClosingEndDivs,
+                                                   hasInconsistentClosingEndDivs,
                                                    // Note that if markup is broken this will enforce
                                                    // the usage of the "stripped" / non-markup variant of the text
                                                    moduleMarkupIsBroken);

package/src/sword_backend/text_processor.hpp

@@ -43,7 +43,7 @@ public:
     std::vector<Verse> getChapterText(std::string moduleName, std::string bookCode, int chapter);
     std::vector<Verse> getVersesFromReferences(std::string moduleName, std::vector<std::string>& references);
     std::vector<std::string> getReferencesFromReferenceRange(std::string referenceRange);
-    std::string getCurrentVerseText(sword::SWModule* module, bool hasStrongs, bool hasDuplicateClosingEndDivs=false, bool forceNoMarkup=false);
+    std::string getCurrentVerseText(sword::SWModule* module, bool hasStrongs, bool hasInconsistentClosingEndDivs=false, bool forceNoMarkup=false);
     std::string getBookIntroduction(std::string moduleName, std::string bookCode);
     std::vector<Verse> getBookHeaderList(std::string moduleName, std::string bookCode, bool withAbsoluteVerseNumbers=false);
 
@@ -60,7 +60,7 @@ private:
                                int verseCount=-1);
 
     std::string getCurrentChapterHeading(sword::SWModule* module);
-    std::string getFilteredText(const std::string& text, int chapter, int verseNr, bool hasStrongs=false, bool hasDuplicateClosingEndDivs=false);
+    std::string getFilteredText(const std::string& text, int chapter, int verseNr, bool hasStrongs=false, bool hasInconsistentClosingEndDivs=false);
     std::string replaceSpacesInStrongs(const std::string& text);
     unsigned int findAndReplaceAll(std::string & data, std::string toSearch, std::string replaceStr);
 

package/patch/sword_icu.patch

@@ -1,55 +0,0 @@
-Index: include/utf8transliterator.h
-===================================================================
---- include/utf8transliterator.h	(Revision 3673)
-+++ include/utf8transliterator.h	(Arbeitskopie)
-@@ -45,6 +45,9 @@
- #include <defs.h>
- #include <map>
- 
-+using icu::UnicodeString;
-+using icu::Transliterator;
-+
- SWORD_NAMESPACE_START
- 
- class SWModule;
-Index: src/modules/filters/scsuutf8.cpp
-===================================================================
---- src/modules/filters/scsuutf8.cpp	(Revision 3673)
-+++ src/modules/filters/scsuutf8.cpp	(Arbeitskopie)
-@@ -35,8 +35,8 @@
- #include <unicode/unistr.h>
- #endif
- 
-+using icu::UnicodeString;
- 
--
- SWORD_NAMESPACE_START
- 
- 
-Index: src/modules/filters/utf8nfc.cpp
-===================================================================
---- src/modules/filters/utf8nfc.cpp	(Revision 3673)
-+++ src/modules/filters/utf8nfc.cpp	(Arbeitskopie)
-@@ -30,6 +30,9 @@
- #include <utf8nfc.h>
- #include <swbuf.h>
- 
-+using icu::UnicodeString;
-+using icu::Normalizer;
-+
- SWORD_NAMESPACE_START
- 
- UTF8NFC::UTF8NFC() {
-Index: src/modules/filters/utf8scsu.cpp
-===================================================================
---- src/modules/filters/utf8scsu.cpp	(Revision 3673)
-+++ src/modules/filters/utf8scsu.cpp	(Arbeitskopie)
-@@ -25,6 +25,8 @@
- #include <utf8scsu.h>
- #include <swbuf.h>
- 
-+using icu::UnicodeString;
-+
- SWORD_NAMESPACE_START
- 
- 

package/patch/sword_mac.patch

@@ -1,62 +0,0 @@
-Index include/utf8transliterator.h
-===================================================================
---- include/utf8transliterator.h
-+++ include/utf8transliterator.h
-@@ -42,6 +42,9 @@ SE_JAMO, SE_HAN, SE_KANJI
- 
- #include <unicode/translit.h>
- 
-+using icu_64::UnicodeString;
-+using icu_64::Transliterator;
-+
- #include <defs.h>
- #include <map>
- 
-Index src/modules/filters/scsuutf8.cpp
-===================================================================
---- src/modules/filters/scsuutf8.cpp
-+++ src/modules/filters/scsuutf8.cpp
-@@ -29,13 +29,14 @@
-  * in http://www.unicode.org/unicode/reports/tr6.html
-  */
- 
--#include <scsuutf8.h>
--#include <swbuf.h>
- #ifdef _ICU_
- #include <unicode/unistr.h>
- #endif
- 
-+using icu_64::UnicodeString;
- 
-+#include <scsuutf8.h>
-+#include <swbuf.h>
- 
- SWORD_NAMESPACE_START
- 
-Index src/modules/filters/utf8nfc.cpp
-===================================================================
---- src/modules/filters/utf8nfc.cpp
-+++ src/modules/filters/utf8nfc.cpp
-@@ -27,6 +27,9 @@
- #include <unicode/normlzr.h>
- #include <unicode/unorm.h>
- 
-+using icu_64::UnicodeString;
-+using icu_64::Normalizer;
-+
- #include <utf8nfc.h>
- #include <swbuf.h>
- 
-Index src/modules/filters/utf8scsu.cpp
-===================================================================
---- src/modules/filters/utf8scsu.cpp
-+++ src/modules/filters/utf8scsu.cpp
-@@ -25,6 +25,8 @@
- #include <utf8scsu.h>
- #include <swbuf.h>
- 
-+using icu_64::UnicodeString;
-+
- SWORD_NAMESPACE_START
- 
-