small up/down tweaking

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

diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h
index 3e2bcf501c4a7c0934d6296e93ad554c593dd57f..338391bfeee9bc6b9c9052a3e82b8799571378dd 100644 (file)
--- a/src/mathed/math_cursor.h
+++ b/src/mathed/math_cursor.h
@@ -29,7 +29,6 @@ class InsetFormulaBase;
 class BufferView;
 class MathPainterInfo;
 class MathUnknownInset;
-class Selection;
 
 /**
 
@@ -47,6 +46,8 @@ class MathCursor {
 public:
        /// short of anything else reasonable
        typedef MathInset::size_type       size_type;
+       /// type for column numbers
+       typedef MathArray::difference_type difference_type;
        /// type for cursor positions within a cell
        typedef MathInset::pos_type        pos_type;
        /// type for cell indices
@@ -65,7 +66,7 @@ public:
        ///
        void insert(MathArray const &);
        ///
-       void paste(MathGridInset const & data);
+       void paste(string const & data);
        ///
        void erase();
        ///
@@ -96,6 +97,8 @@ public:
        void plainInsert(MathAtom const &);
        ///
        void niceInsert(MathAtom const &);
+       ///
+       void niceInsert(string const &);
 
        /// in pixels from top of screen
        void setPos(int x, int y);
@@ -113,6 +116,8 @@ public:
        void popToEnclosingHull();
        /// go up to the hull inset
        void popToHere(MathInset const * p);
+       /// adjust anchor position after deletions/insertions
+       void adjust(pos_type from, difference_type diff);
        ///
        InsetFormulaBase * formula() const;
        /// current offset in the current cell
@@ -123,7 +128,7 @@ public:
        size_type size() const;
        ///
        bool script(bool);
-       /// 
+       ///
        bool interpret(char);
        /// interpret name a name of a macro
        void macroModeClose();
@@ -157,10 +162,8 @@ public:
        void selClear();
        /// clears or deletes selection depending on lyxrc setting
        void selClearOrDel();
-       ///
-       void selGet(MathArray & ar);
-       ///
-       void drawSelection(MathPainterInfo & pain) const;
+       /// draws light-blue selection background
+       void drawSelection(MathPainterInfo & pi) const;
        ///
        void handleNest(MathAtom const & at);
        /// remove this as soon as LyXFunc::getStatus is "localized"
@@ -227,6 +230,10 @@ public:
        void dump(char const * str) const;
        /// moves on
        void setSelection(MathIterator const & where, size_type n);
+       /// grab selection marked by anchor and current cursor
+       string grabSelection() const;
+       /// guess what
+       string grabAndEraseSelection();
        ///
        void insert(char c);
        ///
@@ -237,15 +244,12 @@ public:
        /// hack for reveal codes
        void markInsert();
        void markErase();
-       //void handleExtern(string const & arg);
-
-       ///
-       friend class Selection;
-
-
-private:
        /// injects content of a cell into parent
        void pullArg();
+       /// split font inset etc
+       void handleFont(string const & font);
+
+private:
        /// moves cursor index one cell to the left
        bool idxLeft();
        /// moves cursor index one cell to the right
@@ -265,17 +269,13 @@ private:
        /// are we in a nucleus of a script inset?
        bool inNucleus() const;
 
-       /// grab grid marked by anchor and current cursor 
-       MathGridInset grabSelection() const;
        /// erase the selected part and re-sets the cursor
        void eraseSelection();
-       /// guess what
-       MathGridInset grabAndEraseSelection();
 
        /// the name of the macro we are currently inputting
        string macroName() const;
        /// where in the curent cell does the macro name start?
-       MathInset::difference_type macroNamePos() const;
+       difference_type macroNamePos() const;
        /// can we enter the inset?
        bool openable(MathAtom const &, bool selection) const;
        /// write access to cursor cell position