restore comment about boost::shared_ptr and dtor.

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 0ebc1eeace21fc92b40aa046facff4d2075a9106..027fd0e8043880cf3347fd2444982e9ca68f81dc 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -48,9 +48,9 @@ public:
        bool empty() const;
 
        ///
-       FontInfo getLayoutFont(Buffer const & buffer, pit_type pit) const;
+       FontInfo layoutFont(Buffer const & buffer, pit_type pit) const;
        ///
-       FontInfo getLabelFont(Buffer const & buffer,
+       FontInfo labelFont(Buffer const & buffer,
                Paragraph const & par) const;
        /** Set font of character at position \p pos in paragraph \p pit.
         *  Must not be called if \p pos denotes an inset with text contents,
@@ -134,7 +134,7 @@ public:
         *  @param from return here the start of the word
         *  @param to return here the end of the word
         */
-       void getWord(CursorSlice & from, CursorSlice & to, word_location const);
+       void getWord(CursorSlice & from, CursorSlice & to, word_location const) const;
        /// just selects the word the cursor is in
        void selectWord(Cursor & cur, word_location loc);
 
@@ -169,11 +169,23 @@ public:
         * Returns true if an update is needed after the move.
         */
        bool cursorBackward(Cursor & cur);
+       /// Move cursor visually one position to the left
+       /**
+        * \param skip_inset if true, don't enter insets
+        * Returns true if an update is needed after the move.
+        */
+       bool cursorVisLeft(Cursor & cur, bool skip_inset = false);
        /// Move cursor one position forward
        /**
         * Returns true if an update is needed after the move.
         */
        bool cursorForward(Cursor & cur);
+       /// Move cursor visually one position to the right
+       /**
+        * \param skip_inset if true, don't enter insets
+        * Returns true if an update is needed after the move.
+        */
+       bool cursorVisRight(Cursor & cur, bool skip_inset = false);
        ///
        bool cursorBackwardOneWord(Cursor & cur);
        ///
@@ -241,11 +253,15 @@ public:
 
        ///
        bool checkAndActivateInset(Cursor & cur, bool front);
+       ///
+       bool checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool movingLeft);
 
        ///
        void write(Buffer const & buf, std::ostream & os) const;
        /// returns whether we've seen our usual 'end' marker
-       bool read(Buffer const & buf, Lexer & lex, ErrorList & errorList);
+       /// insetPtr is the containing Inset
+       bool read(Buffer const & buf, Lexer & lex, ErrorList & errorList, 
+                 InsetText * insetPtr);
 
        /// delete double spaces, leading spaces, and empty paragraphs around old cursor.
        /// \retval true if a change has happened and we need a redraw.
@@ -303,4 +319,4 @@ private:
 
 } // namespace lyx
 
-#endif // LYXTEXT_H
+#endif // TEXT_H