whichFont down to 5.3%

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

diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C
index 6f6853f31efddf443721c25b4d21d4d14c667d93..5b560c88a35804c8f9fa83583f0780f61c662f7d 100644 (file)
--- a/src/mathed/math_fracinset.C
+++ b/src/mathed/math_fracinset.C
@@ -3,12 +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"
 
 
-MathFracInset::MathFracInset()
+MathFracInset::MathFracInset(bool atop)
+       : atop_(atop)
 {}
 
 
@@ -18,43 +19,60 @@ MathInset * MathFracInset::clone() const
 }
 
 
-void MathFracInset::metrics(MathStyles st) const
+MathFracInset * MathFracInset::asFracInset()
 {
-       size_    = smallerStyleFrac(st);
-       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; 
+       ascent_  = xcell(0).height() + 2 + 5;
+       descent_ = xcell(1).height() + 2 - 5; 
 }
 
 
 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);
-       pain.line(x + 2, y - 5, x + width() - 4, y - 5, LColor::mathline);
+       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::math);
+}
+
+
+void MathFracInset::write(WriteStream & os) const
+{
+       if (atop_)
+               os << '{' << cell(0) << "\\atop " << cell(1) << '}';
+       else
+               os << "\\frac{" << cell(0) << "}{" << cell(1) << '}';
+}
+
+
+void MathFracInset::normalize(NormalStream & os) const
+{
+       if (atop_) 
+               os << "[atop ";
+       else
+               os << "[frac ";
+       os << cell(0) << ' ' << cell(1) << ']';
 }
 
 
-void MathFracInset::write(std::ostream & os, bool fragile) const
+void MathFracInset::maplize(MapleStream & os) const
 {
-       os << "\\frac{";
-       cell(0).write(os, fragile);
-       os << "}{";
-       cell(1).write(os, fragile);
-       os << '}';
+       os << '(' << cell(0) << ")/(" << cell(1) << ')';
 }
 
 
-void MathFracInset::writeNormal(std::ostream & os) const
+void MathFracInset::mathmlize(MathMLStream & os) const
 {
-       os << "[frac ";
-       cell(0).writeNormal(os);
-       os << " ";
-       cell(1).writeNormal(os);
-       os << "] ";
+       os << MTag("mfrac") << cell(0) << cell(1) << ETag("mfrac");
 }