anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 06:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Supplement the fix for bug #11586

Browse Source 
The mhchem \ce inset is a text mode environment but allows entering
spaces and mathmode commands. However, even if it doesn't allow unicode
symbols, LyX allows entering them (by copy/paste, for example), causing
latex errors. As a unicode symbol may have a proper latex representation
from the unicodesymbols file, use it instead of the bare symbol. Here, we
don't care about the mode because both text and math mode should be allowed.
For example, the ⟶ symbol is not recognized but its latex representation
(\longrightarrow) is fine. Of course, there may be symbols that are
not recognized anyway, but this is better because they cause explicit
errors from mhchem instead of cryptic iconv errors in case they cannot
be represented in the document encoding.
This commit is contained in:
Enrico Forestieri 2019-05-26 09:56:34 +02:00
parent bda3b799c5
commit 15f4fa452d
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/mathed/MathExtern.cpp
View File

@ -1421,11 +1421,46 @@ void write(MathData const & dat, WriteStream & wi)
void writeString(docstring const & s, WriteStream & os)
{
if (!os.latex() || os.lockedMode()) {
if (!os.latex()) {
os << (os.asciiOnly() ? escape(s) : s);
return;
}
if (os.lockedMode()) {
bool space;
docstring cmd;
for (char_type c : s) {
try {
Encodings::latexMathChar(c, false, os.encoding(), cmd, space);
os << cmd;
os.pendingSpace(space);
} catch (EncodingException const & e) {
switch (os.output()) {
case WriteStream::wsDryrun: {
os << "<" << _("LyX Warning: ")
<< _("uncodable character") << " '";
os << docstring(1, e.failed_char);
os << "'>";
break;
}
case WriteStream::wsPreview: {
// indicate the encoding error by a boxed '?'
os << "{\\fboxsep=1pt\\fbox{?}}";
LYXERR0("Uncodable character" << " '"
<< docstring(1, e.failed_char)
<< "'");
break;
}
case WriteStream::wsDefault:
default:
// throw again
throw(e);
}
}
}
return;
}
docstring::const_iterator cit = s.begin();
docstring::const_iterator end = s.end();