X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathString.cpp;h=8aac4f38a8d4f723fa569391887d0fde7decb190;hb=5fdc577badb1cb133d6a0dc7d831bb1f82576adb;hp=ab4a13704ef65759e1c440ed79146021008999f5;hpb=f497296c30e6da2f97b16da8ad1c9e96feffb16b;p=lyx.git

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index ab4a13704e..8aac4f38a8 100644
--- a/src/mathed/InsetMathString.cpp
+++ b/src/mathed/InsetMathString.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,35 +11,40 @@
 #include <config.h>
 
 #include "InsetMathString.h"
-#include "MathStream.h"
+
+#include "MathFactory.h"
+#include "MathExtern.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
+#include "Encoding.h"
+#include "MetricsInfo.h"
 
-namespace lyx {
+#include "support/debug.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
+#include "support/lstrings.h"
+#include "support/textutils.h"
 
-using std::auto_ptr;
-using std::vector;
+using lyx::support::escape;
 
 
+namespace lyx {
+
 InsetMathString::InsetMathString(docstring const & s)
 	: str_(s)
 {}
 
 
-auto_ptr<InsetBase> InsetMathString::doClone() const
+Inset * InsetMathString::clone() const
 {
-	return auto_ptr<InsetBase>(new InsetMathString(*this));
+	return new InsetMathString(*this);
 }
 
 
-bool InsetMathString::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathString::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	mathed_string_dim(mi.base.font, str_, dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
 }
 
 
@@ -89,24 +94,16 @@ void InsetMathString::octave(OctaveStream & os) const
 }
 
 
-void InsetMathString::mathmlize(MathStream & os) const
+void InsetMathString::mathmlize(MathStream &) const
 {
-/*
-	if (code_ == LM_TC_VAR)
-		os << "<mi> " << str_ << " </mi>";
-	else if (code_ == LM_TC_CONST)
-		os << "<mn> " << str_ << " </mn>";
-	else if (code_ == LM_TC_RM || code_ == LM_TC_TEXTRM)
-		os << "<mtext> " << str_ <<  " </mtext>";
-	else
-*/
-		os << str_;
+	// useless, no doubt, but we should not be here
+	LATTEST(false);
 }
 
 
 void InsetMathString::write(WriteStream & os) const
 {
-	os << str_;
+	writeString(str_, os);
 }