1 files changed, 16 insertions, 18 deletions

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index f305b9b7dc..a83ef95c79 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1108,6 +1108,22 @@ struct QBidiAlgorithm {
             resolveImplicitLevels(runs);
         }
 
+        BIDI_DEBUG() << "Rule L1:";
+        // Rule L1:
+        bool resetLevel = true;
+        for (int i = length - 1; i >= 0; --i) {
+            if (analysis[i].bidiFlags & QScriptAnalysis::BidiResetToParagraphLevel) {
+                BIDI_DEBUG() << "resetting pos" << i << "to baselevel";
+                analysis[i].bidiLevel = baseLevel;
+                resetLevel = true;
+            } else if (resetLevel && analysis[i].bidiFlags & QScriptAnalysis::BidiMaybeResetToParagraphLevel) {
+                BIDI_DEBUG() << "resetting pos" << i << "to baselevel (maybereset flag)";
+                analysis[i].bidiLevel = baseLevel;
+            } else {
+                resetLevel = false;
+            }
+        }
+
         // set directions for BN to the minimum of adjacent chars
         // This makes is possible to be conformant with the Bidi algorithm even though we don't
         // remove BN and explicit embedding chars from the stream of characters to reorder
@@ -1139,22 +1155,6 @@ struct QBidiAlgorithm {
             }
         }
 
-        BIDI_DEBUG() << "Rule L1:";
-        // Rule L1:
-        bool resetLevel = true;
-        for (int i = length - 1; i >= 0; --i) {
-            if (analysis[i].bidiFlags & QScriptAnalysis::BidiResetToParagraphLevel) {
-                BIDI_DEBUG() << "resetting pos" << i << "to baselevel";
-                analysis[i].bidiLevel = baseLevel;
-                resetLevel = true;
-            } else if (resetLevel && analysis[i].bidiFlags & QScriptAnalysis::BidiMaybeResetToParagraphLevel) {
-                BIDI_DEBUG() << "resetting pos" << i << "to baselevel (maybereset flag)";
-                analysis[i].bidiLevel = baseLevel;
-            } else {
-                resetLevel = false;
-            }
-        }
-
         if (BidiDebugEnabled) {
             BIDI_DEBUG() << "final resolved levels:";
             for (int i = 0; i < length; ++i)
@@ -2087,8 +2087,6 @@ void QTextEngine::itemize() const
             analysis->flags = QScriptAnalysis::Object;
             break;
         case QChar::LineSeparator:
-            if (analysis->bidiLevel % 2)
-                --analysis->bidiLevel;
             analysis->flags = QScriptAnalysis::LineOrParagraphSeparator;
             if (option.flags() & QTextOption::ShowLineAndParagraphSeparators) {
                 const int offset = uc - string;