Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / Changes.h

diff --git a/src/Changes.h b/src/Changes.h
index 84c4fea707e67d684287cb6e83cd36d3e0d368b4..96383967b96f89fb44b7db096e1804f8c091183c 100644 (file)
--- a/src/Changes.h
+++ b/src/Changes.h
@@ -17,11 +17,12 @@
 
 #include "Color.h"
 
-#include "support/docstream.h"
 #include "support/strfwd.h"
 #include "support/types.h"
 #include "support/lyxtime.h"
 
+#include "texstream.h"
+
 #include <vector>
 
 
@@ -31,6 +32,8 @@ class AuthorList;
 class Buffer;
 class DocIterator;
 class OutputParams;
+class PainterInfo;
+class FontInfo;
 
 class Change {
 public:
@@ -63,6 +66,20 @@ public:
        /// Is this change made by the current author ?
        bool currentAuthor() const { return author == 0; }
 
+       /// Paint under- or strike-through line
+       ///
+       /// Text : underline or strike through
+       /// \param x1 begin
+       /// \param x2 end
+       /// \param y baseline
+       void paintCue(PainterInfo & pi, double const x1, double const y,
+                      double const x2, FontInfo const & font) const;
+       /// Box : line below or diagonal
+       /// \param x1,y1 top-left corner
+       /// \param x2,y2 bottom-right corner
+       void paintCue(PainterInfo & pi, double const x1, double const y1,
+                      double const x2, double const y2) const;
+
        Type type;
 
        int author;
@@ -77,6 +94,8 @@ class BufferParams;
 
 class Changes {
 public:
+       Changes() : is_update_required_(false) {}
+
        /// set the pos to the given change
        void set(Change const & change, pos_type pos);
        /// set the range (excluding end) to the given change
@@ -97,6 +116,8 @@ public:
 
        /// return true if there is a change in the given range (excluding end)
        bool isChanged(pos_type start, pos_type end) const;
+       ///
+       bool isChanged() const;
 
        /// return true if the whole range is deleted
        bool isDeleted(pos_type start, pos_type end) const;
@@ -115,7 +136,13 @@ public:
        void checkAuthors(AuthorList const & authorList);
 
        ///
-       void addToToc(DocIterator const & cdit, Buffer const & buffer) const;
+       void addToToc(DocIterator const & cdit, Buffer const & buffer,
+               bool output_active) const;
+
+       ///
+       void updateBuffer(Buffer const & buf);
+       ///
+       bool isUpdateRequired() const { return is_update_required_; }
 
 private:
        class Range {
@@ -159,6 +186,10 @@ private:
 
        /// table of changes, every row a change and range descriptor
        ChangeTable table_;
+
+       /// signals that the buffer's flag tracked_changes_present_ needs to be
+       /// recalculated
+       bool is_update_required_;
 };