anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check character encodability with pass-thru in command insets

Browse Source 
Fixes: #11584
This commit is contained in:
Juergen Spitzmueller 2019-05-21 12:59:18 +02:00
parent 906c2ae317
commit ebc2b1295a
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/insets/InsetCommandParams.cpp
View File

@ -490,8 +490,41 @@ docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
}
else if (handling & ParamInfo::HANDLING_ESCAPE)
result = escape(command);
else if (handling & ParamInfo::HANDLING_NONE)
result = command;
else if (handling & ParamInfo::HANDLING_NONE) {
// we can only output characters covered by the current
// encoding!
docstring uncodable;
for (size_type i = 0 ; i < command.size() ; ++i) {
char_type c = command[i];
try {
if (runparams.encoding->encodable(c))
result += c;
else if (runparams.dryrun) {
result += "<" + _("LyX Warning: ")
+ _("uncodable character") + " '";
result += docstring(1, c);
result += "'>";
} else
uncodable += c;
} catch (EncodingException & /* e */) {
if (runparams.dryrun) {
result += "<" + _("LyX Warning: ")
+ _("uncodable character") + " '";
result += docstring(1, c);
result += "'>";
} else
uncodable += c;
}
}
if (!uncodable.empty() && !runparams.silent) {
// issue a warning about omitted characters
// FIXME: should be passed to the error dialog
frontend::Alert::warning(_("Uncodable characters in nomenclature inset"),
bformat(_("The following characters in one of the nomenclature listings are\n"
"not representable in the current encoding and have been omitted:\n%1$s."),
uncodable));
}
}
// INDEX_ESCAPE is independent of the others
if (handling & ParamInfo::HANDLING_INDEX_ESCAPE) {
// Now escape special commands