Fix bug #10579

The \lyxdeleted macro cannot cope with empty lines.

(cherry picked from commit 5940dc53aab9fec6cd02f8be337f0e6c9b2e5fb1)

diff --git a/src/insets/InsetSeparator.cpp b/src/insets/InsetSeparator.cpp
index 27aeb7c62b6240eb922147777331520c23c30aef..088c418248e646655c3f0fa817309dc396cb9d4d 100644 (file)
--- a/src/insets/InsetSeparator.cpp
+++ b/src/insets/InsetSeparator.cpp
@@ -135,7 +135,7 @@ ColorCode InsetSeparator::ColorName() const
 }
 
 
-void InsetSeparator::latex(otexstream & os, OutputParams const &) const
+void InsetSeparator::latex(otexstream & os, OutputParams const & runparams) const
 {
        // Do nothing if a paragraph break was just output
        if (!os.afterParbreak()) {
@@ -145,7 +145,10 @@ void InsetSeparator::latex(otexstream & os, OutputParams const &) const
                                break;
                        case InsetSeparatorParams::PARBREAK:
                        case InsetSeparatorParams::LATEXPAR:
-                               os << breakln << "\n";
+                               if (runparams.inDeletedInset)
+                                       os << breakln << "}\n\n{";
+                               else
+                                       os << breakln << "\n";
                                break;
                        default:
                                os << breakln << "%\n";

diff --git a/status.22x b/status.22x
index 2506d219b7a21704bb3eae809446c95a5bfe4f13..8cea812b7de53128bf1d4a5a72d77770a0671083 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -144,6 +144,11 @@ 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).
+
+- Allow for empty .lyx files to be opened (bug 9198).
+
 
 * LYX2LYX