#include "Encoding.h"
#include "support/gettext.h"
+#include "support/lstrings.h"
+#include "support/textutils.h"
namespace lyx {
docstring::const_iterator cit = str_.begin();
docstring::const_iterator end = str_.end();
- bool in_lyxmathsym = 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) {
char_type const c = *cit;
try {
docstring command(1, c);
- if (c < 0x80 || Encodings::latexMathChar(c, command)) {
- if (in_lyxmathsym) {
+ if (c < 0x80 || Encodings::latexMathChar(c, os.encoding(), command)) {
+ if (os.textMode()) {
+ if (in_forced_mode) {
+ // we were inside \lyxmathsym
+ os << '}';
+ os.textMode(false);
+ in_forced_mode = false;
+ }
+ if (c >= 0x80) {
+ os << "\\ensuremath{";
+ os.textMode(false);
+ in_forced_mode = true;
+ }
+ } else if (c < 0x80 && in_forced_mode) {
+ // we were inside \ensuremath
os << '}';
- in_lyxmathsym = false;
- }
- os << command;
- } else {
- if (!in_lyxmathsym) {
- os << "\\lyxmathsym{";
- in_lyxmathsym = true;
+ os.textMode(true);
+ in_forced_mode = false;
}
- os << command;
+ } else if (!os.textMode()) {
+ if (in_forced_mode) {
+ // we were inside \ensuremath
+ os << '}';
+ in_forced_mode = false;
+ } else {
+ os << "\\lyxmathsym{";
+ in_forced_mode = true;
+ }
+ os.textMode(true);
}
+ os << command;
+ // We may need a space if the command contains a macro
+ // and the last char is ASCII.
+ if (lyx::support::contains(command, '\\')
+ && isAlphaASCII(command[command.size() - 1]))
+ os.pendingSpace(true);
} catch (EncodingException & e) {
if (os.dryrun()) {
// FIXME: this is OK for View->Source
}
++cit;
}
- if (in_lyxmathsym)
+
+ if (in_forced_mode && os.textMode()) {
+ // We have to care for closing \lyxmathsym
os << '}';
+ os.textMode(false);
+ } else {
+ os.pendingBrace(in_forced_mode);
+ }
}