Fix math cursor positioning bug

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

diff --git a/src/mathed/math_hullinset.h b/src/mathed/math_hullinset.h
index f8ac234db34917286632114dcc6d04c0526f3e14..d82b845c5b37a6cb450aff5990d38145742c029d 100644 (file)
--- a/src/mathed/math_hullinset.h
+++ b/src/mathed/math_hullinset.h
@@ -13,6 +13,9 @@
 #define MATH_HULLINSET_H
 
 #include "math_gridinset.h"
+#include <boost/scoped_ptr.hpp>
+
+class RenderPreview;
 
 
 /// This provides an interface between "LyX insets" and "LyX math insets"
@@ -23,7 +26,9 @@ public:
        ///
        explicit MathHullInset(std::string const & type);
        ///
-       std::auto_ptr<InsetBase> clone() const;
+       ~MathHullInset();
+       ///
+       MathHullInset & operator=(MathHullInset const &);
        ///
        mode_type currentMode() const;
        ///
@@ -60,7 +65,7 @@ public:
        void addRow(row_type row);
        /// delete a row
        void delRow(row_type row);
-       ///
+       /// swap two rows
        void swapRow(row_type row);
        /// add a column
        void addCol(col_type col);
@@ -81,8 +86,6 @@ public:
        ///
        bool idxLast(LCursor &) const;
 
-       ///
-       std::string fileInsetLabel() const;
        ///
        void write(WriteStream & os) const;
        ///
@@ -97,9 +100,6 @@ public:
        ///
        void read(Buffer const &, LyXLex & lex);
        ///
-       int latex(Buffer const &, std::ostream &,
-                 OutputParams const &) const;
-       ///
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
@@ -109,15 +109,19 @@ public:
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
 
+       /// get notification when the cursor leaves this inset
+       void notifyCursorLeaves(LCursor & cur);
        ///
        //bool insetAllowed(Code code) const;
        ///
-       //void addPreview(lyx::graphics::PreviewLoader &) const;
+       void addPreview(lyx::graphics::PreviewLoader &) const;
 
 
 protected:
-       ///
-       void priv_dispatch(LCursor & cur, FuncRequest & cmd);
+       MathHullInset(MathHullInset const &);
+
+       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+
        /// do we want to handle this event?
        bool getStatus(LCursor & cur, FuncRequest const & cmd,
                FuncStatus & status) const;
@@ -125,6 +129,7 @@ protected:
        std::string eolString(row_type row, bool fragile) const;
 
 private:
+       virtual std::auto_ptr<InsetBase> doClone() const;
        ///
        void setType(std::string const & type);
        ///
@@ -139,10 +144,28 @@ private:
        void doExtern(LCursor & cur, FuncRequest & func);
        ///
        void glueall();
+       /*!
+        * split every row at the first relation operator.
+        * The number of columns must be 1. One column is added.
+        * The first relation operator and everything after it goes to the
+        * second column.
+        */
+       void splitTo2Cols();
+       /*!
+        * split every row at the first relation operator.
+        * The number of columns must be < 3. One or two columns are added.
+        * The first relation operator goes to the second column.
+        * Everything after it goes to the third column.
+        */
+       void splitTo3Cols();
+       /// change number of columns, split or combine columns if necessary.
+       void changeCols(col_type);
        ///
        char const * standardFont() const;
        /// consistency check
        void check() const;
+       /// can this change its number of rows?
+       bool rowChangeOK() const;
        /// can this change its number of cols?
        bool colChangeOK() const;
 
@@ -152,7 +175,8 @@ private:
        std::vector<int> nonum_;
        ///
        std::vector<std::string> label_;
-
+       ///
+       boost::scoped_ptr<RenderPreview> preview_;
 //
 // Incorporate me
 //
@@ -161,16 +185,6 @@ public:
        virtual std::string const editMessage() const;
        ///
        virtual void getCursorDim(int &, int &) const;
-
-       /// To allow transparent use of math editing functions
-       //virtual void status(FuncRequest &);
-
-       ///
-       virtual bool searchForward(BufferView *, std::string const &,
-                                  bool = true, bool = false);
-       ///
-       virtual bool searchBackward(BufferView *, std::string const &,
-                                   bool = true, bool = false);
        ///
        virtual bool isTextInset() const { return true; }
        ///
@@ -178,7 +192,7 @@ public:
        ///
        virtual void revealCodes(LCursor & cur) const;
        ///
-       virtual EDITABLE editable() const { return HIGHLY_EDITABLE; }
+       EDITABLE editable() const { return HIGHLY_EDITABLE; }
        ///
        void edit(LCursor & cur, bool left);
        ///