X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNewline.cpp;h=411da120eb60120df773d8f9771209d2d57d0c1e;hb=4859a1f6bb834aa5efa4a32e7619cc7a3347dc0c;hp=7133f554b0afb5f1302c6da9467acd22c7f6ad2e;hpb=fb12b282f1300123c7f4c7f10525c29cb598e1fe;p=lyx.git

diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index 7133f554b0..411da120eb 100644
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,13 +13,15 @@
 
 #include "InsetNewline.h"
 
-#include "Buffer.h"
+#include "Cursor.h"
 #include "Dimension.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "output_xhtml.h"
+#include "texstream.h"
 
 #include "frontends/Application.h"
 #include "frontends/FontMetrics.h"
@@ -33,13 +35,12 @@ using namespace std;
 
 namespace lyx {
 
-InsetNewline::InsetNewline()
+InsetNewline::InsetNewline() : Inset(0)
 {}
 
 
 void InsetNewlineParams::write(ostream & os) const
 {
-	string command;
 	switch (kind) {
 	case InsetNewlineParams::NEWLINE:
 		os << "newline";
@@ -62,7 +63,6 @@ void InsetNewlineParams::read(Lexer & lex)
 		kind = InsetNewlineParams::LINEBREAK;
 	else
 		lex.printError("Unknown kind: `$$Token'");
-	lex >> "\\end_inset";
 }
 
 
@@ -76,6 +76,7 @@ void InsetNewline::write(ostream & os) const
 void InsetNewline::read(Lexer & lex)
 {
 	params_.read(lex);
+	lex >> "\\end_inset";
 }
 
 
@@ -90,10 +91,11 @@ void InsetNewline::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetNewline::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY: {
 		InsetNewlineParams params;
+		cur.recordUndo();
 		string2params(to_utf8(cmd.argument()), params);
 		params_.kind = params.kind;
 		break;
@@ -109,7 +111,7 @@ void InsetNewline::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetNewline::getStatus(Cursor & cur, FuncRequest const & cmd,
 	FuncStatus & status) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	// we handle these
 	case LFUN_INSET_MODIFY:
 		if (cmd.getArg(0) == "newline") {
@@ -134,20 +136,20 @@ ColorCode InsetNewline::ColorName() const
 		case InsetNewlineParams::LINEBREAK:
 			return Color_pagebreak;
 			break;
-		default:
-			return Color_eolmarker;
-			break;
 	}
+	// not really useful, but to avoids gcc complaints
+	return Color_eolmarker;
 }
 
 
-int InsetNewline::latex(odocstream & os, OutputParams const &) const
+void InsetNewline::latex(otexstream & os, OutputParams const & rp) const
 {
-	LYXERR0("Code: " << buffer().inset().lyxCode());
-	
 	switch (params_.kind) {
 		case InsetNewlineParams::NEWLINE:
-			os << "\\\\\n";
+			if (rp.inTableCell == OutputParams::PLAIN)
+				os << "\\newline\n";
+			else
+				os << "\\\\\n";
 			break;
 		case InsetNewlineParams::LINEBREAK:
 			os << "\\linebreak{}\n";
@@ -156,11 +158,11 @@ int InsetNewline::latex(odocstream & os, OutputParams const &) const
 			os << "\\\\\n";
 			break;
 	}
-	return 0;
 }
 
 
-int InsetNewline::plaintext(odocstream & os, OutputParams const &) const
+int InsetNewline::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
 	os << '\n';
 	return PLAINTEXT_NEWLINE;
@@ -174,6 +176,13 @@ int InsetNewline::docbook(odocstream & os, OutputParams const &) const
 }
 
 
+docstring InsetNewline::xhtml(XHTMLStream & xs, OutputParams const &) const
+{
+	xs << html::CR() << html::CompTag("br") << html::CR();
+	return docstring();
+}
+
+
 void InsetNewline::draw(PainterInfo & pi, int x, int y) const
 {
 	FontInfo font;
@@ -251,9 +260,9 @@ void InsetNewline::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-docstring InsetNewline::contextMenu(BufferView const &, int, int) const
+string InsetNewline::contextMenuName() const
 {
-	return from_ascii("context-newline");
+	return "context-newline";
 }