Preserve \inputencoding value when switching to non-TeX fonts.

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

diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index 24f2672b8cd537f981e087de938540d7fd8d25e9..504fab717bee958d43df5b7802ee5277e86ef03c 100644 (file)
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -1431,7 +1431,7 @@ void writeString(docstring const & s, WriteStream & os)
                docstring cmd;
                for (char_type c : s) {
                        try {
-                               Encodings::latexMathChar(c, false, os.encoding(), cmd, space);
+                               Encodings::latexMathChar(c, true, os.encoding(), cmd, space);
                                os << cmd;
                                os.pendingSpace(space);
                        } catch (EncodingException const & e) {
@@ -1461,18 +1461,14 @@ void writeString(docstring const & s, WriteStream & os)
                return;
        }
 
-       docstring::const_iterator cit = s.begin();
-       docstring::const_iterator end = s.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) {
+       for (char_type const c : s) {
                bool mathmode = in_forced_mode ? os.textMode() : !os.textMode();
-               char_type const c = *cit;
                docstring command(1, c);
                try {
                        bool termination = false;
@@ -1535,7 +1531,6 @@ void writeString(docstring const & s, WriteStream & os)
                                throw(e);
                        }
                }
-               ++cit;
        }
 
        if (in_forced_mode && os.textMode()) {