From: Udi-Fogiel <udifoglle@gmail.com>
Date: Fri, 29 Dec 2023 19:10:50 +0000 (+0100)
Subject: Amend 7441172d
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9ebc7d95121091e726d52e2c52a1a0032fe9585b;p=features.git

Amend 7441172d

colswitch was checking for oldstyle instead of normalcolor
to see if we need \normalcolor, which lead to appearence
of \color{none} in some cases, but "none" is not a known
color.
---

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index e3be8ff9bf..549ff37b0a 100644
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -111,9 +111,9 @@ void InsetMathColor::write(TeXMathStream & os) const
 	bool adjchk = os.latex() && !os.inMathClass() && (normalcolor(color_) || oldstyle_);
 	bool adjust_front = frontclass != "mathord" && adjchk;
 	bool adjust_back = backclass != "mathord" && adjchk;
-	docstring const colswitch =
-		oldstyle_ ? from_ascii("{\\color{") + color_ + from_ascii("}")
-			  : from_ascii("{\\normalcolor ");
+	docstring const colswitch = normalcolor(color_)
+			? from_ascii("{\\normalcolor ")
+			: from_ascii("{\\color{") + color_ + from_ascii("}");
 
 	if (adjust_front && adjust_back) {
 		os << '\\' << frontclass << colswitch << cell(0).front() << '}';