X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_substackinset.C;h=696a9986e9559d52964832ff468127a53d71f6bc;hb=07cc9f67534474b167ca1ea727bda643fdd8d197;hp=43395d993713c1561bf4880f1d3d371a98999ddf;hpb=5e6481b76e54aabd22077684333dfc7938098e1e;p=lyx.git

diff --git a/src/mathed/math_substackinset.C b/src/mathed/math_substackinset.C
index 43395d9937..696a9986e9 100644
--- a/src/mathed/math_substackinset.C
+++ b/src/mathed/math_substackinset.C
@@ -1,12 +1,21 @@
-#include <config.h>
+/**
+ * \file math_substackinset.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_substackinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
+#include "support/std_ostream.h"
+
+using std::auto_ptr;
 
 
 MathSubstackInset::MathSubstackInset()
@@ -14,18 +23,33 @@ MathSubstackInset::MathSubstackInset()
 {}
 
 
-MathInset * MathSubstackInset::clone() const
+auto_ptr<InsetBase> MathSubstackInset::clone() const
+{
+	return auto_ptr<InsetBase>(new MathSubstackInset(*this));
+}
+
+
+void MathSubstackInset::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+	if (mi.base.style == LM_ST_DISPLAY) {
+		StyleChanger dummy(mi.base, LM_ST_TEXT);
+		MathGridInset::metrics(mi, dim);
+	} else {
+		MathGridInset::metrics(mi, dim);
+	}
+	dim_ = dim;
+}
+
+
+void MathSubstackInset::draw(PainterInfo & pi, int x, int y) const
 {
-	return new MathSubstackInset(*this);
+	MathGridInset::draw(pi, x + 1, y);
 }
 
 
-void MathSubstackInset::metrics(MathMetricsInfo const & st) const
+void MathSubstackInset::infoize(std::ostream & os) const
 {
-	MathMetricsInfo mi = st;
-	if (mi.style == LM_ST_DISPLAY)
-		mi.style = LM_ST_TEXT;
-	MathGridInset::metrics(mi);
+	os << "Substack ";
 }
 
 
@@ -41,13 +65,13 @@ void MathSubstackInset::normalize(NormalStream & os) const
 {
 	os << "[substack ";
 	MathGridInset::normalize(os);
-	os << "]";
+	os << ']';
 }
 
 
-void MathSubstackInset::maplize(MapleStream & os) const
+void MathSubstackInset::maple(MapleStream & os) const
 {
 	os << "substack(";
-	MathGridInset::maplize(os);
-	os << ")";
+	MathGridInset::maple(os);
+	os << ')';
 }