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 44d9cd502e2afb00d00675423ef890d9f99ce40a..927ef15db237945b058ada190ca0a82379cec7f7 100644 (file)
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -13,8 +13,14 @@
 #define MATH_HULLINSET_H
 
 #include "InsetMathGrid.h"
+
 #include <boost/scoped_ptr.hpp>
 
+
+namespace lyx {
+
+class InsetLabel;
+class ParConstIterator;
 class RenderPreview;
 
 
@@ -28,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;
@@ -40,9 +52,9 @@ public:
        ///
        void drawT(TextPainter &, int x, int y) const;
        ///
-       std::string label(row_type row) const;
+       docstring label(row_type row) const;
        ///
-       void label(row_type row, std::string const & label);
+       void label(row_type row, docstring const & label);
        ///
        void numbered(row_type row, bool num);
        ///
@@ -51,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<lyx::docstring> & list) const;
        ///
        void validate(LaTeXFeatures & features) const;
        /// identifies HullInset
@@ -82,56 +91,59 @@ public:
        ///
        char defaultColAlign(col_type col);
        ///
-       bool idxFirst(LCursor &) const;
+       bool idxFirst(Cursor &) const;
        ///
-       bool idxLast(LCursor &) const;
+       bool idxLast(Cursor &) const;
 
        ///
        void write(WriteStream & os) const;
        ///
-       void mathmlize(MathMLStream &) const;
+       void mathmlize(MathStream &) const;
        ///
        void normalize(NormalStream &) const;
        ///
-       void infoize(std::ostream & os) const;
+       void infoize(odocstream & os) const;
 
        ///
-       void write(Buffer const &, std::ostream & os) const;
+       void write(std::ostream & os) const;
        ///
-       void read(Buffer const &, LyXLex & lex);
+       void read(Lexer & lex);
        ///
-       int plaintext(Buffer const &, lyx::odocstream &,
-                 OutputParams const &) const;
+       int plaintext(odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, lyx::odocstream &,
-                   OutputParams const &) const;
+       int docbook(odocstream &, OutputParams const &) const;
        /// the string that is passed to the TOC
-       virtual int textString(Buffer const &, lyx::odocstream &,
-               OutputParams const &) const;
+       void textString(odocstream &) const;
 
        /// get notification when the cursor leaves this inset
-       bool notifyCursorLeaves(LCursor & cur);
+       bool notifyCursorLeaves(Cursor const & old, Cursor & cur);
        ///
-       //bool insetAllowed(Code code) const;
+       //bool insetAllowed(InsetCode code) const;
        ///
-       void addPreview(lyx::graphics::PreviewLoader &) const;
+       void addPreview(graphics::PreviewLoader &) const;
 
        ///
        static int displayMargin() { return 12; }
+       
+       /// 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 &);
 
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
 
        /// do we want to handle this event?
-       bool getStatus(LCursor & cur, FuncRequest const & cmd,
+       bool getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & status) const;
        ///
-       std::string eolString(row_type row, bool emptyline, bool fragile) const;
+       docstring eolString(row_type row, bool emptyline, bool fragile) const;
 
 private:
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual Inset * clone() const;
        ///
        void setType(HullType type);
        ///
@@ -141,9 +153,9 @@ private:
        ///
        void footer_write(WriteStream &) const;
        ///
-       lyx::docstring nicelabel(row_type row) const;
+       docstring nicelabel(row_type row) const;
        ///
-       void doExtern(LCursor & cur, FuncRequest & func);
+       void doExtern(Cursor & cur, FuncRequest & func);
        ///
        void glueall();
        /*!
@@ -163,7 +175,7 @@ private:
        /// change number of columns, split or combine columns if necessary.
        void changeCols(col_type);
        ///
-       char const * standardFont() const;
+       docstring standardFont() const;
        /// consistency check
        void check() const;
        /// can this change its number of rows?
@@ -174,9 +186,9 @@ private:
        /// "none", "simple", "display", "eqnarray",...
        HullType type_;
        ///
-       std::vector<int> nonum_;
+       std::vector<bool> nonum_;
        ///
-       std::vector<std::string> label_;
+       std::vector<InsetLabel *> label_;
        ///
        boost::scoped_ptr<RenderPreview> preview_;
        ///
@@ -186,30 +198,34 @@ private:
 //
 public:
        /// what appears in the minibuffer when opening
-       virtual lyx::docstring const editMessage() const;
+       docstring editMessage() const;
        ///
        virtual void mutateToText();
        ///
-       virtual void revealCodes(LCursor & cur) const;
+       virtual void revealCodes(Cursor & cur) const;
        ///
        EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
-       void edit(LCursor & cur, bool left);
+       void edit(Cursor & cur, bool front, 
+               EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
        ///
-       InsetBase * editXY(LCursor & cur, int x, int y);
+       Inset * editXY(Cursor & cur, int x, int y);
        ///
-       bool display() const;
+       DisplayType display() const;
        ///
-       Code lyxCode() const;
+       InsetCode lyxCode() const;
 
 protected:
        ///
-       void handleFont(LCursor & cur, std::string const & arg,
-               std::string const & font);
+       void handleFont(Cursor & cur, docstring const & arg,
+               docstring const & font);
        ///
-       void handleFont2(LCursor & cur, std::string const & arg);
+       void handleFont2(Cursor & cur, docstring const & arg);
        ///
        bool previewState(BufferView * bv) const;
 };
 
+
+
+} // namespace lyx
 #endif