Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

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

diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 7cab643560b6dc97ac0586b9cca914ddd03ab07d..b7a109eaf4ed1c8c28c6b9fc840194e56a7e8063 100644 (file)
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -33,10 +33,10 @@ public:
        InsetLayout();
        ///
        enum InsetDecoration {
-               Classic,
-               Minimalistic,
-               Conglomerate,
-               Default
+               CLASSIC,
+               MINIMALISTIC,
+               CONGLOMERATE,
+               DEFAULT
        };
        enum InsetLyXType {
                NOLYXTYPE,
@@ -46,30 +46,54 @@ public:
                END,
                STANDARD
        };
+       enum InsetLaTeXType {
+               NOLATEXTYPE,
+               COMMAND,
+               ENVIRONMENT,
+               ILT_ERROR
+       };
+       ///
+       bool read(Lexer & lexrc, TextClass const & tclass);
+       ///
+       docstring name() const { return name_; }
+       ///
+       void setName(docstring const & n) { name_ = n; }
+       ///
+       InsetLyXType lyxtype() const { return lyxtype_; }
        ///
-       bool read(Lexer & lexrc, TextClass & tclass);
+       docstring labelstring() const { return labelstring_; }
        ///
-       docstring name() const { return name_; };
+       InsetDecoration decoration() const { return decoration_; }
        ///
-       InsetLyXType lyxtype() const { return lyxtype_; };
+       InsetLaTeXType latextype() const { return latextype_; }
        ///
-       docstring labelstring() const { return labelstring_; };
+       std::string latexname() const { return latexname_; }
        ///
-       InsetDecoration decoration() const { return decoration_; };
+       std::string latexparam() const { return latexparam_; }
        ///
-       std::string latextype() const { return latextype_; };
+       FontInfo font() const { return font_; }
        ///
-       std::string latexname() const { return latexname_; };
+       FontInfo labelfont() const { return labelfont_; }
        ///
-       std::string latexparam() const { return latexparam_; };
+       ColorCode bgcolor() const { return bgcolor_; }
        ///
-       FontInfo font() const { return font_; };
+       docstring preamble() const { return preamble_; }
        ///
-       FontInfo labelfont() const { return labelfont_; };
+       docstring counter() const { return counter_; }
+       /// 
+       std::string const & htmlinnertag() const { return htmlinnertag_; }
+       /// 
+       std::string const & htmlinnerattr() const { return htmlinnerattr_; }
        ///
-       ColorCode bgcolor() const { return bgcolor_; };
+       std::string const & htmltag() const { return htmltag_; }
+       /// 
+       std::string const & htmlattr() const { return htmlattr_; }
        ///
-       std::string preamble() const { return preamble_; };
+       std::string const & htmllabel() const { return htmllabel_; }
+       /// 
+       docstring htmlstyle() const { return htmlstyle_; }
+       /// 
+       docstring htmlpreamble() const { return htmlpreamble_; }
        ///
        std::set<std::string> requires() const { return requires_; };
        ///
@@ -88,6 +112,8 @@ public:
        bool isKeepEmpty() const { return keepempty_; };
        ///
        bool isForceLtr() const { return forceltr_; };
+       ///
+       bool isInToc() const { return intoc_; };
 private:
        ///
        docstring name_;
@@ -102,7 +128,7 @@ private:
        ///
        InsetDecoration decoration_;
        ///
-       std::string latextype_;
+       InsetLaTeXType latextype_;
        ///
        std::string latexname_;
        ///
@@ -114,7 +140,23 @@ private:
        ///
        ColorCode bgcolor_;
        ///
-       std::string preamble_;
+       docstring counter_;
+       ///
+       docstring preamble_;
+       /// 
+       std::string htmltag_;
+       /// 
+       std::string htmlattr_;
+       ///
+       std::string htmlinnertag_;
+       /// 
+       std::string htmlinnerattr_;
+       ///
+       std::string htmllabel_;
+       /// 
+       docstring htmlstyle_;
+       /// 
+       docstring htmlpreamble_;
        ///
        std::set<std::string> requires_;
        ///
@@ -133,6 +175,8 @@ private:
        bool keepempty_;
        ///
        bool forceltr_;
+       /// should the contents be written to TOC strings?
+       bool intoc_;
 };
 
 ///