X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_plaintext.cpp;h=b0450bda9f3a731d68b19e8953f183e996cba7b7;hb=fbc64ea7ee115bdc4a55c214f28de2166d71f6a2;hp=15e700eb8f1cf564d92b0eb273483d2942234a3a;hpb=93a43742a5f1db8a632233c15e2b8d61b4835f3a;p=lyx.git

diff --git a/src/output_plaintext.cpp b/src/output_plaintext.cpp
index 15e700eb8f..b0450bda9f 100644
--- a/src/output_plaintext.cpp
+++ b/src/output_plaintext.cpp
@@ -21,6 +21,8 @@
 #include "ParagraphList.h"
 #include "ParagraphParameters.h"
 
+#include "insets/Inset.h"
+
 #include "support/debug.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -56,9 +58,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";
 	}
 }
@@ -188,7 +192,7 @@ void writePlaintextParagraph(Buffer const & buf,
 		if (os.str().size() > max_length)
 			break;
 
-		char_type c = par.getUChar(buf.params(), i);
+		char_type c = par.getUChar(buf.params(), runparams, i);
 
 		if (par.isInset(i) || c == ' ') {
 			if (runparams.linelen > 0 &&