Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

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

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index b86d36ca6bdc97e5af058fb4f3023825158f9075..784c725de3b8c37d60191e438cf1597b8d67472f 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -114,7 +114,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 +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_);
 }
 
 
@@ -437,7 +437,7 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
 
        // edit mode changed?
        if (editing_[pi.base.bv] != editMode(pi.base.bv))
-               pi.base.bv->cursor().updateFlags(Update::Force);
+               pi.base.bv->cursor().updateFlags(Update::SinglePar);
 }
 
 
@@ -449,7 +449,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 +464,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);
 }
 
 
@@ -492,8 +498,9 @@ bool MathMacro::validName() const
 
        // valid characters?
        for (size_t i = 0; i<n.size(); ++i) {
-               if (!(n[i] >= 'a' && n[i] <= 'z') &&
-                               !(n[i] >= 'A' && n[i] <= 'Z')) 
+               if (!(n[i] >= 'a' && n[i] <= 'z')
+                   && !(n[i] >= 'A' && n[i] <= 'Z')
+                   && n[i] != '*') 
                        return false;
        }
 
@@ -513,7 +520,7 @@ void MathMacro::validate(LaTeXFeatures & features) const
 
 void MathMacro::edit(Cursor & cur, bool front, EntryDirection entry_from)
 {
-       cur.updateFlags(Update::Force);
+       cur.updateFlags(Update::SinglePar);
        InsetMathNest::edit(cur, front, entry_from);
 }
 
@@ -522,7 +529,7 @@ Inset * MathMacro::editXY(Cursor & cur, int x, int y)
 {
        // We may have 0 arguments, but InsetMathNest requires at least one.
        if (nargs() > 0) {
-               cur.updateFlags(Update::Force);
+               cur.updateFlags(Update::SinglePar);
                return InsetMathNest::editXY(cur, x, y);                
        } else
                return this;
@@ -594,14 +601,14 @@ void MathMacro::attachArguments(vector<MathData> const & args, size_t arity, int
 
 bool MathMacro::idxFirst(Cursor & cur) const 
 {
-       cur.updateFlags(Update::Force);
+       cur.updateFlags(Update::SinglePar);
        return InsetMathNest::idxFirst(cur);
 }
 
 
 bool MathMacro::idxLast(Cursor & cur) const 
 {
-       cur.updateFlags(Update::Force);
+       cur.updateFlags(Update::SinglePar);
        return InsetMathNest::idxLast(cur);
 }
 
@@ -617,7 +624,7 @@ void MathMacro::fold(Cursor & cur)
 {
        if (!nextFoldMode_) {
                nextFoldMode_ = true;
-               cur.updateFlags(Update::Force);
+               cur.updateFlags(Update::SinglePar);
        }
 }
 
@@ -626,7 +633,7 @@ void MathMacro::unfold(Cursor & cur)
 {
        if (nextFoldMode_) {
                nextFoldMode_ = false;
-               cur.updateFlags(Update::Force);
+               cur.updateFlags(Update::SinglePar);
        }
 }
 
@@ -798,13 +805,13 @@ bool MathMacro::insertCompletion(Cursor & cur, docstring const & s,
        docstring newName = name() + s;
        asArray(newName, cell(0));
        cur.bv().cursor().pos() = name().size();
-       cur.updateFlags(Update::Force);
+       cur.updateFlags(Update::SinglePar);
        
        // finish macro
        if (finished) {
                cur.bv().cursor().pop();
                ++cur.bv().cursor().pos();
-               cur.updateFlags(Update::Force | Update::SinglePar);
+               cur.updateFlags(Update::SinglePar);
        }
        
        return true;