X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.h;h=cf5647dbc39b1132e8719acbf9573b7f15197b18;hb=cfeddb92;hp=33fcffaddd980d5e56a4c6402b30d5797db221d5;hpb=99f84aab9515ff7a3da6fdd0ad6e4ac9395b6e8d;p=lyx.git

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 33fcffaddd..cf5647dbc3 100644
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -76,17 +76,30 @@ public:
 	///
 	std::string latexparam() const { return latexparam_; }
 	///
+	docstring leftdelim() const { return leftdelim_; }
+	///
+	docstring rightdelim() const { return rightdelim_; }
+	///
 	FontInfo font() const { return font_; }
 	///
 	FontInfo labelfont() const { return labelfont_; }
 	///
 	ColorCode bgcolor() const { return bgcolor_; }
+	/// 
+	Layout::LaTeXArgMap const & latexargs() const { return latexargs_; }
 	///
-	Layout::LaTeXArgMap 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;
 	///
-	int optArgs() const;
+	unsigned int optArgs() const;
 	///
-	int requiredArgs() const;
+	unsigned int requiredArgs() const;
 	///
 	docstring preamble() const { return preamble_; }
 	/// Get language dependent macro definitions needed for this inset
@@ -151,6 +164,8 @@ public:
 	///
 	bool forceLTR() const { return forceltr_; }
 	///
+	bool forceOwnlines() const { return forceownlines_; }
+	///
 	bool isInToc() const { return intoc_; }
 	///
 	bool spellcheck() const { return spellcheck_; }
@@ -158,14 +173,16 @@ public:
 	bool resetsFont() const { return resetsfont_; }
 	///
 	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_;
@@ -188,6 +205,10 @@ private:
 	///
 	std::string latexparam_;
 	///
+	docstring leftdelim_;
+	///
+	docstring rightdelim_;
+	///
 	FontInfo font_;
 	///
 	FontInfo labelfont_;
@@ -245,6 +266,8 @@ private:
 	///
 	bool forceltr_;
 	///
+	bool forceownlines_;
+	///
 	bool needprotect_;
 	/// should the contents be written to TOC strings?
 	bool intoc_;
@@ -255,11 +278,21 @@ 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_;
+	///
+	Layout::LaTeXArgMap postcommandargs_;
 };
 
 ///
 InsetLayout::InsetLyXType translateLyXType(std::string const & str);
+InsetLayout::InsetDecoration translateDecoration(std::string const & str);
 
 } // namespace lyx