X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=4f49050a4d28baa83893901f96822c7b1cfa0eee;hb=b0babedcb7a9f4c737540d8ac7007b12ff5d979b;hp=10023bf801c10e9d9bf3a8402541376ba03c2453;hpb=83f4b0018ebf8a7566d11d74ad2eb84add5b7984;p=lyx.git

diff --git a/src/paragraph.h b/src/paragraph.h
index 10023bf801..4f49050a4d 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -32,11 +32,6 @@ class LaTeXFeatures;
 class ParagraphParameters;
 class TexRow;
 
-// After 1.2.0 is released, during 1.3.0cvs, we enable this. And after
-// a while we verify that reading of 1.2.x files work perfectly we remove
-// this code completely. (Lgb)
-#define NO_PEXTRA_REALLY 1
-
 // Define this if you want to try out the new storage container for
 // paragraphs. (Lgb)
 // This is non working and far from finished.
@@ -45,28 +40,6 @@ class TexRow;
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
 public:
-#ifndef NO_PEXTRA_REALLY
-	///
-	enum PEXTRA_TYPE {
-		///
-		PEXTRA_NONE,
-		///
-		PEXTRA_INDENT,
-		///
-		PEXTRA_MINIPAGE,
-		///
-		PEXTRA_FLOATFLT
-	};
-	///
-	enum MINIPAGE_ALIGNMENT {
-		///
-		MINIPAGE_ALIGN_TOP,
-		///
-		MINIPAGE_ALIGN_MIDDLE,
-		///
-		MINIPAGE_ALIGN_BOTTOM
-	};
-#endif
 	///
 	enum META_KIND {
 		///
@@ -83,9 +56,11 @@ public:
 
 	///
 	Paragraph();
+#ifndef NO_NEXT
 	/// this constructor inserts the new paragraph in a list
 	explicit
 	Paragraph(Paragraph * par);
+#endif
 	///
 	Paragraph(Paragraph const &, bool same_ids);
 	/// the destructor removes the new paragraph from the list
@@ -102,14 +77,14 @@ public:
 	bool isMultiLingual(BufferParams const &);
 
 	///
-	string const asString(Buffer const *, bool label);
+	string const asString(Buffer const *, bool label) const;
 	///
 	string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end,
-			      bool label);
+			      bool label) const;
 
 	///
-	void writeFile(Buffer const *, std::ostream &, BufferParams const &,
-		       depth_type) const;
+	void write(Buffer const *, std::ostream &, BufferParams const &,
+		       depth_type & depth) const;
 	///
 	void validate(LaTeXFeatures &) const;
 
@@ -181,6 +156,7 @@ public:
 	///
 	InsetBibKey * bibkey;  // ale970302
 
+#ifndef NO_NEXT
 	///
 	void next(Paragraph *);
 	/** these function are able to hide closed footnotes
@@ -195,7 +171,7 @@ public:
 	Paragraph * previous();
 	///
 	Paragraph const * previous() const;
-
+#endif
 	/// for the environments
 	Paragraph * depthHook(depth_type depth);
 	/// for the environments
@@ -223,11 +199,6 @@ public:
 	void applyLayout(LyXLayout_ptr const & new_layout);
 	///
 	void erase(lyx::pos_type pos);
-	/** the flag determines wether the layout should be copied
-	 */
-	void breakParagraph(BufferParams const &, lyx::pos_type pos, int flag);
-	///
-	void breakParagraphConservative(BufferParams const &, lyx::pos_type pos);
 	/** Get unistantiated font setting. Returns the difference
 	    between the characters font and the layoutfont.
 	    This is what is stored in the fonttable
@@ -302,11 +273,6 @@ public:
 	///
 	bool isWord(lyx::pos_type pos) const;
 
-	/** paste this paragraph with the next one
-	    be carefull, this doesent make any check at all
-	*/
-	void pasteParagraph(BufferParams const &);
-
 	/// returns -1 if inset not found
 	int getPositionOfInset(Inset const * inset) const;
 
@@ -316,15 +282,6 @@ public:
 	///
 	int stripLeadingSpaces();
 
-#ifndef NO_PEXTRA_REALLY
-	/* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE
-	   I have to set it on each of it's elements */
-	///
-	void setPExtraType(BufferParams const &, int type,
-			   string const & width, string const & widthp);
-	///
-	void unsetPExtraType(BufferParams const &);
-#endif
 	///
 	bool isFreeSpacing() const;
 
@@ -335,18 +292,19 @@ public:
 	///
 	InsetList insetlist;
 	///
-	Counters & counters();
+	//Counters & counters();
 
 private:
 	///
 	LyXLayout_ptr layout_;
 	/// if anything uses this we don't want it to.
 	Paragraph(Paragraph const &);
+#ifndef NO_NEXT
 	///
 	Paragraph * next_;
 	///
 	Paragraph * previous_;
-
+#endif
 	struct Pimpl;
 	///
 	friend struct Paragraph::Pimpl;