Fix bug 5802 (http://bugzilla.lyx.org/show_bug.cgi?id=5802)

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

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index 44b450787716b2e5b255a15d859bb265195a6e87..552124a1435f1c7346a8788b8fabdd16b331e812 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.
  */
@@ -114,14 +114,18 @@ void InsetMathString::write(WriteStream & os) const
        // We may already be inside an \ensuremath command.
        bool in_forced_mode = os.pendingBrace();
 
+       // Track italic shape inside \lyxmathsym
+       bool mathalpha = false;
+
        // 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, os.encoding(), command)) {
+                       if (c < 0x80 || Encodings::latexMathChar(c, mathmode, os.encoding(), command)) {
                                if (os.textMode()) {
                                        if (in_forced_mode) {
                                                // we were inside \lyxmathsym
@@ -129,7 +133,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;
@@ -146,10 +150,22 @@ void InsetMathString::write(WriteStream & os) const
                                                os << '}';
                                                in_forced_mode = false;
                                        } else {
-                                               os << "\\lyxmathsym{";
+                                               mathalpha = Encodings::isMathAlpha(c);
+                                               if (mathalpha)
+                                                       os << "\\lyxmathsym*{";
+                                               else
+                                                       os << "\\lyxmathsym{";
                                                in_forced_mode = true;
                                        }
                                        os.textMode(true);
+                       } else if (in_forced_mode && mathalpha != Encodings::isMathAlpha(c)) {
+                               // we are already inside \lyxmathsym but
+                               // have to change the output shape
+                               mathalpha = !mathalpha;
+                               if (mathalpha)
+                                       os << "}\\lyxmathsym*{";
+                               else
+                                       os << "}\\lyxmathsym{";
                        }
                        os << command;
                        // We may need a space if the command contains a macro