X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=297bff3847bcd7aa12d4c5ab8d27a8ae5d627a7a;hb=66c5d055e776e0cd08fb35c164b49d9ccc7812b7;hp=ec1c8c8b9a564c753b6a738ac2beb85a7cb9c019;hpb=000832f9d967cba9901db5f74bea7eaf1b49e31b;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index ec1c8c8b9a..297bff3847 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -68,7 +68,7 @@ public:
 	{
 		return first < s.first;
 	}
-	
+
 	inline bool operator==(FontSpan const & s) const
 	{
 		return first == s.first && last == s.last;
@@ -83,7 +83,7 @@ public:
 	{
 		return empty() ? 0 : last - first;
 	}
-	
+
 
 	inline FontSpan intersect(FontSpan const & f) const
 	{
@@ -100,7 +100,7 @@ public:
 			result.last = last;
 		return result;
 	}
-	
+
 	inline bool empty() const
 	{
 		return first > last;
@@ -153,10 +153,6 @@ public:
 	///
 	void addChangesToToc(DocIterator const & cdit, Buffer const & buf,
 	                     bool output_active, TocBackend & backend) const;
-	/// set the buffer flag if there are changes in the paragraph
-	void addChangesToBuffer(Buffer const & buf) const;
-	///
-	bool isChangeUpdateRequired() const;
 	///
 	Language const * getParLanguage(BufferParams const &) const;
 	///
@@ -263,10 +259,14 @@ public:
 	/// look up change at given pos
 	Change const & lookupChange(pos_type pos) const;
 
-	/// is there a change within the given range ?
+	/// is there a change within the given range (does not
+	/// check contained paragraphs)
 	bool isChanged(pos_type start, pos_type end) const;
 	/// is there an unchanged char at the given pos ?
 	bool isChanged(pos_type pos) const;
+	/// is there a change in the paragraph ?
+	bool isChanged() const;
+
 	/// is there an insertion at the given pos ?
 	bool isInserted(pos_type pos) const;
 	/// is there a deletion at the given pos ?
@@ -277,6 +277,8 @@ public:
 	/// will the paragraph be physically merged with the next
 	/// one if the imaginary end-of-par character is logically deleted?
 	bool isMergedOnEndOfParDeletion(bool trackChanges) const;
+	/// Return Change form of paragraph break
+	Change parEndChange() const;
 
 	/// set change for the entire par
 	void setChange(Change const & change);
@@ -310,7 +312,9 @@ public:
 	/// Set label width string.
 	void setLabelWidthString(docstring const & s);
 	/// Actual paragraph alignment used
-	LyXAlignment getAlign() const;
+	LyXAlignment getAlign(BufferParams const &) const;
+	/// Default paragraph alignment as determined by layout
+	LyXAlignment getDefaultAlign(BufferParams const &) const;
 	/// The nesting depth of a paragraph
 	depth_type getDepth() const;
 	/// The maximal possible depth of a paragraph after this one
@@ -358,7 +362,8 @@ public:
 	///
 	char_type getChar(pos_type pos) const;
 	/// Get the char, but mirror all bracket characters if it is right-to-left
-	char_type getUChar(BufferParams const &, pos_type pos) const;
+	char_type getUChar(BufferParams const &, OutputParams const &,
+			   pos_type pos) const;
 	/// pos <= size() (there is a dummy font change at the end of each par)
 	void setFont(pos_type pos, Font const & font);
 	///
@@ -397,7 +402,7 @@ public:
 	///
 	InsetList const & insetList() const;
 	///
-	void setBuffer(Buffer &);
+	void setInsetBuffers(Buffer &);
 	///
 	void resetBuffer();
 
@@ -416,7 +421,7 @@ public:
 	bool isLineSeparator(pos_type pos) const;
 	/// True if the character/inset at this point is a word separator.
 	/// Note that digits in particular are not considered as word separator.
-	bool isWordSeparator(pos_type pos) const;
+	bool isWordSeparator(pos_type pos, bool const ignore_deleted = false) const;
 	/// True if the element at this point is a character that is not a letter.
 	bool isChar(pos_type pos) const;
 	/// True if the element at this point is a space
@@ -424,6 +429,9 @@ public:
 	/// True if the element at this point is a hard hyphen or a apostrophe
 	/// If it is enclosed by spaces return false
 	bool isHardHyphenOrApostrophe(pos_type pos) const;
+	/// Return true if this paragraph has verbatim content that needs to be
+	/// protected by \cprotect
+	bool needsCProtection(bool const fragile = false) const;
 
 	/// returns true if at least one line break or line separator has been deleted
 	/// at the beginning of the paragraph (either physically or logically)
@@ -468,9 +476,9 @@ public:
 		bool mw, ///<
 		pos_type pos, ///< start from here.
 		bool del = true) const;
-	
+
 	void locateWord(pos_type & from, pos_type & to,
-		word_location const loc) const;
+		word_location const loc, bool const ignore_deleted = false) const;
 	///
 	void updateWords();
 
@@ -505,6 +513,10 @@ public:
 	/// presently used only in the XHTML output routines.
 	std::string magicLabel() const;
 
+	/// anonymizes the paragraph contents (but not the paragraphs
+	/// contained inside it. Does not handle undo.
+	void anonymize();
+
 private:
 	/// Expand the counters for the labelstring of \c layout
 	docstring expandParagraphLabel(Layout const &, BufferParams const &,