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

diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index e9b803f080..dfb664c26c 100644
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -1,103 +1,92 @@
-#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 "Painter.h"
 #include "math_support.h"
-#include "math_parser.h"
-#include "debug.h"
 
-#include <cctype>
 
+using std::string;
+using std::auto_ptr;
 
-MathStringInset::MathStringInset()
-	: str_(), code_(LM_TC_MIN)
-{}
 
-MathStringInset::MathStringInset(string const & s, MathTextCodes t)
-	: str_(s), code_(t)
+MathStringInset::MathStringInset(string const & s)
+	: str_(s)
 {}
 
 
-MathInset * MathStringInset::clone() const
-{   
-	return new MathStringInset(*this);
-}
-
-
-int MathStringInset::ascent() const
-{
-	return mathed_string_ascent(code_, mi_, str_);
-}
-
-
-int MathStringInset::descent() const
+auto_ptr<InsetBase> MathStringInset::clone() const
 {
-	return mathed_string_descent(code_, mi_, str_);
+	return auto_ptr<InsetBase>(new MathStringInset(*this));
 }
 
 
-int MathStringInset::width() const
+void MathStringInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	return mathed_string_width(code_, mi_, str_);
+	mathed_string_dim(mi.base.font, str_, dim);
 }
 
 
-void MathStringInset::metrics(MathMetricsInfo const & mi) const
+void MathStringInset::draw(PainterInfo & pi, int x, int y) const
 {
-	mi_ = mi;
-}
-
-
-void MathStringInset::draw(Painter & pain, int x, int y) const
-{ 
 	//lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
-	drawStr(pain, code_, mi_, x, y, str_);
+	drawStr(pi, pi.base.font, x, y, str_);
 }
 
 
 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;
-	}	
+	}
 
 	// insert '*' between adjacent chars if type is LM_TC_VAR
 	os << str_[0];
-	for (string::size_type i = 1; i < str_.size(); ++i) 
-		os << '*' << str_[i];
+	for (string::size_type i = 1; i < str_.size(); ++i)
+		os << str_[i];
 }
 
 
-void MathStringInset::octavize(OctaveStream & os) const
+void MathStringInset::mathematica(MathematicaStream & os) const
 {
-	if (code_ != LM_TC_VAR || str_.size() <= 1) {
+	os << ' ' << str_ << ' ';
+}
+
+
+void MathStringInset::octave(OctaveStream & os) const
+{
+	if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
 		os << ' ' << str_ << ' ';
 		return;
-	}	
+	}
 
 	// insert '*' between adjacent chars if type is LM_TC_VAR
 	os << str_[0];
-	for (string::size_type i = 1; i < str_.size(); ++i) 
-		os << '*' << str_[i];
+	for (string::size_type i = 1; i < str_.size(); ++i)
+		os << str_[i];
 }
 
 
 void MathStringInset::mathmlize(MathMLStream & os) const
 {
+/*
 	if (code_ == LM_TC_VAR)
 		os << "<mi> " << str_ << " </mi>";
 	else if (code_ == LM_TC_CONST)
@@ -105,14 +94,12 @@ void MathStringInset::mathmlize(MathMLStream & os) const
 	else if (code_ == LM_TC_RM || code_ == LM_TC_TEXTRM)
 		os << "<mtext> " << str_ <<  " </mtext>";
 	else
+*/
 		os << str_;
 }
 
 
 void MathStringInset::write(WriteStream & os) const
 {
-	if (math_font_name(code_)) 
-		os << '\\' << math_font_name(code_) << '{' << str_ << '}';
-	else 
-		os << str_;
+	os << str_;
 }