X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.h;h=1d55b03b548acd191cb36d77d764bc16df0bc130;hb=e2bc7ffae3eb387661064be8b9dc927742f9e7e8;hp=615b1099b1a7e848fd8741762282c7ee103271ca;hpb=f05504f5ef438eef9ecf52cd989148d8f6209b00;p=lyx.git

diff --git a/src/Changes.h b/src/Changes.h
index 615b1099b1..1d55b03b54 100644
--- a/src/Changes.h
+++ b/src/Changes.h
@@ -21,6 +21,8 @@
 #include "support/types.h"
 #include "support/lyxtime.h"
 
+#include "texstream.h"
+
 #include <vector>
 
 
@@ -29,6 +31,7 @@ namespace lyx {
 class AuthorList;
 class Buffer;
 class DocIterator;
+class OutputParams;
 
 class Change {
 public:
@@ -39,7 +42,7 @@ public:
 		DELETED // deleted text
 	};
 
-	explicit Change(Type t = UNCHANGED, int a = 0, time_t 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?
@@ -58,6 +61,8 @@ public:
 	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;
 
@@ -73,6 +78,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
@@ -93,24 +100,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 isFullyDeleted(pos_type const start, pos_type const end) const;		
+	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;
+	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 {
@@ -154,6 +170,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_;
 };