X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=0c0b4ae0ef89f29a88c3ffafa16b6474077ecb9d;hb=a4d9315bc49445e4419b3b59fd238a13c5f7be31;hp=7fc8a7c7772413d81111840c070f5bf2a46d1f69;hpb=43d096f6471e0c52779ab1ed28349c3667703bfc;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 7fc8a7c777..0c0b4ae0ef 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -26,7 +26,8 @@
 
 namespace lyx {
 
-class Lexer;
+namespace support { class Lexer; }
+
 class TextClass;
 
 /* Fixed labels are printed flushright, manual labels flushleft.
@@ -58,23 +59,23 @@ public:
 	void setUnknown(bool unknown) { unknown_ = unknown; }
 	/// Reads a layout definition from file
 	/// \return true on success.
-	bool read(Lexer &, TextClass const &, bool validating = false);
+	bool read(support::Lexer &, TextClass const &, bool validating = false);
 	///
-	void readAlign(Lexer &);
+	void readAlign(support::Lexer &);
 	///
-	void readAlignPossible(Lexer &);
+	void readAlignPossible(support::Lexer &);
 	///
-	void readLabelType(Lexer &);
+	void readLabelType(support::Lexer &);
 	///
-	void readEndLabelType(Lexer &);
+	void readEndLabelType(support::Lexer &);
 	///
-	void readMargin(Lexer &);
+	void readMargin(support::Lexer &);
 	///
-	void readLatexType(Lexer &);
+	void readLatexType(support::Lexer &);
 	///
-	void readSpacing(Lexer &);
+	void readSpacing(support::Lexer &);
 	///
-	void readArgument(Lexer &, bool);
+	void readArgument(support::Lexer &, bool);
 	/// Write a layout definition in utf8 encoding
 	void write(std::ostream &) const;
 	///
@@ -265,6 +266,8 @@ public:
 	///
 	bool docbooknofontinside() const { return docbooknofontinside_; }
 	///
+	bool docbookgeneratetitle() const { return docbookgeneratetitle_; }
+	///
 	bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
 	///
 	bool isCommand() const { return latextype == LATEX_COMMAND; }
@@ -290,6 +293,11 @@ public:
 			|| labeltype == LABEL_CENTERED
 			|| labeltype == LABEL_BIBLIO;
 	}
+	bool isNumHeadingLabelType() const {
+		return labeltype == LABEL_ABOVE
+			|| labeltype == LABEL_CENTERED
+			|| labeltype == LABEL_STATIC;
+	}
 	///
 	bool addToToc() const { return add_to_toc_; }
 	///
@@ -432,7 +440,7 @@ public:
 private:
 	/// Reads a layout definition from file
 	/// \return true on success.
-	bool readIgnoreForcelocal(Lexer &, TextClass const &, bool validating);
+	bool readIgnoreForcelocal(support::Lexer &, TextClass const &, bool validating);
 	/// generates the default CSS for this layout
 	void makeDefaultCSS() const;
 	///
@@ -587,10 +595,14 @@ private:
 	bool docbookabstract_;
 	/// Whether this element (root or not) does not accept text without a section (i.e. the first text that is met
 	/// in LyX must be considered as the abstract if this is true); this text must be output with the specific tag
-	/// held by this attribute
+	/// held by this attribute.
 	mutable std::string docbookforceabstracttag_;
 	/// Whether font tags are allowed inside this tag.
 	bool docbooknofontinside_ = false;
+	/// Whether LyX should create a title on its own, just after the wrapper tag. Typically, this parameter is required
+	/// because the wrapper tag requires a title (like a figure). The generated title will be similar to a LyXHTML label
+	/// (environment type and a number).
+	bool docbookgeneratetitle_ = false;
 	/// Should we generate the default CSS for this layout, even if HTMLStyle
 	/// has been given? Default is false.
 	/// Note that the default CSS is output first, then the user CSS, so it is