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

diff --git a/src/Paragraph.h b/src/Paragraph.h
index d59753dece..7761c5ff68 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,15 +17,12 @@
 #define PARAGRAPH_H
 
 #include "FontEnums.h"
-#include "LayoutPtr.h"
+#include "Layout.h"
 
 #include "insets/InsetCode.h"
 
 #include "support/strfwd.h"
 #include "support/types.h"
-// FIXME: would be nice to forward declare odocstream instead of
-// including this:
-#include "support/docstream.h"
 
 namespace lyx {
 
@@ -34,6 +31,9 @@ class Buffer;
 class BufferParams;
 class Change;
 class Counters;
+class Cursor;
+class CursorSlice;
+class DocumentClass;
 class Inset;
 class InsetBibitem;
 class LaTeXFeatures;
@@ -97,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,
@@ -148,17 +142,22 @@ public:
 	///
 	InsetCode ownerCode() const;
 	///
-	bool forceDefaultParagraphs() const;
-
+	bool forceEmptyLayout() const;
+	///
+	bool allowParagraphCustomization() const;
+	///
+	bool useEmptyLayout() const;
 	///
 	pos_type size() const;
 	///
 	bool empty() const;
 
 	///
-	LayoutPtr const & layout() const;
+	Layout const & layout() const;
+	/// Do not pass a temporary to this!
+	void setLayout(Layout const & layout);
 	///
-	void layout(LayoutPtr const & new_layout);
+	void setEmptyOrDefaultLayout(DocumentClass const & tc);
 
 	/// This is the item depth, only used by enumerate and itemize
 	signed char itemdepth;
@@ -201,7 +200,7 @@ public:
 	void setBeginOfBody();
 
 	///
-	docstring const & getLabelstring() const;
+	docstring const & labelString() const;
 
 	/// the next two functions are for the manual labels
 	docstring const getLabelWidthString() const;
@@ -211,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;
@@ -220,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);
@@ -345,16 +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);
-
-	/// To resolve macros properly the paragraphs are numbered.
-	/// Every macro definition is stored with its paragraph number
-	/// as well. Only those macros with a smaller number become 
-	/// visible in a paragraph (plus those in the same paragraph, but
-	/// in an earlier inset.
-	unsigned int macrocontextPosition() const;
-	///
-	void setMacrocontextPosition(unsigned int pos);
+	int checkBiblio(Buffer const & buffer);
 
 	/// For each author, set 'used' to true if there is a change
 	/// by this author in the paragraph.
@@ -362,7 +352,7 @@ public:
 
 	///
 	void changeCase(BufferParams const & bparams, pos_type pos,
-		pos_type right, TextCase action);
+		pos_type & right, TextCase action);
 
 	/// find \param str string inside Paragraph.
 	/// \return true if the specified string is at the specified position
@@ -373,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;
 	///