mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-10 20:04:46 +00:00
* cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23451 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
8aac28367e
commit
cf15bd840b
@ -283,7 +283,7 @@ void MathMacro::updateMacro(MacroContext const & mc)
|
||||
}
|
||||
|
||||
|
||||
void MathMacro::updateRepresentation(Cursor const * bvCur)
|
||||
void MathMacro::updateRepresentation()
|
||||
{
|
||||
// known macro?
|
||||
if (macro_ == 0)
|
||||
@ -297,30 +297,30 @@ void MathMacro::updateRepresentation(Cursor const * bvCur)
|
||||
return;
|
||||
|
||||
// macro changed?
|
||||
if (needsUpdate_) {
|
||||
needsUpdate_ = false;
|
||||
|
||||
// get default values of macro
|
||||
vector<docstring> const & defaults = macro_->defaults();
|
||||
|
||||
// create MathMacroArgumentValue objects pointing to the cells of the macro
|
||||
vector<MathData> values(nargs());
|
||||
for (size_t i = 0; i < nargs(); ++i) {
|
||||
ArgumentProxy * proxy;
|
||||
if (i < defaults.size())
|
||||
proxy = new ArgumentProxy(*this, i, defaults[i]);
|
||||
else
|
||||
proxy = new ArgumentProxy(*this, i);
|
||||
values[i].insert(0, MathAtom(proxy));
|
||||
}
|
||||
|
||||
// expanding macro with the values
|
||||
macro_->expand(values, expanded_.cell(0));
|
||||
|
||||
// get definition for list edit mode
|
||||
docstring const & display = macro_->display();
|
||||
asArray(display.empty() ? macro_->definition() : display, definition_);
|
||||
if (!needsUpdate_)
|
||||
return;
|
||||
|
||||
needsUpdate_ = false;
|
||||
|
||||
// get default values of macro
|
||||
vector<docstring> const & defaults = macro_->defaults();
|
||||
|
||||
// create MathMacroArgumentValue objects pointing to the cells of the macro
|
||||
vector<MathData> values(nargs());
|
||||
for (size_t i = 0; i < nargs(); ++i) {
|
||||
ArgumentProxy * proxy;
|
||||
if (i < defaults.size())
|
||||
proxy = new ArgumentProxy(*this, i, defaults[i]);
|
||||
else
|
||||
proxy = new ArgumentProxy(*this, i);
|
||||
values[i].insert(0, MathAtom(proxy));
|
||||
}
|
||||
|
||||
// expanding macro with the values
|
||||
macro_->expand(values, expanded_.cell(0));
|
||||
// get definition for list edit mode
|
||||
docstring const & display = macro_->display();
|
||||
asArray(display.empty() ? macro_->definition() : display, definition_);
|
||||
}
|
||||
|
||||
|
||||
|
@ -133,7 +133,7 @@ protected:
|
||||
/// update macro definition
|
||||
void updateMacro(MacroContext const & mc);
|
||||
/// check if macro definition changed, argument changed etc. and adapt
|
||||
void updateRepresentation(Cursor const * bvCur);
|
||||
void updateRepresentation();
|
||||
/// empty macro, put arguments into args, possibly strip arity-attachedArgsNum_ empty ones.
|
||||
/// Includes the optional arguments.
|
||||
void detachArguments(std::vector<MathData> & args, bool strip);
|
||||
|
Loading…
Reference in New Issue
Block a user