X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.h;h=cf5647dbc39b1132e8719acbf9573b7f15197b18;hb=cfeddb92;hp=687561f0a21cc30d7004bca8d5631f67ab8c5919;hpb=37f41fd4b56c54764014c93c003be555f3fd6421;p=lyx.git

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 687561f0a2..cf5647dbc3 100644
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -85,13 +85,18 @@ public:
 	FontInfo labelfont() const { return labelfont_; }
 	///
 	ColorCode bgcolor() const { return bgcolor_; }
-	///
+	/// 
+	Layout::LaTeXArgMap const & latexargs() const { return latexargs_; }
+	///
+	Layout::LaTeXArgMap const & postcommandargs() const { return postcommandargs_; }
+	/// Returns latexargs() + postcommandargs().
+	/// But note that it returns a *copy*, not a reference, so do not do 
+	/// anything like:
+	///   Layout::LaTeXArgMap::iterator it = args().begin();
+	///   Layout::LaTeXArgMap::iterator en = args().end();
+	/// Those are iterators for different containers.
 	Layout::LaTeXArgMap args() const;
 	///
-	Layout::LaTeXArgMap latexargs() const { return latexargs_; }
-	///
-	Layout::LaTeXArgMap postcommandargs() const { return postcommandargs_; }
-	///
 	unsigned int optArgs() const;
 	///
 	unsigned int requiredArgs() const;
@@ -159,6 +164,8 @@ public:
 	///
 	bool forceLTR() const { return forceltr_; }
 	///
+	bool forceOwnlines() const { return forceownlines_; }
+	///
 	bool isInToc() const { return intoc_; }
 	///
 	bool spellcheck() const { return spellcheck_; }
@@ -168,14 +175,14 @@ public:
 	bool isDisplay() const { return display_; }
 	///
 	bool forcelocalfontswitch() const { return forcelocalfontswitch_; }
+	///
+	docstring const & obsoleted_by() const { return obsoleted_by_; }
 private:
 	///
 	void makeDefaultCSS() const;
 	///
 	std::string defaultCSSClass() const;
 	///
-	std::string defaultCSSLabelClass() const { return defaultCSSClass() + "_label"; }
-	///
 	void readArgument(Lexer &);
 	///
 	docstring name_;
@@ -259,6 +266,8 @@ private:
 	///
 	bool forceltr_;
 	///
+	bool forceownlines_;
+	///
 	bool needprotect_;
 	/// should the contents be written to TOC strings?
 	bool intoc_;
@@ -270,6 +279,11 @@ private:
 	bool display_;
 	///
 	bool forcelocalfontswitch_;
+	/** Name of an insetlayout that has replaced this insetlayout.
+	    This is used to rename an insetlayout, while keeping backward
+	    compatibility
+	*/
+	docstring obsoleted_by_;
 	///
 	Layout::LaTeXArgMap latexargs_;
 	///