#include "support/debug.h"
#include "support/gettext.h"
+#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/textutils.h"
+using lyx::support::escape;
+
namespace lyx {
}
-void InsetMathString::mathmlize(MathStream & os) const
+void InsetMathString::mathmlize(MathStream & /*os*/) const
{
-/*
- if (code_ == LM_TC_VAR)
- os << "<mi> " << str_ << " </mi>";
- else if (code_ == LM_TC_CONST)
- os << "<mn> " << str_ << " </mn>";
- else if (code_ == LM_TC_RM || code_ == LM_TC_TEXTRM)
- os << "<mtext> " << str_ << " </mtext>";
- else
-*/
- os << str_;
+ // useless, no doubt, but we should not be here
+ LASSERT(false, /* */);
}
void InsetMathString::write(WriteStream & os) const
{
if (!os.latex() || os.lockedMode()) {
- os << str_;
+ os << (os.asciiOnly() ? escape(str_) : str_);
return;
}
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: ")
}
case WriteStream::wsPreview: {
// indicate the encoding error by a boxed '?'
- os << "{\\fboxsep=1pt\\fbox{?}}";;
+ os << "{\\fboxsep=1pt\\fbox{?}}";
LYXERR0("Uncodable character" << " '"
<< docstring(1, e.failed_char)
<< "'");