X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.h;h=5619dc042b73f491accce98d5c5d986ad1a3dcbc;hb=48b1e8a0aca2f3f3faa8f1f800568e47792ba9a0;hp=05da26566e7d6ab06fd57eb5d52e7bee70687f7c;hpb=601a8e0192b60274ab316c0bfa31811d236c972e;p=lyx.git

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index 05da26566e..5619dc042b 100644
--- a/src/insets/InsetWrap.h
+++ b/src/insets/InsetWrap.h
@@ -12,9 +12,9 @@
 #ifndef INSETWRAP_H
 #define INSETWRAP_H
 
-#include "InsetCollapsable.h"
-#include "Length.h"
-#include "MailInset.h"
+#include "InsetCaptionable.h"
+
+#include "support/Length.h"
 
 
 namespace lyx {
@@ -30,86 +30,73 @@ public:
 	///
 	std::string type;
 	///
+	int lines;
+	///
 	std::string placement;
 	///
+	Length overhang;
+	///
 	Length width;
 };
 
 
 /** The wrap inset
  */
-class InsetWrap : public InsetCollapsable {
+class InsetWrap : public InsetCaptionable {
 public:
 	///
-	InsetWrap(BufferParams const &, std::string const &);
+	InsetWrap(Buffer *, std::string const &);
 	///
 	~InsetWrap();
 	///
-	void write(Buffer const & buf, std::ostream & os) const;
-	///
-	void read(Buffer const & buf, Lexer & lex);
+	InsetWrapParams const & params() const { return params_; }
 	///
-	void validate(LaTeXFeatures & features) const;
+	static void string2params(std::string const &, InsetWrapParams &);
 	///
-	Inset::Code lyxCode() const { return Inset::WRAP_CODE; }
+	static std::string params2string(InsetWrapParams const &);
+private:
 	///
-	int latex(Buffer const &, odocstream &,
-		  OutputParams const &) const;
+	void setCaptionType(std::string const & type);
 	///
-	int plaintext(Buffer const &, odocstream &,
-		      OutputParams const &) const;
+	void write(std::ostream & os) const;
 	///
-	int docbook(Buffer const &, odocstream &,
-		    OutputParams const &) const;
+	void read(Lexer & lex);
 	///
-	virtual docstring const editMessage() const;
+	void validate(LaTeXFeatures & features) const;
 	///
-	bool insetAllowed(Inset::Code) const;
+	InsetCode lyxCode() const { return WRAP_CODE; }
 	///
-	bool showInsetDialog(BufferView *) const;
+	docstring toolTip(BufferView const & bv, int x, int y) const;
 	///
-	InsetWrapParams const & params() const { return params_; }
+	void latex(otexstream &, OutputParams const &) 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:
+	int plaintext(odocstringstream & ods, OutputParams const & op,
+	              size_t max_length = INT_MAX) const;
 	///
-	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+	void docbook(XMLStream &, OutputParams const &) const;
 	///
-	virtual docstring name() const { return name_; }
-private:
-	virtual std::auto_ptr<Inset> doClone() const;
-
+	docstring xhtml(XMLStream &, OutputParams const &) const;
 	///
-	InsetWrapParams params_;
+	bool insetAllowed(InsetCode) const;
 	///
-	docstring name_;
-};
-
-
-class InsetWrapMailer : public MailInset {
-public:
-	///
-	InsetWrapMailer(InsetWrap & inset);
-	///
-	virtual Inset & inset() const { return inset_; }
-	///
-	virtual std::string const & name() const { return name_; }
+	bool showInsetDialog(BufferView *) const;
 	///
-	virtual std::string const inset2string(Buffer const &) const;
+	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
+	/// Update the label
+	void updateBuffer(ParIterator const &, UpdateType, bool const deleted = false);
 	///
-	static void string2params(std::string const &, InsetWrapParams &);
+	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
-	static std::string const params2string(InsetWrapParams const &);
-private:
+	docstring layoutName() const;
 	///
-	static std::string const name_;
+	Inset * clone() const { return new InsetWrap(*this); }
+	/// Is the content of this inset part of the immediate (visible) text sequence?
+	bool isPartOfTextSequence() const { return false; }
+
 	///
-	InsetWrap & inset_;
+	InsetWrapParams params_;
 };
 
-
 } // namespace lyx
 
 #endif