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 07c9cfdc999e32b18b2fd3cb872184f5d5fa5027..2b6f667fd4a8d82b1bb688d644f2e422bf11a829 100644 (file)
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -1,18 +1,17 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #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())))
 {}
 
 
@@ -24,19 +23,17 @@ MathInset * MathSizeInset::clone() const
 
 void MathSizeInset::metrics(MathMetricsInfo & mi) const
 {
-       //MathStyleChanger dummy(mi.base, MathStyles(key_->id));
-       xcell(0).metrics(mi);
-       ascent_   = xcell(0).ascent_ + 1;
-       descent_  = xcell(0).descent_ + 1;
-       width_    = xcell(0).width_ + 2;
+       MathStyleChanger dummy(mi.base, style_);
+       dim_ = cell(0).metrics(mi);
+       metricsMarkers2();
 }
 
 
 void MathSizeInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       //MathStyleChanger dummy(pi.base, MathStyles(key_->id));
-       xcell(0).draw(pi, x + 1, y);
-       mathed_draw_framebox(pi, x, y, this);
+       MathStyleChanger dummy(pi.base, style_);
+       cell(0).draw(pi, x + 1, y);
+       drawMarkers2(pi, x, y);
 }
 
 
@@ -48,5 +45,11 @@ void MathSizeInset::write(WriteStream & os) const
 
 void MathSizeInset::normalize(NormalStream & os) const
 {
-       os << "[" << key_->name << ' ' << cell(0) << ']';
+       os << '[' << key_->name << ' ' << cell(0) << ']';
+}
+
+
+void MathSizeInset::infoize(std::ostream & os) const
+{
+       os << "Size: " << key_->name;
 }