X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_stringinset.C;h=dfb664c26c68b5f6a588d14c438fb730969c8996;hb=12ac7f339e14c4f76a24f45a21c0697303099145;hp=27082663027acf75453bf633f04eec492658c4b4;hpb=c649284611c4198c9d70be8a16d153cdf1ec0700;p=lyx.git

diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index 2708266302..dfb664c26c 100644
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -1,17 +1,23 @@
-#include <config.h>
+/**
+ * \file math_stringinset.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_stringinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "LColor.h"
 #include "math_support.h"
-#include "math_parser.h"
-#include "LaTeXFeatures.h"
-#include "debug.h"
+
+
+using std::string;
+using std::auto_ptr;
 
 
 MathStringInset::MathStringInset(string const & s)
@@ -19,19 +25,19 @@ MathStringInset::MathStringInset(string const & s)
 {}
 
 
-MathInset * MathStringInset::clone() const
+auto_ptr<InsetBase> MathStringInset::clone() const
 {
-	return new MathStringInset(*this);
+	return auto_ptr<InsetBase>(new MathStringInset(*this));
 }
 
 
-void MathStringInset::metrics(MathMetricsInfo & mi) const
+void MathStringInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	mathed_string_dim(mi.base.font, str_, ascent_, descent_, width_);
+	mathed_string_dim(mi.base.font, str_, dim);
 }
 
 
-void MathStringInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathStringInset::draw(PainterInfo & pi, int x, int y) const
 {
 	//lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
 	drawStr(pi, pi.base.font, x, y, str_);
@@ -40,13 +46,13 @@ void MathStringInset::draw(MathPainterInfo & pi, int x, int y) const
 
 void MathStringInset::normalize(NormalStream & os) const
 {
-	os << "[string " << str_ << ' ' << "mathalpha" << "]";
+	os << "[string " << str_ << ' ' << "mathalpha" << ']';
 }
 
 
-void MathStringInset::maplize(MapleStream & os) const
+void MathStringInset::maple(MapleStream & os) const
 {
-	if (/*code_ != LM_TC_VAR || */ str_.size() <= 1) {
+	if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
 		os << ' ' << str_ << ' ';
 		return;
 	}
@@ -58,7 +64,13 @@ void MathStringInset::maplize(MapleStream & os) const
 }
 
 
-void MathStringInset::octavize(OctaveStream & os) const
+void MathStringInset::mathematica(MathematicaStream & os) const
+{
+	os << ' ' << str_ << ' ';
+}
+
+
+void MathStringInset::octave(OctaveStream & os) const
 {
 	if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
 		os << ' ' << str_ << ' ';