X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNewline.h;h=7e5ee37bbf8cfe88c46abf6bd45cbf8b69d5ce07;hb=c3a8b3a566e9e90f9ade72acbc723232d721d0b1;hp=adf37d4aa39d944db352a3665051389867dc94fa;hpb=c8d00ed1272cd489041bed2115081008b6a26489;p=lyx.git

diff --git a/src/insets/InsetNewline.h b/src/insets/InsetNewline.h
index adf37d4aa3..7e5ee37bbf 100644
--- a/src/insets/InsetNewline.h
+++ b/src/insets/InsetNewline.h
@@ -14,18 +14,19 @@
 
 
 #include "Inset.h"
+#include "support/gettext.h"
 
 
 namespace lyx {
 
-class InsetNewline : public InsetOld {
+class InsetNewline : public Inset {
 public:
 
 	InsetNewline() {}
 
-	InsetBase::Code lyxCode() const { return InsetBase::NEWLINE_CODE; }
+	InsetCode lyxCode() const { return NEWLINE_CODE; }
 
-	bool metrics(MetricsInfo &, Dimension &) const;
+	void metrics(MetricsInfo &, Dimension &) const;
 
 	virtual void draw(PainterInfo & pi, int x, int y) const;
 
@@ -35,18 +36,46 @@ public:
 
 	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
 
-	virtual void read(Buffer const &, LyXLex & lex);
+	virtual void read(Buffer const &, Lexer & lex);
 
-	virtual void write(Buffer const & buf, std::ostream & os) const;
+	virtual void write(Buffer const &, 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;
+
+	virtual docstring insetLabel() const { return docstring(); }
+
+	virtual std::string getLyXName() const { return "\\newline"; }
+
+	virtual std::string getCmdName() const { return "\\\\"; }
+
+	virtual ColorCode ColorName() const { return Color_eolmarker; }
+
+private:
+	virtual Inset * clone() const
+	{
+		return new InsetNewline;
+	}
+};
+
+class InsetLinebreak : public InsetNewline {
+public:
+	InsetLinebreak() {}
+
+	docstring insetLabel() const { return _("line break"); }
+
+	std::string getLyXName() const { return "\\linebreak"; }
+
+	std::string getCmdName() const { return "\\linebreak{}"; }
+
+	ColorCode ColorName() const { return Color_pagebreak; }
+
 private:
-	virtual std::auto_ptr<InsetBase> doClone() const
+	virtual Inset * clone() const
 	{
-		return std::auto_ptr<InsetBase>(new InsetNewline);
+		return new InsetLinebreak;
 	}
 };