X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=c8f7c95ad08ad70dc0d64cc98747b953d4b5e9d3;hb=4ddc9e2501400f8bdc35d4d1fe56f39c49e82115;hp=90d1b2e8edf5ff87dc7501aae47f45331c82d546;hpb=51aebc9327345f6ea065035f489dbfec1568279f;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 90d1b2e8ed..c8f7c95ad0 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -94,6 +94,7 @@ public:
 		docstring labelstring;
 		docstring menustring;
 		bool mandatory;
+		bool nodelims;
 		docstring ldelim;
 		docstring rdelim;
 		docstring defaultarg;
@@ -105,9 +106,12 @@ public:
 		FontInfo labelfont;
 		bool autoinsert;
 		bool insertcotext;
+		bool insertonnewline;
 		ArgPassThru passthru;
 		docstring pass_thru_chars;
 		bool is_toc_caption;
+		bool free_spacing;
+		std::string newlinecmd;
 	};
 	///
 	typedef std::map<std::string, latexarg> LaTeXArgMap;
@@ -116,6 +120,8 @@ public:
 	///
 	LaTeXArgMap const & postcommandargs() const { return postcommandargs_; }
 	///
+	LaTeXArgMap const & listpreamble() const { return listpreamble_; }
+	///
 	LaTeXArgMap const & itemargs() const { return itemargs_; }
 	/// Returns true is the layout has arguments. If false, then an
 	/// InsetArgument in this layout stands for the parent InsetText.
@@ -147,7 +153,11 @@ public:
 	/// this layout for language \p lang
 	docstring const babelpreamble() const { return babelpreamble_; }
 	///
-	std::set<std::string> const & requires() const { return requires_; }
+	std::set<std::string> const & required() const { return requires_; }
+	///
+	std::set<docstring> const & autonests() const { return autonests_; }
+	///
+	std::set<docstring> const & isAutonestedBy() const { return autonested_by_; }
 	///
 	std::string const & latexparam() const { return latexparam_; }
 	///
@@ -307,6 +317,12 @@ public:
 	/** true when the fragile commands in the paragraph need to be
 	    \protect'ed. */
 	bool needprotect;
+	/** true when the verbatim stuff of this layout needs to be
+	    \cprotect'ed. */
+	bool needcprotect;
+	/** true when specific commands in this paragraph need to be
+	    protected in an \mbox. */
+	bool needmboxprotect;
 	/// true when empty paragraphs should be kept.
 	bool keepempty;
 	/// Type of LaTeX object
@@ -468,11 +484,17 @@ private:
 	bool par_group_;
 	/// Packages needed for this layout
 	std::set<std::string> requires_;
+	/// Layouts that are by default nested after this one
+	std::set<docstring> autonests_;
+	/// Layouts that by auto-nest this one
+	std::set<docstring> autonested_by_;
 	///
 	LaTeXArgMap latexargs_;
 	///
 	LaTeXArgMap postcommandargs_;
 	///
+	LaTeXArgMap listpreamble_;
+	///
 	LaTeXArgMap itemargs_;
 	///
 	bool add_to_toc_;