* Lazy MathData to avoid unneeded interpretation of macro definitions

[features.git] / src / DocIterator.h

diff --git a/src/DocIterator.h b/src/DocIterator.h
index 0531a23c6870bc07aca03a08621011673751c175..6e730ea685018f6b85116c6adbdffdb07469b39e 100644 (file)
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -19,9 +19,10 @@
 
 namespace lyx {
 
-class Text;
+class LyXErr;
 class MathAtom;
 class Paragraph;
+class Text;
 
 
 // The public inheritance should go in favour of a suitable data member
@@ -183,6 +184,7 @@ public:
        /// 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 &);
@@ -248,20 +250,44 @@ DocIterator doc_iterator_begin(Inset & inset);
 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.