Improved character count statistics for letter based insets (e.g. the LyX logo).

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

diff --git a/src/insets/InsetBox.h b/src/insets/InsetBox.h
index 151d622fcb7b73b87fd86f1561941b15e5b72e71..3398a52ed600962a172805ad8760b68a0817c867 100644 (file)
--- a/src/insets/InsetBox.h
+++ b/src/insets/InsetBox.h
@@ -14,8 +14,9 @@
 #ifndef INSETBOX_H
 #define INSETBOX_H
 
-#include "InsetCollapsable.h"
-#include "Length.h"
+#include "InsetCollapsible.h"
+
+#include "support/Length.h"
 
 
 namespace lyx {
@@ -24,7 +25,7 @@ class InsetBoxParams
 {
 public:
        ///
-       InsetBoxParams(std::string const &);
+       explicit InsetBoxParams(std::string const &);
        ///
        void write(std::ostream & os) const;
        ///
@@ -74,7 +75,7 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-class InsetBox : public InsetCollapsable
+class InsetBox : public InsetCollapsible
 {
 public:
        ///
@@ -111,8 +112,6 @@ public:
        ///
        void metrics(MetricsInfo &, Dimension &) const;
        ///
-       DisplayType display() const { return Inline; }
-       ///
        ColorCode backgroundColor(PainterInfo const &) const;
        ///
        LyXAlignment contentAlignment() const;
@@ -123,6 +122,9 @@ public:
        ///
        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; }
@@ -132,9 +134,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;
        ///
@@ -143,7 +145,7 @@ public:
        std::string contextMenuName() const;
        //@}
 
-       /// \name Public functions inherited from InsetCollapsable class
+       /// \name Public functions inherited from InsetCollapsible class
        //@{
        ///
        void setButtonLabel();