X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.h;h=273a36155bbedbfeb10124980993a7808737fb5b;hb=c3acdb9c7c7395bd299317ecab82b8076203ace2;hp=05f6cbd08a07f31b0cfb8154d20922f623e28d16;hpb=2928afbd01b58cfe639b8390081c9dfcd4fb3a0f;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 05f6cbd08a..273a36155b 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -104,6 +104,9 @@ public:
 		FontInfo font;
 		FontInfo labelfont;
 		bool autoinsert;
+		bool insertcotext;
+		docstring pass_thru_chars;
+		bool is_toc_caption;
 	};
 	///
 	typedef std::map<std::string, latexarg> LaTeXArgMap;
@@ -116,8 +119,8 @@ public:
 	/// Returns latexargs() + postcommandargs() + itemargs().
 	/// But note that it returns a *copy*, not a reference, so do not do
 	/// anything like:
-	///   Layout::LaTeXArgMap it = args().begin();
-	///   Layout::LaTeXArgMap en = args().end();
+	///   Layout::LaTeXArgMap::iterator it = args().begin();
+	///   Layout::LaTeXArgMap::iterator en = args().end();
 	/// Those are iterators for different containers.
 	LaTeXArgMap args() const;
 	///
@@ -188,10 +191,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 +204,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;
@@ -280,9 +286,13 @@ public:
 	///
 	bool nextnoindent;
 	///
+	ToggleIndentation toggle_indent;
+	///
 	bool free_spacing;
 	///
 	bool pass_thru;
+	/// Individual chars to be passed verbatim
+	docstring pass_thru_chars;
 	///
 	bool parbreak_is_newline;
 	/// show this in toc
@@ -438,7 +448,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_;
@@ -446,6 +456,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_;
 	///
@@ -454,8 +466,15 @@ private:
 	LaTeXArgMap postcommandargs_;
 	///
 	LaTeXArgMap itemargs_;
+	///
+	bool add_to_toc_;
+	///
+	std::string toc_type_;
+	///
+	bool is_toc_caption_;
 };
 
+
 } // namespace lyx
 
 #endif