From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 27 Oct 2016 01:18:29 +0000 (+0200)
Subject: In mathed, require xcolor instead of color when appropriate
X-Git-Tag: 2.2.3~178
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f8d3a8860b05ec29f5e13e7c9737bdce64a3da20;p=features.git

In mathed, require xcolor instead of color when appropriate

Fixes bug #10417.
---

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index c50f613609..0a6d0aa6b9 100644
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -74,8 +74,26 @@ static bool normalcolor(docstring const & color)
 void InsetMathColor::validate(LaTeXFeatures & features) const
 {
 	InsetMathNest::validate(features);
-	if (!normalcolor(color_))
-		features.require("color");
+	if (!normalcolor(color_)) {
+		switch (lcolor.getFromLaTeXName(to_utf8(color_))) {
+			case Color_brown:
+			case Color_darkgray:
+			case Color_gray:
+			case Color_lightgray:
+			case Color_lime:
+			case Color_olive:
+			case Color_orange:
+			case Color_pink:
+			case Color_purple:
+			case Color_teal:
+			case Color_violet:
+				features.require("xcolor");
+				break;
+			default:
+				features.require("color");
+				break;
+		}
+	}
 }
 
 
diff --git a/status.22x b/status.22x
index c10ae233dc..294480a036 100644
--- a/status.22x
+++ b/status.22x
@@ -97,6 +97,8 @@ What's new
 
 - Fix display of Arabic text when compiling with Qt5 (bug 10436).
 
+- Allow using colors supported by xcolor inside mathed (bug 10417).
+
 
 * INTERNALS