X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=f6e437064ae313d7a18ea5d422e93b66c1e5933a;hb=28168bd4df9a568e79cdc57cb257743b7adb7c2a;hp=953b3f96ea124b83be6da3773283057bbe525855;hpb=af7109795725294e87e7c2fd29d13eddb837c769;p=lyx.git

diff --git a/src/paragraph.h b/src/paragraph.h
index 953b3f96ea..f6e437064a 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *	    Copyright 1995 Matthias Ettrich
  *          Copyright 1995-2001 The LyX Team.
  *
@@ -77,7 +77,7 @@ public:
 	};
 	///
 	typedef char value_type;
-	/// The same as ParameterStruct::depth_type 
+	/// The same as ParameterStruct::depth_type
 	typedef unsigned int depth_type;
 
 	///
@@ -105,13 +105,13 @@ public:
 	///
 	string const asString(Buffer const *, lyx::pos_type beg, lyx::pos_type end,
 			      bool label);
-	
+
 	///
 	void writeFile(Buffer const *, std::ostream &, BufferParams const &,
 		       depth_type) const;
 	///
 	void validate(LaTeXFeatures &) const;
-	
+
 	///
 	int id() const;
 	///
@@ -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,7 +167,9 @@ public:
 	void clearContents();
 
 	///
-	lyx::layout_type layout;
+	string const & layout() const;
+	///
+	void layout(string const & new_layout);
 
 	///
 	void setCounter(int i, int v);
@@ -170,11 +180,11 @@ public:
 
 	///
 	char enumdepth;
-	
+
 	///
 	char itemdepth;
 
-	/// 
+	///
 	InsetBibKey * bibkey;  // ale970302
 
 	///
@@ -196,35 +206,33 @@ public:
 	Paragraph * depthHook(depth_type depth);
 	/// for the environments
 	Paragraph const * depthHook(depth_type depth) const;
-	/// 
+	///
 	Paragraph * outerHook();
-	/// 
+	///
 	Paragraph const * outerHook() const;
 	///
 	int beginningOfMainBody() const;
 	///
 	string const & getLabelstring() const;
-	
+
 	/// the next two functions are for the manual labels
 	string const getLabelWidthString() const;
 	///
 	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;
 	///
 	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);
@@ -241,7 +249,7 @@ public:
 	    font attached to this paragraph.
 	    If pos == -2, use the label font of the layout attached here.
 	    In all cases, the font is instantiated, i.e. does not have any
-	    attributes with values LyXFont::INHERIT, LyXFont::IGNORE or 
+	    attributes with values LyXFont::INHERIT, LyXFont::IGNORE or
 	    LyXFont::TOGGLE.
 	*/
 	LyXFont const getFont(BufferParams const &, lyx::pos_type pos) const;
@@ -257,7 +265,7 @@ public:
 	void setFont(lyx::pos_type pos, LyXFont const & font);
 	/// Returns the height of the highest font in range
 	LyXFont::FONT_SIZE highestFontInRange(lyx::pos_type startpos,
-	                                      lyx::pos_type endpos,
+					      lyx::pos_type endpos,
 					      LyXFont::FONT_SIZE const def_size) const;
 	///
 	void insertChar(lyx::pos_type pos, value_type c);
@@ -298,22 +306,14 @@ public:
 	bool isKomma(lyx::pos_type pos) const;
 	/// Used by the spellchecker
 	bool isLetter(lyx::pos_type pos) const;
-	/// 
+	///
 	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 const * inset) const;
 
@@ -321,7 +321,7 @@ public:
 	Paragraph * getParFromID(int id) const;
 
 	///
-	int stripLeadingSpaces(lyx::textclass_type tclass); 
+	int stripLeadingSpaces(lyx::textclass_type tclass);
 
 #ifndef NO_PEXTRA_REALLY
 	/* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE
@@ -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; }
 		///
@@ -386,7 +390,7 @@ public:
 	};
 	///
 	friend class inset_iterator;
-	
+
 	///
 	inset_iterator inset_iterator_begin();
 	///