Assure correct spacing of colored items in mathed

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

diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp
index fba920dea2e53dac3df3252d07db16c2d68ea836..90d507cfbe38fdeee2fca069d312a29d0e6d51af 100644 (file)
--- a/src/mathed/InsetMathFrac.cpp
+++ b/src/mathed/InsetMathFrac.cpp
@@ -171,8 +171,7 @@ latexkeys const * slash_symbol()
        return in_word_set(from_ascii("slash"));
 }
 
-} // anon namespace
-
+} // namespace
 
 
 void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
@@ -244,12 +243,12 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
                int const dy = axis_height(mi.base);
                Changer dummy =
                        // \tfrac is always in text size
-                       (kind_ == TFRAC) ? mi.base.font.changeStyle(LM_ST_SCRIPT) :
+                       (kind_ == TFRAC) ? mi.base.font.changeStyle(SCRIPT_STYLE) :
                        // \cfrac and \dfrac are always in display size
                        (kind_ == CFRAC
                         || kind_ == CFRACLEFT
                         || kind_ == CFRACRIGHT
-                        || kind_ == DFRAC) ? mi.base.font.changeStyle(LM_ST_DISPLAY) :
+                        || kind_ == DFRAC) ? mi.base.font.changeStyle(DISPLAY_STYLE) :
                        // all others
                                              mi.base.changeFrac();
                Changer dummy2 = mi.base.changeEnsureMath();
@@ -326,12 +325,12 @@ void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const
                int const dy = axis_height(pi.base);
                Changer dummy =
                        // \tfrac is always in text size
-                       (kind_ == TFRAC) ? pi.base.font.changeStyle(LM_ST_SCRIPT) :
+                       (kind_ == TFRAC) ? pi.base.font.changeStyle(SCRIPT_STYLE) :
                        // \cfrac and \dfrac are always in display size
                        (kind_ == CFRAC
                         || kind_ == CFRACLEFT
                         || kind_ == CFRACRIGHT
-                        || kind_ == DFRAC) ? pi.base.font.changeStyle(LM_ST_DISPLAY) :
+                        || kind_ == DFRAC) ? pi.base.font.changeStyle(DISPLAY_STYLE) :
                        // all others
                                              pi.base.changeFrac();
                Dimension const dim1 = cell(1).dimension(*pi.base.bv);
@@ -492,14 +491,14 @@ void InsetMathFrac::octave(OctaveStream & os) const
 }
 
 
-void InsetMathFrac::mathmlize(MathStream & os) const
+void InsetMathFrac::mathmlize(MathStream & ms) const
 {
        switch (kind_) {
        case ATOP:
-               os << MTag("mfrac", "linethickeness='0'")
+               ms << MTag("mfrac", "linethickness='0'")
                   << MTag("mrow") << cell(0) << ETag("mrow")
-                        << MTag("mrow") << cell(1) << ETag("mrow")
-                        << ETag("mfrac");
+                  << MTag("mrow") << cell(1) << ETag("mrow")
+                  << ETag("mfrac");
                break;
 
        // we do not presently distinguish these
@@ -510,38 +509,38 @@ void InsetMathFrac::mathmlize(MathStream & os) const
        case CFRAC:
        case CFRACLEFT:
        case CFRACRIGHT:
-               os << MTag("mfrac")
+               ms << MTag("mfrac")
                   << MTag("mrow") << cell(0) << ETag("mrow")
-                        << MTag("mrow") << cell(1) << ETag("mrow")
-                        << ETag("mfrac");
+                  << MTag("mrow") << cell(1) << ETag("mrow")
+                  << ETag("mfrac");
                break;
 
        case NICEFRAC:
-               os << MTag("mfrac", "bevelled='true'")
+               ms << MTag("mfrac", "bevelled='true'")
                   << MTag("mrow") << cell(0) << ETag("mrow")
-                        << MTag("mrow") << cell(1) << ETag("mrow")
-                        << ETag("mfrac");
+                  << MTag("mrow") << cell(1) << ETag("mrow")
+                  << ETag("mfrac");
                break;
 
        case UNITFRAC:
                if (nargs() == 3)
-                       os << cell(2);
-               os << MTag("mfrac", "bevelled='true'")
+                       ms << cell(2);
+               ms << MTag("mfrac", "bevelled='true'")
                   << MTag("mrow") << cell(0) << ETag("mrow")
-                        << MTag("mrow") << cell(1) << ETag("mrow")
-                        << ETag("mfrac");
+                  << MTag("mrow") << cell(1) << ETag("mrow")
+                  << ETag("mfrac");
                break;
 
        case UNIT:
                // FIXME This is not right, because we still output mi, etc,
                // when we output the cell. So we need to prevent that somehow.
                if (nargs() == 2)
-                       os << cell(0) 
+                       ms << cell(0)
                           << MTag("mstyle mathvariant='normal'") 
                           << cell(1) 
                           << ETag("mstyle");
                else
-                       os << MTag("mstyle mathvariant='normal'") 
+                       ms << MTag("mstyle mathvariant='normal'")
                           << cell(0)
                           << ETag("mstyle");
        }
@@ -586,12 +585,12 @@ void InsetMathFrac::htmlize(HtmlStream & os) const
                // FIXME This is not right, because we still output i, etc,
                // when we output the cell. So we need to prevent that somehow.
                if (nargs() == 2)
-                       os << cell(0) 
-                          << MTag("span") 
-                          << cell(1) 
+                       os << cell(0)
+                          << MTag("span")
+                          << cell(1)
                           << ETag("span");
                else
-                       os << MTag("span") 
+                       os << MTag("span")
                           << cell(0)
                           << ETag("span");
        }
@@ -650,8 +649,8 @@ void InsetMathBinom::metrics(MetricsInfo & mi, Dimension & dim) const
        Dimension dim0, dim1;
        int const dy = axis_height(mi.base);
        Changer dummy =
-               (kind_ == DBINOM) ? mi.base.font.changeStyle(LM_ST_DISPLAY) :
-               (kind_ == TBINOM) ? mi.base.font.changeStyle(LM_ST_SCRIPT) :
+               (kind_ == DBINOM) ? mi.base.font.changeStyle(DISPLAY_STYLE) :
+               (kind_ == TBINOM) ? mi.base.font.changeStyle(SCRIPT_STYLE) :
                                    mi.base.changeFrac();
        cell(0).metrics(mi, dim0);
        cell(1).metrics(mi, dim1);
@@ -677,8 +676,8 @@ void InsetMathBinom::draw(PainterInfo & pi, int x, int y) const
        int m = x + dim.width() / 2;
        {
                Changer dummy =
-                       (kind_ == DBINOM) ? pi.base.font.changeStyle(LM_ST_DISPLAY) :
-                       (kind_ == TBINOM) ? pi.base.font.changeStyle(LM_ST_SCRIPT) :
+                       (kind_ == DBINOM) ? pi.base.font.changeStyle(DISPLAY_STYLE) :
+                       (kind_ == TBINOM) ? pi.base.font.changeStyle(SCRIPT_STYLE) :
                                            pi.base.changeFrac();
                // take dy both for the vertical alignment and for the spacing between
                // cells
@@ -731,7 +730,7 @@ void InsetMathBinom::normalize(NormalStream & os) const
 }
 
 
-void InsetMathBinom::mathmlize(MathStream & os) const
+void InsetMathBinom::mathmlize(MathStream & ms) const
 {
        char ldelim = ' ';
        char rdelim = ' ';
@@ -752,11 +751,15 @@ void InsetMathBinom::mathmlize(MathStream & os) const
                rdelim = ']';
                break;
        }
-       os << "<mo fence='true' stretchy='true' form='prefix'>" << ldelim << "</mo>"
-          << "<mfrac linethickness='0'>"
+       ms << "<" << from_ascii(ms.namespacedTag("mo")) << " fence='true' stretchy='true' form='prefix'>"
+          << ldelim
+          << "</" << from_ascii(ms.namespacedTag("mo")) << ">"
+          << "<" << from_ascii(ms.namespacedTag("mfrac")) << " linethickness='0'>"
           << cell(0) << cell(1)
-          << "</mfrac>"
-          << "<mo fence='true' stretchy='true' form='postfix'>" << rdelim << "</mo>";
+       << "</" << from_ascii(ms.namespacedTag("mfrac")) << ">"
+          << "<" << from_ascii(ms.namespacedTag("mo")) << " fence='true' stretchy='true' form='postfix'>"
+          << rdelim
+          << "</" << from_ascii(ms.namespacedTag("mo")) << ">";
 }