X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=fcfdc11872ba495055a312bf02027ca4c916ead6;hb=71fe3282077d572aabcc6b76639476ab2d6ca151;hp=184711b3b4b9c48c2af1e642b6e229b4c17fd111;hpb=fb9a866a6666be093b7b12a3ad8e7f83bfc3b3f3;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 184711b3b4..fcfdc11872 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;
@@ -108,6 +109,7 @@ public:
 		ArgPassThru passthru;
 		docstring pass_thru_chars;
 		bool is_toc_caption;
+		std::string newlinecmd;
 	};
 	///
 	typedef std::map<std::string, latexarg> LaTeXArgMap;
@@ -116,7 +118,12 @@ 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.
+	bool hasArgs() const;
 	/// Returns latexargs() + postcommandargs() + itemargs().
 	/// But note that it returns a *copy*, not a reference, so do not do
 	/// anything like:
@@ -129,7 +136,7 @@ public:
 	///
 	int requiredArgs() const;
 	///
-	docstring const & labelstring(bool in_appendix) const 
+	docstring const & labelstring(bool in_appendix) const
 	{ return in_appendix ? labelstring_appendix_ : labelstring_; }
 	///
 	docstring const & endlabelstring() const { return endlabelstring_; }
@@ -146,6 +153,10 @@ public:
 	///
 	std::set<std::string> const & requires() 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_; }
 	///
 	docstring leftdelim() const { return leftdelim_; }
@@ -157,25 +168,25 @@ public:
 	std::string const & labeltag() const { return labeltag_; }
 	///
 	std::string const & itemtag() const { return itemtag_; }
-	/// 
+	///
 	std::string const & htmltag() const;
-	/// 
+	///
 	std::string const & htmlattr() const;
-	/// 
+	///
 	std::string const & htmlitemtag() const;
-	/// 
+	///
 	std::string const & htmlitemattr() const;
-	/// 
+	///
 	std::string const & htmllabeltag() const;
-	/// 
+	///
 	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_; }
@@ -215,7 +226,7 @@ public:
 	///
 	bool operator==(Layout const &) const;
 	///
-	bool operator!=(Layout const & rhs) const 
+	bool operator!=(Layout const & rhs) const
 		{ return !(*this == rhs); }
 
 	////////////////////////////////////////////////////////////////
@@ -304,6 +315,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
@@ -353,7 +370,7 @@ private:
 	std::string defaultCSSItemClass() const { return defaultCSSClass() + "_item"; }
 	///
 	std::string defaultCSSLabelClass() const { return defaultCSSClass() + "_label"; }
-	
+
 	/// Name of the layout/paragraph environment
 	docstring name_;
 
@@ -398,13 +415,13 @@ private:
 	/// Internal tag to surround the item text in a list.
 	std::string itemtag_;
 	/// The interpretation of this tag varies depending upon the latextype.
-	/// In an environment, it is the tag enclosing all content for this set of 
-	/// paragraphs. So for quote, e.g,. it would be: blockquote. For itemize, 
+	/// In an environment, it is the tag enclosing all content for this set of
+	/// paragraphs. So for quote, e.g,. it would be: blockquote. For itemize,
 	/// it would be: ul. (You get the idea.)
 	///
 	/// For a command, it is the tag enclosing the content of the command.
 	/// So, for section, it might be: h2.
-	/// 
+	///
 	/// For the paragraph type, it is the tag that will enclose each paragraph.
 	///
 	/// Defaults to "div".
@@ -414,7 +431,7 @@ private:
 	mutable std::string htmlattr_;
 	/// Tag for individual paragraphs in an environment. In lists, this
 	/// would be something like "li". But it also needs to be set for
-	/// quotation, e.g., since the paragraphs in a quote need to be 
+	/// quotation, e.g., since the paragraphs in a quote need to be
 	/// in "p" tags. Default is "div".
 	/// Note that when I said "environment", I meant it: This has no
 	/// effect for LATEX_PARAGRAPH type layouts.
@@ -423,7 +440,7 @@ private:
 	mutable std::string htmlitemattr_;
 	/// Tag for labels, of whatever sort. One use for this is in setting
 	/// descriptions, in which case it would be: dt. Another use is to
-	/// customize the display of, say, the auto-generated label for 
+	/// customize the display of, say, the auto-generated label for
 	/// sections. Defaults to "span".
 	/// If set to "NONE", this suppresses the printing of the label.
 	mutable std::string htmllabeltag_;
@@ -465,11 +482,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_;