oh well

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

diff --git a/src/mathed/math_stackrelinset.C b/src/mathed/math_stackrelinset.C
index 3db27793445493a5b0f743b9d04018a612ccff4d..73500944eb02a6cb3b29f791868372d2b8cbea67 100644 (file)
--- a/src/mathed/math_stackrelinset.C
+++ b/src/mathed/math_stackrelinset.C
@@ -3,8 +3,11 @@
 #endif
 
 #include "math_stackrelinset.h"
-#include "mathed/support.h"
-#include "support/LOstream.h"
+#include "math_mathmlstream.h"
+#include "math_support.h"
+
+
+using std::max;
 
 
 MathStackrelInset::MathStackrelInset()
@@ -12,18 +15,18 @@ MathStackrelInset::MathStackrelInset()
 
 
 MathInset * MathStackrelInset::clone() const
-{   
+{
        return new MathStackrelInset(*this);
 }
 
 
-void MathStackrelInset::metrics(MathMetricsInfo const & st) const
+void MathStackrelInset::metrics(MathMetricsInfo const & mi) const
 {
-       size_    = st;
-       smallerStyleFrac(size_);
-       xcell(0).metrics(size_);
-       xcell(1).metrics(st);
-       width_   = std::max(xcell(0).width(), xcell(1).width()) + 4; 
+       MathMetricsInfo m = mi;
+       smallerStyleFrac(m);
+       xcell(0).metrics(m);
+       xcell(1).metrics(mi);
+       width_   = max(xcell(0).width(), xcell(1).width()) + 4;
        ascent_  = xcell(1).ascent() + xcell(0).height() + 4;
        descent_ = xcell(1).descent();
 }
@@ -31,25 +34,20 @@ void MathStackrelInset::metrics(MathMetricsInfo const & st) const
 
 void MathStackrelInset::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).height() - 4);
+       int m  = x + width() / 2;
+       int yo = y - xcell(1).ascent() - xcell(0).descent() - 1;
+       xcell(0).draw(pain, m - xcell(0).width() / 2, yo);
        xcell(1).draw(pain, m - xcell(1).width() / 2, y);
 }
 
 
-void MathStackrelInset::write(MathWriteInfo & os) const
+void MathStackrelInset::write(WriteStream & os) const
 {
        os << "\\stackrel{" << cell(0) << "}{" << cell(1) << '}';
 }
 
 
-void MathStackrelInset::writeNormal(std::ostream & os) const
+void MathStackrelInset::normalize(NormalStream & os) const
 {
-       os << "[stackrel ";
-       cell(0).writeNormal(os);
-       os << " ";
-       cell(1).writeNormal(os);
-       os << "] ";
+       os << "[stackrel " << cell(0) << ' ' << cell(1) << ']';
 }