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 a1c49d16be530ee1f3277a7bcf6a99431a60da99..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_);
@@ -212,8 +210,8 @@ void InsetMathChar::octave(OctaveStream & os) const
 
 // We have a bit of a problem here. MathML wants to know whether the
 // character represents an "identifier" or an "operator", and we have
-// no general way of telling. So we shall guess: If it's alpha or 
-// mathalpha, then we'll treat it as an identifier, otherwise as an 
+// no general way of telling. So we shall guess: If it's alpha or
+// mathalpha, then we'll treat it as an identifier, otherwise as an
 // operator.
 // Worst case: We get bad spacing, or bad italics.
 void InsetMathChar::mathmlize(MathStream & ms) const
@@ -224,30 +222,36 @@ 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;
        }
-       
+
        if (ms.inText()) {
                if (entity.empty())
                        ms.os().put(char_);
-               else 
+               else
                        ms << from_ascii(entity);
                return;
        }
 
        if (!entity.empty()) {
-               ms << "<mo>" << from_ascii(entity) << "</mo>";
+               ms << "<" << from_ascii(ms.namespacedTag("mo")) << ">"
+                  << from_ascii(entity)
+                  << "</" << from_ascii(ms.namespacedTag("mo")) << ">";
                return;
-       }               
+       }
 
-       char const * type = 
+       char const * type =
                (isAlphaASCII(char_) || Encodings::isMathAlpha(char_))
                        ? "mi" : "mo";
-       // we don't use MTag and ETag because we do not want the spacing
-       ms << "<" << type << ">" << char_type(char_) << "</" << type << ">";    
+       // we don't use MTag and ETag because we do not want the spacing before the end tag.
+       docstring tag = from_ascii(ms.namespacedTag(type));
+       ms << "<" << tag << ">" << char_type(char_) << "</" << tag << ">";
 }
 
 
@@ -263,9 +267,9 @@ void InsetMathChar::htmlize(HtmlStream & ms) const
                case ' ': entity = "&nbsp;"; break;
                default: break;
        }
-       
+
        bool have_entity = !entity.empty();
-       
+
        if (ms.inText()) {
                if (have_entity)
                        ms << from_ascii(entity);
@@ -273,12 +277,12 @@ void InsetMathChar::htmlize(HtmlStream & ms) const
                        ms.os().put(char_);
                return;
        }
-       
+
        if (have_entity) {
                // an operator, so give some space
                ms << ' ' << from_ascii(entity) << ' ';
                return;
-       }               
+       }
 
        if (isAlphaASCII(char_) || Encodings::isMathAlpha(char_))
                // we don't use MTag and ETag because we do not want the spacing