Improve handling of top and bottom margin

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

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index e8ea613efd06e505ed75e1a85c0f48141577c2c1..418a24277200f67a479ed11a383780a73b2f36be 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -14,7 +14,7 @@
 #ifndef INSETBOX_H
 #define INSETBOX_H
 
-#include "InsetCollapsable.h"
+#include "InsetCollapsible.h"
 #include "Length.h"
 
 
@@ -24,7 +24,7 @@ class InsetBoxParams
 {
 public:
        ///
-       InsetBoxParams(std::string const &);
+       explicit InsetBoxParams(std::string const &);
        ///
        void write(std::ostream & os) const;
        ///
@@ -59,6 +59,10 @@ public:
        Length separation;
        ///
        Length shadowsize;
+       ///
+       std::string framecolor;
+       ///
+       std::string backgroundcolor;
 };
 
 
@@ -70,7 +74,7 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-class InsetBox : public InsetCollapsable
+class InsetBox : public InsetCollapsible
 {
 public:
        ///
@@ -107,16 +111,19 @@ public:
        ///
        void metrics(MetricsInfo &, Dimension &) 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 needsCProtection(bool const maintext = false,
+                             bool const fragile = false) const;
+       ///
        bool neverIndent() const { return true; }
        ///
        bool inheritFont() const { return false; }
@@ -126,9 +133,9 @@ public:
        int plaintext(odocstringstream & ods, OutputParams const & op,
                      size_t max_length = INT_MAX) const;
        ///
-       int docbook(odocstream &, OutputParams const &) const;
+       void docbook(XMLStream &, OutputParams const &) const;
        ///
-       docstring xhtml(XHTMLStream &, OutputParams const &) const;
+       docstring xhtml(XMLStream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
@@ -137,7 +144,7 @@ public:
        std::string contextMenuName() const;
        //@}
 
-       /// \name Public functions inherited from InsetCollapsable class
+       /// \name Public functions inherited from InsetCollapsible class
        //@{
        ///
        void setButtonLabel();