Display properly math characters that behave like symbols

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

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 68c824742919f1c866368894bb8f0ee423344740..620ca226a2881b6c182c4885cb86a39c49716c59 100644 (file)
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -60,36 +60,17 @@ docstring InsetMathSymbol::name() const
 
 void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       //lyxerr << "metrics: symbol: '" << sym_->name
-       //      << "' in font: '" << sym_->inset
-       //      << "' drawn as: '" << sym_->draw
-       //      << "'" << endl;
-
-       bool const italic_upcase_greek = sym_->inset == "cmr" &&
-                                        sym_->extra == "mathalpha" &&
-                                        mi.base.fontname == "mathit";
-       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);
+       // set dim
+       mathedSymbolDim(mi, dim, sym_);
+       // set kerning_
+       kerning_ = mathed_char_kerning(mi.base.font, *sym_->draw.rbegin());
        // correct height for broken cmex and wasy font
        if (sym_->inset == "cmex" || sym_->inset == "wasy") {
                h_ = 4 * dim.des / 5;
                dim.asc += h_;
                dim.des -= h_;
        }
-       // seperate things a bit
-       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);
-
+       // set striptable_
        scriptable_ = false;
        if (mi.base.style == LM_ST_DISPLAY)
                if (sym_->inset == "cmex" || sym_->inset == "esint" ||
@@ -101,25 +82,7 @@ void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetMathSymbol::draw(PainterInfo & pi, int x, int y) const
 {
-       //lyxerr << "metrics: symbol: '" << sym_->name
-       //      << "' in font: '" << sym_->inset
-       //      << "' drawn as: '" << sym_->draw
-       //      << "'" << endl;
-
-       bool const italic_upcase_greek = sym_->inset == "cmr" &&
-                                        sym_->extra == "mathalpha" &&
-                                        pi.base.fontname == "mathit";
-       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);
+       mathedSymbolDraw(pi, x, y - h_, sym_);
 }