simplify GuiToc / TocWidget interaction. Much can still be simplified...

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

diff --git a/src/mathed/MathMacro.h b/src/mathed/MathMacro.h
index c5faebc9bf163372531fb755647bb0fe33c1f68f..a4928f1cd58f7f4ded1d5e47ac319107411c1dc4 100644 (file)
--- a/src/mathed/MathMacro.h
+++ b/src/mathed/MathMacro.h
@@ -46,7 +46,7 @@ public:
        void cursorPos(BufferView const & bv, CursorSlice const & sl,
                bool boundary, int & x, int & y) const;
        ///
-       void edit(Cursor & cur, bool left);
+       void edit(Cursor & cur, bool front, EntryDirection entry_from);
        ///
        Inset * editXY(Cursor & cur, int x, int y);
 
@@ -140,25 +140,25 @@ protected:
        void attachArguments(std::vector<MathData> const & args, size_t arity, int optionals);
        ///
        MacroData const * macro() { return macro_; }
-
+       ///
+       bool editMetrics(BufferView const * bv) const;
+       
 private:
        ///
        virtual Inset * clone() const;
-       /// the index of the cursor slice of the macro, or -1 if it is not edited
-       int cursorIdx(Cursor const & cur) const;
        ///
-       bool editMode(Cursor const & cur) const;
+       bool editMode(BufferView const * bv) const;
        
        /// name of macro
        docstring name_;
        /// current display mode
        DisplayMode displayMode_;
-       /// display mode before change
+       /// expanded macro with ArgumentProxies
        InsetMathSqrt expanded_;
+       /// macro definition with #1,#2,.. insets
+       MathData definition_;
        /// number of arguments that were really attached
        size_t attachedArgsNum_;
-       /// cursor position during last draw
-       mutable std::map<BufferView const *, idx_type> previousCurIdx_;
        /// optional argument attached? (only in DISPLAY_NORMAL mode)
        size_t optionals_;
        /// fold mode to be set in next metrics call?