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

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index d4e2e17ab9..461d9ce4f4 100644
--- 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.
  */
@@ -21,37 +21,43 @@ namespace lyx {
 class InsetCaption : public InsetText {
 public:
 	///
-	InsetCaption(Buffer const &);
+	InsetCaption(Buffer *, std::string const &);
 	///
-	std::string const & type() const { return type_; }
+	std::string const & floattype() const { return floattype_; }
+	///
+	docstring layoutName() const;
 	/// return the mandatory argument (LaTeX format) only
-	int getArgument(odocstream & os, OutputParams const &) const;
-	/// return the optional argument(s) only
-	int getOptArg(odocstream & os, OutputParams const &) const;
+	void getArgument(otexstream & 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(XHTMLStream & os, OutputParams const &) const;
+	///
+	std::string contextMenuName() const;
 private:
 	///
 	void write(std::ostream & os) const;
 	///
-	void read(Lexer & lex);
-	///
 	DisplayType display() const { return AlignCenter; }
 	///
 	bool neverIndent() const { return true; }
 	///
-	InsetCode lyxCode() const { return CAPTION_CODE; }
+	bool forceLocalFontSwitch() const { return true; }
 	///
-	docstring editMessage() const;
+	InsetCode lyxCode() const { return CAPTION_CODE; }
 	///
 	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;
+	///	
+	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);
 	///
@@ -59,19 +65,24 @@ private:
 	///
 	bool insetAllowed(InsetCode code) const;
 	///
+	void doDispatch(Cursor & cur, FuncRequest & cmd);
+	///
 	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;
+	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;
+	/// 
+	docstring xhtml(XHTMLStream & os, OutputParams const & runparams) const;
 	///
 	void setCustomLabel(docstring const & label);
 	///
-	void addToToc(DocIterator 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.
@@ -84,9 +95,11 @@ private:
 	///
 	mutable int labelwidth_;
 	///
-	std::string type_;
+	std::string floattype_;
 	///
-	bool in_subfloat_;
+	bool is_subfloat_;
+	///
+	std::string type_;
 	///
 	docstring custom_label_;
 };