X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCaption.h;h=be0d163041ef43504aab31f3135d90d7d6664476;hb=a6b07608d8e9de24;hp=a2aca81c4bbfcde30269cb8583521bffe335b519;hpb=3391fed36a574fb729f243888258d1b6d45b0251;p=lyx.git

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index a2aca81c4b..be0d163041 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -31,7 +31,7 @@ public:
 	/// return the caption text
 	int getCaptionAsPlaintext(odocstream & os, OutputParams const &) const;
 	/// return the caption text as HTML
-	docstring getCaptionAsHTML(XHTMLStream & os, OutputParams const &) const;
+	docstring getCaptionAsHTML(XMLStream & os, OutputParams const &) const;
 	///
 	std::string contextMenuName() const;
 private:
@@ -52,7 +52,7 @@ 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;
@@ -69,7 +69,7 @@ private:
 	///
 	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 	// Update the counters of this inset and of its contents
-	void updateBuffer(ParIterator const &, UpdateType);
+	void updateBuffer(ParIterator const &, UpdateType, bool const deleted);
 	///
 	void latex(otexstream & os, OutputParams const &) const;
 	///
@@ -77,14 +77,12 @@ private:
 	              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);
+	docstring xhtml(XMLStream & os, OutputParams const & runparams) const;
 	///
 	void addToToc(DocIterator const & di, bool output_active, UpdateType utype,
 	              TocBackend & backend) const;
-	/// 
+	///
 	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; }
@@ -100,9 +98,9 @@ private:
 	///
 	bool is_subfloat_;
 	///
-	std::string type_;
+	bool is_deleted_;
 	///
-	docstring custom_label_;
+	std::string type_;
 };