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

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index a8eb1067c3..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,15 +11,23 @@
 #include <config.h>
 
 #include "InsetMathString.h"
+
+#include "MathFactory.h"
+#include "MathExtern.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
 #include "Encoding.h"
+#include "MetricsInfo.h"
 
+#include "support/debug.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
+using lyx::support::escape;
+
 
 namespace lyx {
 
@@ -86,71 +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
 {
-	if (!os.latex()) {
-		os << str_;
-		return;
-	}
-
-	docstring::const_iterator cit = str_.begin();
-	docstring::const_iterator end = str_.end();
-
-	bool in_lyxmathsym = false;
-	while (cit != end) {
-		char_type const c = *cit;
-		try {
-			docstring command(1, c);
-			if (c < 0x80 || Encodings::latexMathChar(c, command)) {
-				if (in_lyxmathsym) {
-					os << '}';
-					in_lyxmathsym = false;
-				}
-				os << command;
-			} else {
-				if (!in_lyxmathsym) {
-					os << "\\lyxmathsym{";
-					in_lyxmathsym = true;
-				}
-				os << command;
-			}
-			// We may need a space if the command contains a macro
-			// and the last char is ASCII.
-			if (lyx::support::contains(command, '\\')
-			    && isAlphaASCII(command[command.size() - 1]))
-				os.pendingSpace(true);
-		} catch (EncodingException & e) {
-			if (os.dryrun()) {
-				// FIXME: this is OK for View->Source
-				// but math preview will likely fail.
-				os << "<" << _("LyX Warning: ")
-				   << _("uncodable character") << " '";
-				os << docstring(1, e.failed_char);
-				os << "'>";
-			} else {
-				// throw again
-				throw(e);
-			}
-		}
-		++cit;
-	}
-	if (in_lyxmathsym)
-		os << '}';
+	writeString(str_, os);
 }