X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=3d1f8691fd07d8ef48102060e5852fb3f964703a;hb=501f1dd61b6c0beb927151ecf331f78848261b59;hp=d17bcdd0eafa62b6c4efdd852a1d2724a9ca299a;hpb=570ac6e4f47f07753616764eea741ce8ba963536;p=lyx.git

diff --git a/src/paragraph.h b/src/paragraph.h
index d17bcdd0ea..3d1f8691fd 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -20,6 +20,7 @@
 #include "insets/inset.h" // Just for Inset::Code
 
 #include "support/types.h"
+#include "changes.h"
 
 #include "LString.h"
 
@@ -32,11 +33,6 @@ class LaTeXFeatures;
 class ParagraphParameters;
 class TexRow;
 
-// After 1.2.0 is released, during 1.3.0cvs, we enable this. And after
-// a while we verify that reading of 1.2.x files work perfectly we remove
-// this code completely. (Lgb)
-#define NO_PEXTRA_REALLY 1
-
 // Define this if you want to try out the new storage container for
 // paragraphs. (Lgb)
 // This is non working and far from finished.
@@ -45,28 +41,6 @@ class TexRow;
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
 public:
-#ifndef NO_PEXTRA_REALLY
-	///
-	enum PEXTRA_TYPE {
-		///
-		PEXTRA_NONE,
-		///
-		PEXTRA_INDENT,
-		///
-		PEXTRA_MINIPAGE,
-		///
-		PEXTRA_FLOATFLT
-	};
-	///
-	enum MINIPAGE_ALIGNMENT {
-		///
-		MINIPAGE_ALIGN_TOP,
-		///
-		MINIPAGE_ALIGN_MIDDLE,
-		///
-		MINIPAGE_ALIGN_BOTTOM
-	};
-#endif
 	///
 	enum META_KIND {
 		///
@@ -104,14 +78,14 @@ public:
 	bool isMultiLingual(BufferParams const &);
 
 	///
-	string const asString(Buffer const *, bool label);
+	string const asString(Buffer const *, bool label) const;
 	///
 	string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end,
-			      bool label);
+			      bool label) const;
 
 	///
 	void write(Buffer const *, std::ostream &, BufferParams const &,
-		       depth_type) const;
+		       depth_type & depth) const;
 	///
 	void validate(LaTeXFeatures &) const;
 
@@ -192,6 +166,36 @@ public:
 	///
 	Paragraph const * next() const;
 
+	/// initialise tracking for this par
+	void trackChanges(Change::Type = Change::UNCHANGED);
+ 
+	/// stop tracking
+	void untrackChanges();
+ 
+	/// set entire paragraph to new text for change tracking
+	void cleanChanges();
+ 
+	/// look up change type at given pos
+	Change::Type lookupChange(lyx::pos_type pos) const;
+ 
+	/// look up change at given pos
+	Change const lookupChangeFull(lyx::pos_type pos) const;
+ 
+	/// is there a change within the given range ?
+	bool isChanged(lyx::pos_type start, lyx::pos_type end) const;
+
+	/// is there a non-addition in this range ?
+	bool isChangeEdited(lyx::pos_type start, lyx::pos_type end) const;
+ 
+	/// accept change
+	void acceptChange(lyx::pos_type start, lyx::pos_type end);
+
+	/// reject change
+	void rejectChange(lyx::pos_type start, lyx::pos_type end);
+ 
+	/// mark whole par as erased
+	void markErased();
+ 
 	///
 	void previous(Paragraph *);
 	///
@@ -224,14 +228,13 @@ public:
 	depth_type getMaxDepthAfter() const;
 	///
 	void applyLayout(LyXLayout_ptr const & new_layout);
-	///
+ 
+	/// erase the char at the given position
 	void erase(lyx::pos_type pos);
-	/** the flag determines wether the layout should be copied
-	 */
-	void breakParagraph(BufferParams const &, lyx::pos_type pos, int flag);
-	///
-	void breakParagraphConservative(BufferParams const &, lyx::pos_type pos);
-	/** Get unistantiated font setting. Returns the difference
+	/// erase the given range. Returns true if actually erased.
+	bool erase(lyx::pos_type start, lyx::pos_type end);
+ 
+	/** Get uninstantiated font setting. Returns the difference
 	    between the characters font and the layoutfont.
 	    This is what is stored in the fonttable
 	*/
@@ -266,13 +269,13 @@ public:
 	///
 	void insertChar(lyx::pos_type pos, value_type c);
 	///
-	void insertChar(lyx::pos_type pos, value_type c, LyXFont const &);
+	void insertChar(lyx::pos_type pos, value_type c, LyXFont const &, Change change = Change(Change::INSERTED));
 	///
 	bool checkInsertChar(LyXFont &);
 	///
 	void insertInset(lyx::pos_type pos, Inset * inset);
 	///
-	void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const &);
+	void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const &, Change change = Change(Change::INSERTED));
 	///
 	bool insetAllowed(Inset::Code code);
 	///
@@ -305,11 +308,6 @@ public:
 	///
 	bool isWord(lyx::pos_type pos) const;
 
-	/** paste this paragraph with the next one
-	    be carefull, this doesent make any check at all
-	*/
-	void pasteParagraph(BufferParams const &);
-
 	/// returns -1 if inset not found
 	int getPositionOfInset(Inset const * inset) const;
 
@@ -319,15 +317,6 @@ public:
 	///
 	int stripLeadingSpaces();
 
-#ifndef NO_PEXTRA_REALLY
-	/* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE
-	   I have to set it on each of it's elements */
-	///
-	void setPExtraType(BufferParams const &, int type,
-			   string const & width, string const & widthp);
-	///
-	void unsetPExtraType(BufferParams const &);
-#endif
 	///
 	bool isFreeSpacing() const;
 
@@ -338,8 +327,11 @@ public:
 	///
 	InsetList insetlist;
 	///
-	Counters & counters();
+	//Counters & counters();
 
+	friend void breakParagraph(BufferParams const & bparams,
+                    Paragraph * par, lyx::pos_type pos, int flag);
+ 
 private:
 	///
 	LyXLayout_ptr layout_;
@@ -358,4 +350,16 @@ private:
 	Pimpl * pimpl_;
 };
 
-#endif
+ 
+inline bool isInsertedText(Paragraph const * par, lyx::pos_type pos)
+{
+	return par->lookupChange(pos) == Change::INSERTED;
+}
+ 
+ 
+inline bool isDeletedText(Paragraph const * par, lyx::pos_type pos)
+{
+	return par->lookupChange(pos) == Change::DELETED;
+}
+ 
+#endif // PARAGRAPH_H