X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=34ae917f182cb49856aedd6ec5015850bb219bf8;hb=890fb133b1b2349588705d32fe0c9b95eb50503a;hp=50516d77ae9f75eeba4aff6800a04a5a86b949dd;hpb=b917c4e40f9f5cd3d101444600eddafcca54d6e3;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 50516d77ae..34ae917f18 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"
@@ -47,6 +48,7 @@ class MetricsInfo;
 class OutputParams;
 class PainterInfo;
 class ParagraphParameters;
+class TocBackend;
 class WordLangTuple;
 class XHTMLStream;
 class otexstream;
@@ -66,7 +68,7 @@ public:
 	{
 		return first < s.first;
 	}
-	
+
 	inline bool operator==(FontSpan const & s) const
 	{
 		return first == s.first && last == s.last;
@@ -81,7 +83,7 @@ public:
 	{
 		return empty() ? 0 : last - first;
 	}
-	
+
 
 	inline FontSpan intersect(FontSpan const & f) const
 	{
@@ -98,7 +100,7 @@ public:
 			result.last = last;
 		return result;
 	}
-	
+
 	inline bool empty() const
 	{
 		return first > last;
@@ -150,7 +152,7 @@ public:
 
 	///
 	void addChangesToToc(DocIterator const & cdit, Buffer const & buf,
-	        bool output_active) const;
+	                     bool output_active, TocBackend & backend) const;
 	/// set the buffer flag if there are changes in the paragraph
 	void addChangesToBuffer(Buffer const & buf) const;
 	///
@@ -181,8 +183,8 @@ public:
 			   int options = AS_STR_NONE,
 			   const OutputParams *runparams = 0) const;
 	///
-	void forOutliner(docstring &, size_t const maxlen,
-					 bool const shorten = true) const;
+	void forOutliner(docstring &, size_t maxlen, bool shorten = true,
+	                 bool label = true) const;
 
 	///
 	void write(std::ostream &, BufferParams const &,
@@ -219,6 +221,8 @@ public:
 				 XHTMLStream & xs,
 				 OutputParams const & runparams,
 				 Font const & outerfont,
+				 bool start_paragraph = true,
+				 bool close_paragraph = true,
 				 pos_type initial = 0) const;
 
 	///
@@ -259,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 ?
@@ -306,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
@@ -354,12 +360,10 @@ 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);
-	/// Returns the height of the highest font in range
-	FontSize highestFontInRange(pos_type startpos,
-					pos_type endpos, FontSize def_size) const;
 	///
 	void insert(pos_type pos, docstring const & str,
 		    Font const & font, Change const & change);
@@ -397,6 +401,8 @@ public:
 	InsetList const & insetList() const;
 	///
 	void setBuffer(Buffer &);
+	///
+	void resetBuffer();
 
 	///
 	bool isHfill(pos_type pos) const;
@@ -465,7 +471,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;
 	///
@@ -502,6 +508,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 &,