From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Mon, 3 Jun 2024 01:49:54 +0000 (-0400)
Subject: Merge branch '2.4.x' into 2.4.1-devel
X-Git-Tag: 2.4.1~65
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=701c7632213c688b2cc621279f2a42cc8e644a38;p=lyx.git

Merge branch '2.4.x' into 2.4.1-devel
---

701c7632213c688b2cc621279f2a42cc8e644a38
diff --cc src/TextMetrics.cpp
index 93d4334598,a694c997ea..9979909f28
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@@ -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()) {