Merge remote-tracking branch 'features/properpaint' into 2.3.2-staging

[lyx.git] / src / mathed / InsetMathColor.cpp

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index c50f61360932a519e6b6f030bd369f2f07852814..6cb996013b13d10682c788733f0edba5d66ad9f7 100644 (file)
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -49,7 +49,6 @@ Inset * InsetMathColor::clone() const
 void InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
-       metricsMarkers(dim);
 }
 
 
@@ -57,10 +56,8 @@ void InsetMathColor::draw(PainterInfo & pi, int x, int y) const
 {
        ColorCode origcol = pi.base.font.color();
        pi.base.font.setColor(lcolor.getFromLaTeXName(to_utf8(color_)));
-       cell(0).draw(pi, x + 1, y);
+       cell(0).draw(pi, x, y);
        pi.base.font.setColor(origcol);
-       drawMarkers(pi, x, y);
-       setPosCache(pi, x, y);
 }
 
 
@@ -74,8 +71,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;
+               }
+       }
 }