Fix regression of 18779013 for \smash

[lyx.git] / src / mathed / MathMacroTemplate.cpp

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index f6421c6c48df5218f2499c5ea330f8769a3cafec..53cec03f740a9d84efad953d48192a6a910bc900 100644 (file)
--- a/src/mathed/MathMacroTemplate.cpp
+++ b/src/mathed/MathMacroTemplate.cpp
@@ -47,6 +47,7 @@
 #include "support/docstream.h"
 #include "support/lstrings.h"
 
+#include <set>
 #include <sstream>
 
 using namespace std;
@@ -464,7 +465,7 @@ docstring MathMacroTemplate::name() const
 }
 
 
-void MathMacroTemplate::updateToContext(MacroContext const & mc) const
+void MathMacroTemplate::updateToContext(MacroContext const & mc)
 {
        redefinition_ = mc.get(name()) != 0;
 }
@@ -550,13 +551,9 @@ void MathMacroTemplate::metrics(MetricsInfo & mi, Dimension & dim) const
 
        // valid macro?
        MacroData const * macro = 0;
-       if (validName()) {
+       if (validName())
                macro = mi.macrocontext.get(name());
 
-               // updateToContext() - avoids another lookup
-               redefinition_ = macro != 0;
-       }
-
        // update look?
        int argsInDef = maxArgumentInDefinition();
        if (lookOutdated_ || argsInDef != argsInLook_) {
@@ -623,10 +620,13 @@ void MathMacroTemplate::edit(Cursor & cur, bool front, EntryDirection entry_from
 
 bool MathMacroTemplate::notifyCursorLeaves(Cursor const & old, Cursor & cur)
 {
+       unsigned int const nargs_before = nargs();
        commitEditChanges(cur, old);
        updateLook();
        cur.screenUpdateFlags(Update::Force);
-       return InsetMathNest::notifyCursorLeaves(old, cur);
+       // If we have removed a cell, we might have invalidated the cursor
+       return InsetMathNest::notifyCursorLeaves(old, cur)
+               || nargs() < nargs_before;
 }
 
 
@@ -721,11 +721,11 @@ void MathMacroTemplate::changeArity(Cursor & cur,
 {
        // remove parameter which do not appear anymore in the definition
        for (int i = numargs_; i > newNumArg; --i)
-               removeParameter(cur, inset_pos, numargs_ - 1, false);
+               removeParameter(cur, inset_pos, numargs_ - 1, true);
        
        // add missing parameter
        for (int i = numargs_; i < newNumArg; ++i)
-               insertParameter(cur, inset_pos, numargs_, false, false);
+               insertParameter(cur, inset_pos, numargs_, true, false);
 }
 
 
@@ -736,7 +736,8 @@ public:
        ///
        AddRemoveMacroInstanceFix(int n, bool insert) : n_(n), insert_(insert) {}
        ///
-       void operator()(MathMacro * macro) {
+       void operator()(MathMacro * macro)
+       {
                if (macro->folded()) {
                        if (insert_)
                                macro->insertArgument(n_);
@@ -760,7 +761,8 @@ public:
        ///
        OptionalsMacroInstanceFix(int optionals) : optionals_(optionals) {}
        ///
-       void operator()(MathMacro * macro) {
+       void operator()(MathMacro * macro)
+       {
                macro->setOptionals(optionals_);
        }
 
@@ -791,18 +793,15 @@ void fixMacroInstances(Cursor & cur, DocIterator const & inset_pos,
        // remember hull to trigger preview reload
        DocIterator hull(dit.buffer());
        bool preview_reload_needed = false;
+       set<DocIterator> preview_hulls;
 
        // iterate over all positions until macro is redefined
        for (; dit; dit.forwardPos()) {
                // left the outer hull?
                if (!hull.empty() && dit.depth() == hull.depth()) {
-                       // reload the preview if necessary 
+                       // schedule reload of the preview if necessary 
                        if (preview_reload_needed) {
-                               InsetMathHull * inset_hull =
-                                       hull.nextInset()->asInsetMath()->asHullInset();
-                               LASSERT(inset_hull, /**/);
-                               inset_hull->reloadPreview(hull);
-                               cur.screenUpdateFlags(Update::Force);
+                               preview_hulls.insert(hull);
                                preview_reload_needed = false;
                        }
                        hull.clear();
@@ -838,6 +837,19 @@ void fixMacroInstances(Cursor & cur, DocIterator const & inset_pos,
                                preview_reload_needed = true;
                }
        }
+
+       if (!preview_hulls.empty()) {
+               // reload the scheduled previews
+               set<DocIterator>::const_iterator sit = preview_hulls.begin();
+               set<DocIterator>::const_iterator end = preview_hulls.end();
+               for (; sit != end; ++sit) {
+                       InsetMathHull * inset_hull =
+                               sit->nextInset()->asInsetMath()->asHullInset();
+                       LBUFERR(inset_hull);
+                       inset_hull->reloadPreview(*sit);
+               }
+               cur.screenUpdateFlags(Update::Force);
+       }
 }
 
 
@@ -981,7 +993,7 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd)
                        commitEditChanges(cur, cur);
                        cur.recordUndoFullDocument();
                        size_t pos = numargs_;
-                       if (arg.size() != 0)
+                       if (!arg.empty())
                                pos = (size_t)convert<int>(arg) - 1; // it is checked for >=0 in getStatus
                        insertParameter(cur, cur, pos);
                }
@@ -993,7 +1005,7 @@ void MathMacroTemplate::doDispatch(Cursor & cur, FuncRequest & cmd)
                        commitEditChanges(cur, cur);
                        cur.recordUndoFullDocument();
                        size_t pos = numargs_ - 1;
-                       if (arg.size() != 0)
+                       if (!arg.empty())
                                pos = (size_t)convert<int>(arg) - 1; // it is checked for >=0 in getStatus
                        removeParameter(cur, cur, pos);
                }
@@ -1067,7 +1079,7 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd,
        switch (cmd.action()) {
                case LFUN_MATH_MACRO_ADD_PARAM: {
                        int num = numargs_ + 1;
-                       if (arg.size() != 0)
+                       if (!arg.empty())
                                num = convert<int>(arg);
                        bool on = (num >= optionals_
                                   && numargs_ < 9 && num <= numargs_ + 1);
@@ -1079,9 +1091,10 @@ bool MathMacroTemplate::getStatus(Cursor & /*cur*/, FuncRequest const & cmd,
                        flag.setEnabled(numargs_ < 9);
                        break;
 
+               case LFUN_MATH_MACRO_REMOVE_GREEDY_PARAM:
                case LFUN_MATH_MACRO_REMOVE_PARAM: {
                        int num = numargs_;
-                       if (arg.size() != 0)
+                       if (!arg.empty())
                                num = convert<int>(arg);
                        flag.setEnabled(num >= 1 && num <= numargs_);
                        break;
@@ -1238,8 +1251,8 @@ docstring MathMacroTemplate::xhtml(XHTMLStream &, OutputParams const &) const
        return docstring();
 }
 
-int MathMacroTemplate::plaintext(odocstream & os,
-                                OutputParams const &) const
+int MathMacroTemplate::plaintext(odocstringstream & os,
+                                OutputParams const &, size_t) const
 {
        static docstring const str = '[' + buffer().B_("math macro") + ']';
 
@@ -1252,8 +1265,7 @@ bool MathMacroTemplate::validName() const
 {
        docstring n = name();
 
-       // empty name?
-       if (n.size() == 0)
+       if (n.empty())
                return false;
 
        // converting back and force doesn't swallow anything?
@@ -1302,7 +1314,7 @@ bool MathMacroTemplate::fixNameAndCheckIfValid()
        }
 
        // now it should be valid if anything in the name survived
-       return data.size() > 0;
+       return !data.empty();
 }
 
        
@@ -1353,9 +1365,9 @@ void MathMacroTemplate::infoize(odocstream & os) const
 }
 
 
-docstring MathMacroTemplate::contextMenuName() const
+string MathMacroTemplate::contextMenuName() const
 {
-       return from_ascii("context-math-macro-definition");
+       return "context-math-macro-definition";
 }
 
 } // namespace lyx