Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C
index cc7efc8890a7c2b410639b4d9e4b083724723013..ec0517161dd6e7e58234f469e4d0fb9a645736a9 100644 (file)
--- a/src/mathed/math_fracinset.C
+++ b/src/mathed/math_fracinset.C
@@ -1,6 +1,3 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_fracinset.h"
 #include "math_support.h"
@@ -29,43 +26,49 @@ MathFracInset * MathFracInset::asFracInset()
 }
 
 
-void MathFracInset::metrics(MathMetricsInfo const & mi) const
+MathFracInset const * MathFracInset::asFracInset() const
 {
-       MathMetricsInfo m = mi;
-       smallerStyleFrac(m);
-       xcell(0).metrics(m);
-       xcell(1).metrics(m);
-       width_   = max(xcell(0).width(), xcell(1).width()) + 2;
-       ascent_  = xcell(0).height() + 2 + 5;
-       descent_ = xcell(1).height() + 2 - 5;
+       return atop_ ? 0 : this;
+}
+
+
+void MathFracInset::metrics(MathMetricsInfo & mi) const
+{
+       MathFracChanger dummy(mi.base);
+       cell(0).metrics(mi);
+       cell(1).metrics(mi);
+       dim_.w = max(cell(0).width(), cell(1).width()) + 2;
+       dim_.a = cell(0).height() + 2 + 5;
+       dim_.d = cell(1).height() + 2 - 5;
 }
 
 
-void MathFracInset::draw(Painter & pain, int x, int y) const
+void MathFracInset::draw(MathPainterInfo & pi, int x, int y) const
 {
        int m = x + width() / 2;
-       xcell(0).draw(pain, m - xcell(0).width() / 2, y - xcell(0).descent() - 2 - 5);
-       xcell(1).draw(pain, m - xcell(1).width() / 2, y + xcell(1).ascent()  + 2 - 5);
+       MathFracChanger dummy(pi.base);
+       cell(0).draw(pi, m - cell(0).width() / 2, y - cell(0).descent() - 2 - 5);
+       cell(1).draw(pi, m - cell(1).width() / 2, y + cell(1).ascent()  + 2 - 5);
        if (!atop_)
-               pain.line(x, y - 5, x + width(), y - 5, LColor::math);
+               pi.pain.line(x + 1, y - 5, x + width() - 2, y - 5, LColor::math);
 }
 
 
 void MathFracInset::metricsT(TextMetricsInfo const & mi) const
 {
-       xcell(0).metricsT(mi);
-       xcell(1).metricsT(mi);
-       width_   = max(xcell(0).width(), xcell(1).width());
-       ascent_  = xcell(0).height() + 1;
-       descent_ = xcell(1).height();
+       cell(0).metricsT(mi);
+       cell(1).metricsT(mi);
+       dim_.w = max(cell(0).width(), cell(1).width());
+       dim_.a = cell(0).height() + 1;
+       dim_.d = cell(1).height();
 }
 
 
 void MathFracInset::drawT(TextPainter & pain, int x, int y) const
 {
        int m = x + width() / 2;
-       xcell(0).drawT(pain, m - xcell(0).width() / 2, y - xcell(0).descent() - 1);
-       xcell(1).drawT(pain, m - xcell(1).width() / 2, y + xcell(1).ascent());
+       cell(0).drawT(pain, m - cell(0).width() / 2, y - cell(0).descent() - 1);
+       cell(1).drawT(pain, m - cell(1).width() / 2, y + cell(1).ascent());
        if (!atop_)
                pain.horizontalLine(x, y, width());
 }
@@ -75,28 +78,30 @@ void MathFracInset::write(WriteStream & os) const
 {
        if (atop_)
                os << '{' << cell(0) << "\\atop " << cell(1) << '}';
-       else
-               os << "\\frac{" << cell(0) << "}{" << cell(1) << '}';
+       else // it's \\frac
+               MathNestInset::write(os);
 }
 
 
-void MathFracInset::normalize(NormalStream & os) const
+string MathFracInset::name() const
 {
-       if (atop_)
-               os << "[atop ";
-       else
-               os << "[frac ";
-       os << cell(0) << ' ' << cell(1) << ']';
+       return atop_ ? "atop" : "frac";
+}
+
+
+void MathFracInset::maple(MapleStream & os) const
+{
+       os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
 
-void MathFracInset::maplize(MapleStream & os) const
+void MathFracInset::mathematica(MathematicaStream & os) const
 {
        os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
 
-void MathFracInset::octavize(OctaveStream & os) const
+void MathFracInset::octave(OctaveStream & os) const
 {
        os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }