node-sword-interface 1.0.31 → 1.0.33

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/examples/install_kjv.js

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/examples/print_kjv_matthew.js

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/index.js

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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.31",
+  "version": "1.0.33",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",
@@ -32,6 +32,6 @@
   },
   "devDependencies": {
     "jsdoc-to-markdown": "^8.0.3",
-    "node-gyp": "^10.2.0"
+    "node-gyp": "^9.1.0"
   }
 }

package/scripts/build_sword.sh

@@ -2,7 +2,7 @@
 
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/scripts/get_sword_build_win32.ps1

@@ -1,6 +1,6 @@
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/scripts/get_sword_include_path.sh

@@ -2,7 +2,7 @@
 
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/scripts/get_sword_library.sh

@@ -2,7 +2,7 @@
 
 #   This file is part of node-sword-interface.
 #
-#   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+#   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 #
 #   node-sword-interface is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by

package/scripts/postinstall.js

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/api_lock.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/api_lock.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/binding.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/install_module_worker.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/install_module_worker.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/module_search_worker.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/module_search_worker.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/napi_sword_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/napi_sword_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/napi_module/node_sword_interface.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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/napi_module/worker.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/common_defs.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/dict_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/dict_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/file_system_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/file_system_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_installer.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_installer.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_search.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -141,13 +141,28 @@ vector<Verse> ModuleSearch::getModuleSearchResults(string moduleName,
                 return searchResults;
             }
 
-            // If the Strong's key is OT we need to insert a zero in front of the key
-            // This is necessary because the Sword modules with Strong's have a zero in front of the Hebrew Strong's numbers
-            if (searchTerm[0] == 'H' && this->_textProcessor.moduleHasStrongsZeroPrefixes(module)) {
-                // Cut out the number from the Strong's key (starting at index 1 until end of string)
-                string strongsKey = searchTerm.substr(1, searchTerm.size());
-                // Overwrite the searchTerm with an inserted 0
-                searchTerm = "H0" + strongsKey;
+            // Cut out the number from the Strong's key (starting at index 1 until end of string)
+            string strongsNumber = searchTerm.substr(1, searchTerm.size());
+
+            if (searchTerm[0] == 'H') {
+
+                if (this->_textProcessor.moduleHasStrongsPaddedZeroPrefixes(module)) {
+                    string paddedStrongsNumber = this->_textProcessor.padStrongsNumber(strongsNumber);
+                    searchTerm = "H" + paddedStrongsNumber;
+
+                } else if (this->_textProcessor.moduleHasStrongsZeroPrefixes(module)) {
+                    // If the Strong's key is OT we need to insert a zero in front of the key
+                    // This is necessary because the Sword modules with Strong's have a zero in front of the Hebrew Strong's numbers
+                    // Overwrite the searchTerm with an inserted 0
+                    searchTerm = "H0" + strongsNumber;
+                }
+
+            } else if (searchTerm[0] == 'G') {
+
+                if (this->_textProcessor.moduleHasStrongsPaddedZeroPrefixes(module)) {
+                    string paddedStrongsNumber = this->_textProcessor.padStrongsNumber(strongsNumber);
+                    searchTerm = "G" + paddedStrongsNumber;
+                }
             }
 
             // from swmodule.h api docs:

package/src/sword_backend/module_search.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_store.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/module_store.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/mutex.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/mutex.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/percentage_calc.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/repository_interface.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/repository_interface.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/string_helper.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/string_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/strongs_entry.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/strongs_entry.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/sword_status_reporter.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/sword_status_reporter.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/sword_translation_helper.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

package/src/sword_backend/text_processor.cpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include <sstream>
 #include <string>
 #include <regex>
+#include <iomanip>
 
 // Sword includes
 #include <versekey.h>
@@ -40,6 +41,7 @@ TextProcessor::TextProcessor(ModuleStore& moduleStore, ModuleHelper& moduleHelpe
     : _moduleStore(moduleStore), _moduleHelper(moduleHelper)
 {
     this->_markupEnabled = false;
+    this->_strongsWithNbspEnabled = false;
     this->_rawMarkupEnabled = false;
 }
 
@@ -210,7 +212,7 @@ string TextProcessor::getFilteredText(const string& text, int chapter, int verse
         }
     }
 
-    if (hasStrongs) {
+    if (hasStrongs && this->_strongsWithNbspEnabled) {
         filteredText = this->replaceSpacesInStrongs(filteredText);
     }
 
@@ -533,6 +535,7 @@ string TextProcessor::replaceSpacesInStrongs(const string& text)
         filteredText += std::regex_replace(m[0].str(), space, "&nbsp;");
         input = m.suffix();
     }
+
     filteredText += input;
 
     return filteredText;
@@ -548,7 +551,38 @@ bool TextProcessor::moduleHasStrongsZeroPrefixes(sword::SWModule* module)
     string verseText = this->getCurrentVerseText(module, true);
     this->_markupEnabled = previousMarkupSetting;
     
-    return verseText.find("strong:H0") != string::npos;
+    // Check if the verse text contains the Strong's number H07225 ("beginning") with a zero prefix
+    return verseText.find("strong:H07225") != string::npos;
+}
+
+bool TextProcessor::moduleHasStrongsPaddedZeroPrefixes(sword::SWModule* module)
+{
+    // Check if the module has Strongs's numbers that are padded with zeros
+    string key = "Gen 2:24";
+    module->setKey(key.c_str());
+
+    bool previousMarkupSetting = this->_markupEnabled;
+    this->enableMarkup();
+    string verseText = this->getCurrentVerseText(module, true);
+    this->_markupEnabled = previousMarkupSetting;
+
+    // Check if the verse text contains the Strong's number H0001 ("father") with padded zeros
+    return verseText.find("strong:H0001") != string::npos;
+}
+
+string TextProcessor::padStrongsNumber(const string strongsNumber) {
+    if (strongsNumber.size() == 0) {
+        return strongsNumber;
+    }
+
+    // Convert to int
+    int numericValue = stoi(strongsNumber);
+
+    // Use stringstream and i/o manipulators to pad with zeros
+    std::ostringstream padded;
+    padded << std::setw(4) << std::setfill('0') << numericValue;
+
+    return padded.str();
 }
 
 bool TextProcessor::isModuleReadable(sword::SWModule* module, std::string key)

package/src/sword_backend/text_processor.hpp

@@ -1,6 +1,6 @@
 /* This file is part of node-sword-interface.
 
-   Copyright (C) 2019 - 2024 Tobias Klein <contact@tklein.info>
+   Copyright (C) 2019 - 2025 Tobias Klein <contact@tklein.info>
 
    node-sword-interface is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -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);
@@ -50,6 +52,8 @@ public:
     StrongsEntry* getStrongsEntry(std::string key);
 
     bool moduleHasStrongsZeroPrefixes(sword::SWModule* module);
+    bool moduleHasStrongsPaddedZeroPrefixes(sword::SWModule* module);
+    std::string padStrongsNumber(const std::string strongsNumber);
     bool isModuleReadable(sword::SWModule* module, std::string key="John 1:1");
 
 private:
@@ -71,6 +75,7 @@ private:
     ModuleHelper& _moduleHelper;
     bool _markupEnabled;
     bool _rawMarkupEnabled;
+    bool _strongsWithNbspEnabled;
 };
 
 #endif // _TEXT_PROCESSOR