X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathColor.cpp;h=e3be8ff9bf9bf22efd0b8b389159f70bac59ba29;hb=4ed0312c51704780af1c452d3a82a84171b3725a;hp=cbf6cb5d860cf455e92fcbe34f1f798f277ab7ef;hpb=ccc0e03fdc4c880685db016d97cdea802512d104;p=lyx.git

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index cbf6cb5d86..e3be8ff9bf 100644
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -29,14 +29,16 @@ using namespace lyx::support;
 namespace lyx {
 
 InsetMathColor::InsetMathColor(Buffer * buf, bool oldstyle, ColorCode color)
-	: InsetMathNest(buf, 1), w_(0), oldstyle_(oldstyle),
-	  color_(from_utf8(lcolor.getLaTeXName(color)))
+	: InsetMathNest(buf, 1), oldstyle_(oldstyle),
+	  color_(from_utf8(lcolor.getLaTeXName(color))),
+	  current_mode_(UNDECIDED_MODE)
 {}
 
 
 InsetMathColor::InsetMathColor(Buffer * buf, bool oldstyle,
 		docstring const & color)
-	: InsetMathNest(buf, 1), w_(0), oldstyle_(oldstyle), color_(color)
+	: InsetMathNest(buf, 1), oldstyle_(oldstyle), color_(color),
+	  current_mode_(UNDECIDED_MODE)
 {}
 
 
@@ -48,19 +50,22 @@ Inset * InsetMathColor::clone() const
 
 void InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+	current_mode_ = isTextFont(mi.base.fontname) ? TEXT_MODE : MATH_MODE;
+	Changer dummy = mi.base.changeEnsureMath(current_mode_);
+
 	cell(0).metrics(mi, dim);
-	metricsMarkers(dim);
 }
 
 
 void InsetMathColor::draw(PainterInfo & pi, int x, int y) const
 {
+	current_mode_ = isTextFont(pi.base.fontname) ? TEXT_MODE : MATH_MODE;
+	Changer dummy = pi.base.changeEnsureMath(current_mode_);
+
 	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);
 }
 
 
@@ -88,16 +93,53 @@ void InsetMathColor::validate(LaTeXFeatures & features) const
 			case Color_teal:
 			case Color_violet:
 				features.require("xcolor");
+				break;
 			default:
 				features.require("color");
+				break;
 		}
 	}
 }
 
 
-void InsetMathColor::write(WriteStream & os) const
+void InsetMathColor::write(TeXMathStream & os) const
 {
-	if (normalcolor(color_))
+	// We have to ensure correct spacing when the front and/or back
+	// atoms are not ordinary ones (bug 11827).
+	docstring const frontclass = class_to_string(cell(0).firstMathClass());
+	docstring const backclass = class_to_string(cell(0).lastMathClass());
+	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 ");
+
+	if (adjust_front && adjust_back) {
+		os << '\\' << frontclass << colswitch << cell(0).front() << '}';
+		if (cell(0).size() > 2) {
+			os << colswitch;
+			for (size_t i = 1; i < cell(0).size() - 1; ++i)
+				os << cell(0)[i];
+			os << '}';
+		}
+		if (cell(0).size() > 1)
+			os << '\\' << backclass << colswitch << cell(0).back() << '}';
+	} else if (adjust_front) {
+		os << '\\' << frontclass << colswitch << cell(0).front() << '}';
+		if (cell(0).size() > 1) {
+			os << colswitch;
+			for (size_t i = 1; i < cell(0).size(); ++i)
+				os << cell(0)[i];
+			os << '}';
+		}
+	} else if (adjust_back) {
+		os << colswitch;
+		for (size_t i = 0; i < cell(0).size() - 1; ++i)
+			os << cell(0)[i];
+		os << '}' << '\\' << backclass << colswitch << cell(0).back()
+		   << '}';
+	} else if (normalcolor(color_))
 		// reset to default color inside another color inset
 		os << "{\\normalcolor " << cell(0) << '}';
 	else if (oldstyle_)