node-sword-interface 0.243.0 → 0.247.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/examples/install_kjv.js +1 -1
  2. package/examples/print_kjv_matthew.js +1 -1
  3. package/index.js +1 -1
  4. package/package.json +1 -1
  5. package/scripts/build_sword.sh +1 -1
  6. package/scripts/get_sword_build_win32.ps1 +1 -1
  7. package/scripts/get_sword_include_path.sh +1 -1
  8. package/scripts/get_sword_library.sh +1 -1
  9. package/src/napi_module/api_lock.cpp +1 -1
  10. package/src/napi_module/api_lock.hpp +1 -1
  11. package/src/napi_module/binding.cpp +1 -1
  12. package/src/napi_module/install_module_worker.cpp +1 -1
  13. package/src/napi_module/install_module_worker.hpp +1 -1
  14. package/src/napi_module/module_search_worker.cpp +1 -1
  15. package/src/napi_module/module_search_worker.hpp +1 -1
  16. package/src/napi_module/napi_sword_helper.cpp +1 -1
  17. package/src/napi_module/napi_sword_helper.hpp +1 -1
  18. package/src/napi_module/node_sword_interface.cpp +1 -1
  19. package/src/napi_module/node_sword_interface.hpp +1 -1
  20. package/src/napi_module/worker.hpp +1 -1
  21. package/src/node_sword_cli.cpp +12 -2
  22. package/src/sword_backend/common_defs.hpp +1 -1
  23. package/src/sword_backend/file_system_helper.cpp +1 -1
  24. package/src/sword_backend/file_system_helper.hpp +1 -1
  25. package/src/sword_backend/module_helper.cpp +1 -1
  26. package/src/sword_backend/module_helper.hpp +1 -1
  27. package/src/sword_backend/module_installer.cpp +1 -1
  28. package/src/sword_backend/module_installer.hpp +1 -1
  29. package/src/sword_backend/module_search.cpp +1 -1
  30. package/src/sword_backend/module_search.hpp +1 -1
  31. package/src/sword_backend/module_store.cpp +1 -1
  32. package/src/sword_backend/module_store.hpp +1 -1
  33. package/src/sword_backend/mutex.cpp +1 -1
  34. package/src/sword_backend/mutex.hpp +1 -1
  35. package/src/sword_backend/percentage_calc.hpp +1 -1
  36. package/src/sword_backend/repository_interface.cpp +1 -1
  37. package/src/sword_backend/repository_interface.hpp +1 -1
  38. package/src/sword_backend/string_helper.cpp +1 -1
  39. package/src/sword_backend/string_helper.hpp +1 -1
  40. package/src/sword_backend/strongs_entry.cpp +1 -1
  41. package/src/sword_backend/strongs_entry.hpp +1 -1
  42. package/src/sword_backend/sword_status_reporter.cpp +1 -1
  43. package/src/sword_backend/sword_status_reporter.hpp +1 -1
  44. package/src/sword_backend/sword_translation_helper.hpp +1 -1
  45. package/src/sword_backend/text_processor.cpp +12 -10
  46. package/src/sword_backend/text_processor.hpp +2 -2
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
package/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "node-sword-interface",
3
- "version": "0.243.0",
3
+ "version": "0.247.0",
4
4
  "description": "Javascript (N-API) interface to SWORD library",
5
5
  "keywords": [
6
6
  "C++",
@@ -2,7 +2,7 @@
2
2
 
3
3
  # This file is part of node-sword-interface.
4
4
  #
5
- # Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
5
+ # Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
6
6
  #
7
7
  # node-sword-interface is free software: you can redistribute it and/or modify
8
8
  # it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  # This file is part of node-sword-interface.
2
2
  #
3
- # Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ # Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
  #
5
5
  # node-sword-interface is free software: you can redistribute it and/or modify
6
6
  # it under the terms of the GNU General Public License as published by
@@ -2,7 +2,7 @@
2
2
 
3
3
  # This file is part of node-sword-interface.
4
4
  #
5
- # Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
5
+ # Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
6
6
  #
7
7
  # node-sword-interface is free software: you can redistribute it and/or modify
8
8
  # it under the terms of the GNU General Public License as published by
@@ -2,7 +2,7 @@
2
2
 
3
3
  # This file is part of node-sword-interface.
4
4
  #
5
- # Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
5
+ # Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
6
6
  #
7
7
  # node-sword-interface is free software: you can redistribute it and/or modify
8
8
  # it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -114,6 +114,14 @@ void get_book_list(ModuleHelper& module_helper)
114
114
  }
115
115
  }
116
116
 
117
+ void get_book_headers(TextProcessor& text_processor)
118
+ {
119
+ vector<Verse> headerList = text_processor.getBookHeaderList("NASB", "John");
120
+ for (int i = 0; i < headerList.size(); i++) {
121
+ cout << headerList[i].content << endl;
122
+ }
123
+ }
124
+
117
125
  void test_unlock_key(ModuleInstaller& module_installer, ModuleStore& module_store, TextProcessor& text_processor)
118
126
  {
119
127
  module_installer.uninstallModule("NA28");
@@ -206,11 +214,13 @@ int main(int argc, char** argv)
206
214
  //string translation = sword_facade.getSwordTranslation(string("/usr/share/sword/locales.d"), string("de"), string("locales"));
207
215
  //cout << translation << endl;
208
216
 
209
- vector<Verse> searchResults = moduleSearch.getModuleSearchResults("NASB", "faith", SearchType::multiWord, SearchScope::NT, true);
217
+ /*vector<Verse> searchResults = moduleSearch.getModuleSearchResults("NASB", "faith", SearchType::multiWord, SearchScope::NT, true);
210
218
  cout << "Got " << searchResults.size() << " results!" << endl;
211
219
  for (unsigned int i=0; i < searchResults.size(); i++) {
212
220
  cout << searchResults[i].reference << endl;
213
- }
221
+ }*/
222
+
223
+ get_book_headers(textProcessor);
214
224
 
215
225
  return 0;
216
226
  }
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -36,8 +36,6 @@
36
36
  using namespace std;
37
37
  using namespace sword;
38
38
 
39
- #define SEARCHTYPE_ENTRYATTR -3L
40
-
41
39
  TextProcessor::TextProcessor(ModuleStore& moduleStore, ModuleHelper& moduleHelper)
42
40
  : _moduleStore(moduleStore), _moduleHelper(moduleHelper)
43
41
  {
@@ -45,7 +43,7 @@ TextProcessor::TextProcessor(ModuleStore& moduleStore, ModuleHelper& moduleHelpe
45
43
  this->_rawMarkupEnabled = false;
46
44
  }
47
45
 
48
- string TextProcessor::getFilteredText(const string& text, int chapter, bool hasStrongs, bool hasDuplicateClosingEndDivs)
46
+ string TextProcessor::getFilteredText(const string& text, int chapter, int verseNr, bool hasStrongs, bool hasDuplicateClosingEndDivs)
49
47
  {
50
48
  //static regex schlachterMarkupFilter = regex("<H.*> ");
51
49
  static string chapterFilter = "<chapter";
@@ -128,7 +126,8 @@ string TextProcessor::getFilteredText(const string& text, int chapter, bool hasS
128
126
 
129
127
  stringstream sectionTitleElement;
130
128
  sectionTitleElement << "<div class=\"sword-markup sword-section-title\" ";
131
- sectionTitleElement << "chapter=\"" << chapter << "\"";
129
+ sectionTitleElement << "chapter=\"" << chapter << "\" ";
130
+ sectionTitleElement << "verse=\"" << verseNr << "\"";
132
131
  this->findAndReplaceAll(filteredText, titleStartElementFilter, sectionTitleElement.str());
133
132
  this->findAndReplaceAll(filteredText, divTitleElementFilter, sectionTitleElement.str());
134
133
 
@@ -183,7 +182,7 @@ string TextProcessor::getCurrentChapterHeading(sword::SWModule* module)
183
182
  string chapterHeading = "";
184
183
  VerseKey currentVerseKey = module->getKey();
185
184
  int currentChapter = currentVerseKey.getChapter();
186
- int currentVerse = currentVerseKey.getVerse();
185
+ int currentVerseNr = currentVerseKey.getVerse();
187
186
 
188
187
  if (currentVerseKey.getVerse() == 1) { // X:1, set key to X:0
189
188
  // Include chapter/book/testament/module intros
@@ -203,10 +202,10 @@ string TextProcessor::getCurrentChapterHeading(sword::SWModule* module)
203
202
  if (this->_markupEnabled && !this->_rawMarkupEnabled) {
204
203
  // The chapter headings in the ISV are screwed up somehow for 1:1
205
204
  // Therefore we do not render chapter headings for the first verse of the book in this case.
206
- if (currentChapter == 1 && currentVerse == 1 && currentModuleName == "ISV") {
205
+ if (currentChapter == 1 && currentVerseNr == 1 && currentModuleName == "ISV") {
207
206
  chapterHeading = "";
208
207
  } else {
209
- chapterHeading = this->getFilteredText(chapterHeading, currentChapter);
208
+ chapterHeading = this->getFilteredText(chapterHeading, currentChapter, currentVerseNr);
210
209
  }
211
210
  }
212
211
 
@@ -221,12 +220,13 @@ string TextProcessor::getCurrentVerseText(sword::SWModule* module, bool hasStron
221
220
  if (this->_markupEnabled && !forceNoMarkup) {
222
221
  VerseKey currentVerseKey = module->getKey();
223
222
  int currentChapter = currentVerseKey.getChapter();
223
+ int currentVerseNr = currentVerseKey.getVerse();
224
224
  verseText = string(module->getRawEntry());
225
225
  StringHelper::trim(verseText);
226
226
  filteredText = verseText;
227
227
 
228
228
  if (!this->_rawMarkupEnabled) {
229
- filteredText = this->getFilteredText(verseText, currentChapter, hasStrongs, hasDuplicateClosingEndDivs);
229
+ filteredText = this->getFilteredText(verseText, currentChapter, currentVerseNr, hasStrongs, hasDuplicateClosingEndDivs);
230
230
  }
231
231
  } else {
232
232
  verseText = string(module->stripText());
@@ -475,7 +475,7 @@ vector<Verse> TextProcessor::getBookHeaderList(string moduleName, string bookCod
475
475
  ListKey scopeList = VerseKey().parseVerseList(bookCode.c_str(), "", true);
476
476
  SWKey* scope = &scopeList;
477
477
 
478
- ListKey resultKey = module->search("/Heading", SEARCHTYPE_ENTRYATTR, 0, scope);
478
+ ListKey resultKey = module->search("/Heading", SWModule::SEARCHTYPE_ENTRYATTR, 0, scope);
479
479
 
480
480
  static string titleStartElementFilter = "<title";
481
481
  static string titleEndElementFilter = "</title>";
@@ -484,6 +484,8 @@ vector<Verse> TextProcessor::getBookHeaderList(string moduleName, string bookCod
484
484
 
485
485
  for (resultKey = TOP; !resultKey.popError(); resultKey++) {
486
486
  module->setKey(resultKey);
487
+ module->renderText();
488
+
487
489
  VerseKey currentKey(resultKey.getShortText());
488
490
 
489
491
  // get both Preverse and Interverse Headings and just merge them into the same map
@@ -1,6 +1,6 @@
1
1
  /* This file is part of node-sword-interface.
2
2
 
3
- Copyright (C) 2019 - 2021 Tobias Klein <contact@tklein.info>
3
+ Copyright (C) 2019 - 2022 Tobias Klein <contact@tklein.info>
4
4
 
5
5
  node-sword-interface is free software: you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ private:
60
60
  int verseCount=-1);
61
61
 
62
62
  std::string getCurrentChapterHeading(sword::SWModule* module);
63
- std::string getFilteredText(const std::string& text, int chapter, bool hasStrongs=false, bool hasDuplicateClosingEndDivs=false);
63
+ std::string getFilteredText(const std::string& text, int chapter, int verseNr, bool hasStrongs=false, bool hasDuplicateClosingEndDivs=false);
64
64
  std::string replaceSpacesInStrongs(const std::string& text);
65
65
  unsigned int findAndReplaceAll(std::string & data, std::string toSearch, std::string replaceStr);
66
66