X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=90d1b2e8edf5ff87dc7501aae47f45331c82d546;hb=a81a0c55349693df59be9239cae2fdfd3333f7a1;hp=9f98f0a1f9ed40be3a823f72bb33d982b1781afe;hpb=897b2e73a1d547311db6cb83097d351c9d3676ef;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 9f98f0a1f9..90d1b2e8ed 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -104,6 +104,10 @@ public:
 		FontInfo font;
 		FontInfo labelfont;
 		bool autoinsert;
+		bool insertcotext;
+		ArgPassThru passthru;
+		docstring pass_thru_chars;
+		bool is_toc_caption;
 	};
 	///
 	typedef std::map<std::string, latexarg> LaTeXArgMap;
@@ -113,6 +117,9 @@ public:
 	LaTeXArgMap const & postcommandargs() const { return postcommandargs_; }
 	///
 	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:
@@ -125,7 +132,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_; }
@@ -153,25 +160,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_; }
@@ -188,10 +195,7 @@ public:
 	}
 	/// Is this the kind of layout in which adjacent paragraphs
 	/// are handled as one group?
-	bool isParagraphGroup() const {
-	return latextype == LATEX_ENVIRONMENT
-		|| latextype == LATEX_BIB_ENVIRONMENT;
-	}
+	bool isParagraphGroup() const {	return par_group_; }
 	///
 	bool labelIsInline() const {
 		return labeltype == LABEL_STATIC
@@ -204,11 +208,17 @@ public:
 			|| labeltype == LABEL_CENTERED
 		  || labeltype == LABEL_BIBLIO;
 	}
+	///
+	bool addToToc() const { return add_to_toc_; }
+	///
+	std::string tocType() const { return toc_type_; }
+	///
+	bool isTocCaption() const { return is_toc_caption_; }
 
 	///
 	bool operator==(Layout const &) const;
 	///
-	bool operator!=(Layout const & rhs) const 
+	bool operator!=(Layout const & rhs) const
 		{ return !(*this == rhs); }
 
 	////////////////////////////////////////////////////////////////
@@ -307,6 +317,10 @@ public:
 	bool inpreamble;
 	/// Which counter to step
 	docstring counter;
+	/// Resume counter?
+	bool resumecounter;
+	/// Step master counter?
+	bool stepmastercounter;
 	/// Prefix to use when creating labels
 	docstring refprefix;
 	/// Depth of XML command
@@ -342,7 +356,7 @@ private:
 	std::string defaultCSSItemClass() const { return defaultCSSClass() + "_item"; }
 	///
 	std::string defaultCSSLabelClass() const { return defaultCSSClass() + "_label"; }
-	
+
 	/// Name of the layout/paragraph environment
 	docstring name_;
 
@@ -387,13 +401,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".
@@ -403,7 +417,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.
@@ -412,7 +426,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_;
@@ -450,6 +464,8 @@ private:
 	docstring langpreamble_;
 	/// Language and babel dependent macro definitions needed for this layout
 	docstring babelpreamble_;
+	/// Are adjacent paragraphs handled as one group?
+	bool par_group_;
 	/// Packages needed for this layout
 	std::set<std::string> requires_;
 	///
@@ -458,8 +474,15 @@ private:
 	LaTeXArgMap postcommandargs_;
 	///
 	LaTeXArgMap itemargs_;
+	///
+	bool add_to_toc_;
+	///
+	std::string toc_type_;
+	///
+	bool is_toc_caption_;
 };
 
+
 } // namespace lyx
 
 #endif