X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_sizeinset.C;h=b6e3a8176914f88ee7310b0d6946ce333129d477;hb=07cc9f67534474b167ca1ea727bda643fdd8d197;hp=7fb67920b53180fe814549d56eeed54aed7af0a0;hpb=fa77b206ab841ee24f38310e05aa8387b2ce5741;p=lyx.git

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index 7fb67920b5..b6e3a81769 100644
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -1,43 +1,54 @@
-#include <config.h>
+/**
+ * \file math_sizeinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_sizeinset.h"
-#include "math_parser.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
+#include "math_parser.h"
 #include "math_streamstr.h"
-#include "math_support.h"
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
+
+#ifndef CXX_GLOBAL_CSTD
+using std::atoi;
+#endif
+
+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_ = 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);
-	mathed_draw_framebox(pi, x, y, this);
+	StyleChanger dummy(pi.base, style_);
+	cell(0).draw(pi, x + 1, y);
+	drawMarkers(pi, x, y);
 }
 
 
@@ -49,7 +60,7 @@ void MathSizeInset::write(WriteStream & os) const
 
 void MathSizeInset::normalize(NormalStream & os) const
 {
-	os << "[" << key_->name << ' ' << cell(0) << ']';
+	os << '[' << key_->name << ' ' << cell(0) << ']';
 }