X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=f957f747304a85425b1142d2a701c54b3162c831;hb=77185fe83d28a0a1dc48980a9db3c34110e02e31;hp=19436815c1954a032dd08f52b96666e4d823d437;hpb=4c004e0485032c03598600f1102a9357350aed24;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 19436815c1..f957f74730 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -73,7 +73,7 @@ public:
 	///
 	void readSpacing(Lexer &);
 	///
-	docstring const & name() const { return name_; };
+	docstring const & name() const { return name_; }
 	///
 	void setName(docstring const & n) { name_ = n; }
 	///
@@ -95,10 +95,10 @@ public:
 	docstring const & preamble() const { return preamble_; }
 	/// Get language dependent macro definitions needed for this layout
 	/// for language \p lang
-	docstring const langpreamble(Language const * lang) const;
+	docstring const langpreamble(Language const * lang, bool const polyglossia) const;
 	/// Get language and babel dependent macro definitions needed for
 	/// this layout for language \p lang
-	docstring const babelpreamble(Language const * lang) const;
+	docstring const babelpreamble(Language const * lang, bool const polyglossia) const;
 	///
 	std::set<std::string> const & requires() const { return requires_; }
 	///
@@ -122,12 +122,16 @@ public:
 	/// 
 	std::string const & htmllabelattr() const;
 	///
+	std::string defaultCSSClass() const;
+	///
 	bool htmllabelfirst() const { return htmllabelfirst_; }
 	/// 
 	docstring htmlstyle() const;
 	/// 
 	docstring const & htmlpreamble() const { return htmlpreamble_; }
 	///
+	bool htmltitle() const { return htmltitle_; }
+	///
 	bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
 	///
 	bool isCommand() const { return latextype == LATEX_COMMAND; }
@@ -210,10 +214,6 @@ public:
 	///
 	MarginType margintype;
 	///
-	bool fill_top;
-	///
-	bool fill_bottom;
-	///
 	bool newline_allowed;
 	///
 	bool nextnoindent;
@@ -221,6 +221,8 @@ public:
 	bool free_spacing;
 	///
 	bool pass_thru;
+	///
+	bool parbreak_is_newline;
 	/// show this in toc
 	int toclevel;
 	/// special value of toclevel for non-section layouts
@@ -235,10 +237,21 @@ public:
 	LatexType latextype;
 	/// Does this object belong in the title part of the document?
 	bool intitle;
-	/// Does this layout allow for an optional parameter?
-	int optionalargs;
+	/// Is the content to go in the preamble rather than the body?
+	bool inpreamble;
+	/// Number of requried arguments for this command or environment
+	unsigned int reqargs;
+	/// Number of optional arguments for this command or environment
+	/// These MUST come at the beginning, so:
+	///  \cmd[opt1][opt2]{req1}{here is the text from LyX}
+	/// is fine. But:
+	///  \cmd[opt1]{req1}[opt2]{here is the text from LyX}
+	/// is not.
+	unsigned int optargs;
 	/// Which counter to step
 	docstring counter;
+	/// Prefix to use when creating labels
+	docstring refprefix;
 	/// Depth of XML command
 	int commanddepth;
 
@@ -247,13 +260,14 @@ public:
 	/// until it has proper support for the caption inset (JMarc)
 	static Layout * forCaption();
 
+	/// Is this spellchecked?
+	bool spellcheck;
+
 
 private:
 	/// generates the default CSS for this layout
 	void makeDefaultCSS() const;
 	///
-	std::string defaultCSSClass() const;
-	///
 	std::string defaultCSSItemClass() const { return defaultCSSClass() + "_item"; }
 	///
 	std::string defaultCSSLabelClass() const { return defaultCSSClass() + "_label"; }
@@ -345,6 +359,8 @@ private:
 	mutable docstring htmldefaultstyle_;
 	/// Any other info for the HTML header.
 	docstring htmlpreamble_;
+	/// Whether this is the <title> paragraph.
+	bool htmltitle_;
 	/// calculating this is expensive, so we cache it.
 	mutable std::string defaultcssclass_;
 	/// This is the `category' for this layout. The following are