X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathColor.cpp;h=ea4f4ef6e29793c84a8d62be1a906f6523dc7111;hb=02e82157ec583c3900e359de86be79fac6512387;hp=076a1afd67c9004f757115509f204e982e45388c;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index 076a1afd67..ea4f4ef6e2 100644
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "Color.h"
+#include "ColorSet.h"
 
 #include "InsetMathColor.h"
 #include "LaTeXFeatures.h"
@@ -19,19 +19,24 @@
 #include "MathSupport.h"
 #include "MetricsInfo.h"
 
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
 #include <ostream>
 
+using namespace lyx::support;
 
 namespace lyx {
 
-InsetMathColor::InsetMathColor(bool oldstyle, ColorCode color)
-	: InsetMathNest(1), oldstyle_(oldstyle),
+InsetMathColor::InsetMathColor(Buffer * buf, bool oldstyle, ColorCode color)
+	: InsetMathNest(buf, 1), w_(0), oldstyle_(oldstyle),
 	  color_(from_utf8(lcolor.getLaTeXName(color)))
 {}
 
 
-InsetMathColor::InsetMathColor(bool oldstyle, docstring const & color)
-	: InsetMathNest(1), oldstyle_(oldstyle), color_(color)
+InsetMathColor::InsetMathColor(Buffer * buf, bool oldstyle,
+		docstring const & color)
+	: InsetMathNest(buf, 1), w_(0), oldstyle_(oldstyle), color_(color)
 {}
 
 
@@ -44,7 +49,7 @@ Inset * InsetMathColor::clone() const
 void InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	cell(0).metrics(mi, dim);
-	metricsMarkers(dim);
+	metricsMarkers(mi, dim);
 }
 
 
@@ -55,7 +60,6 @@ void InsetMathColor::draw(PainterInfo & pi, int x, int y) const
 	cell(0).draw(pi, x + 1, y);
 	pi.base.font.setColor(origcol);
 	drawMarkers(pi, x, y);
-	setPosCache(pi, x, y);
 }
 
 
@@ -69,8 +73,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;
+		}
+	}
 }
 
 
@@ -94,7 +116,7 @@ void InsetMathColor::normalize(NormalStream & os) const
 
 void InsetMathColor::infoize(odocstream & os) const
 {
-	os << "Color: " << color_;
+	os << bformat(_("Color: %1$s"), color_);
 }