Improve the list of equations

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

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index d5b0d78864e9754c721c5b50956e9c147b998860..8aac4f38a8d4f723fa569391887d0fde7decb190 100644 (file)
--- a/src/mathed/InsetMathString.cpp
+++ b/src/mathed/InsetMathString.cpp
@@ -11,11 +11,14 @@
 #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"
@@ -91,103 +94,16 @@ void InsetMathString::octave(OctaveStream & os) const
 }
 
 
-void InsetMathString::mathmlize(MathStream & /*os*/) const
+void InsetMathString::mathmlize(MathStream &) const
 {
        // useless, no doubt, but we should not be here
-       LASSERT(false, /* */);
+       LATTEST(false);
 }
 
 
 void InsetMathString::write(WriteStream & os) const
 {
-       if (!os.latex() || os.lockedMode()) {
-               os << (os.asciiOnly() ? escape(str_) : 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) {
-                       switch (os.output()) {
-                       case WriteStream::wsDryrun: {
-                               os << "<" << _("LyX Warning: ")
-                                  << _("uncodable character") << " '";
-                               os << docstring(1, e.failed_char);
-                               os << "'>";
-                               break;
-                       }
-                       case WriteStream::wsPreview: {
-                               // indicate the encoding error by a boxed '?'
-                               os << "{\\fboxsep=1pt\\fbox{?}}";;
-                               LYXERR0("Uncodable character" << " '"
-                                       << docstring(1, e.failed_char)
-                                       << "'");
-                               break;
-                       }
-                       case WriteStream::wsDefault:
-                       default:
-                               // 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);
 }