namespace lyx {
-class Text;
+class LyXErr;
class MathAtom;
class Paragraph;
+class Text;
// The public inheritance should go in favour of a suitable data member
/// output
friend std::ostream &
operator<<(std::ostream & os, DocIterator const & cur);
+ friend LyXErr & operator<<(LyXErr & os, DocIterator const & it);
///
friend bool operator==(DocIterator const &, DocIterator const &);
friend bool operator<(DocIterator const &, DocIterator const &);
DocIterator doc_iterator_end(Inset & inset);
-inline
-bool operator==(DocIterator const & di1, DocIterator const & di2)
+inline bool operator==(DocIterator const & di1, DocIterator const & di2)
{
return di1.slices_ == di2.slices_;
}
-inline
-bool operator!=(DocIterator const & di1, DocIterator const & di2)
+inline bool operator!=(DocIterator const & di1, DocIterator const & di2)
{
return !(di1 == di2);
}
+inline
+bool operator<(DocIterator const & p, DocIterator const & q)
+{
+ size_t depth = std::min(p.depth(), q.depth());
+ for (size_t i = 0 ; i < depth ; ++i) {
+ if (p[i] != q[i])
+ return p[i] < q[i];
+ }
+ return p.depth() < q.depth();
+}
+
+
+inline
+bool operator>(DocIterator const & p, DocIterator const & q)
+{
+ return q < p;
+}
+
+
+inline
+bool operator<=(DocIterator const & p, DocIterator const & q)
+{
+ return !(q < p);
+}
+
+
// The difference to a ('non stable') DocIterator is the removed
// (overwritten by 0...) part of the CursorSlice data items. So this thing
// is suitable for external storage, but not for iteration as such.