Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index 3686ec21951e569893e19a4cd83aa7779697bd95..461d9ce4f4e0da43ff59c713808f749f352fddd8 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -21,27 +21,29 @@ namespace lyx {
 class InsetCaption : public InsetText {
 public:
        ///
-       InsetCaption(Buffer *);
+       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
-       int getArgument(odocstream & os, OutputParams const &) const;
-       /// return the optional argument(s) only
-       int getOptArg(odocstream & os, OutputParams const &) const;
+       void getArgument(otexstream & os, OutputParams const &) const;
        /// return the caption text
        int getCaptionAsPlaintext(odocstream & os, OutputParams const &) const;
        /// return the caption text as HTML
        docstring getCaptionAsHTML(XHTMLStream & os, OutputParams const &) const;
+       ///
+       std::string contextMenuName() const;
 private:
        ///
        void write(std::ostream & os) const;
        ///
-       void read(Lexer & lex);
-       ///
        DisplayType display() const { return AlignCenter; }
        ///
        bool neverIndent() const { return true; }
        ///
+       bool forceLocalFontSwitch() const { return true; }
+       ///
        InsetCode lyxCode() const { return CAPTION_CODE; }
        ///
        void cursorPos(BufferView const & bv,
@@ -50,8 +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);
        ///
@@ -59,13 +65,16 @@ private:
        ///
        bool insetAllowed(InsetCode code) const;
        ///
+       void doDispatch(Cursor & cur, FuncRequest & cmd);
+       ///
        bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
        // Update the counters of this inset and of its contents
-       void updateLabels(ParIterator const &, bool);
+       void updateBuffer(ParIterator const &, UpdateType);
        ///
-       int latex(odocstream & os, OutputParams const &) const;
+       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;
        /// 
@@ -73,7 +82,7 @@ private:
        ///
        void setCustomLabel(docstring const & label);
        ///
-       void addToToc(DocIterator 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.
@@ -86,6 +95,10 @@ private:
        ///
        mutable int labelwidth_;
        ///
+       std::string floattype_;
+       ///
+       bool is_subfloat_;
+       ///
        std::string type_;
        ///
        docstring custom_label_;