X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.h;h=2aeff8fca13b69f6488691100a4f9b3b306f901e;hb=32f6c066ccad00e1580f1f2a5c1d989153e4a83b;hp=ed2575ee27b60a36fddef5e5646933c441794129;hpb=4209cbc631e92edd02f4558e75d085eeea210d17;p=lyx.git

diff --git a/src/DocIterator.h b/src/DocIterator.h
index ed2575ee27..2aeff8fca1 100644
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -19,16 +19,19 @@
 
 namespace lyx {
 
+class DocIterator;
 class LyXErr;
 class MathAtom;
 class Paragraph;
 class Text;
 class InsetIterator;
+class FontSpan;
 
+DocIterator doc_iterator_begin(Buffer const * buf, Inset const * inset = 0);
+DocIterator doc_iterator_end(Buffer const * buf, Inset const * inset = 0);
 
-// The public inheritance should go in favour of a suitable data member
-// (or maybe private inheritance) at some point of time.
-class DocIterator // : public std::vector<CursorSlice>
+
+class DocIterator
 {
 public:
 	/// type for cell number in inset
@@ -41,6 +44,17 @@ public:
 public:
 	///
 	DocIterator();
+	///
+	explicit DocIterator(Buffer *buf);
+
+	/// access to owning buffer
+	Buffer * buffer() const { return buffer_; }
+	/// access to owning buffer
+	void setBuffer(Buffer * buf) { buffer_ = buf; }
+
+	/// Clone this for given \p buffer.
+	/// \p buffer must be a clone of buffer_.
+	DocIterator clone(Buffer * buffer) const;
 
 	/// access slice at position \p i
 	CursorSlice const & operator[](size_t i) const { return slices_[i]; }
@@ -58,6 +72,8 @@ public:
 	bool empty() const { return slices_.empty(); }
 	/// is this the end position?
 	bool atEnd() const { return slices_.empty(); }
+	/// is this the last possible position?
+	bool atLastPos() const { return pit() == lastpit() && pos() == lastpos(); }
 
 	//
 	// access to slice at tip
@@ -148,6 +164,9 @@ public:
 	Paragraph & innerParagraph() const;
 	/// return the inner text slice.
 	CursorSlice const & innerTextSlice() const;
+	/// the first and last positions of a word at top cursor slice
+	/// \warning only works within text!
+	FontSpan locateWord(word_location const loc) const;
 	///
 	Text * text() const;
 	/// the containing inset or the cell, respectively
@@ -228,10 +247,10 @@ public:
 
 private:
 	friend class InsetIterator;
-	friend DocIterator doc_iterator_begin(Inset & inset);
-	friend DocIterator doc_iterator_end(Inset & inset);
+	friend DocIterator doc_iterator_begin(Buffer const * buf, Inset const * inset);
+	friend DocIterator doc_iterator_end(Buffer const * buf, Inset const * inset);
 	///
-	explicit DocIterator(Inset & inset);
+	explicit DocIterator(Buffer * buf, Inset * inset);
 	/**
 	 * Normally, when the cursor is at position i, it is painted *before*
 	 * the character at position i. However, what if we want the cursor 
@@ -259,20 +278,16 @@ private:
 	 */
 	bool boundary_;
 	///
-	std::vector<CursorSlice> const & internalData() const {
-		return slices_;
-	}
+	std::vector<CursorSlice> const & internalData() const { return slices_; }
 	///
 	std::vector<CursorSlice> slices_;
 	///
 	Inset * inset_;
+	///
+	Buffer * buffer_;
 };
 
 
-DocIterator doc_iterator_begin(Inset & inset);
-DocIterator doc_iterator_end(Inset & inset);
-
-
 inline bool operator==(DocIterator const & di1, DocIterator const & di2)
 {
 	return di1.slices_ == di2.slices_;
@@ -322,14 +337,15 @@ bool operator>=(DocIterator const & p, DocIterator const & q)
 // (overwritten by 0...) part of the CursorSlice data items. So this thing
 // is suitable for external storage, but not for iteration as such.
 
-class StableDocIterator {
+class StableDocIterator
+{
 public:
 	///
 	StableDocIterator() {}
 	/// non-explicit intended
 	StableDocIterator(const DocIterator & it);
 	///
-	DocIterator asDocIterator(Inset * start) const;
+	DocIterator asDocIterator(Buffer * buf) const;
 	///
 	size_t size() const { return data_.size(); }
 	///  return the position within the paragraph
@@ -349,7 +365,6 @@ private:
 	std::vector<CursorSlice> data_;
 };
 
-
 } // namespace lyx
 
-#endif
+#endif // DOCITERATOR_H