* 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 fe05e398c841ac228094beba4af124abfc7b66cb..6e730ea685018f6b85116c6adbdffdb07469b39e 100644 (file)
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -15,22 +15,14 @@
 #include "CursorSlice.h"
 
 #include <vector>
-#include <iosfwd>
 
 
 namespace lyx {
 
-class Text;
+class LyXErr;
 class MathAtom;
 class Paragraph;
-
-
-// only needed for gcc 2.95, remove when support terminated
-template <typename A, typename B>
-bool ptr_cmp(A const * a, B const * b)
-{
-       return a == b;
-}
+class Text;
 
 
 // The public inheritance should go in favour of a suitable data member
@@ -192,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 &);
@@ -212,6 +205,19 @@ public:
        /// \return true if the DocIterator was fixed.
        bool fixIfBroken();
 
+       /// find index of CursorSlice with &cell() == &cell (or -1 if not found)
+       idx_type find(MathData const & cell) const;
+       /// find index of CursorSlice with inset() == inset (or -1 of not found)
+       idx_type find(InsetMath const * inset) const;
+       /// cut off CursorSlices with index > above and store cut off slices in cut
+       void cutOff(idx_type above, std::vector<CursorSlice> & cut);
+       /// cut off CursorSlices with index > above
+       void cutOff(idx_type above);
+       /// push CursorSlices on top
+       void append(std::vector<CursorSlice> const & x);
+       /// push one CursorSlice on top and set its index and position
+       void append(idx_type idx, pos_type pos);
+
 private:
        /**
         * When the cursor position is i, is the cursor after the i-th char
@@ -244,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.