X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetnewline.h;h=aa6d2066dd0b503255aedf3d7ad553065eaaa1d3;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=f9df8583adee13c1be590e7f75087d638638474f;hpb=4ba8a4d6f603c01d7ab7dfa937dc6072ef5db1f2;p=lyx.git

diff --git a/src/insets/insetnewline.h b/src/insets/insetnewline.h
index f9df8583ad..aa6d2066dd 100644
--- a/src/insets/insetnewline.h
+++ b/src/insets/insetnewline.h
@@ -6,7 +6,7 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSET_NEWLINE_H
@@ -15,35 +15,45 @@
 
 #include "inset.h"
 
-class InsetNewline : public Inset {
+
+namespace lyx {
+
+class InsetNewline : public InsetOld {
 public:
 
 	InsetNewline() {}
 
-	virtual std::auto_ptr<InsetBase> clone() const {
-		return std::auto_ptr<InsetBase>(new InsetNewline);
-	}
-
-	Inset::Code lyxCode() const { return Inset::NEWLINE_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::NEWLINE_CODE; }
 
-	void metrics(MetricsInfo &, Dimension &) const;
+	bool metrics(MetricsInfo &, Dimension &) const;
 
 	virtual void draw(PainterInfo & pi, int x, int y) const;
 
-	virtual int latex(Buffer const *, std::ostream &,
-			  LatexRunParams const &) const;
+	virtual int latex(Buffer const &, odocstream &,
+			  OutputParams const &) const;
 
-	virtual int ascii(Buffer const *, std::ostream &, int linelen) const;
+	virtual int plaintext(Buffer const &, odocstream &,
+			  OutputParams const &) const;
 
-	virtual int linuxdoc(Buffer const *, std::ostream &) const;
+	virtual int docbook(Buffer const &, odocstream &,
+			    OutputParams const &) const;
 
-	virtual int docbook(Buffer const *, std::ostream &, bool) const;
+	virtual void read(Buffer const &, LyXLex & lex);
 
-	virtual void read(Buffer const *, LyXLex & lex);
-
-	virtual void write(Buffer const * buf, std::ostream & os) const;
+	virtual void write(Buffer const & buf, std::ostream & os) const;
 	/// We don't need \begin_inset and \end_inset
 	virtual bool directWrite() const { return true; }
+	/// is this equivalent to a space (which is BTW different from
+	// a line separator)?
+	bool isSpace() const;
+private:
+	virtual std::auto_ptr<InsetBase> doClone() const
+	{
+		return std::auto_ptr<InsetBase>(new InsetNewline);
+	}
 };
 
+
+} // namespace lyx
+
 #endif // INSET_NEWLINE_H