commit f5457342c439b20e84fa43f2aedea87762fb80b8
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Sat Apr 15 12:35:22 2023 +0200
Do not load mathrsfs if unicode-math is required (#12734)
The latter provides \mathscr and the packages clash
(cherry picked from commit a15bc829d10e73fd89d2d4baacb63bd34fc9d966)
---
src/mathed/InsetMathFont.cpp | 2 +-
status.23x | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/mathed/InsetMathFont.cpp b/src/mathed/InsetMathFont.cpp
index 6611590..c918d32 100644
--- a/src/mathed/InsetMathFont.cpp
+++ b/src/mathed/InsetMathFont.cpp
@@ -128,7 +128,7 @@ void InsetMathFont::validate(LaTeXFeatures & features) const
if (fontname == "text" || fontname == "textnormal"
|| (fontname.length() == 6 && fontname.substr(0, 4) ==
"text"))
features.require("amstext");
- if (fontname == "mathscr")
+ if (fontname == "mathscr" &&
!features.isRequired("unicode-math"))
features.require("mathrsfs");
if (fontname == "textipa")
features.require("tipa");
diff --git a/status.23x b/status.23x
index f28c289..461cef0 100644
--- a/status.23x
+++ b/status.23x
@@ -43,6 +43,8 @@ What's new
- Fix leaking of linespace settings between paragraphs if they have
different aligment (bug 12638).
+
+- Do not load mathrsfs if unicode-math is required (bug 12734).
* USER INTERFACE
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
