Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_braceinset.C b/src/mathed/math_braceinset.C
index 9d9ee6f139031315a3f66f18e18c116ed4674512..4cd94c19504d5c2f90814580d3b865c9e8228b9b 100644 (file)
--- a/src/mathed/math_braceinset.C
+++ b/src/mathed/math_braceinset.C
@@ -1,8 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_braceinset.h"
 #include "math_parser.h"
@@ -33,13 +30,13 @@ MathInset * MathBraceInset::clone() const
 
 void MathBraceInset::metrics(MathMetricsInfo & mi) const
 {
-       xcell(0).metrics(mi);
+       cell(0).metrics(mi);
        Dimension t;
        mathed_char_dim(mi.base.font, '{', t);
        wid_ = t.w;
-       dim_.a = max(xcell(0).ascent(), t.a);
-       dim_.d = max(xcell(0).descent(), t.a);
-       dim_.w = xcell(0).width() + 2 * wid_;
+       dim_.a = max(cell(0).ascent(), t.a);
+       dim_.d = max(cell(0).descent(), t.d);
+       dim_.w = cell(0).width() + 2 * wid_;
 }
 
 
@@ -48,7 +45,7 @@ void MathBraceInset::draw(MathPainterInfo & pi, int x, int y) const
        LyXFont font = pi.base.font;
        font.setColor(LColor::latex);
        drawChar(pi, font, x, y, '{');
-       xcell(0).draw(pi, x + wid_, y);
+       cell(0).draw(pi, x + wid_, y);
        drawChar(pi, font, x + width() - wid_, y, '}');
 }
 
@@ -65,13 +62,13 @@ void MathBraceInset::normalize(NormalStream & os) const
 }
 
 
-void MathBraceInset::maplize(MapleStream & os) const
+void MathBraceInset::maple(MapleStream & os) const
 {
        os << cell(0);
 }
 
 
-void MathBraceInset::octavize(OctaveStream & os) const
+void MathBraceInset::octave(OctaveStream & os) const
 {
        os << cell(0);
 }
@@ -83,7 +80,7 @@ void MathBraceInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathBraceInset::mathematicize(MathematicaStream & os) const
+void MathBraceInset::mathematica(MathematicaStream & os) const
 {
        os << cell(0);
 }