}
-void MacroData::expand(vector<MathData> const & args, MathData & to) const
+bool MacroData::expand(vector<MathData> const & args, MathData & to) const
{
updateData();
static InsetMathSqrt inset(0);
inset.setBuffer(const_cast<Buffer &>(*buffer_));
- // FIXME UNICODE
- asArray(display_.empty() ? definition_ : display_, inset.cell(0));
+ docstring const & definition(display_.empty() ? definition_ : display_);
+ asArray(definition, inset.cell(0));
//lyxerr << "MathData::expand: args: " << args << endl;
- //lyxerr << "MathData::expand: ar: " << inset.cell(0) << endl;
+ //LYXERR0("MathData::expand: ar: " << inset.cell(0));
for (DocIterator it = doc_iterator_begin(buffer_, &inset); it; it.forwardChar()) {
if (!it.nextInset())
continue;
it.cell().insert(it.pos(), args[n - 1]);
}
}
- //lyxerr << "MathData::expand: res: " << inset.cell(0) << endl;
+ //LYXERR0("MathData::expand: res: " << inset.cell(0));
to = inset.cell(0);
+ // If the result is equal to the definition then we either have a
+ // recursive loop, or the definition did not contain any macro in the
+ // first place.
+ return asString(to) != definition;
}
size_t numargs() const { updateData(); return numargs_; }
/// replace #1,#2,... by given MathAtom 0,1,.., _including_ the possible
/// optional argument
- void expand(std::vector<MathData> const & from, MathData & to) const;
+ /// \return whether anything was expanded
+ bool expand(std::vector<MathData> const & from, MathData & to) const;
/// number of optional arguments
size_t optionals() const;
///
void MathMacro::updateRepresentation(Cursor * cur, MacroContext const & mc,
UpdateType utype)
{
+ // block recursive calls (bug 8999)
if (isUpdating_)
return;
values[i].insert(0, MathAtom(proxy));
}
// expanding macro with the values
- macro_->expand(values, expanded_.cell(0));
- if (utype == OutputUpdate && !expanded_.cell(0).empty())
- expanded_.cell(0).updateMacros(cur, mc, utype);
+ // Only update the argument macros if anything was expanded, otherwise
+ // we would get an endless loop (bug 9140). UpdateLocker does not work
+ // in this case, since MacroData::expand() creates new MathMacro
+ // objects, so this would be a different recursion path than the one
+ // protected by UpdateLocker.
+ if (macro_->expand(values, expanded_.cell(0))) {
+ if (utype == OutputUpdate && !expanded_.cell(0).empty())
+ expanded_.cell(0).updateMacros(cur, mc, utype);
+ }
// get definition for list edit mode
docstring const & display = macro_->display();
asArray(display.empty() ? macro_->definition() : display, definition_);