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

Correctly protect macros with optionals inserted in an optional argument

Browse Source 
The trick turns out to be inserting in braces the whole optional
argument, rather than the single macro.

See #11552 for the long history.
This commit is contained in:
Enrico Forestieri 2019-04-26 15:30:08 +02:00
parent e763f90244
commit 2731c5dc55
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mathed/InsetMathMacro.cpp
View File

@ -1101,14 +1101,24 @@ void InsetMathMacro::write(WriteStream & os) const
// For correctly parsing it when a document is reloaded, we
// need to enclose an optional argument in braces if it starts
// with a script inset with empty nucleus or ends with a
// delimiter-size-modifier macro (see #10497 and #11346)
// delimiter-size-modifier macro (see #10497 and #11346).
// We also need to do that when the optional argument
// contains macros with optionals.
bool braced = false;
size_type last = cell(i).size() - 1;
if (cell(i).size() && cell(i)[last].nucleus()->asUnknownInset()) {
latexkeys const * l = in_word_set(cell(i)[last].nucleus()->name());
if (cell(i).size() && cell(i)[last]->asUnknownInset()) {
latexkeys const * l = in_word_set(cell(i)[last]->name());
braced = (l && l->inset == "big");
} else if (cell(i).size() && cell(i)[0].nucleus()->asScriptInset()) {
braced = cell(i)[0].nucleus()->asScriptInset()->nuc().empty();
} else if (cell(i).size() && cell(i)[0]->asScriptInset()) {
braced = cell(i)[0]->asScriptInset()->nuc().empty();
} else {
for (size_type j = 0; j < cell(i).size(); ++j) {
InsetMathMacro const * ma = cell(i)[j]->asMacro();
if (ma && ma->optionals()) {
braced = true;
break;
}
}
}
if (braced)
os << "[{" << cell(i) << "}]";