Get rid of regex_constants::match_partial

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

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index ced0402c793879e8e426148349a806460600211a..cd99455b2e5fb86c000ff3317a9d7a983f28eea9 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -21,25 +21,23 @@ 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 name() const;
+       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; }
@@ -63,21 +61,25 @@ 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 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;
        /// 
        docstring xhtml(XHTMLStream & os, OutputParams const & runparams) const;
        ///
        void setCustomLabel(docstring const & label);
-       ///
-       void addToToc(DocIterator const &) const;
+       /// \param output_active : is the toc being generated for use by the
+       /// output routines?
+       void addToToc(DocIterator const & di, bool output_active) const;
        /// 
        virtual bool forcePlainLayout(idx_type = 0) const { return true; }
        /// Captions don't accept alignment, spacing, etc.
@@ -90,6 +92,8 @@ private:
        ///
        mutable int labelwidth_;
        ///
+       std::string floattype_;
+       ///
        std::string type_;
        ///
        docstring custom_label_;