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

[lyx.git] / src / Changes.h

diff --git a/src/Changes.h b/src/Changes.h
index d7041480cb6e32639bdbceea3e4ad8302222994c..96383967b96f89fb44b7db096e1804f8c091183c 100644 (file)
--- a/src/Changes.h
+++ b/src/Changes.h
@@ -15,14 +15,25 @@
 #ifndef CHANGES_H
 #define CHANGES_H
 
-#include "support/docstream.h"
+#include "Color.h"
+
+#include "support/strfwd.h"
+#include "support/types.h"
 #include "support/lyxtime.h"
 
+#include "texstream.h"
+
 #include <vector>
 
 
 namespace lyx {
 
+class AuthorList;
+class Buffer;
+class DocIterator;
+class OutputParams;
+class PainterInfo;
+class FontInfo;
 
 class Change {
 public:
@@ -33,17 +44,47 @@ public:
                DELETED // deleted text
        };
 
-       explicit Change(Type t, int a = 0, time_type ct = current_time())
+       explicit Change(Type t = UNCHANGED, int a = 0, time_t ct = support::current_time())
                : type(t), author(a), changetime(ct) {}
 
        /// is the change similar to the given change such that both can be merged?
-       bool isSimilarTo(Change const & change);
+       bool isSimilarTo(Change const & change) const;
+       /// The color of this change on screen
+       Color color() const;
+       ///
+       bool changed() const { return type != UNCHANGED; }
+       ///
+       void setUnchanged() { type = UNCHANGED; }
+       ///
+       bool inserted() const { return type == INSERTED; }
+       ///
+       void setInserted() { type = INSERTED; }
+       ///
+       bool deleted() const { return type == DELETED; }
+       ///
+       void setDeleted() { type = DELETED; }
+       /// 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;
 
-       time_type changetime;
+       time_t changetime;
 };
 
 bool operator==(Change const & l, Change const & r);
@@ -53,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
@@ -73,17 +116,33 @@ 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;
 
        /// output latex to mark a transition between two change types
        /// returns length of text outputted
-       static int latexMarkChange(odocstream & os, BufferParams const & bparams,
-                                  Change const & oldChange, Change const & change);
+       static int latexMarkChange(otexstream & os, BufferParams const & bparams,
+                                  Change const & oldChange, Change const & change,
+                                  OutputParams const & runparams);
 
        /// output .lyx file format for transitions between changes
-       static void lyxMarkChange(std::ostream & os, int & column,
-               Change const & old, Change const & change);
+       static void lyxMarkChange(std::ostream & os, BufferParams const & bparams,
+               int & column, Change const & old, Change const & change);
+
+       ///
+       void checkAuthors(AuthorList const & authorList);
+
+       ///
+       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 {
@@ -127,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_;
 };