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 d3fb9842413219bf95b842656374436a50d72cf2..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.
  */
@@ -118,10 +118,11 @@ void InsetMathString::write(WriteStream & os) const
        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 (in_forced_mode) {
                                                // we were inside \lyxmathsym
@@ -129,7 +130,7 @@ void InsetMathString::write(WriteStream & os) const
                                                os.textMode(false);
                                                in_forced_mode = false;
                                        }
-                                       if (c >= 0x80) {
+                                       if (c >= 0x80 && os.textMode()) {
                                                os << "\\ensuremath{";
                                                os.textMode(false);
                                                in_forced_mode = true;