X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=2f61083b801d7c203faae6ffbf25f67740ad6b40;hb=0b54650f0e7f1eae39f93444cac6c8525811975b;hp=03a652ec08ced266b8be525ea87677e1c4ccc7b9;hpb=a53847964dc44d15f7c83cc65dbc16fef88d54c9;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 03a652ec08..2f61083b80 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,6 +17,7 @@
 #define PARAGRAPH_H
 
 #include "FontEnums.h"
+#include "LayoutEnums.h"
 #include "SpellChecker.h"
 
 #include "support/strfwd.h"
@@ -67,7 +68,7 @@ public:
 	{
 		return first < s.first;
 	}
-	
+
 	inline bool operator==(FontSpan const & s) const
 	{
 		return first == s.first && last == s.last;
@@ -82,7 +83,7 @@ public:
 	{
 		return empty() ? 0 : last - first;
 	}
-	
+
 
 	inline FontSpan intersect(FontSpan const & f) const
 	{
@@ -99,7 +100,7 @@ public:
 			result.last = last;
 		return result;
 	}
-	
+
 	inline bool empty() const
 	{
 		return first > last;
@@ -262,10 +263,12 @@ 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 an insertion at the given pos ?
 	bool isInserted(pos_type pos) const;
 	/// is there a deletion at the given pos ?
@@ -309,7 +312,7 @@ public:
 	/// Set label width string.
 	void setLabelWidthString(docstring const & s);
 	/// Actual paragraph alignment used
-	char getAlign() const;
+	LyXAlignment getAlign() const;
 	/// The nesting depth of a paragraph
 	depth_type getDepth() const;
 	/// The maximal possible depth of a paragraph after this one
@@ -357,7 +360,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);
 	///
@@ -396,7 +400,7 @@ public:
 	///
 	InsetList const & insetList() const;
 	///
-	void setBuffer(Buffer &);
+	void setInsetBuffers(Buffer &);
 	///
 	void resetBuffer();
 
@@ -423,6 +427,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)
@@ -467,7 +474,7 @@ 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;
 	///
@@ -504,6 +511,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 &,