Merge branch 'master' into biblatex2

[lyx.git] / src / insets / InsetLayout.h

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 33fcffaddd980d5e56a4c6402b30d5797db221d5..c1bbe5c07371afa2b14764d9d6c0dc85de57b493 100644 (file)
--- 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
@@ -95,6 +108,8 @@ public:
        /// this inset
        docstring const babelpreamble() const { return babelpreamble_; }
        ///
+       bool fixedwidthpreambleencoding() const { return fixedwidthpreambleencoding_; }
+       ///
        docstring counter() const { return counter_; }
        ///
        docstring refprefix() const { return refprefix_; }
@@ -141,6 +156,8 @@ public:
        ///
        bool isPassThru() const { return passthru_; }
        ///
+       docstring passThruChars() const { return passthru_chars_; }
+       ///
        bool parbreakIsNewline() const { return parbreakisnewline_; }
        ///
        bool isNeedProtect() const { return needprotect_; }
@@ -151,6 +168,8 @@ public:
        ///
        bool forceLTR() const { return forceltr_; }
        ///
+       bool forceOwnlines() const { return forceownlines_; }
+       ///
        bool isInToc() const { return intoc_; }
        ///
        bool spellcheck() const { return spellcheck_; }
@@ -158,14 +177,22 @@ public:
        bool resetsFont() const { return resetsfont_; }
        ///
        bool isDisplay() const { return display_; }
+       ///
+       bool forcelocalfontswitch() const { return forcelocalfontswitch_; }
+       ///
+       docstring const & obsoleted_by() const { return obsoleted_by_; }
+       ///
+       bool addToToc() const { return add_to_toc_; }
+       ///
+       std::string tocType() const { return toc_type_; }
+       ///
+       bool isTocCaption() const { return is_toc_caption_; }
 private:
        ///
        void makeDefaultCSS() const;
        ///
        std::string defaultCSSClass() const;
        ///
-       std::string defaultCSSLabelClass() const { return defaultCSSClass() + "_label"; }
-       ///
        void readArgument(Lexer &);
        ///
        docstring name_;
@@ -188,6 +215,10 @@ private:
        ///
        std::string latexparam_;
        ///
+       docstring leftdelim_;
+       ///
+       docstring rightdelim_;
+       ///
        FontInfo font_;
        ///
        FontInfo labelfont_;
@@ -202,6 +233,8 @@ private:
        /// Language and babel dependent macro definitions needed for this inset
        docstring babelpreamble_;
        ///
+       bool fixedwidthpreambleencoding_;
+       ///
        docstring refprefix_;
        ///
        mutable std::string htmltag_;
@@ -237,6 +270,8 @@ private:
        ///
        bool passthru_;
        ///
+       docstring passthru_chars_;
+       ///
        bool parbreakisnewline_;
        ///
        bool freespacing_;
@@ -245,6 +280,8 @@ private:
        ///
        bool forceltr_;
        ///
+       bool forceownlines_;
+       ///
        bool needprotect_;
        /// should the contents be written to TOC strings?
        bool intoc_;
@@ -255,11 +292,27 @@ 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_;
+       ///
+       bool add_to_toc_;
+       ///
+       std::string toc_type_;
+       ///
+       bool is_toc_caption_;
 };
 
 ///
 InsetLayout::InsetLyXType translateLyXType(std::string const & str);
+InsetLayout::InsetDecoration translateDecoration(std::string const & str);
 
 } // namespace lyx