Assure correct spacing of colored items in mathed

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

diff --git a/src/mathed/InsetMathColor.cpp b/src/mathed/InsetMathColor.cpp
index ea4f4ef6e29793c84a8d62be1a906f6523dc7111..94a6c42e642c9dbc774bf84379e51505c1a2eed5 100644 (file)
--- a/src/mathed/InsetMathColor.cpp
+++ b/src/mathed/InsetMathColor.cpp
@@ -29,14 +29,14 @@ using namespace lyx::support;
 namespace lyx {
 
 InsetMathColor::InsetMathColor(Buffer * buf, bool oldstyle, ColorCode color)
-       : InsetMathNest(buf, 1), w_(0), oldstyle_(oldstyle),
+       : InsetMathNest(buf, 1), oldstyle_(oldstyle),
          color_(from_utf8(lcolor.getLaTeXName(color)))
 {}
 
 
 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)
 {}
 
 
@@ -49,7 +49,6 @@ Inset * InsetMathColor::clone() const
 void InsetMathColor::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
-       metricsMarkers(mi, dim);
 }
 
 
@@ -57,9 +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);
 }
 
 
@@ -98,7 +96,46 @@ void InsetMathColor::validate(LaTeXFeatures & features) const
 
 void InsetMathColor::write(WriteStream & 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 =
+               cell(0).size() ? class_to_string(cell(0).front()->mathClass())
+                              : from_ascii("mathord");
+       docstring const backclass =
+               cell(0).size() ? class_to_string(cell(0).back()->mathClass())
+                              : from_ascii("mathord");
+       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_)