X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=0c0b4ae0ef89f29a88c3ffafa16b6474077ecb9d;hb=a4d9315bc49445e4419b3b59fd238a13c5f7be31;hp=6efc5129f97ea97c5e1db94558868193b0e1d70e;hpb=16a1aa9901adc1f91671499b39565f9bccc2e644;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 6efc5129f9..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;
 	///
@@ -292,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_; }
 	///
@@ -434,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;
 	///