Use new display() values to remove some inset hardcoding.

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

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index 26b3b260418560f050aa032d1823a391fa658c50..1d3cac1bb956946a5dad467de74bcc368602e563 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -38,7 +38,7 @@ private:
        ///
        void write(std::ostream & os) const;
        ///
-       DisplayType display() const { return AlignCenter; }
+       DisplayType display() const { return Display; }
        ///
        bool neverIndent() const { return true; }
        ///
@@ -52,10 +52,12 @@ private:
        bool descendable(BufferView const &) const { return true; }
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
-       ///     
+       ///
        void drawBackground(PainterInfo & pi, int x, int y) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
+       /// Strike out the inset when deleted.
+       bool canPaintChange(BufferView const &) const { return true; }
        ///
        void edit(Cursor & cur, bool front, EntryDirection entry_from);
        ///
@@ -75,14 +77,14 @@ private:
                      size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream & os, OutputParams const & runparams) const;
-       /// 
+       ///
        docstring xhtml(XHTMLStream & os, OutputParams const & runparams) const;
        ///
        void setCustomLabel(docstring const & label);
-       /// \param output_active : is the toc being generated for use by the
-       /// output routines?
-       void addToToc(DocIterator const & di, bool output_active) const;
-       /// 
+       ///
+       void addToToc(DocIterator const & di, bool output_active, UpdateType utype,
+                     TocBackend & backend) const;
+       ///
        virtual bool forcePlainLayout(idx_type = 0) const { return true; }
        /// Captions don't accept alignment, spacing, etc.
        virtual bool allowParagraphCustomization(idx_type = 0) const { return false; }
@@ -96,6 +98,8 @@ private:
        ///
        std::string floattype_;
        ///
+       bool is_subfloat_;
+       ///
        std::string type_;
        ///
        docstring custom_label_;