Pure HTML output for math macros.

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

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index a942752126ad194e95bbb70aa8e1699c8722881a..be5a73aeba056e67961a52b9d54226ad31bdb806 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -13,6 +13,7 @@
 #define INSETCAPTION_H
 
 #include "InsetText.h"
+#include "support/strfwd.h"
 
 namespace lyx {
 
@@ -21,9 +22,11 @@ namespace lyx {
 class InsetCaption : public InsetText {
 public:
        ///
-       InsetCaption(Buffer const &);
+       InsetCaption(Buffer *);
        ///
        std::string const & type() const { return type_; }
+       ///
+       docstring name() const;
        /// return the mandatory argument (LaTeX format) only
        int getArgument(odocstream & os, OutputParams const &) const;
        /// return the optional argument(s) only
@@ -31,7 +34,7 @@ public:
        /// return the caption text
        int getCaptionAsPlaintext(odocstream & os, OutputParams const &) const;
        /// return the caption text as HTML
-       docstring getCaptionAsHTML(odocstream & os, OutputParams const &) const;
+       docstring getCaptionAsHTML(XHTMLStream & os, OutputParams const &) const;
 private:
        ///
        void write(std::ostream & os) const;
@@ -44,12 +47,10 @@ private:
        ///
        InsetCode lyxCode() const { return CAPTION_CODE; }
        ///
-       docstring editMessage() const;
-       ///
        void cursorPos(BufferView const & bv,
                CursorSlice const & sl, bool boundary, int & x, int & y) const;
        ///
-       bool descendable() const { return true; }
+       bool descendable(BufferView const &) const { return true; }
        ///
        void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
@@ -63,15 +64,15 @@ private:
        ///
        bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
        // Update the counters of this inset and of its contents
-       void updateLabels(ParIterator const &);
+       void updateBuffer(ParIterator const &, UpdateType);
        ///
        int latex(odocstream & os, OutputParams const &) const;
        ///
        int plaintext(odocstream & os, OutputParams const & runparams) const;
        ///
        int docbook(odocstream & os, OutputParams const & runparams) const;
-       /// This does nothing here. Instead, it is handled inside the float.
-       docstring xhtml(odocstream & os, OutputParams const & runparams) const;
+       /// 
+       docstring xhtml(XHTMLStream & os, OutputParams const & runparams) const;
        ///
        void setCustomLabel(docstring const & label);
        ///