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

Always validate a macro definition

Browse Source 
If a user-defined macro appears only in the argument of another
macro its definition is not validated and this leads to errors.

Fixes bug #12524.
This commit is contained in:
Enrico Forestieri 2022-05-31 22:13:52 +02:00
parent 5f8ba9387d
commit 0aad230154
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mathed/InsetMathMacro.cpp
View File

@ -967,23 +967,28 @@ void InsetMathMacro::validate(LaTeXFeatures & features) const
features.require(data->required());
}
if (name() == "binom")
features.require("binom");
// validate the cells and the definition
if (displayMode() == DISPLAY_NORMAL) {
// Don't update requirements if the macro comes from
// the symbols file and has not been redefined.
MathWordList const & words = mathedWordList();
MathWordList::const_iterator it = words.find(name());
MacroNameSet macros;
buffer().listMacroNames(macros);
if (it == words.end() || it->second.inset != "macro"
|| macros.find(name()) != macros.end()) {
d->definition_.validate(features);
// Validate the cells and the definition.
// However, don't validate the definition if the macro is
// from the symbols file and has not been redefined, because
// in this case the definition is only used for screen display.
MathWordList const & words = mathedWordList();
MathWordList::const_iterator it = words.find(name());
MacroNameSet macros;
buffer().listMacroNames(macros);
if (it == words.end() || it->second.inset != "macro"
|| macros.find(name()) != macros.end()) {
if (displayMode() == DISPLAY_NORMAL) {
d->definition_.validate(features);
} else if (displayMode() == DISPLAY_INIT) {
MathData ar(const_cast<Buffer *>(&buffer()));
MacroData const * data = buffer().getMacro(name());
if (data) {
asArray(data->definition(), ar);
ar.validate(features);
}
}
InsetMathNest::validate(features);
}
InsetMathNest::validate(features);
}