X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetSpace.h;h=a4fd6151f90a458c9a8429573e6d0cdc735f03a1;hb=239b9919ffe28338d789e6dc9122228f77ab77a7;hp=bc2d685d6d4e6aa48f6c60a06992f4071b1a347e;hpb=f61bebd7fb25beabdf0dc761520030f9059499d6;p=lyx.git

diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h
index bc2d685d6d..a4fd6151f9 100644
--- a/src/insets/InsetSpace.h
+++ b/src/insets/InsetSpace.h
@@ -23,14 +23,15 @@ namespace lyx {
 
 class LaTeXFeatures;
 
-class InsetSpaceParams {
-public:
+struct InsetSpaceParams {
 	/// The different kinds of spaces we support
 	enum Kind {
 		/// Normal space ('\ ')
 		NORMAL,
 		/// Protected (no break) space ('~')
 		PROTECTED,
+		/// Visible ("open box") space ('\textvisiblespace')
+		VISIBLE,
 		/// Thin space ('\,')
 		THIN,
 		/// Medium space ('\:')
@@ -81,7 +82,7 @@ public:
 	///
 	Kind kind;
 	///
-	Length length;
+	GlueLength length;
 	/**
 	 * Whether these params are to be used in mathed.
 	 * This determines the set of valid kinds.
@@ -95,22 +96,20 @@ class InsetSpace : public Inset
 {
 public:
 	///
-	InsetSpace() {}
+	InsetSpace() : Inset(0) {}
 	///
 	explicit InsetSpace(InsetSpaceParams const & par);
 	///
-	InsetSpaceParams params() const { return params_; }
+	InsetSpaceParams const & params() const { return params_; }
 	///
 	InsetSpaceParams::Kind kind() const;
-	///
-	~InsetSpace();
 
 	///
 	static void string2params(std::string const &, InsetSpaceParams &);
 	///
 	static std::string params2string(InsetSpaceParams const &);
 	///
-	Length length() const;
+	GlueLength length() const;
 
 	///
 	docstring toolTip(BufferView const & bv, int x, int y) const;
@@ -123,25 +122,29 @@ public:
 	/// Will not be used when lyxf3
 	void read(Lexer & lex);
 	///
-	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;
 	///
-	int xhtml(odocstream &, OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures & features) const;
-	/// the string that is passed to the TOC
-	void tocString(odocstream &) const;
+	///
+	void toString(odocstream &) const;
+	///
+	void forOutliner(docstring &, size_t const, bool const) const;
 	///
 	bool hasSettings() const { return true; }
 	///
+	bool clickable(BufferView const &, int, int) const { return true; }
+	///
 	InsetCode lyxCode() const { return SPACE_CODE; }
-	/// is this an expandible space (rubber length)?
-	bool isStretchableSpace() const;
-
-	// should this inset be handled like a normal charater
+	/// does this inset try to use all available space (like \\hfill does)?
+	bool isHfill() const;
+	/// should this inset be handled like a normal character?
 	bool isChar() const { return true; }
 	/// is this equivalent to a letter?
 	bool isLetter() const { return false; }
@@ -149,7 +152,7 @@ public:
 	// a line separator)?
 	bool isSpace() const { return true; }
 	///
-	docstring contextMenu(BufferView const & bv, int x, int y) const;
+	std::string contextMenuName() const;
 protected:
 	///
 	Inset * clone() const { return new InsetSpace(*this); }
@@ -160,8 +163,6 @@ public:
 	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 
 private:
-	///
-	bool showInsetDialog(BufferView * bv) const;
 	///
 	InsetSpaceParams params_;
 };