hopefully fix tex2lyx linking.

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

diff --git a/src/mathed/InsetMathSymbol.C b/src/mathed/InsetMathSymbol.C
index 1733b4587959dacc1984c321640106d11bd3d9f0..206b6304db00dab1331e18155cb5baa863d29e5d 100644 (file)
--- a/src/mathed/InsetMathSymbol.C
+++ b/src/mathed/InsetMathSymbol.C
@@ -65,24 +65,12 @@ void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
        FontSetChanger dummy(mi.base, sym_->inset);
        mathed_string_dim(mi.base.font, sym_->draw, dim);
        // correct height for broken cmex and wasy font
-#if defined(__APPLE__) && defined(__GNUC__)
-       if (sym_->inset == "cmex") {
-               h_ = 4 * dim.des / 5;
-               dim.asc += 0*h_;
-               dim.des -= h_;
-               h_ = dim.asc;
-       } else if (sym_->inset == "wasy") {
-               h_ = 4 * dim.des / 5;
-               dim.asc += h_;
-               dim.des -= h_;
-       }
-#else
        if (sym_->inset == "cmex" || sym_->inset == "wasy") {
                h_ = 4 * dim.des / 5;
                dim.asc += h_;
                dim.des -= h_;
        }
-#endif
+
        // seperate things a bit
        if (isRelOp())
                dim.wid += static_cast<int>(0.5 * em + 0.5);
@@ -91,7 +79,8 @@ void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
 
        scriptable_ = false;
        if (mi.base.style == LM_ST_DISPLAY)
-               if (sym_->inset == "cmex" || sym_->extra == "funclim")
+               if (sym_->inset == "cmex" || sym_->inset == "esint" ||
+                   sym_->extra == "funclim")
                        scriptable_ = true;
 
        width_ = dim.wid;
@@ -111,9 +100,7 @@ void InsetMathSymbol::draw(PainterInfo & pi, int x, int y) const
                x += static_cast<int>(0.0833*em+0.5);
 
        FontSetChanger dummy(pi.base, sym_->inset.c_str());
-       // FIXME UNICODE
-       docstring n(sym_->draw.begin(), sym_->draw.end());
-       pi.draw(x, y - h_, n);
+       pi.draw(x, y - h_, sym_->draw);
 }
 
 
@@ -134,6 +121,7 @@ bool InsetMathSymbol::takesLimits() const
        return
                sym_->inset == "cmex" ||
                sym_->inset == "lyxboldsymb" ||
+               sym_->inset == "esint" ||
                sym_->extra == "funclim";
 }