Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetCaptionable.h b/src/insets/InsetCaptionable.h
index 9e85f67f5ee0a7e3553f0b20f8f03eddd0b58676..5e06d77b73134212b0b38590dbffbea942cd419c 100644 (file)
--- a/src/insets/InsetCaptionable.h
+++ b/src/insets/InsetCaptionable.h
@@ -23,9 +23,7 @@ namespace lyx {
 class InsetCaptionable : public InsetCollapsable
 {
 public:
-       InsetCaptionable(Buffer * buffer)
-               : InsetCollapsable(buffer), caption_type_("senseless") {}
-       InsetCaptionable(Buffer * buffer, std::string const & type)
+       InsetCaptionable(Buffer * buffer, std::string const & type = "senseless")
                : InsetCollapsable(buffer), caption_type_(type) {}
        ///
        std::string const & captionType() const { return caption_type_; }
@@ -33,12 +31,19 @@ public:
        docstring floatName(std::string const & type) const;
        ///
 protected:
+       ///
+       InsetCaption const * getCaptionInset() const;
+       ///
+       docstring getCaptionText(OutputParams const &) const;
+       ///
+       docstring getCaptionHTML(OutputParams const &) const;
        ///
        virtual void setCaptionType(std::string const & type);
        /// are our captions subcaptions?
        virtual bool hasSubCaptions(ParIterator const &) const { return false; }
        ///
-       void addToToc(DocIterator const & di, bool output_active) const;
+       void addToToc(DocIterator const & di, bool output_active,
+                                 UpdateType utype) const;
        /// Update the counters of this inset and of its contents
        void updateBuffer(ParIterator const &, UpdateType);
        ///