From caf56220c65e92f0bcf189d225ed654e47932407 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Mon, 3 Apr 2017 00:07:53 +0200 Subject: [PATCH] Fix bug #10554 The \lyxdeleted macro cannot cope with \newpage & co. --- src/insets/InsetNewpage.cpp | 7 ++++++- status.22x | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/insets/InsetNewpage.cpp b/src/insets/InsetNewpage.cpp index 418bf8b361..42cd64ab50 100644 --- a/src/insets/InsetNewpage.cpp +++ b/src/insets/InsetNewpage.cpp @@ -214,7 +214,11 @@ ColorCode InsetNewpage::ColorName() 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{}"; break; @@ -232,6 +236,7 @@ void InsetNewpage::latex(otexstream & os, OutputParams const & runparams) const default: os << "\\newpage{}"; break; + } } } diff --git a/status.22x b/status.22x index 17521d5657..04d0c37460 100644 --- a/status.22x +++ b/status.22x @@ -144,8 +144,8 @@ What's new - Use \providecommand for logical markup macros. This fixes a LaTeX error with strong and fontenc. -- Fix problem with deleted paragraph breaks when changes are shown in - output (bug 10579). +- Fix problem with deleted page and paragraph breaks when changes are + shown in output (bugs 10554 and 10579). - Allow for empty .lyx files to be opened (bug 9198). -- 2.39.5