Updates from Bennett and myself.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 60948936535b18a2eb5b3e0d4035926d02576e41..db041303289d0e98bb0c1933de48240f60e1c309 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -96,7 +96,9 @@ public:
        /// Set font over selection paragraphs and rebreak.
        void setFont(LCursor & cur, LyXFont const &, bool toggleall = false);
 
-       /// rebreaks the given par
+       /// Rebreaks the given paragraph.
+       /// \retval true if a full screen redraw is needed.
+       /// \retval false if a single paragraph redraw is enough.
        bool redoParagraph(BufferView &, pit_type pit);
 
        /// returns pos in given par at given x coord
@@ -220,20 +222,15 @@ public:
        ///
        bool cursorEnd(LCursor & cur);
        ///
-       bool cursorPrevious(LCursor & cur);
+       void cursorPrevious(LCursor & cur);
        ///
-       bool cursorNext(LCursor & cur);
+       void cursorNext(LCursor & cur);
        ///
        bool cursorTop(LCursor & cur);
        ///
        bool cursorBottom(LCursor & cur);
        /// Erase character at cursor. Honour change tracking
        bool erase(LCursor & cur);
-       /** At cursor position 0, merge paragraph with the one before it.
-        * Ignore CT (this is used in \c acceptChange, \c rejectChange for
-        * physical deletion of paragraph break)
-        */
-       bool backspacePos0(LCursor & cur);
        /// Delete character before cursor. Honour CT
        bool backspace(LCursor & cur);
        // Dissolve the inset under cursor
@@ -251,6 +248,8 @@ public:
        };
        /// Change the case of the word at cursor position.
        void changeCase(LCursor & cur, TextCase action);
+       /// Transposes the character at the cursor with the one before it
+       void charsTranspose(LCursor & cur);
 
        /** the DTP switches for paragraphs. LyX will store the top settings
         always in the first physical paragraph, the bottom settings in the
@@ -260,7 +259,7 @@ public:
        void setParagraph(LCursor & cur,
                          Spacing const & spacing,
                          LyXAlignment align,
-                         std::string const & labelwidthstring,
+                         docstring const & labelwidthstring,
                          bool noindent);
 
        /* these things are for search and replace */
@@ -381,6 +380,10 @@ private:
        // position. Called by deleteEmptyParagraphMechanism
        void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where);
 
+       // At cursor position 0, try to merge the paragraph with the one before it.
+       // Ignore change tracking, i.e., physically remove the end-of-par character
+       bool backspacePos0(LCursor & cur);
+
        ///
        void deleteWordForward(LCursor & cur);
        ///