rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_cursor.h b/src/mathed/math_cursor.h
index 0ef9dd555e9652626eb346c9a14d8a625c41a711..8043f3b7d9c032441f99ca14366b63b39857a818 100644 (file)
--- a/src/mathed/math_cursor.h
+++ b/src/mathed/math_cursor.h
@@ -17,9 +17,6 @@
 #ifndef MATH_CURSOR
 #define MATH_CURSOR
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "math_inset.h"
 #include "math_iterator.h"
@@ -29,7 +26,6 @@ class InsetFormulaBase;
 class BufferView;
 class MathPainterInfo;
 class MathUnknownInset;
-class Selection;
 
 /**
 
@@ -47,6 +43,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,11 +63,11 @@ public:
        ///
        void insert(MathArray const &);
        ///
-       void paste(MathGridInset const & data);
-       ///
-       void erase();
-       ///
-       void backspace();
+       void paste(string const & data);
+       /// return false for empty math insets
+       bool erase();
+       /// return false for empty math insets
+       bool backspace();
        /// called for LFUN_HOME etc
        bool home(bool sel = false);
        /// called for LFUN_END etc
@@ -96,6 +94,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 +113,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
@@ -124,8 +126,6 @@ public:
        ///
        bool script(bool);
        ///
-       bool interpret(string const &);
-       /// 
        bool interpret(char);
        /// interpret name a name of a macro
        void macroModeClose();
@@ -159,10 +159,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"
@@ -220,7 +218,7 @@ public:
        unsigned depth() const;
 
        /// local dispatcher
-       MathInset::result_type dispatch(FuncRequest const & cmd);
+       dispatch_result dispatch(FuncRequest const & cmd);
        /// describe the situation
        string info() const;
        /// dump selection information for debugging
@@ -229,6 +227,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);
        ///
@@ -239,15 +241,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
@@ -267,17 +266,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