commit 701c7632213c688b2cc621279f2a42cc8e644a38
Merge: 1d7c8325f2 342a0f5438
Author: Richard Kimberly Heck <[email protected]>
Date: Sun Jun 2 21:49:54 2024 -0400
Merge branch '2.4.x' into 2.4.1-devel
ANNOUNCE | 25 +-
INSTALL | 6 +-
README | 8 +-
.../Win32/packaging/installer/src/dictionaries.nsh | 4 +-
development/Win32/packaging/installer/src/main.nsh | 3 +-
development/cmake/modules/LyXMacros.cmake | 4 +-
development/tools/lyx-build | 2 +-
development/tools/update-po.sh | 12 +-
lib/CREDITS | 8 +-
lib/RELEASE-NOTES | 31 +-
lib/attic/doc/id_UserGuide.lyx | 2 +-
lib/configure.py | 4 +-
lib/doc/Additional.lyx | 269 +-
lib/doc/LFUNs.lyx | 2 +-
lib/doc/UserGuide.lyx | 42 +-
lib/doc/de/UserGuide.lyx | 2 +-
lib/doc/fr/Additional.lyx | 4316 +++++++++++---------
lib/doc/fr/EmbeddedObjects.lyx | 239 +-
lib/doc/fr/Intro.lyx | 6 +-
lib/doc/fr/Math.lyx | 51 +-
lib/doc/fr/Tutorial.lyx | 15 +-
lib/doc/fr/UserGuide.lyx | 181 +-
lib/doc/ja/UserGuide.lyx | 2 +-
lib/doc/ru/UserGuide.lyx | 2 +-
lib/examples/fr/Modules/Linguistics.lyx | 2 +-
lib/generate_contributions.py | 11 +-
lib/layouttranslations.review | 6 +-
lib/org.lyx.LyX.metainfo.xml | 1 +
po/ar.po | 2000 ++++-----
po/bg.po | 2037 ++++-----
po/cs.po | 1007 ++---
po/en.po | 1942 ++++-----
po/es.po | 2010 ++++-----
po/eu.po | 2013 ++++-----
po/fi.po | 2005 ++++-----
po/fr.gmo | Bin 656494 -> 657647
bytes
po/fr.po | 1323 +++---
po/he.po | 2000 ++++-----
po/hu.po | 2007 ++++-----
po/ia.po | 1999 ++++-----
po/id.po | 1996 ++++-----
po/it.po | 1996 ++++-----
po/ja.gmo | Bin 678876 -> 678815
bytes
po/ja.po | 1996 ++++-----
po/nb.po | 2010 ++++-----
po/nl.po | 1996 ++++-----
po/nn.po | 2008 ++++-----
po/pl.po | 2006 ++++-----
po/pt_BR.gmo | Bin 646632 -> 646894
bytes
po/pt_BR.po | 2005 ++++-----
po/pt_PT.po | 2010 ++++-----
po/ru.po | 1996 ++++-----
po/sv.po | 2012 ++++-----
po/uk.po | 1996 ++++-----
po/zh_CN.gmo | Bin 447576 -> 471508
bytes
po/zh_CN.po | 2257 +++++-----
po/zh_TW.po | 2012 ++++-----
src/CutAndPaste.cpp | 45 +-
src/LaTeXPackages.cpp | 39 +-
src/LaTeXPackages.h | 2 +-
src/LyXAction.cpp | 2 +-
src/Text.cpp | 2 +-
src/TextMetrics.cpp | 13 +-
src/frontends/qt/GuiInfo.cpp | 1 +
src/frontends/qt/GuiPrefs.cpp | 29 +-
src/frontends/qt/GuiWorkArea.cpp | 2 +
src/graphics/GraphicsConverter.cpp | 2 +
src/insets/InsetCommandParams.cpp | 9 +-
src/insets/InsetCommandParams.h | 2 +-
src/insets/InsetInfo.cpp | 42 +-
src/insets/InsetInfo.h | 5 -
src/insets/InsetLayout.h | 2 +-
src/insets/InsetNote.cpp | 7 +-
src/lyxfind.cpp | 2 +-
src/mathed/InsetMathRef.cpp | 22 +-
src/mathed/MathExtern.cpp | 15 +-
src/mathed/MathFactory.cpp | 2 +-
src/output_latex.cpp | 3 +
78 files changed, 28201 insertions(+), 25942 deletions(-)
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()) {
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
