char_type const c = *cit;
docstring command(1, c);
try {
- if (c < 0x80 || Encodings::latexMathChar(c, mathmode, os.encoding(), command)) {
+ bool termination = false;
+ if (isASCII(c) ||
+ Encodings::latexMathChar(c, mathmode, os.encoding(), command, termination)) {
if (os.textMode()) {
if (in_forced_mode) {
// we were inside \lyxmathsym
os.textMode(false);
in_forced_mode = false;
}
- if (c >= 0x80 && os.textMode()) {
+ if (!isASCII(c) && os.textMode()) {
os << "\\ensuremath{";
os.textMode(false);
in_forced_mode = true;
}
- } else if (c < 0x80 && in_forced_mode) {
+ } else if (isASCII(c) && in_forced_mode) {
// we were inside \ensuremath
os << '}';
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]))
+ if (termination)
os.pendingSpace(true);
- } catch (EncodingException & e) {
+ } catch (EncodingException const & e) {
switch (os.output()) {
case WriteStream::wsDryrun: {
os << "<" << _("LyX Warning: ")