forward search in math insets. ugly. seems to work. don't ask why.

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

diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C
index e25adc5c0eb821fab3635623fc053e826f3e70bf..c1f8f23ff4bfa78e7a965a23028803eee7206da4 100644 (file)
--- a/src/mathed/math_fracinset.C
+++ b/src/mathed/math_fracinset.C
@@ -3,9 +3,9 @@
 #endif
 
 #include "math_fracinset.h"
-#include "mathed/support.h"
+#include "math_support.h"
 #include "Painter.h"
-#include "support/LOstream.h"
+#include "math_mathmlstream.h"
 
 
 MathFracInset::MathFracInset(bool atop)
@@ -19,12 +19,18 @@ MathInset * MathFracInset::clone() const
 }
 
 
-void MathFracInset::metrics(MathMetricsInfo const & st) const
+MathFracInset * MathFracInset::asFracInset()
 {
-       size_    = st;
-       smallerStyleFrac(size_);
-       xcell(0).metrics(size_);
-       xcell(1).metrics(size_);
+       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; 
@@ -33,17 +39,15 @@ void MathFracInset::metrics(MathMetricsInfo const & st) const
 
 void MathFracInset::draw(Painter & pain, int x, int y) const
 {
-       xo(x);
-       yo(y);
        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);
        if (!atop_)
-               pain.line(x + 2, y - 5, x + width() - 4, y - 5, LColor::mathline);
+               pain.line(x + 2, y - 5, x + width() - 4, y - 5, LColor::math);
 }
 
 
-void MathFracInset::write(MathWriteInfo & os) const
+void MathFracInset::write(WriteStream & os) const
 {
        if (atop_)
                os << '{' << cell(0) << "\\atop " << cell(1) << '}';
@@ -52,14 +56,23 @@ void MathFracInset::write(MathWriteInfo & os) const
 }
 
 
-void MathFracInset::writeNormal(std::ostream & os) const
+void MathFracInset::normalize(NormalStream & os) const
 {
        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::mathmlize(MathMLStream & os) const
+{
+       os << MTag("mfrac") << cell(0) << cell(1) << ETag("mfrac");
 }