Fix bug #10901.

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

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index 6cff1089754a15401dff14d5a33d2b169cc815db..e05f5678e2f2311dcc189248c47d9902d2ba4d8d 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -13,15 +13,19 @@
 #ifndef INSET_FLOAT_H
 #define INSET_FLOAT_H
 
-#include "InsetCollapsable.h"
+#include "InsetCaptionable.h"
 
 
 namespace lyx {
 
-class InsetFloatParams {
+struct TexString;
+
+
+class InsetFloatParams
+{
 public:
        ///
-       InsetFloatParams() : wide(false), sideways(false), subfloat(false) {}
+       InsetFloatParams() : type("senseless"), wide(false), sideways(false), subfloat(false) {}
        ///
        void write(std::ostream & os) const;
        ///
@@ -47,12 +51,10 @@ public:
 /////////////////////////////////////////////////////////////////////////
 
 /// Used for "floating" objects like tables, figures etc.
-class InsetFloat : public InsetCollapsable
+class InsetFloat : public InsetCaptionable
 {
 public:
-       ///
        InsetFloat(Buffer * buffer, std::string params_str);
-
        ///
        static void string2params(std::string const &, InsetFloatParams &);
        ///
@@ -70,6 +72,8 @@ public:
        ///
        bool allowsCaptionVariation(std::string const &) const;
 private:
+       ///
+       void setCaptionType(std::string const & type);
        ///
        docstring layoutName() const;
        ///
@@ -99,15 +103,17 @@ private:
        bool inheritFont() const { return false; }
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
-       // Update the counters of this inset and of its contents
-       void updateBuffer(ParIterator const &, UpdateType);
+       ///
+       bool hasSubCaptions(ParIterator const & it) const;
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
        Inset * clone() const { return new InsetFloat(*this); }
+       /// Is the content of this inset part of the immediate (visible) text sequence?
+       bool isPartOfTextSequence() const { return false; }
        ///
-       docstring getCaption(OutputParams const &) const;
-       ///
+       TexString getCaption(OutputParams const &) const;
+
        InsetFloatParams params_;
 };