X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLayout.h;h=184711b3b4b9c48c2af1e642b6e229b4c17fd111;hb=07c82e9f840afbf9b1b391e4de2312284c6cfd4d;hp=0f5ebbf86b43a20cd6eb8d8be73c8462406c4987;hpb=20bcaec061193a3984d42040ee65d2723872ecf4;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 0f5ebbf86b..184711b3b4 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;
@@ -188,10 +192,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,6 +205,12 @@ 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;
@@ -285,6 +292,8 @@ public:
 	bool free_spacing;
 	///
 	bool pass_thru;
+	/// Individual chars to be passed verbatim
+	docstring pass_thru_chars;
 	///
 	bool parbreak_is_newline;
 	/// show this in toc
@@ -305,6 +314,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
@@ -440,7 +453,7 @@ private:
 	mutable std::string defaultcssclass_;
 	/// This is the `category' for this layout. The following are
 	/// recommended basic categories: FrontMatter, BackMatter, MainText,
-	/// Section, Starred, List, Theorem.
+	/// Sectioning, Starred, List, Reasoning.
 	docstring category_;
 	/// Macro definitions needed for this layout
 	docstring preamble_;
@@ -448,6 +461,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_;
 	///
@@ -456,8 +471,15 @@ private:
 	LaTeXArgMap postcommandargs_;
 	///
 	LaTeXArgMap itemargs_;
+	///
+	bool add_to_toc_;
+	///
+	std::string toc_type_;
+	///
+	bool is_toc_caption_;
 };
 
+
 } // namespace lyx
 
 #endif