commit 7fbcc2c88e2dd063ba282db3845e22e9543511c8
Author: Juergen Spitzmueller <[email protected]>
Date: Sun Dec 15 09:49:36 2024 +0100
Fix erroneous whitespace before and after math preview (#13127)
(cherry picked from commit 40dd37089d39010105ae7163c07733ed515c54be)
---
lib/scripts/legacy_lyxpreview2ppm.py | 9 +++++++--
src/mathed/InsetMathHull.cpp | 3 ++-
status.24x | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/scripts/legacy_lyxpreview2ppm.py
b/lib/scripts/legacy_lyxpreview2ppm.py
index 1a8a2b6c4b..8765a5001c 100644
--- a/lib/scripts/legacy_lyxpreview2ppm.py
+++ b/lib/scripts/legacy_lyxpreview2ppm.py
@@ -260,8 +260,13 @@ def legacy_latex_file(latex_file, fg_color, bg_color):
tmp.write(b"""
\\usepackage[%s,tightpage]{preview}
\\makeatletter
-\\g@addto@macro\\preview{\\leavevmode\\begingroup\\color{lyxbg}\\special{background
\\current@color}\\special{ps::clippath fill}\\color{lyxfg}}
-\\g@addto@macro\\endpreview{\\endgroup}
+\\ifdefined\\AddToHook
+
\\AddToHook{env/preview/before}{\\leavevmode\\begingroup\\color{lyxbg}\\special{background
\\current@color}\\special{ps::clippath fill}\\color{lyxfg}}
+ \\AddToHook{env/preview/after}{\\endgroup}
+\\else
+
\\g@addto@macro\\preview{\\leavevmode\\begingroup\\color{lyxbg}\\special{background
\\current@color}\\special{ps::clippath fill}\\color{lyxfg}}
+ \\g@addto@macro\\endpreview{\\endgroup}
+\\fi
\\let\\pr@set@pagerightoffset\\@empty
\\ifx\\pagerightoffset\\@undefined\\else
\\def\\pr@set@pagerightoffset{\\ifnum\\pagedirection=1
diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 0864a21d4b..4a21457e0e 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -886,7 +886,8 @@ void InsetMathHull::preparePreview(DocIterator const & pos,
if (lsize != "normalsize" && !prefixIs(lsize, "error"))
setfont += from_ascii("\\" + lsize + '\n');
- docstring const snippet = macro_preamble + setfont + latexString(*this)
+ endfont;
+ docstring const snippet = macro_preamble + setfont
+ + trim(latexString(*this), "\n") + endfont;
LYXERR(Debug::MACROS, "Preview snippet: " << snippet);
preview_->addPreview(snippet, *buffer, forexport);
}
diff --git a/status.24x b/status.24x
index ffcf073115..e8b34ea3a4 100644
--- a/status.24x
+++ b/status.24x
@@ -45,7 +45,7 @@ What's new
* DOCUMENT INPUT/OUTPUT
-
+- Fix erroneous whitespace before and after math preview (bug 13127).
* USER INTERFACE
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
