Assure correct spacing of colored items in mathed

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

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 7069bdcd5f0775cddcadca0d99af0dbf4c8e5d83..d5ef8dc1f5030bfcac2a6bb6f8f11161bdddf7aa 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -113,9 +113,7 @@ void InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const
        if (isMathFont(f) && subst_) {
                // If the char has a substitute, draw the replacement symbol
                // instead, but only in math mode.
-               mathedSymbolDim(mi.base, dim, subst_);
-               kerning_ = mathed_char_kerning(mi.base.font, *subst_->draw.rbegin());
-               return;
+               kerning_ = mathedSymbolDim(mi.base, dim, subst_);
        } else if (!slanted(char_) && f == "mathnormal") {
                Changer dummy = mi.base.font.changeShape(UP_SHAPE);
                dim = theFontMetrics(mi.base.font).dimension(char_);
@@ -224,7 +222,10 @@ void InsetMathChar::mathmlize(MathStream & ms) const
                case '>': entity = ">"; break;
                case '&': entity = "&"; break;
                case ' ': {
-                       ms << from_ascii("&nbsp;");
+                       if (ms.xmlMode())
+                               ms << from_ascii("&#0160;");
+                       else
+                               ms << from_ascii("&nbsp;");
                        return;
                }
                default: break;