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

Check class options for uncodable glyphs

Browse Source 
Fixes #11865
This commit is contained in:
Juergen Spitzmueller 2020-05-15 09:50:25 +02:00
parent d4b64d81fe
commit 11dc817e9d
1 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/BufferParams.cpp
View File

@ -1725,11 +1725,51 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
clsoptions << options << ',';
}
string strOptions(clsoptions.str());
docstring const strOptions = from_utf8(clsoptions.str());
if (!strOptions.empty()) {
strOptions = rtrim(strOptions, ",");
// FIXME UNICODE
os << '[' << from_utf8(strOptions) << ']';
// Check if class options contain uncodable glyphs
docstring uncodable_glyphs;
docstring options_encodable;
Encoding const * const enc = features.runparams().encoding;
if (enc) {
for (size_t n = 0; n < strOptions.size(); ++n) {
char_type c = strOptions[n];
if (!enc->encodable(c)) {
docstring const glyph(1, c);
LYXERR0("Uncodable character '"
<< glyph
<< "' in class options!");
uncodable_glyphs += glyph;
if (features.runparams().dryrun) {
options_encodable += "<" + _("LyX Warning: ")
+ _("uncodable character") + " '";
options_encodable += c;
options_encodable += "'>";
}
} else
options_encodable += c;
}
} else
options_encodable = strOptions;
// On BUFFER_VIEW|UPDATE, warn user if we found uncodable glyphs
if (!features.runparams().dryrun && !uncodable_glyphs.empty()) {
frontend::Alert::warning(
_("Uncodable character in class options"),
support::bformat(
_("The class options of your document contain glyphs "
"that are unknown in the current document encoding "
"(namely %1$s).\nThese glyphs are omitted "
" from the output, which may result in "
"incomplete output."
"\n\nPlease select an appropriate "
"document encoding\n"
"(such as utf8) or change the "
"class options accordingly."),
uncodable_glyphs));
}
options_encodable = rtrim(options_encodable, ",");
os << '[' << options_encodable << ']';
}
os << '{' << from_ascii(tclass.latexname()) << "}\n";