Better TOC output for XHTML, per Rob and Pavel.

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

diff --git a/src/insets/InsetFloat.h b/src/insets/InsetFloat.h
index a5ea2ef64f85f7c2a8df0ed6fd1a163a0801032e..4a4c7d5bfbded980859a3d7174ebf884695af1dd 100644 (file)
--- a/src/insets/InsetFloat.h
+++ b/src/insets/InsetFloat.h
@@ -51,27 +51,25 @@ class InsetFloat : public InsetCollapsable
 {
 public:
        ///
-       InsetFloat(Buffer const &, std::string const &);
-       ///
-       ~InsetFloat();
+       InsetFloat(Buffer * buffer, std::string params_str);
 
        ///
        static void string2params(std::string const &, InsetFloatParams &);
        ///
        static std::string params2string(InsetFloatParams const &);
        ///
-       void setWide(bool w, BufferParams const &, bool update_label = true);
+       void setWide(bool w, bool update_label = true);
        ///
-       void setSideways(bool s, BufferParams const &, bool update_label = true);
+       void setSideways(bool s, bool update_label = true);
        ///
-       void setSubfloat(bool s, BufferParams const &, bool update_label = true);
+       void setSubfloat(bool s, bool update_label = true);
        ///
-       void setNewLabel(BufferParams const &);
+       void setNewLabel();
        ///
        InsetFloatParams const & params() const { return params_; }
 private:
        ///
-       docstring name() const;
+       docstring layoutName() const;
        ///
        docstring toolTip(BufferView const & bv, int x, int y) const;
        ///
@@ -83,27 +81,23 @@ private:
        ///
        InsetCode lyxCode() const { return FLOAT_CODE; }
        ///
-       int latex(odocstream &, OutputParams const &) const;
+       void latex(otexstream &, OutputParams const &) const;
        ///
        int plaintext(odocstream &, OutputParams const &) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(odocstream &, OutputParams const &) const;
-       ///
-       docstring editMessage() const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        bool insetAllowed(InsetCode) const;
-       /** returns true if, when outputing LaTeX, font changes should
+       /** returns false if, when outputing LaTeX, font changes should
            be closed before generating this inset. This is needed for
            insets that may contain several paragraphs */
-       bool noFontChange() const { return true; }
-       ///
-       bool showInsetDialog(BufferView *) const;
+       bool inheritFont() const { return false; }
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        // Update the counters of this inset and of its contents
-       void updateLabels(ParIterator const &);
+       void updateBuffer(ParIterator const &, UpdateType);
        ///
        void doDispatch(Cursor & cur, FuncRequest & cmd);
        ///
@@ -112,8 +106,6 @@ private:
        docstring getCaption(OutputParams const &) const;
        ///
        InsetFloatParams params_;
-       ///
-       docstring name_;
 };