X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetspace.h;h=414e6e4171411043755982c71732157aef84cebc;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=6e5aa846eb5445202949a83af584285fd95b4f02;hpb=cd424d78530c9e38502ee7f989ef5c426c97ad61;p=lyx.git

diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h
index 6e5aa846eb..414e6e4171 100644
--- a/src/insets/insetspace.h
+++ b/src/insets/insetspace.h
@@ -18,7 +18,10 @@
 
 #include "inset.h"
 
-struct LaTeXFeatures;
+
+namespace lyx {
+
+class LaTeXFeatures;
 
 ///  Used to insert different kinds of spaces
 class InsetSpace : public InsetOld {
@@ -53,7 +56,7 @@ public:
 	///
 	Kind kind() const;
 	///
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
 	void draw(PainterInfo & pi, int x, int y) const;
 	///
@@ -61,21 +64,19 @@ public:
 	/// Will not be used when lyxf3
 	void read(Buffer const &, LyXLex & lex);
 	///
-	int latex(Buffer const &, std::ostream &,
+	int latex(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, std::ostream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const &) const;
 	///
-	int linuxdoc(Buffer const &, std::ostream &,
-		     OutputParams const &) const;
-	///
-	int docbook(Buffer const &, std::ostream &,
+	int docbook(Buffer const &, odocstream &,
 		    OutputParams const &) const;
+	/// the string that is passed to the TOC
+	virtual int textString(Buffer const &, odocstream &,
+		OutputParams const &) const;
 	///
-	virtual std::auto_ptr<InsetBase> clone() const;
-	///
-	InsetOld::Code lyxCode() const { return InsetOld::SPACE_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::SPACE_CODE; }
 	/// We don't need \begin_inset and \end_inset
 	bool directWrite() const { return true; }
 
@@ -86,11 +87,14 @@ public:
 	/// is this equivalent to a space (which is BTW different from
 	// a line separator)?
 	bool isSpace() const;
-	// should we break lines after this inset?
-	bool isLineSeparator() const;
 private:
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 	/// And which kind is this?
 	Kind kind_;
 };
 
+
+} // namespace lyx
+
 #endif // INSET_SPACE_H