small up/down tweaking

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

diff --git a/src/mathed/math_stackrelinset.C b/src/mathed/math_stackrelinset.C
index eb19b0ba0f3f22585f1571ff3d12c632394f0a14..159360707e8448076f7459ca55d4dbca1598ceaa 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,42 +15,39 @@ MathStackrelInset::MathStackrelInset()
 
 
 MathInset * MathStackrelInset::clone() const
-{   
+{
        return new MathStackrelInset(*this);
 }
 
 
-void MathStackrelInset::metrics(MathMetricsInfo const & mi) const
+void MathStackrelInset::metrics(MathMetricsInfo & mi) const
 {
-       MathMetricsInfo m = mi;
-       smallerStyleFrac(m);
-       xcell(0).metrics(m);
-       xcell(1).metrics(mi);
-       width_   = std::max(xcell(0).width(), xcell(1).width()) + 4; 
-       ascent_  = xcell(1).ascent() + xcell(0).height() + 4;
-       descent_ = xcell(1).descent();
+       cell(1).metrics(mi);
+       MathFracChanger dummy(mi.base);
+       cell(0).metrics(mi);
+       dim_.w = max(cell(0).width(), cell(1).width()) + 4;
+       dim_.a = cell(1).ascent() + cell(0).height() + 4;
+       dim_.d = cell(1).descent();
 }
 
 
-void MathStackrelInset::draw(Painter & pain, int x, int y) const
+void MathStackrelInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       int m = x + width() / 2;
-       xcell(0).draw(pain, m - xcell(0).width() / 2, y - xcell(0).height() - 4);
-       xcell(1).draw(pain, m - xcell(1).width() / 2, y);
+       int m  = x + width() / 2;
+       int yo = y - cell(1).ascent() - cell(0).descent() - 1;
+       cell(1).draw(pi, m - cell(1).width() / 2, y);
+       MathFracChanger dummy(pi.base);
+       cell(0).draw(pi, m - cell(0).width() / 2, yo);
 }
 
 
-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) << ']';
 }