node-sword-interface 1.0.30 → 1.0.32

package/API.md

@@ -50,6 +50,7 @@ This is the main class of node-sword-interface and it provides a set of static f
     * [.isModuleReadable(moduleCode)](#NodeSwordInterface+isModuleReadable) ⇒ <code>Boolean</code>
     * [.getModuleDescription(moduleCode)](#NodeSwordInterface+getModuleDescription) ⇒ <code>String</code>
     * [.enableMarkup()](#NodeSwordInterface+enableMarkup)
+    * [.enableStrongsWithNbsp()](#NodeSwordInterface+enableStrongsWithNbsp)
     * [.getRawModuleEntry(moduleCode, key)](#NodeSwordInterface+getRawModuleEntry) ⇒ <code>String</code>
     * [.getReferenceText(moduleCode, key)](#NodeSwordInterface+getReferenceText) ⇒ [<code>VerseObject</code>](#VerseObject)
     * [.getChapterText(moduleCode, bookCode, chapter)](#NodeSwordInterface+getChapterText) ⇒ [<code>Array.&lt;VerseObject&gt;</code>](#VerseObject)
@@ -310,6 +311,12 @@ Returns the description of a module.
 Enables available markup (like Strongs, foot notes, etc.)
 This influences the output for getChapterText, getBookText and getBibleText.
 
+**Kind**: instance method of [<code>NodeSwordInterface</code>](#NodeSwordInterface)  
+<a name="NodeSwordInterface+enableStrongsWithNbsp"></a>
+
+### nodeSwordInterface.enableStrongsWithNbsp()
+Enables rendering of Strongs elements with non-breaking spaces.
+
 **Kind**: instance method of [<code>NodeSwordInterface</code>](#NodeSwordInterface)  
 <a name="NodeSwordInterface+getRawModuleEntry"></a>
 

package/index.js

@@ -331,6 +331,13 @@ class NodeSwordInterface {
     return this.nativeInterface.enableMarkup();
   }
 
+  /**
+   * Enables rendering of Strongs elements with non-breaking spaces.
+   */
+  enableStrongsWithNbsp() {
+    return this.nativeInterface.enableStrongsWithNbsp();
+  }
+
   /**
    * Returns the raw text of an entry for the given module and key.
    * If no entry exists for the given key the return value is undefined.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",
@@ -23,7 +23,7 @@
   "license": "GPL-2.0+",
   "dependencies": {
     "glob": "^8.0.3",
-    "node-addon-api": "^7.1.0",
+    "node-addon-api": "^8.2.2",
     "node-html-parser": "^6.1.13"
   },
   "repository": {

package/src/napi_module/node_sword_interface.cpp

@@ -90,6 +90,7 @@ Napi::Object NodeSwordInterface::Init(Napi::Env env, Napi::Object exports)
         InstanceMethod("getModuleDescription", &NodeSwordInterface::getModuleDescription),
         InstanceMethod("getLocalModule", &NodeSwordInterface::getLocalModule),
         InstanceMethod("enableMarkup", &NodeSwordInterface::enableMarkup),
+        InstanceMethod("enableStrongsWithNbsp", &NodeSwordInterface::enableStrongsWithNbsp),
         InstanceMethod("getRawModuleEntry", &NodeSwordInterface::getRawModuleEntry),
         InstanceMethod("getReferenceText", &NodeSwordInterface::getReferenceText),
         InstanceMethod("getChapterText", &NodeSwordInterface::getChapterText),
@@ -526,6 +527,16 @@ Napi::Value NodeSwordInterface::enableMarkup(const Napi::CallbackInfo& info)
     return info.Env().Undefined();
 }
 
+Napi::Value NodeSwordInterface::enableStrongsWithNbsp(const Napi::CallbackInfo& info)
+{
+    lockApi();
+    Napi::Env env = info.Env();
+    Napi::HandleScope scope(env);
+    this->_textProcessor->enableStrongsWithNbsp();
+    unlockApi();
+    return info.Env().Undefined();
+}
+
 Napi::Value NodeSwordInterface::getRawModuleEntry(const Napi::CallbackInfo& info)
 {
     lockApi();

package/src/napi_module/node_sword_interface.hpp

@@ -70,6 +70,7 @@ private:
     Napi::Value getLocalModule(const Napi::CallbackInfo& info);
 
     Napi::Value enableMarkup(const Napi::CallbackInfo& info);
+    Napi::Value enableStrongsWithNbsp(const Napi::CallbackInfo& info);
     
     Napi::Value getRawModuleEntry(const Napi::CallbackInfo& info);
     Napi::Value getReferenceText(const Napi::CallbackInfo& info);

package/src/sword_backend/module_helper.cpp

@@ -43,14 +43,6 @@ bool ModuleHelper::moduleHasFeature(sword::SWModule* module, std::string feature
     return this->moduleHasKeyValuePair(module, "Feature", feature);
 }
 
-bool ModuleHelper::moduleHasStrongsKeys(sword::SWModule* module)
-{
-    bool hasHebrewStrongsKeys = this->moduleHasFeature(module, "HebrewDef");
-    bool hasGreekStrongsKeys = this->moduleHasFeature(module, "GreekDef");
-
-    return hasHebrewStrongsKeys || hasGreekStrongsKeys;
-}
-
 bool ModuleHelper::moduleHasKeyValuePair(sword::SWModule* module, std::string key, std::string value)
 {
     bool hasKeyValuePair = false;

package/src/sword_backend/module_helper.hpp

@@ -42,7 +42,6 @@ public:
 
     bool moduleHasGlobalOption(sword::SWModule* module, std::string globalOption);
     bool moduleHasFeature(sword::SWModule* module, std::string feature);
-    bool moduleHasStrongsKeys(sword::SWModule* module);
     bool moduleHasBook(sword::SWModule* module, std::string bookCode);
 
     std::vector<std::string> getBookList(std::string moduleName);

package/src/sword_backend/repository_interface.cpp

@@ -230,10 +230,6 @@ vector<SWModule*> RepositoryInterface::getAllRepoModules(string repoName, Module
             SWModule* currentModule = it->second;
             string currentModuleType = currentModule->getType();
 
-            /*if (moduleType == ModuleType::dict && !this->_moduleHelper.moduleHasStrongsKeys(currentModule)) {
-                continue;
-            }*/
-
             if (moduleTypeString == "ANY" || currentModuleType == moduleTypeString) {
                 modules.push_back(currentModule);
             }
@@ -288,11 +284,6 @@ vector<SWModule*> RepositoryInterface::getRepoModulesByLang(string repoName,
             continue;
         }
 
-        /*if (moduleType == ModuleType::dict && !hasHebrewStrongsKeys && !hasGreekStrongsKeys) {
-            // In case of a dictionary module we ignore it if there are not Strong's keys
-            continue;
-        }*/
-
         if (hebrewStrongsKeys && !hasHebrewStrongsKeys) {
             continue;
         }

package/src/sword_backend/text_processor.cpp

@@ -40,6 +40,7 @@ TextProcessor::TextProcessor(ModuleStore& moduleStore, ModuleHelper& moduleHelpe
     : _moduleStore(moduleStore), _moduleHelper(moduleHelper)
 {
     this->_markupEnabled = false;
+    this->_strongsWithNbspEnabled = false;
     this->_rawMarkupEnabled = false;
 }
 
@@ -210,7 +211,7 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
         }
     }
 
-    if (hasStrongs) {
+    if (hasStrongs && this->_strongsWithNbspEnabled) {
         filteredText = this->replaceSpacesInStrongs(filteredText);
     }
 
@@ -533,6 +534,7 @@ string TextProcessor::replaceSpacesInStrongs(const string& text)
         filteredText += std::regex_replace(m[0].str(), space, " ");
         input = m.suffix();
     }
+
     filteredText += input;
 
     return filteredText;

package/src/sword_backend/text_processor.hpp

@@ -38,6 +38,8 @@ public:
     void enableMarkup() { this->_markupEnabled = true; }
     void disableMarkup() { this->_markupEnabled = false; }
 
+    void enableStrongsWithNbsp() { this->_strongsWithNbspEnabled = true; }
+
     std::vector<Verse> getBibleText(std::string moduleName);
     Verse getReferenceText(std::string moduleName, std::string reference);
     std::vector<Verse> getBookText(std::string moduleName, std::string bookCode, int startVerseNumber=-1, int verseCount=-1);
@@ -71,6 +73,7 @@ private:
     ModuleHelper& _moduleHelper;
     bool _markupEnabled;
     bool _rawMarkupEnabled;
+    bool _strongsWithNbspEnabled;
 };
 
 #endif // _TEXT_PROCESSOR