Reinsert newlines.

[lyx.git] / src / Cursor.h

diff --git a/src/Cursor.h b/src/Cursor.h
index 719a2cbd4f8138e49259badd6abd6ac065cb22ce..a7111c2908d0dc57c699d768182370834d2407fd 100644 (file)
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -111,7 +111,7 @@ public:
         */
        bool selHandle(bool selecting);
        ///
-       docstring selectionAsString(bool label) const;
+       docstring selectionAsString(bool with_label) const;
        ///
        docstring currentState() const;
 
@@ -225,15 +225,15 @@ public:
         * Right Thing (even if my getStatus partner said that I can do it).
         * It is sort of a kludge that should be used only rarely...
         */
-       void undispatched();
+       void undispatched() const;
        /// the event was already dispatched
-       void dispatched();
+       void dispatched() const;
        /// Set which screen update should be done
-       void screenUpdateFlags(Update::flags f);
+       void screenUpdateFlags(Update::flags f) const;
        /// Forces an updateBuffer() call
-       void forceBufferUpdate();
+       void forceBufferUpdate() const;
        /// Removes any pending updateBuffer() call
-       void clearBufferUpdate();
+       void clearBufferUpdate() const;
        /// Do we need to call updateBuffer()?
        bool needBufferUpdate() const;
        /**
@@ -246,7 +246,7 @@ public:
         * This is a fairly rare event as well and only some optimization.
         * Not using noScreenUpdate() should never be wrong.
         */
-       void noScreenUpdate();
+       void noScreenUpdate() const;
        /// fix cursor in circumstances that should never happen.
        /// \retval true if a fix occured.
        bool fixIfBroken();
@@ -280,7 +280,8 @@ public:
        void recordUndo(UndoKind kind = ATOMIC_UNDO) const;
 
        /// Convenience: prepare undo for the inset containing the cursor
-       void recordUndoInset(UndoKind kind = ATOMIC_UNDO) const;
+       void recordUndoInset(UndoKind kind = ATOMIC_UNDO,
+                            Inset const * inset = 0) const;
 
        /// Convenience: prepare undo for the whole buffer
        void recordUndoFullDocument() const;
@@ -291,6 +292,15 @@ public:
        ///
        void checkBufferStructure();
 
+       /// hook for text input to maintain the "new born word"
+       void markNewWordPosition();
+
+       /// The position of the new born word
+       /// As the user is entering a word without leaving it
+       /// the result is not empty. When not in text mode
+       /// and after leaving the word the result is empty.
+       DocIterator newWord() const { return new_word_; }
+
 public:
 //private:
        
@@ -299,11 +309,19 @@ public:
        ///
        void saveBeforeDispatchPosXY();
 
+private:
+       /// validate the "new born word" position
+       void checkNewWordPosition();
+       /// clear the "new born word" position
+       void clearNewWordPosition();
+
 private:
        ///
        BufferView * bv_;
        /// the anchor position
        DocIterator anchor_;
+       /// the start of the new born word
+       DocIterator new_word_;
        ///
        mutable DispatchResult disp_;
        /**
@@ -395,8 +413,8 @@ public:
        void plainInsert(MathAtom const & at);
        ///
        void niceInsert(MathAtom const & at);
-       ///
-       void niceInsert(docstring const & str, Parse::flags f = Parse::NORMAL,
+       /// return the number of inserted array items
+       int niceInsert(docstring const & str, Parse::flags f = Parse::NORMAL,
                        bool enter = true);
 
        /// in pixels from top of screen