node-sword-interface 1.0.100 → 1.0.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sword-interface",
-  "version": "1.0.100",
+  "version": "1.0.101",
   "description": "Javascript (N-API) interface to SWORD library",
   "keywords": [
     "C++",

package/src/sword_backend/text_processor.cpp

@@ -294,6 +294,48 @@ string TextProcessor::getCurrentChapterHeading(sword::SWModule* module, const st
     return chapterHeading;
 }
 
+string TextProcessor::getCurrentPreverseHeading(sword::SWModule* module, const string& moduleFileUrl)
+{
+    string preverse = "";
+    VerseKey currentVerseKey = module->getKey();
+    int currentChapter = currentVerseKey.getChapter();
+    int currentVerseNr = currentVerseKey.getVerse();
+
+    // First, we need to access the rendered text to populate entry attributes
+    // The entry attributes are only available after rendering/stripping
+    module->renderText();
+
+    // Get the entry attributes map
+    sword::AttributeTypeList& attributes = module->getEntryAttributes();
+
+    // Look for Heading/Preverse entries (indexed 0, 1, 2, ...)
+    auto headingIt = attributes.find("Heading");
+    if (headingIt != attributes.end()) {
+        auto preverseIt = headingIt->second.find("Preverse");
+        if (preverseIt != headingIt->second.end()) {
+            // Iterate through all preverse entries (0, 1, 2, ...)
+            for (auto& entry : preverseIt->second) {
+                string preverseContent = string(entry.second.c_str());
+                StringHelper::trim(preverseContent);
+                
+                if (!preverseContent.empty()) {
+                    // Render the preverse content through the module
+                    sword::SWBuf renderedBuf = module->renderText(preverseContent.c_str());
+                    string rendered = string(renderedBuf.c_str());
+                    
+                    if (this->_markupEnabled && !this->_rawMarkupEnabled) {
+                        rendered = this->getFilteredText(rendered, currentChapter, currentVerseNr, false, false, moduleFileUrl);
+                    }
+                    
+                    preverse += rendered;
+                }
+            }
+        }
+    }
+
+    return preverse;
+}
+
 string TextProcessor::getCurrentVerseText(sword::SWModule* module, bool hasStrongs, bool hasInconsistentClosingEndDivs, bool forceNoMarkup)
 {
     string moduleFileUrl = this->getFileUrl(this->_moduleStore.getModuleDataPath(module));
@@ -408,7 +450,13 @@ vector<Verse> TextProcessor::getVersesFromReferences(string moduleName, vector<s
         bool entryExisting = module->hasEntry(module->getKey());
 
         if (entryExisting) {
-          currentVerseText = this->getCurrentVerseText(module, false, hasInconsistentClosingEndDivs, moduleMarkupIsBroken, moduleFileUrl);
+          // Add preverse heading before verse text
+          if (!moduleMarkupIsBroken) {
+              string preverseHeading = this->getCurrentPreverseHeading(module, moduleFileUrl);
+              currentVerseText += preverseHeading;
+          }
+          
+          currentVerseText += this->getCurrentVerseText(module, false, hasInconsistentClosingEndDivs, moduleMarkupIsBroken, moduleFileUrl);
         }
 
         Verse currentVerse;
@@ -499,6 +547,13 @@ vector<Verse> TextProcessor::getText(string moduleName, string key, QueryLimit q
                 verseText += chapterHeading;
             }
 
+            // Preverse heading (introductory material attached to this verse via entry attributes)
+            // This includes intro images and other material that should appear before the verse text
+            if (!moduleMarkupIsBroken) {
+                string preverseHeading = this->getCurrentPreverseHeading(module, moduleFileUrl);
+                verseText += preverseHeading;
+            }
+
             // Current verse text
             verseText += this->getCurrentVerseText(module,
                                                    hasStrongs,

package/src/sword_backend/text_processor.hpp

@@ -64,6 +64,7 @@ private:
                                int verseCount=-1);
 
     std::string getCurrentChapterHeading(sword::SWModule* module, const std::string& moduleFileUrl);
+    std::string getCurrentPreverseHeading(sword::SWModule* module, const std::string& moduleFileUrl);
     std::string getCurrentVerseText(sword::SWModule* module, bool hasStrongs, bool hasInconsistentClosingEndDivs, bool forceNoMarkup, const std::string& moduleFileUrl);
     std::string getFilteredText(const std::string& text, int chapter, int verseNr, bool hasStrongs, bool hasInconsistentClosingEndDivs, const std::string& moduleFileUrl);
     std::string getFileUrl(const std::string& nativePath);