Substack support for XHTML.

[lyx.git] / src / mathed / InsetMathString.cpp

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index 8b9db39c818facae13cab001d4dce3b7f6e6d0c2..98b641a72655d922a37acce871b696727d5e8aab 100644 (file)
--- 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;
        }
 
@@ -171,7 +166,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)
                                        << "'");