X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=7761c5ff683b54cc31510a52467b01464da2017f;hb=9337d73f1f9a6d4dae2e239e9f679a7452660c40;hp=3c9e533562d0bf2e6959df1a973727609a0df5a7;hpb=f8d516c7afcb84b73930fb9de5738fafa8a921c9;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 3c9e533562..7761c5ff68 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,7 +17,7 @@
 #define PARAGRAPH_H
 
 #include "FontEnums.h"
-#include "LayoutPtr.h"
+#include "Layout.h"
 
 #include "insets/InsetCode.h"
 
@@ -31,6 +31,9 @@ class Buffer;
 class BufferParams;
 class Change;
 class Counters;
+class Cursor;
+class CursorSlice;
+class DocumentClass;
 class Inset;
 class InsetBibitem;
 class LaTeXFeatures;
@@ -43,7 +46,6 @@ class MetricsInfo;
 class OutputParams;
 class PainterInfo;
 class ParagraphParameters;
-class TextClass;
 class TexRow;
 
 
@@ -95,36 +97,30 @@ public:
 	///
 	bool isMultiLingual(BufferParams const &) const;
 
+	/// Convert the paragraph to a string.
+	/// Used for building the table of contents
+	docstring asString(bool label) const;
 	///
-	docstring const asString(Buffer const &, bool label) const;
-	///
-	docstring const asString(Buffer const & buffer,
-				   pos_type beg,
-				   pos_type end,
-				   bool label) const;
+	docstring asString(pos_type beg, pos_type end, bool label) const;
 
 	///
-	void write(Buffer const &, std::ostream &, BufferParams const &,
+	void write(std::ostream &, BufferParams const &,
 		   depth_type & depth) const;
 	///
 	void validate(LaTeXFeatures &) const;
 
 	///
-	bool latex(Buffer const &, BufferParams const &,
-			     Font const & outerfont, odocstream &,
-			     TexRow & texrow, OutputParams const &) const;
+	bool latex(BufferParams const &, Font const & outerfont, odocstream &,
+		TexRow & texrow, OutputParams const &) const;
 
 	/// Can we drop the standard paragraph wrapper?
 	bool emptyTag() const;
 
 	/// Get the id of the paragraph, usefull for docbook
-	std::string getID(Buffer const & buf,
-			  OutputParams const & runparams) const;
+	std::string getID(Buffer const & buf, OutputParams const & runparams) const;
 
 	/// Get the first word of a paragraph, return the position where it left
-	pos_type getFirstWord(Buffer const & buf,
-				   odocstream & os,
-				   OutputParams const & runparams) const;
+	pos_type firstWord(odocstream & os, OutputParams const & runparams) const;
 
 	/// Writes to stream the docbook representation
 	void simpleDocBookOnePar(Buffer const & buf,
@@ -157,11 +153,11 @@ public:
 	bool empty() const;
 
 	///
-	LayoutPtr const & layout() const;
-	///
-	void setLayout(LayoutPtr const & layout);
+	Layout const & layout() const;
+	/// Do not pass a temporary to this!
+	void setLayout(Layout const & layout);
 	///
-	void setEmptyOrDefaultLayout(TextClass const & tc);
+	void setEmptyOrDefaultLayout(DocumentClass const & tc);
 
 	/// This is the item depth, only used by enumerate and itemize
 	signed char itemdepth;
@@ -214,7 +210,7 @@ public:
 	docstring const translateIfPossible(docstring const & label,
 		BufferParams const & bparams) const;
 	/// Expand the counters for the labelstring of \c layout
-	docstring expandLabel(LayoutPtr const &, BufferParams const &,
+	docstring expandLabel(Layout const &, BufferParams const &,
 		bool process_appendix = true) const;
 	/// Actual paragraph alignment used
 	char getAlign() const;
@@ -223,7 +219,7 @@ public:
 	/// The maximal possible depth of a paragraph after this one
 	depth_type getMaxDepthAfter() const;
 	///
-	void applyLayout(LayoutPtr const & new_layout);
+	void applyLayout(Layout const & new_layout);
 
 	/// (logically) erase the char at pos; return true if it was actually erased
 	bool eraseChar(pos_type pos, bool trackChanges);
@@ -348,7 +344,7 @@ public:
 	/// an inset, in which case pos is the position from which the inset
 	/// was deleted, and the cursor will need to be moved back one if it
 	/// was previously past that position. Return 0 otherwise.
-	int checkBiblio(bool track_changes);
+	int checkBiblio(Buffer const & buffer);
 
 	/// For each author, set 'used' to true if there is a change
 	/// by this author in the paragraph.
@@ -367,8 +363,18 @@ public:
 		bool mw, ///<
 		pos_type pos, ///< start from here.
 		bool del = true) const;
+	
+	///
+	void updateWords(CursorSlice const & sl);
 
 private:
+	///
+	void deregisterWords();
+	///
+	void collectWords(CursorSlice const & sl);
+	///
+	void registerWords();
+
 	/// Pimpl away stuff
 	class Private;
 	///