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

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

diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index 3f57c824029c6eb3dbbbad2debe781303dd5edb5..6f2fa1d3b7e03b7696760bdf4f3390a82fb948a1 100644 (file)
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -38,7 +38,7 @@ public:
        ///
        EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
-       void edit(Cursor & cur, bool left);
+       void edit(Cursor & cur, bool front, EntryDirection entry_from);
        ///
        bool notifyCursorLeaves(Cursor & cur);
        ///
@@ -80,6 +80,9 @@ public:
        /// Remove everything from the name which makes it invalid 
        /// and return true iff it is valid.
        bool fixNameAndCheckIfValid();
+       
+       /// request "external features"
+       virtual void validate(LaTeXFeatures &) const;
 
        /// decide whether its a redefinition
        void updateToContext(MacroContext const & mc) const;
@@ -105,6 +108,10 @@ protected:
                FuncStatus & status) const;
 
 private:
+       friend class InsetLabelBox;
+       friend class DisplayLabelBox;
+       
+       ///
        virtual Inset * clone() const;
 
        /// remove #n with from<=n<=to
@@ -125,8 +132,10 @@ private:
        idx_type optIdx(idx_type n) const { return n + 1; }
        ///
        idx_type displayIdx() const { return optionals_ + 2; }
-       /// The label with some holes to edit
-       mutable MathData label_;
+       ///
+       void updateLook() const;
+       /// The representation of the macro tempalte, with some holes to edit
+       mutable MathData look_;
        ///
        mutable int numargs_;
        ///
@@ -140,7 +149,21 @@ private:
        /// defined before already?
        mutable bool redefinition_;
        ///
-       mutable Dimension cellDim_;
+       void createLook() const;
+       ///
+       mutable bool lookOutdated_;
+       /// true if in pre-calculations of metrics to get height of boxes
+       mutable bool premetrics_;
+       ///
+       mutable int labelBoxAscent_;
+       ///
+       mutable int labelBoxDescent_;
+       ///
+       bool premetrics() const { return premetrics_; }
+       ///
+       int commonLabelBoxAscent() const { return labelBoxAscent_; }
+       ///
+       int commonLabelBoxDescent() const { return labelBoxDescent_; }
 };