X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCaption.h;h=461d9ce4f4e0da43ff59c713808f749f352fddd8;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=d792d77640f4cb8b23602f61d3599a02bd7b67d1;hpb=f9691aed8dd13e349349cd28cf1b6245e7aae7fd;p=lyx.git

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index d792d77640..461d9ce4f4 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -23,8 +23,6 @@ public:
 	///
 	InsetCaption(Buffer *, std::string const &);
 	///
-	std::string const & type() const { return type_; }
-	///
 	std::string const & floattype() const { return floattype_; }
 	///
 	docstring layoutName() const;
@@ -44,6 +42,8 @@ private:
 	///
 	bool neverIndent() const { return true; }
 	///
+	bool forceLocalFontSwitch() const { return true; }
+	///
 	InsetCode lyxCode() const { return CAPTION_CODE; }
 	///
 	void cursorPos(BufferView const & bv,
@@ -56,6 +56,8 @@ private:
 	void drawBackground(PainterInfo & pi, int x, int y) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
+	/// Strike out the inset when deleted.
+	bool canPaintChange(BufferView const &) const { return true; }
 	///
 	void edit(Cursor & cur, bool front, EntryDirection entry_from);
 	///
@@ -71,7 +73,8 @@ private:
 	///
 	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;
 	/// 
@@ -79,7 +82,7 @@ private:
 	///
 	void setCustomLabel(docstring const & label);
 	///
-	void addToToc(DocIterator const &) const;
+	void addToToc(DocIterator const & di, bool output_active, UpdateType utype) const;
 	/// 
 	virtual bool forcePlainLayout(idx_type = 0) const { return true; }
 	/// Captions don't accept alignment, spacing, etc.
@@ -94,6 +97,8 @@ private:
 	///
 	std::string floattype_;
 	///
+	bool is_subfloat_;
+	///
 	std::string type_;
 	///
 	docstring custom_label_;