]> git.lyx.org Git - lyx.git/commitdiff
Merge branch '2.4.x' into 2.4.1-devel
authorRichard Kimberly Heck <rikiheck@lyx.org>
Mon, 3 Jun 2024 01:49:54 +0000 (21:49 -0400)
committerRichard Kimberly Heck <rikiheck@lyx.org>
Mon, 3 Jun 2024 01:49:54 +0000 (21:49 -0400)
1  2 
lib/doc/LFUNs.lyx
lib/doc/UserGuide.lyx
lib/doc/de/UserGuide.lyx
src/LyXAction.cpp
src/Text.cpp
src/TextMetrics.cpp
src/frontends/qt/GuiWorkArea.cpp
src/insets/InsetInfo.cpp
src/insets/InsetLayout.h

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/Text.cpp
Simple merge
index 93d433459898436a8cec175499b0ff4dd4a19444,a694c997ea36cc0afebc51bac3a5f8697659ba98..9979909f28e8a73095005a9af447ffd05e56f0df
@@@ -2048,10 -2000,15 +2048,16 @@@ void TextMetrics::drawParagraph(Painter
        if (pm.rows().empty())
                return;
        size_t const nrows = pm.rows().size();
 +      int const wh = bv_->workHeight();
        // Remember left and right margin for drawing math numbers
-       Changer changeleft = changeVar(pi.leftx, x + leftMargin(pit));
-       Changer changeright = changeVar(pi.rightx, x + width() - rightMargin(pit));
+       Changer changeleft, changeright;
+       if (text_->isRTL(pit)) {
+               changeleft = changeVar(pi.leftx, x + rightMargin(pit));
+               changeright = changeVar(pi.rightx, x + width() - leftMargin(pit));
+       } else {
+               changeleft = changeVar(pi.leftx, x + leftMargin(pit));
+               changeright = changeVar(pi.rightx, x + width() - rightMargin(pit));
+       }
  
        // Use fast lane in nodraw stage.
        if (pi.pain.isNull()) {
Simple merge
Simple merge
Simple merge