Remove all BufferParam arguments in InsetXXX methods (since insets know about their...

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

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index f5b4bba0f227d9892dd1527e3a534c8311487150..5379b171bc0d1f3b680615070cb610dfd633dba5 100644 (file)
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -29,7 +29,9 @@ public:
        /// return the optional argument(s) only
        int getOptArg(odocstream & os, OutputParams const &) const;
        /// return the caption text
-       int getCaptionText(odocstream & os, OutputParams const &) const;
+       int getCaptionAsPlaintext(odocstream & os, OutputParams const &) const;
+       /// return the caption text as HTML
+       docstring getCaptionAsHTML(odocstream & os, OutputParams const &) const;
 private:
        ///
        void write(std::ostream & os) const;
@@ -68,12 +70,14 @@ private:
        int plaintext(odocstream & os, OutputParams const & runparams) const;
        ///
        int docbook(odocstream & os, OutputParams const & runparams) const;
+       /// 
+       docstring xhtml(odocstream & os, OutputParams const & runparams) const;
        ///
        void setCustomLabel(docstring const & label);
        ///
        void addToToc(DocIterator const &);
        /// 
-       virtual bool forceEmptyLayout(idx_type = 0) const { return true; }
+       virtual bool forcePlainLayout(idx_type = 0) const { return true; }
        /// Captions don't accept alignment, spacing, etc.
        virtual bool allowParagraphCustomization(idx_type = 0) const { return false; }
        ///
@@ -86,8 +90,6 @@ private:
        ///
        std::string type_;
        ///
-       bool in_subfloat_;
-       ///
        docstring custom_label_;
 };