typo

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

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 831bc797eab8124ed2271bb9d3758fa0a03d1d7a..9f391f66f93e03dfb428a0f0f9eb00624ac9d939 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -289,7 +289,7 @@ MathClass InsetMathScript::mathClass() const
 void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        // we store this, because it is much easier
-       has_limits_ = hasLimits(mi.base.font);
+       has_limits_ = hasLimits(mi.base.font.style());
 
        // Compute metrics of the available cells
        Dimension dim0;
@@ -385,13 +385,13 @@ void InsetMathScript::drawT(TextPainter & pain, int x, int y) const
 }
 
 
-bool InsetMathScript::hasLimits(FontInfo const & font) const
+bool InsetMathScript::hasLimits(MathStyle const & style) const
 {
        if (nuc().empty())
                return false;
 
        Limits const lim = nuc().back()->limits() == AUTO_LIMITS
-               ? nuc().back()->defaultLimits(font.style() == DISPLAY_STYLE)
+               ? nuc().back()->defaultLimits(style == DISPLAY_STYLE)
                : nuc().back()->limits();
        LASSERT(lim != AUTO_LIMITS, return false);
        return lim == LIMITS;
@@ -606,25 +606,25 @@ void InsetMathScript::mathmlize(MathMLStream & ms) const
 {
        bool d = hasDown() && !down().empty();
        bool u = hasUp() && !up().empty();
-       // FIXME: the MathMLStream should be able to give us has_limits_
+       bool has_limits = hasLimits(ms.getFontMathStyle());
 
        if (!d && !u)
                return;
 
        const char * tag;
        if (u && d)
-               tag = has_limits_ ? "munderover" : "msubsup";
+               tag = has_limits ? "munderover" : "msubsup";
        else if (u)
-               tag = has_limits_ ? "mover" : "msup";
+               tag = has_limits ? "mover" : "msup";
        else if (d)
-               tag = has_limits_ ? "munder" : "msub";
+               tag = has_limits ? "munder" : "msub";
 
        ms << MTag(tag);
 
        if (!nuc().empty())
                ms << nuc();
        else
-               ms << "<" << from_ascii(ms.namespacedTag("mrow")) << " />";
+               ms << CTag("mrow");
 
        if (d)
                ms << MTag("mrow") << down() << ETag("mrow");