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

diff --git a/src/paragraph.h b/src/paragraph.h
index 383a4c8ea2..5c9ba843c3 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -20,19 +20,18 @@
 
 #include "LString.h"
 
+class Buffer;
 class BufferParams;
 class BufferView;
 class Counters;
 class InsetBibitem;
 class Language;
 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_NEXT 1
+class ParagraphList;
+class UpdatableInset;
 
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
@@ -53,13 +52,11 @@ public:
 
 	///
 	Paragraph();
-#ifndef NO_NEXT
-	/// this constructor inserts the new paragraph in a list
-	explicit
-	Paragraph(Paragraph * par);
-#endif
+
+	///
+	Paragraph(Paragraph const &);
 	///
-	Paragraph(Paragraph const &, bool same_ids);
+	void operator=(Paragraph const &);
 	/// the destructor removes the new paragraph from the list
 	~Paragraph();
 
@@ -87,8 +84,8 @@ public:
 
 	/// return the unique ID of this paragraph
 	int id() const;
-	///
-	void read();
+	/// Set the Id of this paragraph.
+	void id(int);
 
 	///
 	int startTeXParParams(BufferParams const &, std::ostream &, bool) const;
@@ -99,24 +96,19 @@ public:
 
 	///
 	bool simpleTeXOnePar(Buffer const *, BufferParams const &,
-			     std::ostream &, TexRow & texrow, bool moving_arg);
+			     LyXFont const & outerfont, std::ostream &,
+			     TexRow & texrow, LatexRunParams const &);
 
 	///
-	bool hasSameLayout(Paragraph const * par) const;
+	bool hasSameLayout(Paragraph const & par) const;
 
 	///
-	void makeSameLayout(Paragraph const * par);
-
-	/// Is it the first par with same depth and layout?
-	bool isFirstInSequence() const;
+	void makeSameLayout(Paragraph const & par);
 
-	/** Check if the current paragraph is the last paragraph in a
-	    proof environment */
-	int getEndLabel() const;
 	///
-	Inset * inInset() const;
+	UpdatableInset * inInset() const;
 	///
-	void setInsetOwner(Inset * i);
+	void setInsetOwner(UpdatableInset * inset);
 	///
 	void deleteInsetsLyXText(BufferView *);
 	///
@@ -127,7 +119,7 @@ public:
 	///
 	bool empty() const;
 	///
-	void setContentsFromPar(Paragraph * par);
+	void setContentsFromPar(Paragraph const & par);
 	///
 	void clearContents();
 
@@ -143,24 +135,7 @@ public:
 	char itemdepth;
 
 	///
-	InsetBibitem * bibitem();  // ale970302
-
-#ifndef NO_NEXT
-	///
-	void next(Paragraph *);
-	/** these function are able to hide closed footnotes
-	 */
-	Paragraph * next();
-	///
-	Paragraph const * next() const;
-
-	///
-	void previous(Paragraph *);
-	///
-	Paragraph * previous();
-	///
-	Paragraph const * previous() const;
-#endif
+	InsetBibitem * bibitem() const;  // ale970302
 
 	/// initialise tracking for this par
 	void trackChanges(Change::Type = Change::UNCHANGED);
@@ -195,19 +170,11 @@ public:
 	/// mark whole par as erased
 	void markErased();
 
-	/// for the environments
-	Paragraph * depthHook(depth_type depth);
-	/// for the environments
-	Paragraph const * depthHook(depth_type depth) const;
-	///
-	Paragraph * outerHook();
-	///
-	Paragraph const * outerHook() const;
-
-	/// 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;
 
 	///
@@ -229,9 +196,9 @@ public:
 	/// definite erase
 	void eraseIntern(lyx::pos_type pos);
 	/// erase the char at the given position
-	void erase(lyx::pos_type pos);
-	/// erase the given range. Returns true if actually erased.
-	bool erase(lyx::pos_type start, lyx::pos_type end);
+	bool erase(lyx::pos_type pos);
+	/// erase the given range. Returns the number of chars actually erased
+	int erase(lyx::pos_type start, lyx::pos_type end);
 
 	/** Get uninstantiated font setting. Returns the difference
 	    between the characters font and the layoutfont.
@@ -249,9 +216,12 @@ public:
 	    attributes with values LyXFont::INHERIT, LyXFont::IGNORE or
 	    LyXFont::TOGGLE.
 	*/
-	LyXFont const getFont(BufferParams const &, lyx::pos_type pos) const;
-	LyXFont const getLayoutFont(BufferParams const &) const;
-	LyXFont const getLabelFont(BufferParams const &) const;
+	LyXFont const getFont(BufferParams const &, lyx::pos_type pos,
+			      LyXFont const & outerfont) const;
+	LyXFont const getLayoutFont(BufferParams const &,
+				    LyXFont const & outerfont) const;
+	LyXFont const getLabelFont(BufferParams const &,
+				   LyXFont const & outerfont) const;
 	///
 	value_type getChar(lyx::pos_type pos) const;
 	///
@@ -313,33 +283,29 @@ 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();
+
 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;
 	///
 	Pimpl * pimpl_;
+
 };
 
 
@@ -354,4 +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