Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index df61656c45c0b56edb20331b1b67b2427d121f4b..151d622fcb7b73b87fd86f1561941b15e5b72e71 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -6,6 +6,7 @@
  *
  * \author Angus Leeming
  * \author Martin Vermeer
+ * \author Uwe Stöhr
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -31,8 +32,10 @@ public:
 
        ///
        std::string type;
-       /// Use a parbox (true) or minipage (false)
+       /// Is there a parbox?
        bool use_parbox;
+       /// Is there a makebox?
+       bool use_makebox;
        /// Do we have an inner parbox or minipage to format paragraphs to
        /// columnwidth?
        bool inner_box;
@@ -50,6 +53,16 @@ public:
        Length height;
        ///
        std::string height_special;
+       ///
+       Length thickness;
+       ///
+       Length separation;
+       ///
+       Length shadowsize;
+       ///
+       std::string framecolor;
+       ///
+       std::string backgroundcolor;
 };
 
 
@@ -76,68 +89,83 @@ public:
                Doublebox
        };
        ///
-       InsetBox(Buffer const &, std::string const &);
-       ///
-       ~InsetBox();
+       InsetBox(Buffer *, std::string const &);
+
        ///
        static std::string params2string(InsetBoxParams const &);
        ///
        static void string2params(std::string const &, InsetBoxParams &);
-private:
        ///
-       friend class InsetBoxParams;
-       ///
-       docstring editMessage() const;
+       InsetBoxParams const & params() const { return params_; }
+
+       /// \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;
-       /// show the Box dialog
-       bool showInsetDialog(BufferView * bv) const;
        ///
        DisplayType display() const { return Inline; }
        ///
+       ColorCode backgroundColor(PainterInfo const &) const;
+       ///
+       LyXAlignment contentAlignment() const;
+       ///
        bool allowParagraphCustomization(idx_type = 0) const { return !forcePlainLayout(); }
        ///
+       bool allowMultiPar() const;
+       ///
        bool forcePlainLayout(idx_type = 0) const;
        ///
        bool neverIndent() const { return true; }
        ///
-       bool noFontChange() const { return true; }
+       bool inheritFont() const { return false; }
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(odocstream &, OutputParams const &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
-       InsetBoxParams const & params() const { return params_; }
+       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 contextMenu(BufferView const & bv, int x, int y) const;
 
        ///
+       friend class InsetBoxParams;
        InsetBoxParams params_;
 };