X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=5c9ba843c3858caae9f60fad1929e90adcdea7cd;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=feb3ba5fe7cc6eb99bdb24080f63a7d0d37d3864;hpb=850ec3731821edbf1903178126a4293e169d862a;p=lyx.git

diff --git a/src/paragraph.h b/src/paragraph.h
index feb3ba5fe7..5c9ba843c3 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -18,11 +18,9 @@
 #include "support/types.h"
 #include "changes.h"
 
-#include "ParagraphList.h"
 #include "LString.h"
 
-#include <boost/optional.hpp>
-
+class Buffer;
 class BufferParams;
 class BufferView;
 class Counters;
@@ -32,21 +30,12 @@ class LaTeXFeatures;
 class LatexRunParams;
 class ParagraphParameters;
 class TexRow;
-
-// Define this if you want to try out the new storage container for
-// paragraphs. (Lgb)
-// This is non working and far from finished.
-#define NO_STD_LIST 1
+class ParagraphList;
+class UpdatableInset;
 
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
 public:
-#ifdef NO_STD_LIST
-	// Remove this whan ParagraphList transition is over. (Lgb)
-	friend class ParagraphList;
-	friend class ParagraphList::iterator;
-	friend class ParagraphList::const_iterator;
-#endif
 	///
 	enum META_KIND {
 		/// Note that this is 1 right now to avoid
@@ -67,7 +56,7 @@ public:
 	///
 	Paragraph(Paragraph const &);
 	///
-	//void operator=(Paragraph const &);
+	void operator=(Paragraph const &);
 	/// the destructor removes the new paragraph from the list
 	~Paragraph();
 
@@ -117,9 +106,9 @@ public:
 	void makeSameLayout(Paragraph const & par);
 
 	///
-	Inset * inInset() const;
+	UpdatableInset * inInset() const;
 	///
-	void setInsetOwner(Inset * i);
+	void setInsetOwner(UpdatableInset * inset);
 	///
 	void deleteInsetsLyXText(BufferView *);
 	///
@@ -181,10 +170,11 @@ public:
 	/// mark whole par as erased
 	void markErased();
 
-	/// Paragraphs can contain "manual labels", for example, Description environment.
-	/// The text for this user-editable label is stored in the paragraph alongside
-	/// the text of the rest of the paragraph (the body). This function returns
-	/// the starting position of the body of the text in the paragraph.
+	/// Paragraphs can contain "manual labels", for example, Description
+	/// environment. The text for this user-editable label is stored in
+	/// the paragraph alongside the text of the rest of the paragraph
+	/// (the body). This function returns the starting position of the
+	/// body of the text in the paragraph.
 	int beginningOfBody() const;
 
 	///
@@ -293,30 +283,22 @@ public:
 	///
 	int stripLeadingSpaces();
 
-	///
+	/// return true if we allow multiple spaces
 	bool isFreeSpacing() const;
 
+	/// return true if we allow this par to stay empty
+	bool allowEmpty() const;
+
 	///
 	ParagraphParameters & params();
 	///
 	ParagraphParameters const & params() const;
 	///
 	InsetList insetlist;
-	///
-	//Counters & counters();
-	///
-	void owningBuffer(Buffer const & b) {
-		buffer_.reset(&b);
-	}
+
 private:
 	///
 	LyXLayout_ptr layout_;
-#ifdef NO_STD_LIST
-	Paragraph * next_par_;
-	Paragraph * prev_par_;
-#endif
-	///
-	boost::optional<Buffer const *> buffer_;
 
 	struct Pimpl;
 	///
@@ -338,6 +320,7 @@ inline bool isDeletedText(Paragraph const & par, lyx::pos_type pos)
 	return par.lookupChange(pos) == Change::DELETED;
 }
 
+
 bool operator==(Paragraph const & lhs, Paragraph const & rhs);
 
 #endif // PARAGRAPH_H