X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.h;h=435d44bca37d609a1404152272434e5181fdf086;hb=19478f3efa546378818af103be9c03cd63d9fc54;hp=d7041480cb6e32639bdbceea3e4ad8302222994c;hpb=038cc706500567634c68d71342e8be54cf0e81bd;p=lyx.git

diff --git a/src/Changes.h b/src/Changes.h
index d7041480cb..435d44bca3 100644
--- a/src/Changes.h
+++ b/src/Changes.h
@@ -15,7 +15,11 @@
 #ifndef CHANGES_H
 #define CHANGES_H
 
+#include "Color.h"
+
 #include "support/docstream.h"
+#include "support/strfwd.h"
+#include "support/types.h"
 #include "support/lyxtime.h"
 
 #include <vector>
@@ -23,6 +27,10 @@
 
 namespace lyx {
 
+class AuthorList;
+class Buffer;
+class DocIterator;
+class OutputParams;
 
 class Change {
 public:
@@ -33,17 +41,33 @@ 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 = 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; }
 
 	Type type;
 
 	int author;
 
-	time_type changetime;
+	time_t changetime;
 };
 
 bool operator==(Change const & l, Change const & r);
@@ -74,16 +98,24 @@ public:
 	/// return true if there is a change in the given range (excluding end)
 	bool isChanged(pos_type start, pos_type end) 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) const;
 
 private:
 	class Range {