X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=fca8d25163e77b0d775ab233b87ce0395473dde2;hb=af37f0d23e8aab1bfbd7ab7f26a10e7685dfca68;hp=bcc8ac63a2ce2b37d795ece26fa0c0786bacb005;hpb=69fae0531d533ce87aaf0962b6a3138009a5fa76;p=lyx.git

diff --git a/src/paragraph.h b/src/paragraph.h
index bcc8ac63a2..fca8d25163 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -33,7 +33,7 @@ class InsetBibitem;
 class InsetOld_code;
 class Language;
 class LaTeXFeatures;
-class LatexRunParams;
+class OutputParams;
 class LyXFont;
 class LyXFont_size;
 class ParagraphParameters;
@@ -71,8 +71,6 @@ public:
 
 	///
 	int id() const;
-	///
-	void id(int i);
 
 	///
 	Language const * getParLanguage(BufferParams const &) const;
@@ -84,11 +82,23 @@ public:
 	///
 	bool isMultiLingual(BufferParams const &);
 
+	///
+	std::string const asString(Buffer const &,
+				   OutputParams const & runparams,
+				   bool label) const;
 	///
 	std::string const asString(Buffer const &, bool label) const;
 	///
-	std::string const asString(Buffer const &, lyx::pos_type beg, lyx::pos_type end,
-			      bool label) const;
+	std::string const Paragraph::asString(Buffer const & buffer,
+					      lyx::pos_type beg,
+					      lyx::pos_type end,
+					      bool label) const;
+	///
+	std::string const asString(Buffer const &,
+				   OutputParams const & runparams,
+				   lyx::pos_type beg,
+				   lyx::pos_type end,
+				   bool label) const;
 
 	///
 	void write(Buffer const &, std::ostream &, BufferParams const &,
@@ -106,7 +116,22 @@ public:
 	///
 	bool simpleTeXOnePar(Buffer const &, BufferParams const &,
 			     LyXFont const & outerfont, std::ostream &,
-			     TexRow & texrow, LatexRunParams const &);
+			     TexRow & texrow, OutputParams const &);
+
+	///
+	void simpleLinuxDocOnePar(Buffer const & buf,
+				  std::ostream & os,
+				  LyXFont const & outerfont,
+				  OutputParams const & runparams,
+				  lyx::depth_type depth) const;
+
+	///
+	void simpleDocBookOnePar(Buffer const & buf,
+				 std::ostream &,
+				 LyXFont const & outerfont,
+				 OutputParams const & runparams,
+				 lyx::depth_type depth,
+				 bool labelid) const;
 
 	///
 	bool hasSameLayout(Paragraph const & par) const;
@@ -118,8 +143,6 @@ public:
 	UpdatableInset * inInset() const;
 	///
 	void setInsetOwner(UpdatableInset * inset);
-	///
-	void deleteInsetsLyXText(BufferView *);
 
 	///
 	lyx::pos_type size() const { return text_.size(); }
@@ -179,7 +202,9 @@ public:
 	/// 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;
+	int beginOfBody() const;
+	/// recompute this value
+	void setBeginOfBody();
 
 	///
 	std::string const & getLabelstring() const;
@@ -246,6 +271,9 @@ public:
 					lyx::pos_type endpos,
 					LyXFont_size def_size) const;
 	///
+	void insert(lyx::pos_type pos, std::string const & str,
+		    LyXFont const & font);
+	///
 	void insertChar(lyx::pos_type pos, value_type c);
 	///
 	void insertChar(lyx::pos_type pos, value_type c, LyXFont const &, Change change = Change(Change::INSERTED));
@@ -318,6 +346,8 @@ private:
 	/// keeping this here instead of in the pimpl makes LyX >10% faster
 	// for average tasks as buffer loading/switching etc.
 	TextContainer text_;
+	/// end of label
+	int begin_of_body_;
 
 	struct Pimpl;
 	///