Cmake export tests: Added sublabel handling also to revertedTests

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

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 1999846729868998005b1f628e392481e63257d1..352352bdd66d2c937a9feff31fd4d17cef48015e 100644 (file)
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -29,17 +29,18 @@
 namespace lyx {
 
 InsetMathSymbol::InsetMathSymbol(latexkeys const * l)
-       : sym_(l), h_(0), scriptable_(false)
+       : sym_(l), h_(0), kerning_(0), scriptable_(false)
 {}
 
 
 InsetMathSymbol::InsetMathSymbol(char const * name)
-       : sym_(in_word_set(from_ascii(name))), h_(0), scriptable_(false)
+       : sym_(in_word_set(from_ascii(name))), h_(0),
+         kerning_(0), scriptable_(false)
 {}
 
 
 InsetMathSymbol::InsetMathSymbol(docstring const & name)
-       : sym_(in_word_set(name)), h_(0), scriptable_(false)
+       : sym_(in_word_set(name)), h_(0), kerning_(0), scriptable_(false)
 {}
 
 
@@ -65,9 +66,9 @@ void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
        bool const italic_upcase_greek = sym_->inset == "cmr" &&
                                         sym_->extra == "mathalpha" &&
                                         mi.base.fontname == "mathit";
-       docstring const font = italic_upcase_greek ? from_ascii("cmm") : sym_->inset;
-       int const em = mathed_char_width(mi.base.font, 'M');
-       FontSetChanger dummy(mi.base, font);
+       std::string const font = italic_upcase_greek ? "cmm" : sym_->inset;
+       int const em = mathed_font_em(mi.base.font);
+       FontSetChanger dummy(mi.base, from_ascii(font));
        mathed_string_dim(mi.base.font, sym_->draw, dim);
        docstring::const_reverse_iterator rit = sym_->draw.rbegin();
        kerning_ = mathed_char_kerning(mi.base.font, *rit);
@@ -86,7 +87,8 @@ void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
        scriptable_ = false;
        if (mi.base.style == LM_ST_DISPLAY)
                if (sym_->inset == "cmex" || sym_->inset == "esint" ||
-                   sym_->extra == "funclim")
+                   sym_->extra == "funclim" ||
+                   (sym_->inset == "stmry" && sym_->extra == "mathop"))
                        scriptable_ = true;
 }
 
@@ -101,14 +103,14 @@ void InsetMathSymbol::draw(PainterInfo & pi, int x, int y) const
        bool const italic_upcase_greek = sym_->inset == "cmr" &&
                                         sym_->extra == "mathalpha" &&
                                         pi.base.fontname == "mathit";
-       docstring const font = italic_upcase_greek ? from_ascii("cmm") : sym_->inset;
-       int const em = mathed_char_width(pi.base.font, 'M');
+       std::string const font = italic_upcase_greek ? "cmm" : sym_->inset;
+       int const em = mathed_font_em(pi.base.font);
        if (isRelOp())
                x += static_cast<int>(0.25*em+0.5);
        else
                x += static_cast<int>(0.0833*em+0.5);
 
-       FontSetChanger dummy(pi.base, font);
+       FontSetChanger dummy(pi.base, from_ascii(font));
        pi.draw(x, y - h_, sym_->draw);
 }
 
@@ -143,7 +145,8 @@ bool InsetMathSymbol::takesLimits() const
                sym_->inset == "cmex" ||
                sym_->inset == "lyxboldsymb" ||
                sym_->inset == "esint" ||
-               sym_->extra == "funclim";
+               sym_->extra == "funclim" ||
+               (sym_->inset == "stmry" && sym_->extra == "mathop");
 }
 
 
@@ -185,22 +188,13 @@ void InsetMathSymbol::mathematica(MathematicaStream & os) const
 }
 
 
-// FIXME This will likely need some work.
-char const * MathMLtype(docstring const & s)
-{
-       if (s == "mathord")
-               return "mi";
-       return "mo";
-}
-
-
 void InsetMathSymbol::mathmlize(MathStream & os) const
 {
-       // FIXME We may need to do more interesting things 
+       // FIXME We may need to do more interesting things
        // with MathMLtype.
-       char const * type = MathMLtype(sym_->extra);
+       char const * type = sym_->MathMLtype();
        os << '<' << type << "> ";
-       if (sym_->xmlname == "x") 
+       if (sym_->xmlname == "x")
                // unknown so far
                os << name();
        else
@@ -211,15 +205,15 @@ void InsetMathSymbol::mathmlize(MathStream & os) const
 
 void InsetMathSymbol::htmlize(HtmlStream & os, bool spacing) const
 {
-       // FIXME We may need to do more interesting things 
+       // FIXME We may need to do more interesting things
        // with MathMLtype.
-       char const * type = MathMLtype(sym_->extra);
+       char const * type = sym_->MathMLtype();
        bool op = (std::string(type) == "mo");
-       
-       if (sym_->xmlname == "x") 
+
+       if (sym_->xmlname == "x")
                // unknown so far
                os << ' ' << name() << ' ';
-       else if (op && spacing) 
+       else if (op && spacing)
                os << ' ' << sym_->xmlname << ' ';
        else
                os << sym_->xmlname;
@@ -278,7 +272,7 @@ void InsetMathSymbol::validate(LaTeXFeatures & features) const
                        "sup.limit{font-size: 75%;}");
        } else {
                if (!sym_->requires.empty())
-                       features.require(to_utf8(sym_->requires));
+                       features.require(sym_->requires);
        }
 }