simplify setInsetFont, removing a potential bug (an invalid DocIterator was built...

[lyx.git] / src / CursorSlice.h

diff --git a/src/CursorSlice.h b/src/CursorSlice.h
index cf32cc611decb458c4d6c475519d6d60c36d7d82..98d054dc4e23ea17c50e97202216212ed37e09d8 100644 (file)
--- a/src/CursorSlice.h
+++ b/src/CursorSlice.h
@@ -28,18 +28,24 @@ namespace lyx {
 
 class Inset;
 class MathData;
-class LyXText;
+class Text;
 class Paragraph;
 
 /// This encapsulates a single slice of a document iterator as used e.g.
 /// for cursors.
 
 // After IU, the distinction of MathInset and InsetOld as well as
-// that of MathData and LyXText should vanish. They are conceptually the
+// that of MathData and Text should vanish. They are conceptually the
 // same (now...)
 
 class CursorSlice {
 public:
+       /// Those needs inset_ access.
+       ///@{
+       friend class DocIterator;
+       friend class StableDocIterator;
+       ///@}
+
        /// type for cell number in inset
        typedef size_t idx_type;
        /// type for row indices
@@ -64,6 +70,8 @@ public:
        pit_type pit() const { return pit_; }
        /// set the offset of the paragraph this cursor is in
        pit_type & pit() { return pit_; }
+       /// return the last paragraph offset within the ParagraphList
+       pit_type lastpit() const;
        /// increments the paragraph this cursor is in
        void incrementPar();
        /// decrements the paragraph this cursor is in
@@ -95,9 +103,9 @@ public:
        /// texted specific stuff
        ///
        /// returns text corresponding to this position
-       LyXText * text() { return inset_->getText(idx_); }
+       Text * text() { return inset_->getText(idx_); }
        /// returns text corresponding to this position
-       LyXText const * text() const { return inset_->getText(idx_); }
+       Text const * text() const { return inset_->getText(idx_); }
        /// paragraph in this cell
        Paragraph & paragraph();
        /// paragraph in this cell
@@ -113,10 +121,20 @@ public:
 
        /// write some debug information to \p os
        friend std::ostream & operator<<(std::ostream &, CursorSlice const &);
-public:
+       /// move to next position
+       void forwardPos();
+       /// move to previous position
+       void backwardPos();
+       /// are we at the end of this slice
+       bool at_end() const;
+       /// are we at the start of this slice
+       bool at_begin() const;
+       
+private:
+
        /// pointer to 'owning' inset. This is some kind of cache.
        Inset * inset_;
-private:
+
        /*!
         * Cell index of a position in this inset.
         * This is the primary cell information also for grid like insets,