X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=9523a23a7cb73464533ad78c28294a8a451620e6;hb=b2f4586c984226bcc945d93891f3d0736d6ffb43;hp=1e2563125cdf49ceb9617ea7df7c8c87156be041;hpb=b00e1315fe4da81da67f63d70e455cda167afab9;p=lyx.git

diff --git a/src/paragraph.h b/src/paragraph.h
index 1e2563125c..9523a23a7c 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -123,6 +123,14 @@ public:
 	Paragraph * TeXOnePar(Buffer const *, BufferParams const &,
 				 std::ostream &, TexRow & texrow,
 				 bool moving_arg);
+
+	/// 
+	int startTeXParParams(BufferParams const &, std::ostream &) const;
+
+	/// 
+	int endTeXParParams(BufferParams const &, std::ostream &) const;
+
+	
 	///
 	bool simpleTeXOnePar(Buffer const *, BufferParams const &,
 			     std::ostream &, TexRow & texrow, bool moving_arg);
@@ -159,8 +167,10 @@ public:
 	void clearContents();
 
 	///
-	lyx::layout_type layout;
-
+	string const & layout() const;
+	///
+	void layout(string const & new_layout);
+	
 	///
 	void setCounter(int i, int v);
 	///
@@ -210,15 +220,13 @@ public:
 	///
 	void setLabelWidthString(string const & s);
 	///
-	lyx::layout_type getLayout() const;
-	///
 	char getAlign() const;
-	///
+	/// The nesting depth of a paragraph
 	depth_type getDepth() const;
+	/// The maximal possible depth of a paragraph after this one
+	depth_type getMaxDepthAfter(Buffer const *) const;
 	///
-	void setLayout(lyx::layout_type new_layout);
-	///
-	void setOnlyLayout(lyx::layout_type new_layout);
+	void applyLayout(string const & new_layout);
 	///
 	int getFirstCounter(int i) const;
 	///
@@ -301,21 +309,13 @@ public:
 	/// 
 	bool isWord(lyx::pos_type pos) const;
 
-	/** This one resets all layout and dtp switches but not the font
-	    of the single characters
-	*/ 
-	void clear();
-
 	/** paste this paragraph with the next one
 	    be carefull, this doesent make any check at all
 	*/ 
 	void pasteParagraph(BufferParams const &);
 
-	/// used to remove the error messages
-	int autoDeleteInsets();
-
 	/// returns -1 if inset not found
-	int getPositionOfInset(Inset * inset) const;
+	int getPositionOfInset(Inset const * inset) const;
 
 	/// some good comment here John?
 	Paragraph * getParFromID(int id) const;
@@ -340,7 +340,8 @@ public:
 	ParagraphParameters & params();
 	ParagraphParameters const & params() const;
 private:
-	
+	///
+	string layout_;
 	///
 	struct InsetTable {
 		///
@@ -370,6 +371,9 @@ public:
 		}
 		///
 		Inset * operator*() { return it->inset; }
+		///
+		Inset * operator->() { return it->inset; }
+		
 		///
 		lyx::pos_type getPos() const { return it->pos; }
 		///