* 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.
*/
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();
+
+ // 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, 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 {
+ mathalpha = Encodings::isMathAlpha(c);
+ if (mathalpha)
+ os << "\\lyxmathsym*{";
+ else
+ os << "\\lyxmathsym{";
+ in_forced_mode = true;
}
- } else if (!in_forced_mode) {
- 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
}
++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);
+ }
}