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

Check encodability of math user macro names (#11855)

Browse Source 
(cherry picked from commit 14b108fc22)
This commit is contained in:
Juergen Spitzmueller 2022-12-02 11:23:32 +01:00
parent 1b09fd459c
commit 8900b5a3aa
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/mathed/InsetMathMacro.cpp
View File

@ -26,6 +26,7 @@
#include "BufferView.h"
#include "CoordCache.h"
#include "Cursor.h"
#include "Encoding.h"
#include "FuncStatus.h"
#include "FuncRequest.h"
#include "LaTeXFeatures.h"
@ -33,6 +34,7 @@
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "frontends/alert.h"
#include "frontends/Painter.h"
#include "support/debug.h"
@ -1074,10 +1076,53 @@ void InsetMathMacro::write(WriteStream & os) const
mode_type mode = currentMode();
MathEnsurer ensurer(os, mode == MATH_MODE, true, mode == TEXT_MODE);
// Check if the macro name is encodable. Otherwise we might crash (#11855).
docstring const name_in = name();
docstring name_recoded;
docstring uncodable;
for (char_type c : name_in) {
if (!os.encoding())
break;
if (os.encoding()->encodable(c))
name_recoded += c;
else {
switch (os.output()) {
case WriteStream::wsDryrun: {
os << "<" << _("LyX Warning: ")
<< _("uncodable character") << " '";
os << docstring(1, c);
os << "'>";
break;
}
case WriteStream::wsPreview: {
// indicate the encoding error by a boxed '?'
os << "{\\fboxsep=1pt\\fbox{?}}";
LYXERR0("Uncodable character" << " '"
<< docstring(1, c)
<< "'");
break;
}
case WriteStream::wsDefault:
default:
// record for error message
uncodable += c;
break;
}
}
}
if (!uncodable.empty()) {
frontend::Alert::warning(
_("Uncodable characters in math macro"),
support::bformat(_("The macro name '%1$s' contains a character.\n"
"that is not encodable in the current encoding (%2$s).\n"
"Please fix this macro."), name_in, uncodable));
}
// non-normal mode
if (d->displayMode_ != DISPLAY_NORMAL) {
os << "\\" << name();
if (name().size() != 1 || isAlphaASCII(name()[0]))
os << "\\" << name_recoded;
if (name_recoded.size() != 1 || isAlphaASCII(name_recoded[0]))
os.pendingSpace(true);
return;
}
@ -1090,7 +1135,7 @@ void InsetMathMacro::write(WriteStream & os) const
if (os.fragile())
os << "\\protect";
os << "\\" << name();
os << "\\" << name_recoded;
bool first = true;
// Optional arguments:

2
status.23x
View File

@ -83,6 +83,8 @@ What's new
- Fix validating a macro definitions (bug 12524).
- Fix crashing due to uncodable character in math macro name (bug 11855).
* USER INTERFACE