X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCaption.h;h=cd99455b2e5fb86c000ff3317a9d7a983f28eea9;hb=dae8555234f0e5c8358b91c307d91b219c664617;hp=e24808e8533113d3b66734dde1abfdb80a4d81fe;hpb=caa4e94bf02b9d3131bc280390fae44683fd5e9a;p=lyx.git

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index e24808e853..cd99455b2e 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -13,7 +13,6 @@
 #define INSETCAPTION_H
 
 #include "InsetText.h"
-#include "support/strfwd.h"
 
 namespace lyx {
 
@@ -22,25 +21,23 @@ namespace lyx {
 class InsetCaption : public InsetText {
 public:
 	///
-	InsetCaption(Buffer *);
+	InsetCaption(Buffer *, std::string const &);
 	///
-	std::string const & type() const { return type_; }
+	std::string const & floattype() const { return floattype_; }
 	///
-	docstring name() const;
+	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 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; }
@@ -53,6 +50,8 @@ 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;
 	///
@@ -62,21 +61,25 @@ 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 &, UpdateType);
+	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 &);
+	/// \param output_active : is the toc being generated for use by the
+	/// output routines?
+	void addToToc(DocIterator const & di, bool output_active) const;
 	/// 
 	virtual bool forcePlainLayout(idx_type = 0) const { return true; }
 	/// Captions don't accept alignment, spacing, etc.
@@ -89,6 +92,8 @@ private:
 	///
 	mutable int labelwidth_;
 	///
+	std::string floattype_;
+	///
 	std::string type_;
 	///
 	docstring custom_label_;