Correctly show merged paragraphs with ct in plain text output

Fixes #3137

diff --git a/src/output_plaintext.cpp b/src/output_plaintext.cpp
index 8c5655d39b6e315b7ab85743cbb94f67ae9b5ea5..9dae951f03915a0f9e2f14751e572d95014d9a1d 100644 (file)
--- a/src/output_plaintext.cpp
+++ b/src/output_plaintext.cpp
@@ -56,9 +56,11 @@ void writePlaintextFile(Buffer const & buf, odocstream & os,
        ParagraphList::const_iterator end = par.end();
        ParagraphList::const_iterator it = beg;
        for (; it != end; ++it) {
+               bool const merged_par = (*it).parEndChange().deleted();
                writePlaintextParagraph(buf, *it, os, runparams, ref_printed);
-               os << "\n";
-               if (runparams.linelen > 0)
+               if (!merged_par)
+                       os << "\n";
+               if (runparams.linelen > 0 && !merged_par)
                        os << "\n";
        }
 }