A little cleanup of the layout files.

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

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index bfa17019b0a88f3d3904cdb2e621904e33d37137..5dcd595d858a0d97e018df7389a4246bd9eb922e 100644 (file)
--- a/src/mathed/InsetMathString.cpp
+++ b/src/mathed/InsetMathString.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -111,35 +111,46 @@ void InsetMathString::write(WriteStream & os) const
        docstring::const_iterator cit = str_.begin();
        docstring::const_iterator end = str_.end();
 
-       bool in_forced_mode = 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) {
+               bool mathmode = in_forced_mode ? os.textMode() : !os.textMode();
                char_type const c = *cit;
+               docstring command(1, c);
                try {
-                       docstring command(1, c);
-                       if (c < 0x80 || Encodings::latexMathChar(c, command)) {
+                       if (c < 0x80 || Encodings::latexMathChar(c, mathmode, os.encoding(), command)) {
                                if (os.textMode()) {
-                                       if (c < 0x80 && in_forced_mode) {
+                                       if (in_forced_mode) {
+                                               // we were inside \lyxmathsym
                                                os << '}';
+                                               os.textMode(false);
                                                in_forced_mode = false;
                                        }
-                                       if (c >= 0x80 && !in_forced_mode) {
+                                       if (c >= 0x80 && os.textMode()) {
                                                os << "\\ensuremath{";
+                                               os.textMode(false);
                                                in_forced_mode = true;
                                        }
-                               } else if (in_forced_mode) {
+                               } else if (c < 0x80 && in_forced_mode) {
+                                       // we were inside \ensuremath
                                        os << '}';
+                                       os.textMode(true);
                                        in_forced_mode = false;
                                }
-                       } else {
-                               if (os.textMode()) {
+                       } else if (!os.textMode()) {
                                        if (in_forced_mode) {
+                                               // we were inside \ensuremath
                                                os << '}';
                                                in_forced_mode = false;
+                                       } else {
+                                               os << "\\lyxmathsym{";
+                                               in_forced_mode = true;
                                        }
-                               } else if (!in_forced_mode) {
-                                       os << "\\lyxmathsym{";
-                                       in_forced_mode = true;
-                               }
+                                       os.textMode(true);
                        }
                        os << command;
                        // We may need a space if the command contains a macro
@@ -162,8 +173,14 @@ void InsetMathString::write(WriteStream & os) const
                }
                ++cit;
        }
-       if (in_forced_mode)
+
+       if (in_forced_mode && os.textMode()) {
+               // We have to care for closing \lyxmathsym
                os << '}';
+               os.textMode(false);
+       } else {
+               os.pendingBrace(in_forced_mode);
+       }
 }