X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNewline.cpp;h=b10954d4da659210f8192c273c7b47273bd2d87d;hb=59e6610d8ad4d5c5a81d9a6b4ef73ae36231489a;hp=71302decab10e80f4facea67f2f9bc9ee52438bc;hpb=4c7a5d00245799695ea81aa0192151eed8f9c5fb;p=lyx.git

diff --git a/src/insets/InsetNewline.cpp b/src/insets/InsetNewline.cpp
index 71302decab..b10954d4da 100644
--- a/src/insets/InsetNewline.cpp
+++ b/src/insets/InsetNewline.cpp
@@ -13,6 +13,7 @@
 
 #include "InsetNewline.h"
 
+#include "Cursor.h"
 #include "Dimension.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
@@ -20,6 +21,7 @@
 #include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
+#include "texstream.h"
 
 #include "frontends/Application.h"
 #include "frontends/FontMetrics.h"
@@ -39,7 +41,6 @@ InsetNewline::InsetNewline() : Inset(0)
 
 void InsetNewlineParams::write(ostream & os) const
 {
-	string command;
 	switch (kind) {
 	case InsetNewlineParams::NEWLINE:
 		os << "newline";
@@ -55,7 +56,7 @@ void InsetNewlineParams::read(Lexer & lex)
 {
 	string token;
 	lex.setContext("InsetNewlineParams::read");
-	lex >> token;	
+	lex >> token;
 	if (token == "newline")
 		kind = InsetNewlineParams::NEWLINE;
 	else if (token == "linebreak")
@@ -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") {
@@ -140,7 +142,7 @@ ColorCode InsetNewline::ColorName() const
 }
 
 
-int InsetNewline::latex(odocstream & os, OutputParams const & rp) const
+void InsetNewline::latex(otexstream & os, OutputParams const & rp) const
 {
 	switch (params_.kind) {
 		case InsetNewlineParams::NEWLINE:
@@ -156,11 +158,11 @@ int InsetNewline::latex(odocstream & os, OutputParams const & rp) 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;
@@ -176,8 +178,7 @@ int InsetNewline::docbook(odocstream & os, OutputParams const &) const
 
 docstring InsetNewline::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-	xs << html::CompTag("br");
-	xs.cr();
+	xs << html::CR() << html::CompTag("br") << html::CR();
 	return docstring();
 }
 
@@ -244,7 +245,7 @@ void InsetNewline::draw(PainterInfo & pi, int x, int y) const
 		yp[0] = int(y - 0.875 * asc * 0.75);
 		yp[1] = int(y - 0.500 * asc * 0.75);
 		yp[2] = int(y - 0.125 * asc * 0.75);
-	
+
 		if (pi.ltr_pos) {
 			xp[0] = int(x + 2 * wid * 0.813);
 			xp[1] = int(x + 2 * wid);
@@ -259,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";
 }