X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=d462f4c41356cfdbeb18468a744abfbeb8e8b062;hb=2b927cbc2ee79f1d1f8a125f4d1a88162a1e5dfa;hp=2133d8ce74ecbdd107cf487c7e28f07dd307486a;hpb=fd50fb720f45a9064ccd91c1066e80ce6b5aa8a5;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 2133d8ce74..d462f4c413 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 &,
@@ -308,7 +310,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
@@ -466,7 +468,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;
 	///