oh well

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

diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C
index 1799838dacceacb563ae104f204e53eaf107e93a..69f935689e62322fe7a992e045e7d08a1ead0bb1 100644 (file)
--- a/src/mathed/math_fracinset.C
+++ b/src/mathed/math_fracinset.C
@@ -6,6 +6,10 @@
 #include "math_support.h"
 #include "Painter.h"
 #include "math_mathmlstream.h"
+#include "textpainter.h"
+
+
+using std::max;
 
 
 MathFracInset::MathFracInset(bool atop)
@@ -14,7 +18,7 @@ MathFracInset::MathFracInset(bool atop)
 
 
 MathInset * MathFracInset::clone() const
-{   
+{
        return new MathFracInset(*this);
 }
 
@@ -31,19 +35,39 @@ void MathFracInset::metrics(MathMetricsInfo const & mi) const
        smallerStyleFrac(m);
        xcell(0).metrics(m);
        xcell(1).metrics(m);
-       width_   = std::max(xcell(0).width(), xcell(1).width()) + 4; 
-       ascent_  = xcell(0).height() + 4 + 5;
-       descent_ = xcell(1).height() + 4 - 5; 
+       width_   = max(xcell(0).width(), xcell(1).width()) + 2;
+       ascent_  = xcell(0).height() + 2 + 5;
+       descent_ = xcell(1).height() + 2 - 5;
 }
 
 
 void MathFracInset::draw(Painter & pain, int x, int y) const
 {
        int m = x + width() / 2;
-       xcell(0).draw(pain, m - xcell(0).width() / 2, y - xcell(0).descent() - 3 - 5);
-       xcell(1).draw(pain, m - xcell(1).width() / 2, y + xcell(1).ascent()  + 3 - 5);
+       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);
        if (!atop_)
-               pain.line(x + 2, y - 5, x + width() - 4, y - 5, LColor::mathline);
+               pain.line(x, y - 5, x + width(), 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();
+}
+
+
+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());
+       if (!atop_)
+               pain.horizontalLine(x, y, width());
 }
 
 
@@ -58,7 +82,7 @@ void MathFracInset::write(WriteStream & os) const
 
 void MathFracInset::normalize(NormalStream & os) const
 {
-       if (atop_) 
+       if (atop_)
                os << "[atop ";
        else
                os << "[frac ";
@@ -72,6 +96,12 @@ void MathFracInset::maplize(MapleStream & os) const
 }
 
 
+void MathFracInset::octavize(OctaveStream & os) const
+{
+       os << '(' << cell(0) << ")/(" << cell(1) << ')';
+}
+
+
 void MathFracInset::mathmlize(MathMLStream & os) const
 {
        os << MTag("mfrac") << cell(0) << cell(1) << ETag("mfrac");