Assure correct spacing of colored items in mathed

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

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index 88012aa247f1d36929509b45a06172e85d4215fd..5ddb9d015e50b7f61b008c1585bf1e72f2e1eb3f 100644 (file)
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -45,25 +45,17 @@ Inset * InsetMathCases::clone() const
 
 void InsetMathCases::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       Changer dummy = mi.base.changeEnsureMath();
        InsetMathGrid::metrics(mi, dim);
-       dim.wid += 8;
-}
-
-
-Dimension const InsetMathCases::dimension(BufferView const & bv) const
-{
-       Dimension dim = InsetMathGrid::dimension(bv);
-       dim.wid += 8;
-       return dim;
 }
 
 
 void InsetMathCases::draw(PainterInfo & pi, int x, int y) const
 {
+       Changer dummy = pi.base.changeEnsureMath();
        Dimension const dim = dimension(*pi.base.bv);
        mathed_draw_deco(pi, x + 1, y - dim.ascent(), 6, dim.height(), from_ascii("{"));
-       InsetMathGrid::drawWithMargin(pi, x, y, 8, 0);
-       setPosCache(pi, x, y);
+       InsetMathGrid::draw(pi, x, y);
 }
 
 
@@ -153,7 +145,10 @@ void InsetMathCases::maple(MapleStream & os) const
 
 void InsetMathCases::mathmlize(MathStream & ms) const
 {
-       ms << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>{</mo>";
+       ms << "<" << from_ascii(ms.namespacedTag("mo"))
+          << " form='prefix' fence='true' stretchy='true' symmetric='true'>"
+          << "{"
+          << "</" << from_ascii(ms.namespacedTag("mo")) << ">";
        InsetMathGrid::mathmlize(ms);
 }
 
@@ -177,11 +172,11 @@ void InsetMathCases::validate(LaTeXFeatures & features) const
        features.require("amsmath");
        InsetMathGrid::validate(features);
        if (features.runparams().math_flavor == OutputParams::MathAsHTML)
-               // CSS based on eLyXer's
+               // CSS based on eLyXer's, with modifications suggested in bug #8755
                features.addCSSSnippet(
-                       "table.cases{display: inline-block; text-align: center;"
+                       "table.cases{display: inline-block; text-align: center; border: none;"
                        "border-left: thin solid black; vertical-align: middle; padding-left: 0.5ex;}\n"
-                       "table.cases td {text-align: left;}");
+                       "table.cases td {text-align: left; border: none;}");
 }