#include "support/debug.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/textutils.h"
extern bool has_math_fonts;
-static bool isBinaryOp(char_type c)
-{
- return support::contains("+-<>=/*", static_cast<char>(c));
-}
-
-
static bool slanted(char_type c)
{
return isAlphaASCII(c) || Encodings::isMathAlpha(c);
{
#if 1
if (char_ == '=' && has_math_fonts) {
- FontSetChanger dummy(mi.base, "cmr");
+ Changer dummy = mi.base.changeFontSet("cmr");
dim = theFontMetrics(mi.base.font).dimension(char_);
} else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
- FontSetChanger dummy(mi.base, "cmm");
+ Changer dummy = mi.base.changeFontSet("cmm");
dim = theFontMetrics(mi.base.font).dimension(char_);
} else if (!slanted(char_) && mi.base.fontname == "mathnormal") {
- ShapeChanger dummy(mi.base.font, UP_SHAPE);
+ Changer dummy = mi.base.font.changeShape(UP_SHAPE);
dim = theFontMetrics(mi.base.font).dimension(char_);
} else {
frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
dim = fm.dimension(char_);
kerning_ = fm.rbearing(char_) - dim.wid;
}
- int const em = mathed_font_em(mi.base.font);
- if (isBinaryOp(char_))
- dim.wid += support::iround(0.5 * em);
+ 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);
else if (char_ == '\'')
- dim.wid += support::iround(0.1667 * em);
+ // FIXME: don't know where this is coming from
+ dim.wid += mathed_thinmuskip(mi.base.font);
#else
whichFont(font_, code_, mi);
dim = theFontMetrics(font_).dimension(char_);
void InsetMathChar::draw(PainterInfo & pi, int x, int y) const
{
//lyxerr << "drawing '" << char_ << "' font: " << pi.base.fontname << std::endl;
- int const em = mathed_font_em(pi.base.font);
- if (isBinaryOp(char_))
- x += support::iround(0.25 * em);
+ if (isMathBin())
+ x += mathed_medmuskip(pi.base.font);
+ else if (isMathRel())
+ x += mathed_thickmuskip(pi.base.font);
else if (char_ == '\'')
- x += support::iround(0.0833 * em);
+ x += mathed_thinmuskip(pi.base.font) / 2;
#if 1
if (char_ == '=' && has_math_fonts) {
- FontSetChanger dummy(pi.base, "cmr");
+ Changer dummy = pi.base.changeFontSet("cmr");
pi.draw(x, y, char_);
} else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
- FontSetChanger dummy(pi.base, "cmm");
+ Changer dummy = pi.base.changeFontSet("cmm");
pi.draw(x, y, char_);
} else if (!slanted(char_) && pi.base.fontname == "mathnormal") {
- ShapeChanger dummy(pi.base.font, UP_SHAPE);
+ Changer dummy = pi.base.font.changeShape(UP_SHAPE);
pi.draw(x, y, char_);
} else {
pi.draw(x, y, char_);
}
-bool InsetMathChar::isRelOp() const
+bool InsetMathChar::isMathBin() const
+{
+ return support::contains("+-*", static_cast<char>(char_));
+}
+
+
+bool InsetMathChar::isMathRel() const
+{
+ return support::contains("<>=:", static_cast<char>(char_));
+}
+
+
+bool InsetMathChar::isMathPunct() const
{
- return char_ == '=' || char_ == '<' || char_ == '>';
+ return support::contains(",;", static_cast<char>(char_));
}