fix off-by-two drawing error

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

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index 0599ef79dea557e74817023ae1a3b6e3b8a9872f..44b450787716b2e5b255a15d859bb265195a6e87 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,55 @@ 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;
+       // 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) {
                char_type const c = *cit;
                try {
-                       if (c < 0x80) {
-                               if (in_mathsym) {
+                       docstring command(1, c);
+                       if (c < 0x80 || Encodings::latexMathChar(c, 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 << "\\ensuremath{";
+                                               os.textMode(false);
+                                               in_forced_mode = true;
+                                       }
+                               } else if (c < 0x80 && in_forced_mode) {
+                                       // we were inside \ensuremath
                                        os << '}';
-                                       in_mathsym = false;
-                               }
-                               os << docstring(1, c);
-                       } else if (can_encode) {
-                               if (!in_mathsym) {
-                                       os << "\\mathsym{";
-                                       in_mathsym = true;
+                                       os.textMode(true);
+                                       in_forced_mode = false;
                                }
-                               os << encit->latexChar(c, true);
-                       } else {
-                               throw EncodingException(c);
+                       } 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
@@ -149,8 +172,14 @@ void InsetMathString::write(WriteStream & os) const
                }
                ++cit;
        }
-       if (in_mathsym)
+
+       if (in_forced_mode && os.textMode()) {
+               // We have to care for closing \lyxmathsym
                os << '}';
+               os.textMode(false);
+       } else {
+               os.pendingBrace(in_forced_mode);
+       }
 }