X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.h;h=4a0c306a6be5470cd1180aee8109111437d9a178;hb=06254d11dfdf670fab3548dc2a2674e7a261262c;hp=9bf84475e35da40e94eae91042d65eb9b8ec4761;hpb=c8d00ed1272cd489041bed2115081008b6a26489;p=lyx.git

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index 9bf84475e3..4a0c306a6b 100644
--- a/src/insets/InsetWrap.h
+++ b/src/insets/InsetWrap.h
@@ -13,7 +13,7 @@
 #define INSETWRAP_H
 
 #include "InsetCollapsable.h"
-#include "lyxlength.h"
+#include "Length.h"
 #include "MailInset.h"
 
 
@@ -25,14 +25,18 @@ public:
 	///
 	void write(std::ostream &) const;
 	///
-	void read(LyXLex &);
+	void read(Lexer &);
 
 	///
 	std::string type;
 	///
+	int lines;
+	///
 	std::string placement;
 	///
-	LyXLength width;
+	Length overhang;
+	///
+	Length width;
 };
 
 
@@ -47,40 +51,46 @@ public:
 	///
 	void write(Buffer const & buf, std::ostream & os) const;
 	///
-	void read(Buffer const & buf, LyXLex & lex);
+	void read(Buffer const & buf, Lexer & lex);
 	///
 	void validate(LaTeXFeatures & features) const;
 	///
-	InsetBase::Code lyxCode() const { return InsetBase::WRAP_CODE; }
+	InsetCode lyxCode() const { return WRAP_CODE; }
+	///
+	bool isMacroScope(Buffer const &) const { return true; }
 	///
 	int latex(Buffer const &, odocstream &,
-	          OutputParams const &) const;
+		  OutputParams const &) const;
 	///
 	int plaintext(Buffer const &, odocstream &,
-	              OutputParams const &) const;
+		      OutputParams const &) const;
 	///
 	int docbook(Buffer const &, odocstream &,
-	            OutputParams const &) const;
+		    OutputParams const &) const;
 	///
 	virtual docstring const editMessage() const;
 	///
-	bool insetAllowed(InsetBase::Code) const;
-	///
-	void addToToc(TocList &, Buffer const &) const;
+	bool insetAllowed(InsetCode) const;
 	///
 	bool showInsetDialog(BufferView *) const;
 	///
 	InsetWrapParams const & params() const { return params_; }
 	///
-	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+	// Update the counters of this inset and of its contents
+	virtual void updateLabels(Buffer const &, ParIterator const &);
 protected:
 	///
-	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+	///
+	virtual docstring name() const { return name_; }
 private:
-	virtual std::auto_ptr<InsetBase> doClone() const;
+	virtual Inset * clone() const;
 
 	///
 	InsetWrapParams params_;
+	///
+	docstring name_;
 };
 
 
@@ -89,7 +99,7 @@ public:
 	///
 	InsetWrapMailer(InsetWrap & inset);
 	///
-	virtual InsetBase & inset() const { return inset_; }
+	virtual Inset & inset() const { return inset_; }
 	///
 	virtual std::string const & name() const { return name_; }
 	///