#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 {
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);
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;
}
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);
}
}
-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";
sym_->inset == "cmex" ||
sym_->inset == "lyxboldsymb" ||
sym_->inset == "esint" ||
- sym_->extra == "funclim";
+ sym_->extra == "funclim" ||
+ (sym_->inset == "stmry" && sym_->extra == "mathop");
}
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);
+ else
+ ensurer = make_unique<MathEnsurer>(os, false, true, true);
os << '\\' << name();
// $,#, etc. In theory the restriction based on catcodes, but then
"sup.limit{font-size: 75%;}");
} else {
if (!sym_->requires.empty())
- features.require(to_utf8(sym_->requires));
+ features.require(sym_->requires);
}
}