X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathString.cpp;h=8aac4f38a8d4f723fa569391887d0fde7decb190;hb=02e82157ec583c3900e359de86be79fac6512387;hp=0dd17fe6d1498cc9cbcdd68e5888f0bf0a2edde5;hpb=b5dcdbc9606e04171bd089f90a34ad86edda60b8;p=lyx.git

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index 0dd17fe6d1..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,101 +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();
-
-	// We may already be inside an \ensuremath command.
-	bool in_forced_mode = os.pendingBrace();
-
-	// We will take care of matching braces.
-	os.pendingBrace(false);
-
-	while (cit != end) {
-		bool mathmode = in_forced_mode ? os.textMode() : !os.textMode();
-		char_type const c = *cit;
-		docstring command(1, c);
-		try {
-			if (c < 0x80 || Encodings::latexMathChar(c, mathmode, os.encoding(), command)) {
-				if (os.textMode()) {
-					if (in_forced_mode) {
-						// we were inside \lyxmathsym
-						os << '}';
-						os.textMode(false);
-						in_forced_mode = false;
-					}
-					if (c >= 0x80 && os.textMode()) {
-						os << "\\ensuremath{";
-						os.textMode(false);
-						in_forced_mode = true;
-					}
-				} else if (c < 0x80 && in_forced_mode) {
-					// we were inside \ensuremath
-					os << '}';
-					os.textMode(true);
-					in_forced_mode = false;
-				}
-			} else if (!os.textMode()) {
-					if (in_forced_mode) {
-						// we were inside \ensuremath
-						os << '}';
-						in_forced_mode = false;
-					} else {
-						os << "\\lyxmathsym{";
-						in_forced_mode = true;
-					}
-					os.textMode(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_forced_mode && os.textMode()) {
-		// We have to care for closing \lyxmathsym
-		os << '}';
-		os.textMode(false);
-	} else {
-		os.pendingBrace(in_forced_mode);
-	}
+	writeString(str_, os);
 }