Update my email and status.

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

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index a001d7121af1f1de642a61f530ed69342f7bff49..cf0f689ed135b5f3ad294ea3f08d7e589dd7c2d5 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -79,39 +79,40 @@ public:
        };
        ///
        InsetBox(Buffer *, std::string const &);
+
        ///
        static std::string params2string(InsetBoxParams const &);
        ///
        static void string2params(std::string const &, InsetBoxParams &);
        ///
        InsetBoxParams const & params() const { return params_; }
-private:
-       ///
-       friend class InsetBoxParams;
+
+       /// \name Public functions inherited from Inset class
+       //@{
        ///
        InsetCode lyxCode() const { return BOX_CODE; }
        ///
-       docstring name() const;
+       docstring layoutName() const;
        ///
        void write(std::ostream &) const;
        ///
        void read(Lexer & lex);
        ///
-       void setButtonLabel();
-       ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
        DisplayType display() const { return Inline; }
        ///
+       ColorCode backgroundColor(PainterInfo const &) const;
+       ///
        bool allowParagraphCustomization(idx_type = 0) const { return !forcePlainLayout(); }
        ///
        bool forcePlainLayout(idx_type = 0) const;
        ///
        bool neverIndent() const { return true; }
        ///
-       bool noFontChange() const { return true; }
+       bool inheritFont() const { return false; }
        ///
-       int latex(otexstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
@@ -121,19 +122,34 @@ private:
        ///
        void validate(LaTeXFeatures &) const;
        ///
+       bool hasFixedWidth() const;
+       ///
+       std::string contextMenuName() const;
+       //@}
+
+       /// \name Public functions inherited from InsetCollapsable class
+       //@{
+       ///
+       void setButtonLabel();
+       //@}
+
+protected:
+       /// \name Protected functions inherited from Inset class
+       //@{
+       ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
-       /// Is the width forced to some value?
-       bool hasFixedWidth() const;
        ///
        Inset * clone() const { return new InsetBox(*this); }
+       //@}
+
+private:
        /// used by the constructors
        void init();
-       ///
-       docstring contextMenuName() const;
 
        ///
+       friend class InsetBoxParams;
        InsetBoxParams params_;
 };