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

diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h
index 1081797ed8..414e6e4171 100644
--- a/src/insets/insetspace.h
+++ b/src/insets/insetspace.h
@@ -1,15 +1,15 @@
 // -*- C++ -*-
 /**
- * \file InsetSpace.h
+ * \file insetspace.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup Nielsen
  * \author Jean-Marc Lasgouttes
  * \author Lars Gullik Bjønnes
- * \author Juergen Spitzmueller
+ * \author Jürgen Spitzmüller
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSET_SPACE_H
@@ -17,12 +17,14 @@
 
 
 #include "inset.h"
-#include "LString.h"
 
-struct LaTeXFeatures;
+
+namespace lyx {
+
+class LaTeXFeatures;
 
 ///  Used to insert different kinds of spaces
-class InsetSpace : public Inset {
+class InsetSpace : public InsetOld {
 public:
 
 	/// The different kinds of spaces we support
@@ -46,35 +48,35 @@ public:
 	};
 
 	///
-	InsetSpace() {}
+	InsetSpace();
+
 	///
 	explicit
 	InsetSpace(Kind k);
 	///
 	Kind kind() const;
 	///
-	void dimension(BufferView *, LyXFont const &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 	///
-	void draw(BufferView *, LyXFont const &, int, float &) const;
+	void draw(PainterInfo & pi, int x, int y) const;
 	///
-	void write(Buffer const *, std::ostream &) const;
+	void write(Buffer const &, std::ostream &) const;
 	/// Will not be used when lyxf3
-	void read(Buffer const *, LyXLex & lex);
-	///
-	int latex(Buffer const *, std::ostream &,
-		  LatexRunParams const &) const;
-	///
-	int ascii(Buffer const *, std::ostream &, int linelen) const;
+	void read(Buffer const &, LyXLex & lex);
 	///
-	int linuxdoc(Buffer const *, std::ostream &) const;
+	int latex(Buffer const &, odocstream &,
+		  OutputParams const &) const;
 	///
-	int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+	int plaintext(Buffer const &, odocstream &,
+		  OutputParams const &) const;
 	///
-	virtual Inset * clone(Buffer const &) const;
+	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 Inset * clone(Buffer const &, bool same_id) const;
-	///
-	Inset::Code lyxCode() const { return Inset::SPACE_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::SPACE_CODE; }
 	/// We don't need \begin_inset and \end_inset
 	bool directWrite() const { return true; }
 
@@ -85,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