Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index 1bacd342c35172565a593a7a935d035c1dce6597..272c38861dd09be9e9e0bddbf1a1e9f6c2dcc78c 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,8 +1,4 @@
 
-#ifdef __GNUG__
-#pragma implementation 
-#endif
-
 #include <config.h>
 
 #include "math_symbolinset.h"
@@ -13,7 +9,6 @@
 #include "LaTeXFeatures.h"
 #include "debug.h"
 
-
 MathSymbolInset::MathSymbolInset(const latexkeys * l)
        : sym_(l), h_(0)
 {}
@@ -48,6 +43,8 @@ void MathSymbolInset::metrics(MathMetricsInfo & mi) const
        //      << "' in font: '" << sym_->inset
        //      << "' drawn as: '" << sym_->draw
        //      << "'\n";
+
+       int const em = mathed_char_width(mi.base.font, 'M');
        MathFontSetChanger dummy(mi.base, sym_->inset.c_str());
        mathed_string_dim(mi.base.font, sym_->draw, dim_);
        // correct height for broken cmex and wasy font
@@ -56,10 +53,11 @@ void MathSymbolInset::metrics(MathMetricsInfo & mi) const
                dim_.a += h_;
                dim_.d -= h_;
        }
-       if (isRelOp())
-               dim_.w += 6;
        // seperate things a bit
-       dim_.w += 2;
+       if (isRelOp())
+               dim_.w += static_cast<int>(0.5*em+0.5);
+       else
+               dim_.w += static_cast<int>(0.1667*em+0.5);
 
        scriptable_ = false;
        if (mi.base.style == LM_ST_DISPLAY)
@@ -74,9 +72,12 @@ void MathSymbolInset::draw(MathPainterInfo & pi, int x, int y) const
        //      << "' in font: '" << sym_->inset
        //      << "' drawn as: '" << sym_->draw
        //      << "'\n";
+       int const em = mathed_char_width(pi.base.font, 'M');
        if (isRelOp())
-               x += 3;
-       x += 1;
+               x += static_cast<int>(0.25*em+0.5);
+       else
+               x += static_cast<int>(0.0833*em+0.5);
+
        MathFontSetChanger dummy(pi.base, sym_->inset.c_str());
        drawStr(pi, pi.base.font, x, y - h_, sym_->draw);
 }
@@ -112,11 +113,11 @@ void MathSymbolInset::validate(LaTeXFeatures & features) const
 
 void MathSymbolInset::normalize(NormalStream & os) const
 {
-       os << "[symbol " << name() << "]";
+       os << "[symbol " << name() << ']';
 }
 
 
-void MathSymbolInset::maplize(MapleStream & os) const
+void MathSymbolInset::maple(MapleStream & os) const
 {
        if (name() == "cdot")
                os << '*';
@@ -126,7 +127,18 @@ void MathSymbolInset::maplize(MapleStream & os) const
                os << name();
 }
 
-void MathSymbolInset::mathematicize(MathematicaStream & os) const
+void MathSymbolInset::maxima(MaximaStream & os) const
+{
+       if (name() == "cdot")
+               os << '*';
+       else if (name() == "infty")
+               os << "INF";
+       else
+               os << name();
+}
+
+
+void MathSymbolInset::mathematica(MathematicaStream & os) const
 {
        if ( name() == "pi")    { os << "Pi"; return;}
        if ( name() == "infty") { os << "Infinity"; return;}
@@ -161,7 +173,7 @@ void MathSymbolInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathSymbolInset::octavize(OctaveStream & os) const
+void MathSymbolInset::octave(OctaveStream & os) const
 {
        if (name() == "cdot")
                os << '*';
@@ -177,7 +189,7 @@ void MathSymbolInset::write(WriteStream & os) const
 }
 
 
-void MathSymbolInset::infoize(std::ostream & os) const
+void MathSymbolInset::infoize2(std::ostream & os) const
 {
        os << "Symbol: " << name();
 }