X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetVSpace.h;h=21afbcd03605392a1f999bf0e46fc4a9c656d570;hb=6e4e0869006aa4c225162164aaa14a70d041facf;hp=38bc2bf9bd5ddd8f8b9c5e5c53473c011d42b322;hpb=e1ac6d411850c934dfc582795bc1ed1570a381c5;p=lyx.git

diff --git a/src/insets/InsetVSpace.h b/src/insets/InsetVSpace.h
index 38bc2bf9bd..21afbcd036 100644
--- a/src/insets/InsetVSpace.h
+++ b/src/insets/InsetVSpace.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,44 +12,51 @@
 #ifndef INSET_VSPACE_H
 #define INSET_VSPACE_H
 
-
 #include "Inset.h"
 #include "VSpace.h"
-#include "MailInset.h"
 
 
 namespace lyx {
 
-class InsetVSpace : public Inset {
+class InsetVSpace : public Inset
+{
 public:
 	///
-	InsetVSpace() {}
+	InsetVSpace() : Inset(0) {}
 	///
 	InsetVSpace(VSpace const &);
-	///
-	~InsetVSpace();
 	/// How much?
 	VSpace const & space() const { return space_; }
 	///
 	InsetCode lyxCode() const { return VSPACE_CODE; }
 	///
-	void edit(Cursor & cur, bool front,
-		EntryDirection entry_from = ENTRY_DIRECTION_IGNORE);
+	bool hasSettings() const { return true; }
+	///
+	bool clickable(BufferView const &, int, int) const { return true; }
 	///
-	EDITABLE editable() const { return IS_EDITABLE; }
+	std::string contextMenuName() const;
+	///
+	static void string2params(std::string const &, VSpace &);
 	///
-	virtual docstring contextMenu(BufferView const & bv, int x, int y) const;
+	static std::string params2string(VSpace const &);
 private:
 	///
 	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
-	int plaintext(odocstream &, OutputParams const &) const;
+	int plaintext(odocstringstream & ods, OutputParams const & op,
+	              size_t max_length = INT_MAX) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
+	/// Note that this returns the inset rather than writing it,
+	/// so it will actually be written after the present paragraph.
+	/// The normal case is that this inset will be on a line by
+	/// itself, and in that case the present paragraph will not,
+	/// in fact, appear at all.
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	void read(Lexer & lex);
 	///
@@ -70,28 +77,6 @@ private:
 };
 
 
-class InsetVSpaceMailer : public MailInset {
-public:
-	///
-	InsetVSpaceMailer(InsetVSpace & inset);
-	///
-	virtual Inset & inset() const { return inset_; }
-	///
-	virtual std::string const & name() const { return name_; }
-	///
-	virtual std::string const inset2string(Buffer const &) const;
-	///
-	static void string2params(std::string const &, VSpace &);
-	///
-	static std::string const params2string(VSpace const &);
-private:
-	///
-	static std::string const name_;
-	///
-	InsetVSpace & inset_;
-};
-
-
 } // namespace lyx
 
 #endif