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

diff --git a/src/mathed/math_sizeinset.C b/src/mathed/math_sizeinset.C
index 707248a131..b6e3a81769 100644
--- a/src/mathed/math_sizeinset.C
+++ b/src/mathed/math_sizeinset.C
@@ -1,70 +1,70 @@
+/**
+ * \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.
+ */
+
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
+#include "math_sizeinset.h"
+#include "math_data.h"
+#include "math_mathmlstream.h"
+#include "math_parser.h"
+#include "math_streamstr.h"
+#include "support/std_ostream.h"
+
+#ifndef CXX_GLOBAL_CSTD
+using std::atoi;
 #endif
 
-#include "math_sizeinset.h"
-#include "support/LOstream.h"
+using std::auto_ptr;
 
 
-MathSizeInset::MathSizeInset(MathStyles st)
-	: MathInset(1), style_(st)
-{
-	name_ = verbose();
-}
+MathSizeInset::MathSizeInset(latexkeys const * l)
+	: MathNestInset(1), key_(l), style_(Styles(atoi(l->extra.c_str())))
+{}
 
 
-char const * MathSizeInset::verbose() const
+auto_ptr<InsetBase> MathSizeInset::clone() const
 {
-	switch (style_) {
-		case LM_ST_DISPLAY:
-			return "displaystyle";
-		case LM_ST_TEXT:
-			return "textstyle";
-		case LM_ST_SCRIPT:
-			return "scriptstyle";
-		case LM_ST_SCRIPTSCRIPT:
-			return "scriptscriptstyle";
-	}
-	return "unknownstyle";
+	return auto_ptr<InsetBase>(new MathSizeInset(*this));
 }
 
 
-MathInset * MathSizeInset::clone() const
+void MathSizeInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	return new MathSizeInset(*this);
+	StyleChanger dummy(mi.base, style_);
+	cell(0).metrics(mi, dim);
+	metricsMarkers(dim);
+	dim_ = dim;
 }
 
 
-void MathSizeInset::draw(Painter & pain, int x, int y)
+void MathSizeInset::draw(PainterInfo & pi, int x, int y) const
 {
-	xo(x);
-	yo(y);
-	xcell(0).draw(pain, x, y);
+	StyleChanger dummy(pi.base, style_);
+	cell(0).draw(pi, x + 1, y);
+	drawMarkers(pi, x, y);
 }
 
 
-void MathSizeInset::Metrics(MathStyles /* st */)
+void MathSizeInset::write(WriteStream & os) const
 {
-	xcell(0).Metrics(style_);
-	ascent_   = xcell(0).ascent_;
-	descent_  = xcell(0).descent_;
-	width_    = xcell(0).width_;
+	os << "{\\" << key_->name << ' ' << cell(0) << '}';
 }
 
 
-void MathSizeInset::Write(std::ostream & os, bool fragile) const
+void MathSizeInset::normalize(NormalStream & os) const
 {
-	os << "{\\" << name() << " ";
-	cell(0).Write(os, fragile);
-	os << "}";
+	os << '[' << key_->name << ' ' << cell(0) << ']';
 }
 
 
-void MathSizeInset::WriteNormal(std::ostream & os) const
+void MathSizeInset::infoize(std::ostream & os) const
 {
-	os << "[" << name() << " ";
-	cell(0).WriteNormal(os);
-	os << "]";
+	os << "Size: " << key_->name;
 }