oh well

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

diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C
index 70e7737a395a70fc9269f5cdce0f9748b53405a2..69f935689e62322fe7a992e045e7d08a1ead0bb1 100644 (file)
--- a/src/mathed/math_fracinset.C
+++ b/src/mathed/math_fracinset.C
@@ -3,9 +3,13 @@
 #endif
 
 #include "math_fracinset.h"
-#include "mathed/support.h"
+#include "math_support.h"
 #include "Painter.h"
-#include "support/LOstream.h"
+#include "math_mathmlstream.h"
+#include "textpainter.h"
+
+
+using std::max;
 
 
 MathFracInset::MathFracInset(bool atop)
@@ -14,34 +18,60 @@ MathFracInset::MathFracInset(bool atop)
 
 
 MathInset * MathFracInset::clone() const
-{   
+{
        return new MathFracInset(*this);
 }
 
 
+MathFracInset * MathFracInset::asFracInset()
+{
+       return atop_ ? 0 : this;
+}
+
+
 void MathFracInset::metrics(MathMetricsInfo const & mi) const
 {
        MathMetricsInfo m = mi;
        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, 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.line(x + 2, y - 5, x + width() - 4, y - 5, LColor::mathline);
+               pain.horizontalLine(x, y, width());
 }
 
 
-void MathFracInset::write(MathWriteInfo & os) const
+void MathFracInset::write(WriteStream & os) const
 {
        if (atop_)
                os << '{' << cell(0) << "\\atop " << cell(1) << '}';
@@ -50,20 +80,29 @@ void MathFracInset::write(MathWriteInfo & os) const
 }
 
 
-void MathFracInset::writeNormal(std::ostream & os) const
+void MathFracInset::normalize(NormalStream & os) const
 {
-       if (atop_) 
+       if (atop_)
                os << "[atop ";
        else
                os << "[frac ";
-       cell(0).writeNormal(os);
-       os << " ";
-       cell(1).writeNormal(os);
-       os << "] ";
+       os << cell(0) << ' ' << cell(1) << ']';
+}
+
+
+void MathFracInset::maplize(MapleStream & os) const
+{
+       os << '(' << cell(0) << ")/(" << cell(1) << ')';
+}
+
+
+void MathFracInset::octavize(OctaveStream & os) const
+{
+       os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
 
-string MathFracInset::maplize() const
+void MathFracInset::mathmlize(MathMLStream & os) const
 {
-       return '(' + cell(0).maplize() + '/' + cell(1).maplize() + ')';
+       os << MTag("mfrac") << cell(0) << cell(1) << ETag("mfrac");
 }