X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathString.cpp;h=44aad43c805075d3176fa88d4fe670ba1e1222a0;hb=efaae780dbbe3685e26e040ed4255e5abf268106;hp=8b9db39c818facae13cab001d4dce3b7f6e6d0c2;hpb=89e7f60e1d1e9f8b20288703643c9bca820b393b;p=lyx.git

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index 8b9db39c81..44aad43c80 100644
--- a/src/mathed/InsetMathString.cpp
+++ b/src/mathed/InsetMathString.cpp
@@ -19,9 +19,12 @@
 
 #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 {
 
@@ -88,25 +91,17 @@ void InsetMathString::octave(OctaveStream & os) const
 }
 
 
-void InsetMathString::mathmlize(MathStream & os) const
+void InsetMathString::mathmlize(MathStream & /*os*/) 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
+	LASSERT(false, /* */);
 }
 
 
 void InsetMathString::write(WriteStream & os) const
 {
 	if (!os.latex() || os.lockedMode()) {
-		os << str_;
+		os << (os.asciiOnly() ? escape(str_) : str_);
 		return;
 	}
 
@@ -124,7 +119,9 @@ void InsetMathString::write(WriteStream & os) const
 		char_type const c = *cit;
 		docstring command(1, c);
 		try {
-			if (c < 0x80 || Encodings::latexMathChar(c, mathmode, os.encoding(), command)) {
+			bool termination = false;
+			if (isASCII(c) ||
+			    Encodings::latexMathChar(c, mathmode, os.encoding(), command, termination)) {
 				if (os.textMode()) {
 					if (in_forced_mode) {
 						// we were inside \lyxmathsym
@@ -132,12 +129,12 @@ void InsetMathString::write(WriteStream & os) const
 						os.textMode(false);
 						in_forced_mode = false;
 					}
-					if (c >= 0x80 && os.textMode()) {
+					if (!isASCII(c) && os.textMode()) {
 						os << "\\ensuremath{";
 						os.textMode(false);
 						in_forced_mode = true;
 					}
-				} else if (c < 0x80 && in_forced_mode) {
+				} else if (isASCII(c) && in_forced_mode) {
 					// we were inside \ensuremath
 					os << '}';
 					os.textMode(true);
@@ -157,10 +154,9 @@ void InsetMathString::write(WriteStream & os) const
 			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]))
+			if (termination)
 				os.pendingSpace(true);
-		} catch (EncodingException & e) {
+		} catch (EncodingException const & e) {
 			switch (os.output()) {
 			case WriteStream::wsDryrun: {
 				os << "<" << _("LyX Warning: ")
@@ -171,7 +167,7 @@ void InsetMathString::write(WriteStream & os) const
 			}
 			case WriteStream::wsPreview: {
 				// indicate the encoding error by a boxed '?'
-				os << "{\\fboxsep=1pt\\fbox{?}}";;
+				os << "{\\fboxsep=1pt\\fbox{?}}";
 				LYXERR0("Uncodable character" << " '"
 					<< docstring(1, e.failed_char)
 					<< "'");