use stream-like syntax for LaTeX output

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

diff --git a/src/mathed/math_fracinset.C b/src/mathed/math_fracinset.C
index 09429072fb4444984d1a7bc19081353ee57b3118..057366ba7bc3be4c4261b0decaad0ce480050b6d 100644 (file)
--- a/src/mathed/math_fracinset.C
+++ b/src/mathed/math_fracinset.C
@@ -1,126 +1,65 @@
-#include <config.h>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "math_fracinset.h"
-#include "LColor.h"
-#include "Painter.h"
 #include "mathed/support.h"
+#include "Painter.h"
 #include "support/LOstream.h"
 
 
-MathFracInset::MathFracInset(MathInsetTypes ot)
-       : MathInset("frac", ot, 2)
-{
-       if (objtype == LM_OT_STACKREL) 
-               SetName("stackrel");
-}
+MathFracInset::MathFracInset(bool atop)
+       : atop_(atop)
+{}
 
 
-MathInset * MathFracInset::Clone() const
+MathInset * MathFracInset::clone() const
 {   
        return new MathFracInset(*this);
 }
 
 
-void MathFracInset::Metrics(MathStyles st)
+void MathFracInset::metrics(MathMetricsInfo const & st) const
 {
-       xcell(0).Metrics(st);
-       xcell(1).Metrics(st);
        size_    = st;
-       width_   = max(xcell(0).width(), xcell(1).width()) + 4; 
+       size_.size = smallerStyleFrac(size_.size);
+       xcell(0).metrics(size_);
+       xcell(1).metrics(size_);
+       width_   = std::max(xcell(0).width(), xcell(1).width()) + 4; 
        ascent_  = xcell(0).height() + 4 + 5;
        descent_ = xcell(1).height() + 4 - 5; 
 }
 
 
-void MathFracInset::draw(Painter & pain, int x, int y)
+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 (objtype == LM_OT_FRAC)
+       if (!atop_)
                pain.line(x + 2, y - 5, x + width() - 4, y - 5, LColor::mathline);
 }
 
 
-void MathFracInset::Write(std::ostream & os, bool fragile) const
+void MathFracInset::write(MathWriteInfo & os) const
 {
-       os << '\\' << name() << '{';
-       cell(0).Write(os, fragile);
-       os << "}{";
-       cell(1).Write(os, fragile);
-       os << '}';
+       if (atop_)
+               os << '{' << cell(0) << "\\atop " << cell(1) << '}';
+       else
+               os << "\\frac{" << cell(0) << "}{" << cell(1) << '}';
 }
 
 
-void MathFracInset::WriteNormal(std::ostream & os) const
+void MathFracInset::writeNormal(std::ostream & os) const
 {
-       os << '[' << name() << ' ';
-       cell(0).WriteNormal(os);
+       if (atop_) 
+               os << "[atop ";
+       else
+               os << "[frac ";
+       cell(0).writeNormal(os);
        os << " ";
-       cell(1).WriteNormal(os);
+       cell(1).writeNormal(os);
        os << "] ";
 }
-
-
-bool MathFracInset::idxRight(int &, int &) const
-{
-       return false;
-}
-
-bool MathFracInset::idxLeft(int &, int &) const
-{
-       return false;
-}
-
-
-bool MathFracInset::idxUp(int & idx, int &) const
-{
-       if (idx == 0)
-               return false;
-       idx = 0;
-       return true;
-}
-
-bool MathFracInset::idxDown(int & idx, int &) const
-{
-       if (idx == 1)
-               return false;
-       idx = 1;
-       return true;
-}
-
-bool MathFracInset::idxFirstUp(int & idx, int & pos) const
-{
-       idx = 0;
-       pos = 0;
-       return true;
-}
-
-bool MathFracInset::idxFirstDown(int & idx, int & pos) const
-{
-       idx = 1;
-       pos = 0;
-       return true;
-}
-
-bool MathFracInset::idxLastUp(int & idx, int & pos) const
-{
-       idx = 0;
-       pos = cell(idx).size();
-       return true;
-}
-
-bool MathFracInset::idxLastDown(int & idx, int & pos) const
-{
-       idx = 1;
-       pos = cell(idx).size();
-       return true;
-}
-