X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetNewpage.cpp;h=e062e8bbecf583f1a8610b487c35c81bf64978fb;hb=14dbaa76083a4fdd2bd52aaf67d8da6d60557633;hp=15d45f071a2157625e3a07ec8feb6be827af843e;hpb=ecef54500d4d77baf4fa47eac2253679875ac08c;p=features.git

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index 15d45f071a..e062e8bbec 100644
--- a/src/insets/InsetNewpage.cpp
+++ b/src/insets/InsetNewpage.cpp
@@ -20,6 +20,7 @@
 #include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
+#include "texstream.h"
 #include "Text.h"
 #include "TextMetrics.h"
 
@@ -47,7 +48,6 @@ InsetNewpage::InsetNewpage(InsetNewpageParams const & params)
 
 void InsetNewpageParams::write(ostream & os) const
 {
-	string command;
 	switch (kind) {
 	case InsetNewpageParams::NEWPAGE:
 		os << "newpage";
@@ -103,8 +103,6 @@ void InsetNewpage::metrics(MetricsInfo & mi, Dimension & dim) const
 	dim.asc = defaultRowHeight();
 	dim.des = defaultRowHeight();
 	dim.wid = mi.base.textwidth;
-	// Cache the inset dimension. 
-	setDimCache(mi, dim);
 }
 
 
@@ -213,23 +211,25 @@ ColorCode InsetNewpage::ColorName() const
 }
 
 
-void InsetNewpage::latex(otexstream & os, OutputParams const &) const
+void InsetNewpage::latex(otexstream & os, OutputParams const & runparams) const
 {
 	switch (params_.kind) {
 		case InsetNewpageParams::NEWPAGE:
-			os << "\\newpage{}";
+			os << "\\newpage" << termcmd;
 			break;
 		case InsetNewpageParams::PAGEBREAK:
-			os << "\\pagebreak{}";
+			if (runparams.moving_arg)
+				os << "\\protect";
+			os << "\\pagebreak" << termcmd;
 			break;
 		case InsetNewpageParams::CLEARPAGE:
-			os << "\\clearpage{}";
+			os << "\\clearpage" << termcmd;
 			break;
 		case InsetNewpageParams::CLEARDOUBLEPAGE:
-			os << "\\cleardoublepage{}";
+			os << "\\cleardoublepage" << termcmd;
 			break;
 		default:
-			os << "\\newpage{}";
+			os << "\\newpage" << termcmd;
 			break;
 	}
 }