Amend 7e121117bb3203

[lyx.git] / src / insets / InsetNewpage.cpp

diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp
index 5e98428fcdcd7dfd060adacbc189325229719fd5..145cec96c6ed2696700d4b0aa691c64e36149df0 100644 (file)
--- 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"
 
@@ -102,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);
 }
 
 
@@ -164,7 +163,7 @@ bool InsetNewpage::getStatus(Cursor & cur, FuncRequest const & cmd,
                        InsetNewpageParams params;
                        string2params(to_utf8(cmd.argument()), params);
                        status.setOnOff(params_.kind == params.kind);
-               } 
+               }
                status.setEnabled(true);
                return true;
        default:
@@ -212,24 +211,31 @@ ColorCode InsetNewpage::ColorName() const
 }
 
 
-void InsetNewpage::latex(otexstream & os, OutputParams const &) const
+void InsetNewpage::latex(otexstream & os, OutputParams const & runparams) const
 {
-       switch (params_.kind) {
+       if (runparams.inDeletedInset) {
+               os << "\\mbox{}\\\\\\makebox[\\columnwidth]{\\dotfill\\ "
+                  << insetLabel() << "\\ \\dotfill}";
+       } else {
+               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;
+               }
        }
 }