Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index fd512e187cd53ac4c901626770c3dcd4c28045b8..461d9ce4f4e0da43ff59c713808f749f352fddd8 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -23,7 +23,7 @@ public:
        ///
        InsetCaption(Buffer *, std::string const &);
        ///
-       std::string const & type() const { return type_; }
+       std::string const & floattype() const { return floattype_; }
        ///
        docstring layoutName() const;
        /// return the mandatory argument (LaTeX format) only
@@ -42,6 +42,8 @@ private:
        ///
        bool neverIndent() const { return true; }
        ///
+       bool forceLocalFontSwitch() const { return true; }
+       ///
        InsetCode lyxCode() const { return CAPTION_CODE; }
        ///
        void cursorPos(BufferView const & bv,
@@ -54,6 +56,8 @@ private:
        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);
        ///
@@ -69,7 +73,8 @@ private:
        ///
        void latex(otexstream & os, OutputParams const &) const;
        ///
-       int plaintext(odocstream & os, OutputParams const & runparams) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream & os, OutputParams const & runparams) const;
        /// 
@@ -77,7 +82,7 @@ private:
        ///
        void setCustomLabel(docstring const & label);
        ///
-       void addToToc(DocIterator const &) const;
+       void addToToc(DocIterator const & di, bool output_active, UpdateType utype) const;
        /// 
        virtual bool forcePlainLayout(idx_type = 0) const { return true; }
        /// Captions don't accept alignment, spacing, etc.
@@ -92,6 +97,8 @@ private:
        ///
        std::string floattype_;
        ///
+       bool is_subfloat_;
+       ///
        std::string type_;
        ///
        docstring custom_label_;