X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=5b22f90cc3d291da37404f7582da0b6dd23974d1;hb=a5b01f8f96efc95633a8da1cf4748aa473a89f1a;hp=596c082b5d6aca131dbaf661714cfd732cf2b1e6;hpb=ffe73b795b611625bc1acf59ab1569598d29dba2;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 596c082b5d..5b22f90cc3 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -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_; }
 	///
@@ -130,6 +130,8 @@ public:
 	/// 
 	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; }
@@ -223,6 +225,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
@@ -239,10 +243,19 @@ public:
 	bool intitle;
 	/// Is the content to go in the preamble rather than the body?
 	bool inpreamble;
-	/// Does this layout allow for an optional parameter?
-	int optionalargs;
+	/// 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;
 
@@ -251,6 +264,9 @@ 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
@@ -347,6 +363,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