Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index a06896ba0fe76d45f0a6bbe916c25bdeca81fa93..2b6f667fd4a8d82b1bb688d644f2e422bf11a829 100644 (file)
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -1,14 +1,17 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
+
 
 #include "math_sizeinset.h"
 #include "math_parser.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_support.h"
 #include "support/LOstream.h"
 
+using std::atoi;
 
 MathSizeInset::MathSizeInset(latexkeys const * l)
-       : MathNestInset(1), key_(l)
+       : MathNestInset(1), key_(l), style_(MathStyles(atoi(l->extra.c_str())))
 {}
 
 
@@ -18,32 +21,35 @@ MathInset * MathSizeInset::clone() const
 }
 
 
-void MathSizeInset::draw(Painter & pain, int x, int y) const
+void MathSizeInset::metrics(MathMetricsInfo & mi) const
 {
-       xcell(0).draw(pain, x, y);
+       MathStyleChanger dummy(mi.base, style_);
+       dim_ = cell(0).metrics(mi);
+       metricsMarkers2();
 }
 
 
-void MathSizeInset::metrics(MathMetricsInfo const & mi) const
+void MathSizeInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       MathMetricsInfo m = mi;
-       m.style = MathStyles(key_->id);
-       xcell(0).metrics(m);
-       ascent_   = xcell(0).ascent_;
-       descent_  = xcell(0).descent_;
-       width_    = xcell(0).width_;
+       MathStyleChanger dummy(pi.base, style_);
+       cell(0).draw(pi, x + 1, y);
+       drawMarkers2(pi, x, y);
 }
 
 
-void MathSizeInset::write(MathWriteInfo & os) const
+void MathSizeInset::write(WriteStream & os) const
 {
        os << "{\\" << key_->name << ' ' << cell(0) << '}';
 }
 
 
-void MathSizeInset::writeNormal(std::ostream & os) const
+void MathSizeInset::normalize(NormalStream & os) const
+{
+       os << '[' << key_->name << ' ' << cell(0) << ']';
+}
+
+
+void MathSizeInset::infoize(std::ostream & os) const
 {
-       os << "[" << key_->name << " ";
-       cell(0).writeNormal(os);
-       os << "]";
+       os << "Size: " << key_->name;
 }