X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCaption.h;h=70894e164d717cfa2a52272c904f5d3e35749e5d;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=296ca8a802d2f2841ccae524f7fed7664519cdc3;hpb=a746aa52146257c0e7a2d60123f63dccad5b2751;p=lyx.git

diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index 296ca8a802..70894e164d 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -13,11 +13,11 @@
 #define INSETCAPTION_H
 
 #include "InsetText.h"
-#include "TextClass.h"
-
 
 namespace lyx {
 
+class TextClass;
+
 /** A caption inset
 */
 class InsetCaption : public InsetText {
@@ -32,11 +32,11 @@ public:
 	///
 	void read(Buffer const & buf, Lexer & lex);
 	///
-	virtual bool display() const;
+	virtual DisplayType display() const;
 	///
 	virtual bool neverIndent(Buffer const &) const { return true; }
 	///
-	virtual Inset::Code lyxCode() const;
+	virtual InsetCode lyxCode() const;
 	///
 	virtual docstring const editMessage() const;
 	///
@@ -45,48 +45,48 @@ public:
 	///
 	bool descendable() const { return true; }
 	///
-	virtual bool metrics(MetricsInfo & mi, Dimension & dim) const;
+	virtual void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	virtual void draw(PainterInfo & pi, int x, int y) const;
 	///
-	void drawSelection(PainterInfo & pi, int x, int y) const;
-	///
-	virtual void edit(Cursor & cur, bool left);
+	virtual void edit(Cursor & cur, bool front, EntryDirection entry_from);
 	///
 	virtual Inset * editXY(Cursor & cur, int x, int y);
 	///
-	bool insetAllowed(Inset::Code code) const;
+	bool insetAllowed(InsetCode code) const;
 	///
 	virtual bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
-	///
-	virtual bool wide() const { return false; }
+	// Update the counters of this inset and of its contents
+	virtual void updateLabels(Buffer const &, ParIterator const &);
 	///
 	int latex(Buffer const & buf, odocstream & os,
-	          OutputParams const &) const;
+		  OutputParams const &) const;
 	///
 	int plaintext(Buffer const & buf, odocstream & os,
-	              OutputParams const & runparams) const;
+		      OutputParams const & runparams) const;
 	///
 	int docbook(Buffer const & buf, odocstream & os,
-	            OutputParams const & runparams) const;
-	///
-	void setCount(int c) { counter_ = c; }
+		    OutputParams const & runparams) const;
+	/// return the mandatory argument (LaTeX format) only
+	int getArgument(Buffer const & buf, odocstream & os,
+		  OutputParams const &) const;
+	/// return the optional argument(s) only
+	int getOptArg(Buffer const & buf, odocstream & os,
+		  OutputParams const &) const;
 	///
 	std::string const & type() const { return type_; }
 	///
-	void setType(std::string const & type) { type_ = type; }
-	///
 	void setCustomLabel(docstring const & label);
 	///
-	void addToToc(TocList &, Buffer const &) const;
+	void addToToc(Buffer const &, ParConstIterator const &) const;
+	/// 
+	virtual bool forceEmptyLayout() const { return true; }
 	/// Captions don't accept alignment, spacing, etc.
-	bool forceDefaultParagraphs(idx_type) const { return true; }
+	virtual bool allowParagraphCustomization(idx_type) const { return false; }
 
 private:
 	///
-	void computeFullLabel(Buffer const & buf) const;
-	///
-	virtual std::auto_ptr<Inset> doClone() const;
+	virtual Inset * clone() const;
 	///
 	mutable docstring full_label_;
 	///
@@ -96,21 +96,19 @@ private:
 	///
 	docstring custom_label_;
 	///
-	int counter_;
-	///
 	TextClass const & textclass_;
 };
 
 
 inline
-bool InsetCaption::display() const
+Inset::DisplayType InsetCaption::display() const
 {
-	return true;
+	return AlignCenter;
 }
 
 
 inline
-Inset::Code InsetCaption::lyxCode() const
+InsetCode InsetCaption::lyxCode() const
 {
 	return CAPTION_CODE;
 }