}
Cursor & cur = mi.base.bv->cursor();
- const_cast<MathData*>(this)->updateMacros(&cur, mi.macrocontext);
+ const_cast<MathData*>(this)->updateMacros(&cur, mi.macrocontext, InternalUpdate);
DocIterator const & inlineCompletionPos = mi.base.bv->inlineCompletionPos();
MathData const * inlineCompletionData = 0;
}
-void MathData::updateMacros(Cursor * cur, MacroContext const & mc)
+void MathData::updateBuffer(ParIterator const & it, UpdateType utype)
{
+ // pass down
+ for (size_t i = 0, n = size(); i != n; ++i) {
+ MathAtom & at = operator[](i);
+ at.nucleus()->updateBuffer(it, utype);
+ }
+}
+
+
+void MathData::updateMacros(Cursor * cur, MacroContext const & mc,
+ UpdateType utype)
+{
+ // If we are editing a macro, we cannot update it immediately,
+ // otherwise wrong undo steps will be recorded (bug 6208).
+ InsetMath const * inmath = cur ? cur->inset().asInsetMath() : 0;
+ MathMacro const * inmacro = inmath ? inmath->asMacro() : 0;
+ docstring const edited_name = inmacro ? inmacro->name() : docstring();
+
// go over the array and look for macros
for (size_t i = 0; i < size(); ++i) {
MathMacro * macroInset = operator[](i).nucleus()->asMacro();
- if (!macroInset || macroInset->name_[0] == '^'
- || macroInset->name_[0] == '_')
+ if (!macroInset || macroInset->name_.empty()
+ || macroInset->name_[0] == '^'
+ || macroInset->name_[0] == '_'
+ || (macroInset->name() == edited_name
+ && macroInset->displayMode() ==
+ MathMacro::DISPLAY_UNFOLDED))
continue;
// get macro
|| newDisplayMode == MathMacro::DISPLAY_UNFOLDED)) {
detachMacroParameters(cur, i);
+ // FIXME: proper anchor handling, this removes the selection
+ if (cur)
+ cur->clearSelection();
}
// the macro could have been copied while resizing this
if (inset->asScriptInset())
inset = inset->asScriptInset()->nuc()[0].nucleus();
LASSERT(inset->asMacro(), /**/);
- inset->asMacro()->updateRepresentation();
+ inset->asMacro()->updateRepresentation(cur, mc, utype);
}
}
-void MathData::detachMacroParameters(Cursor * cur, const size_type macroPos)
+void MathData::detachMacroParameters(DocIterator * cur, const size_type macroPos)
{
MathMacro * macroInset = operator[](macroPos).nucleus()->asMacro();
- Buffer * buf = cur->buffer();
// detach all arguments
vector<MathData> detachedArgs;
for (size_t q = 0; q < arg.size(); ++q) {
if (arg[q]->getChar() == ']') {
// put brace
- brace = new InsetMathBrace(buf);
+ brace = new InsetMathBrace(buffer_);
break;
}
}
++(*cur)[curMacroSlice - 1].pos();
}
- if (cur) {
- // FIXME: proper anchor handling, this removes the selection
- cur->clearSelection();
+ if (cur)
cur->updateInsets(&cur->bottom().inset());
- }
}
size_t p = macroPos + 1;
vector<MathData> detachedArgs;
MathAtom scriptToPutAround;
-
+
// find cursor slice again of this MathData
int thisSlice = -1;
if (cur)
int thisPos = -1;
if (thisSlice != -1)
thisPos = (*cur)[thisSlice].pos();
-
+
// find arguments behind the macro
if (!interactiveInit) {
collectOptionalParameters(cur, macroOptionals, detachedArgs, p,
}
collectParameters(cur, macroNumArgs, detachedArgs, p,
scriptToPutAround, macroPos, thisPos, thisSlice, appetite);
-
+
// attach arguments back to macro inset
macroInset->attachArguments(detachedArgs, macroNumArgs, macroOptionals);
-
+
// found tail script? E.g. \foo{a}b^x
if (scriptToPutAround.nucleus()) {
+ InsetMathScript * scriptInset =
+ scriptToPutAround.nucleus()->asScriptInset();
+ // In the math parser we remove empty braces in the base
+ // of a script inset, but we have to restore them here.
+ if (scriptInset->nuc().empty()) {
+ MathData ar;
+ scriptInset->nuc().push_back(
+ MathAtom(new InsetMathBrace(ar)));
+ }
// put macro into a script inset
- scriptToPutAround.nucleus()->asScriptInset()->nuc()[0]
- = operator[](macroPos);
+ scriptInset->nuc()[0] = operator[](macroPos);
operator[](macroPos) = scriptToPutAround;
// go into the script inset nucleus
if (cur && thisPos == int(macroPos))
cur->append(0, 0);
-
+
// get pointer to "deep" copied macro inset
- InsetMathScript * scriptInset
- = operator[](macroPos).nucleus()->asScriptInset();
+ scriptInset = operator[](macroPos).nucleus()->asScriptInset();
macroInset = scriptInset->nuc()[0].nucleus()->asMacro();
}
-
+
// remove them from the MathData
erase(begin() + macroPos + 1, begin() + p);
// fix cursor if right of p
if (thisPos >= int(p))
(*cur)[thisSlice].pos() -= p - (macroPos + 1);
-
+
// was the macro inset just inserted interactively and was now folded
// and the cursor is just behind?
if ((*cur)[thisSlice].pos() == int(macroPos + 1)