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

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

diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index f00b6f12accd245712e4c06e217e743aa1324db3..927ef15db237945b058ada190ca0a82379cec7f7 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -13,11 +13,14 @@
 #define MATH_HULLINSET_H
 
 #include "InsetMathGrid.h"
+
 #include <boost/scoped_ptr.hpp>
 
 
 namespace lyx {
 
+class InsetLabel;
+class ParConstIterator;
 class RenderPreview;
 
 
@@ -31,6 +34,12 @@ public:
        ///
        ~InsetMathHull();
        ///
+       void setBuffer(Buffer &);
+       ///
+       void updateLabels(ParIterator const &);
+       ///
+       void addToToc(ParConstIterator const &) const;
+       ///
        InsetMathHull & operator=(InsetMathHull const &);
        ///
        mode_type currentMode() const;
@@ -54,9 +63,6 @@ public:
        bool numberedType() const;
        ///
        bool ams() const;
-       /// Appends \c list with all labels found within this inset.
-       void getLabelList(Buffer const &,
-                         std::vector<docstring> & list) const;
        ///
        void validate(LaTeXFeatures & features) const;
        /// identifies HullInset
@@ -99,20 +105,18 @@ public:
        void infoize(odocstream & os) const;
 
        ///
-       void write(Buffer const &, std::ostream & os) const;
+       void write(std::ostream & os) const;
        ///
-       void read(Buffer const &, Lexer & lex);
+       void read(Lexer & lex);
        ///
-       int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+       int plaintext(odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+       int docbook(odocstream &, OutputParams const &) const;
        /// the string that is passed to the TOC
-       virtual void textString(Buffer const &, odocstream &) const;
+       void textString(odocstream &) const;
 
        /// get notification when the cursor leaves this inset
-       bool notifyCursorLeaves(Cursor & cur);
+       bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
        ///
        //bool insetAllowed(InsetCode code) const;
        ///
@@ -124,6 +128,9 @@ public:
        /// Force inset into LTR environment if surroundings are RTL?
        virtual bool forceLTR() const { return true; }
 
+       ///
+       virtual docstring contextMenu(BufferView const &, int, int) const;
+
 protected:
        InsetMathHull(InsetMathHull const &);
 
@@ -179,9 +186,9 @@ private:
        /// "none", "simple", "display", "eqnarray",...
        HullType type_;
        ///
-       std::vector<int> nonum_;
+       std::vector<bool> nonum_;
        ///
-       std::vector<docstring> label_;
+       std::vector<InsetLabel *> label_;
        ///
        boost::scoped_ptr<RenderPreview> preview_;
        ///
@@ -191,7 +198,7 @@ private:
 //
 public:
        /// what appears in the minibuffer when opening
-       virtual docstring const editMessage() const;
+       docstring editMessage() const;
        ///
        virtual void mutateToText();
        ///
@@ -200,7 +207,7 @@ public:
        EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
        void edit(Cursor & cur, bool front, 
-               EntryDirectionType entry_from = IGNORE_ENTRY_DIRECTION);
+               EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
        ///
        Inset * editXY(Cursor & cur, int x, int y);
        ///