architectural changes to tex2lyx

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

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index 845e16ff9f917ee3da6770b47bf8536eb441a876..2d883edce15f00402aa98abfe11200aad088eb4e 100644 (file)
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -1,9 +1,5 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "math_sizeinset.h"
 #include "math_parser.h"
 #include "math_mathmlstream.h"
@@ -11,33 +7,35 @@
 #include "math_support.h"
 #include "support/LOstream.h"
 
+using std::atoi;
+using std::auto_ptr;
+
 
 MathSizeInset::MathSizeInset(latexkeys const * l)
-       : MathNestInset(1), key_(l)
+       : MathNestInset(1), key_(l), style_(Styles(atoi(l->extra.c_str())))
 {}
 
 
-MathInset * MathSizeInset::clone() const
+auto_ptr<InsetBase> MathSizeInset::clone() const
 {
-       return new MathSizeInset(*this);
+       return auto_ptr<InsetBase>(new MathSizeInset(*this));
 }
 
 
-void MathSizeInset::metrics(MathMetricsInfo & mi) const
+void MathSizeInset::metrics(MetricsInfo & mi, Dimension & dim) 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;
+       StyleChanger dummy(mi.base, style_);
+       cell(0).metrics(mi, dim_);
+       metricsMarkers();
+       dim = dim_;
 }
 
 
-void MathSizeInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathSizeInset::draw(PainterInfo & pi, int x, int y) const
 {
-       //MathStyleChanger dummy(pi.base, MathStyles(key_->id));
-       xcell(0).draw(pi, x + 1, y);
-       drawMarkers2(pi, x, y);
+       StyleChanger dummy(pi.base, style_);
+       cell(0).draw(pi, x + 1, y);
+       drawMarkers(pi, x, y);
 }
 
 
@@ -49,7 +47,7 @@ void MathSizeInset::write(WriteStream & os) const
 
 void MathSizeInset::normalize(NormalStream & os) const
 {
-       os << "[" << key_->name << ' ' << cell(0) << ']';
+       os << '[' << key_->name << ' ' << cell(0) << ']';
 }