The previous commit was actually a fix for bug #9158.

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

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 1999846729868998005b1f628e392481e63257d1..a4dc36abf090ec0de1cb26e6c3f720d2ef3c530b 100644 (file)
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -12,34 +12,37 @@
 
 #include "InsetMathSymbol.h"
 
-#include "Dimension.h"
-#include "LaTeXFeatures.h"
 #include "MathAtom.h"
 #include "MathParser.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
+#include "Dimension.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/lyxlib.h"
 #include "support/textutils.h"
-
-#include <boost/scoped_ptr.hpp>
+#include "support/unique_ptr.h"
 
 
 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 +68,8 @@ 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;
+       Changer dummy = mi.base.changeFontSet(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);
@@ -78,15 +80,21 @@ void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.des -= h_;
        }
        // seperate things a bit
-       if (isRelOp())
-               dim.wid += static_cast<int>(0.5 * em + 0.5);
-       else
-               dim.wid += static_cast<int>(0.1667 * em + 0.5);
+       if (isMathBin())
+               dim.wid += 2 * mathed_medmuskip(mi.base.font);
+       else if (isMathRel())
+               dim.wid += 2 * mathed_thickmuskip(mi.base.font);
+       else if (isMathPunct())
+               dim.wid += mathed_thinmuskip(mi.base.font);
+       // FIXME: I see no reason for this
+       //else
+       //      dim.wid += support::iround(0.1667 * em);
 
        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 +109,16 @@ 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');
-       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);
+       std::string const font = italic_upcase_greek ? "cmm" : sym_->inset;
+       if (isMathBin())
+               x += mathed_medmuskip(pi.base.font);
+       else if (isMathRel())
+               x += mathed_thickmuskip(pi.base.font);
+       // FIXME: I see no reason for this
+       //else
+       //      x += support::iround(0.0833 * em);
+
+       Changer dummy = pi.base.changeFontSet(font);
        pi.draw(x, y - h_, sym_->draw);
 }
 
@@ -119,12 +129,24 @@ InsetMath::mode_type InsetMathSymbol::currentMode() const
 }
 
 
-bool InsetMathSymbol::isRelOp() const
+bool InsetMathSymbol::isMathBin() const
+{
+       return sym_->extra == "mathbin";
+}
+
+
+bool InsetMathSymbol::isMathRel() const
 {
        return sym_->extra == "mathrel";
 }
 
 
+bool InsetMathSymbol::isMathPunct() const
+{
+       return sym_->extra == "mathpunct";
+}
+
+
 bool InsetMathSymbol::isOrdAlpha() const
 {
        return sym_->extra == "mathord" || sym_->extra == "mathalpha";
@@ -143,7 +165,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 +208,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 +225,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;
@@ -243,9 +257,9 @@ void InsetMathSymbol::octave(OctaveStream & os) const
 
 void InsetMathSymbol::write(WriteStream & os) const
 {
-       boost::scoped_ptr<MathEnsurer> ensurer;
+       unique_ptr<MathEnsurer> ensurer;
        if (currentMode() != TEXT_MODE)
-               ensurer.reset(new MathEnsurer(os));
+               ensurer = make_unique<MathEnsurer>(os);
        os << '\\' << name();
 
        // $,#, etc. In theory the restriction based on catcodes, but then
@@ -278,7 +292,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);
        }
 }