Fixed longstanding bug in Advanced Find&Replace, when dealing with documents containi...

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

diff --git a/src/mathed/MathMacroTemplate.cpp b/src/mathed/MathMacroTemplate.cpp
index f6421c6c48df5218f2499c5ea330f8769a3cafec..2989e2be5ce01ba25c5aab5ccabdf091308552d4 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;
@@ -721,11 +722,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 +737,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 +762,8 @@ public:
        ///
        OptionalsMacroInstanceFix(int optionals) : optionals_(optionals) {}
        ///
-       void operator()(MathMacro * macro) {
+       void operator()(MathMacro * macro)
+       {
                macro->setOptionals(optionals_);
        }
 
@@ -791,18 +794,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 +838,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();
+                       LASSERT(inset_hull, /**/);
+                       inset_hull->reloadPreview(*sit);
+               }
+               cur.screenUpdateFlags(Update::Force);
+       }
 }
 
 
@@ -1079,6 +1092,7 @@ 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)