X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=65c0190d62ba1185a5b98e92f648179a281ba034;hb=69036ced3765f40048d62be800c98af3ea2d1b4a;hp=485e239b6694dc8e04cea5f03e57db532d6296cf;hpb=e5afe8db6669eb2395cbee3761053e38a0d05613;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 485e239b66..65c0190d62 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,13 +17,14 @@
 #define PARAGRAPH_H
 
 #include "FontEnums.h"
-#include "Layout.h"
 
 #include "insets/InsetCode.h"
 
 #include "support/strfwd.h"
 #include "support/types.h"
 
+#include <set>
+
 namespace lyx {
 
 class AuthorList;
@@ -42,6 +43,7 @@ class LaTeXFeatures;
 class Inset_code;
 class InsetList;
 class Language;
+class Layout;
 class Font;
 class Font_size;
 class MetricsInfo;
@@ -92,7 +94,7 @@ class Paragraph
 public:
 	///
 	Paragraph();
-	///
+	/// Copy constructor.
 	Paragraph(Paragraph const &);
 	/// Partial copy constructor.
 	/// Copy the Paragraph contents from \p beg to \p end (without end).
@@ -103,6 +105,8 @@ public:
 	~Paragraph();
 	///
 	int id() const;
+	///
+	void setId(int id);
 
 	///
 	void addChangesToToc(DocIterator const & cdit, Buffer const & buf) const;
@@ -115,6 +119,8 @@ public:
 			    Language const * from, Language const * to);
 	///
 	bool isMultiLingual(BufferParams const &) const;
+	///
+	void getLanguages(std::set<Language const *> &) const;
 
 	/// Convert the paragraph to a string.
 	/// \param AsStringParameter options. This can contain any combination of
@@ -137,10 +143,10 @@ public:
 	///
 	void validate(LaTeXFeatures &) const;
 
-	///
-	bool latex(BufferParams const &, Font const & outerfont, odocstream &,
+	/// \param force means: output even if layout.inpreamble is true.
+	void latex(BufferParams const &, Font const & outerfont, odocstream &,
 		   TexRow & texrow, OutputParams const &,
-		   int start_pos = 0, int end_pos = -1) const;
+			 int start_pos = 0, int end_pos = -1, bool force = false) const;
 
 	/// Can we drop the standard paragraph wrapper?
 	bool emptyTag() const;
@@ -166,7 +172,6 @@ public:
 				 XHTMLStream & xs,
 				 OutputParams const & runparams,
 				 Font const & outerfont,
-         bool fortoc = false,
 				 pos_type initial = 0) const;
 
 	///
@@ -241,16 +246,16 @@ public:
 	/// recompute this value
 	void setBeginOfBody();
 
+	///
+	docstring expandLabel(Layout const &, BufferParams const &) const;
+	///
+	docstring expandDocBookLabel(Layout const &, BufferParams const &) const;
 	///
 	docstring const & labelString() const;
-
 	/// the next two functions are for the manual labels
 	docstring const getLabelWidthString() const;
 	/// Set label width string.
 	void setLabelWidthString(docstring const & s);
-	/// Expand the counters for the labelstring of \c layout
-	docstring expandLabel(Layout const &, BufferParams const &,
-		bool process_appendix = true) const;
 	/// Actual paragraph alignment used
 	char getAlign() const;
 	/// The nesting depth of a paragraph
@@ -429,6 +434,9 @@ public:
 	std::string magicLabel() const;
 
 private:
+	/// Expand the counters for the labelstring of \c layout
+	docstring expandParagraphLabel(Layout const &, BufferParams const &,
+		bool process_appendix) const;
 	///
 	void deregisterWords();
 	///