Produce a cleaner latex output by avoiding \lyxmathsym when in text mode

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

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index 0599ef79dea557e74817023ae1a3b6e3b8a9872f..bfa17019b0a88f3d3904cdb2e621904e33d37137 100644 (file)
--- a/src/mathed/InsetMathString.cpp
+++ b/src/mathed/InsetMathString.cpp
@@ -17,6 +17,8 @@
 #include "Encoding.h"
 
 #include "support/gettext.h"
+#include "support/lstrings.h"
+#include "support/textutils.h"
 
 
 namespace lyx {
@@ -106,34 +108,45 @@ void InsetMathString::write(WriteStream & os) const
                return;
        }
 
-       // We need the latex macros defined in the unicodesymbols file.
-       // As they do not depend on the encoding, simply use the first
-       // available encoding.
-       Encodings::const_iterator encit = encodings.begin();
-       bool can_encode = encit != encodings.end();
-
        docstring::const_iterator cit = str_.begin();
        docstring::const_iterator end = str_.end();
 
-       bool in_mathsym = false;
+       bool in_forced_mode = false;
        while (cit != end) {
                char_type const c = *cit;
                try {
-                       if (c < 0x80) {
-                               if (in_mathsym) {
+                       docstring command(1, c);
+                       if (c < 0x80 || Encodings::latexMathChar(c, command)) {
+                               if (os.textMode()) {
+                                       if (c < 0x80 && in_forced_mode) {
+                                               os << '}';
+                                               in_forced_mode = false;
+                                       }
+                                       if (c >= 0x80 && !in_forced_mode) {
+                                               os << "\\ensuremath{";
+                                               in_forced_mode = true;
+                                       }
+                               } else if (in_forced_mode) {
                                        os << '}';
-                                       in_mathsym = false;
-                               }
-                               os << docstring(1, c);
-                       } else if (can_encode) {
-                               if (!in_mathsym) {
-                                       os << "\\mathsym{";
-                                       in_mathsym = true;
+                                       in_forced_mode = false;
                                }
-                               os << encit->latexChar(c, true);
                        } else {
-                               throw EncodingException(c);
+                               if (os.textMode()) {
+                                       if (in_forced_mode) {
+                                               os << '}';
+                                               in_forced_mode = false;
+                                       }
+                               } else if (!in_forced_mode) {
+                                       os << "\\lyxmathsym{";
+                                       in_forced_mode = 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
@@ -149,7 +162,7 @@ void InsetMathString::write(WriteStream & os) const
                }
                ++cit;
        }
-       if (in_mathsym)
+       if (in_forced_mode)
                os << '}';
 }