Fixed infinite loop at end of bible (Rev 22)v1.0.6

2 files changed, 13 insertions, 3 deletions

diff --git a/src/bible.cc b/src/bible.cc
index 0e555dc..7773732 100644
--- a/src/bible.cc
+++ b/src/bible.cc
@@ -310,6 +310,11 @@ int main(int argc, char* argv[]) {
         if(omitVerseNums && tex.verse != verse) {
             out << " ";
         } else if(!omitVerseNums && tex.verse != verse) {
+            // First output any whitespace at the start of tex.text
+            for(auto c = tex.text.begin(); c != tex.text.end() and std::isspace(*c);) {
+                out << *c;
+                tex.text.erase(c);
+            }
             if(superscript) {
                 out << " ";
                 map<char,string> d2s = {{'0', "⁰"}, {'1', "¹"}, {'2', "²"}, {'3', "³"}, {'4', "⁴"}, {'5', "⁵"}, {'6', "⁶"}, {'7', "⁷"}, {'8', "⁸"}, {'9', "⁹"}};
diff --git a/src/lib/libbible.cc b/src/lib/libbible.cc
index c6850f7..f3b9820 100644
--- a/src/lib/libbible.cc
+++ b/src/lib/libbible.cc
@@ -184,11 +184,11 @@ vector<libbible::text> libbible::getText(libbible::passage pass) {
 
     string book = string(key->getBookName());
 
-    for(; string(key->getBookName()) == book &&
+    /*for(; string(key->getBookName()) == book &&
             (key->getChapter() < pass.chapterEnd
             || (key->getChapter() == pass.chapterEnd && key->getVerse() <= pass.verseEnd));
-            (*key)++) {
-
+            (*key)++) {*/
+    while(true) {
         string text = string(target->renderText());
         //printf("Working with: %s\n", text.c_str());
 
@@ -276,6 +276,11 @@ vector<libbible::text> libbible::getText(libbible::passage pass) {
             }
         }
         endOfParagraph = ! text.empty() and text.back() == '\n';
+        if(string(key->getBookName()) != book ||
+            (key->getChapter() >= pass.chapterEnd && key->getVerse() >= pass.verseEnd)) {
+            break;
+        }
+        (*key)++;
     }
     return texts;
 }