revert last patch. there's something wrong, possibly unrelated to this

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

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index 96e75ae414178279a2fdbf0ffc2b8dce5f98d18c..d84a64240209b97afdeb431f6d41288cfb49dc42 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -13,9 +13,11 @@
 #include <config.h>
 
 #include "MathMacro.h"
-#include "MathSupport.h"
+
+#include "MathCompletionList.h"
 #include "MathExtern.h"
 #include "MathStream.h"
+#include "MathSupport.h"
 
 #include "Buffer.h"
 #include "BufferView.h"
@@ -114,7 +116,7 @@ private:
 MathMacro::MathMacro(docstring const & name)
        : InsetMathNest(0), name_(name), displayMode_(DISPLAY_INIT),
                attachedArgsNum_(0), optionals_(0), nextFoldMode_(true),
-               macro_(0), needsUpdate_(false)
+               macro_(0), needsUpdate_(false), appetite_(9)
 {}
 
 
@@ -283,7 +285,7 @@ void MathMacro::updateMacro(MacroContext const & mc)
 }
 
 
-void MathMacro::updateRepresentation(Cursor const * bvCur)
+void MathMacro::updateRepresentation()
 {
        // known macro?
        if (macro_ == 0)
@@ -297,30 +299,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_);
 }
 
 
@@ -449,7 +451,7 @@ void MathMacro::drawSelection(PainterInfo & pi, int x, int y) const
 }
 
 
-void MathMacro::setDisplayMode(MathMacro::DisplayMode mode)
+void MathMacro::setDisplayMode(MathMacro::DisplayMode mode, int appetite)
 {
        if (displayMode_ != mode) {             
                // transfer name if changing from or to DISPLAY_UNFOLDED
@@ -464,6 +466,12 @@ void MathMacro::setDisplayMode(MathMacro::DisplayMode mode)
                displayMode_ = mode;
                needsUpdate_ = true;
        }
+       
+       // the interactive init mode is non-greedy by default
+       if (appetite == -1)
+               appetite_ = (mode == DISPLAY_INTERACTIVE_INIT) ? 0 : 9;
+       else
+               appetite_ = size_t(appetite);
 }
 
 
@@ -509,6 +517,12 @@ void MathMacro::validate(LaTeXFeatures & features) const
 
        if (name() == "binom" || name() == "mathcircumflex")
                features.require(to_utf8(name()));
+       
+       // validate the cells and the definition
+       if (displayMode() == DISPLAY_NORMAL) {
+               definition_.validate(features);
+               InsetMathNest::validate(features);
+       }
 }
 
 
@@ -764,7 +778,7 @@ bool MathMacro::automaticPopupCompletion() const
 }
 
 
-Inset::CompletionList const * 
+CompletionList const * 
 MathMacro::createCompletionList(Cursor const & cur) const
 {
        if (displayMode() != DISPLAY_UNFOLDED)