Fix wrong text wrap avoid in some case

Don't avoid wrap at end of line when ending on a space preceded by a CH_PROP_AVOID_WRAP_AFTER char.
koreader · Dec 4, 2018 · 0879de5 · 0879de5
1 parent 74b7f39
commit 0879de5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/crengine/src/lvtextfm.cpp b/crengine/src/lvtextfm.cpp
@@ -1479,7 +1479,9 @@ class LVFormatter {
                             break;
                         }
                     }
-                    if (!avoidWrap) { // Look at preceding char(s)
+                    if (!avoidWrap && i < m_length-1) { // Look at preceding char(s)
+                        // (but not if it is the last char, where a wrap is fine
+                        // even if it ends after a CH_PROP_AVOID_WRAP_AFTER char)
                         for (int j = i-1; j >= 0; j--) {
                             if ( !(m_flags[j] & LCHAR_ALLOW_WRAP_AFTER) ) { // not another (collapsible) space
                                 avoidWrap = lGetCharProps(m_text[j]) & CH_PROP_AVOID_WRAP_AFTER;