X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2FInsetERT.cpp;h=a023f7a464af403154af95fa6ae37737f977997e;hb=85946aae;hp=57fc1e3419ebc1c9f281ebe76dde0aa93dae38a5;hpb=44ef3fadee3435a2eaaf767c6489499889598edc;p=lyx.git

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index 57fc1e3419..a023f7a464 100644
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -98,17 +98,23 @@ void InsetERT::docbook(XMLStream & xs, OutputParams const & runparams) const
 	auto par = begin;
 	auto const end = paragraphs().end();
 
-	xs << XMLStream::ESCAPE_NONE << "<!-- ";
+	odocstringstream os2;
+	XMLStream xs2(os2);
+
+	// Recreate the logic of makeParagraphs in output_docbook.cpp, but much simplified: never open <para>
+	// in an ERT, use simple line breaks.
 	while (par != end) {
-		// Recreate the logic of makeParagraphs in output_docbook.cpp, but much simplified: never open <para>
-		// in an ERT, use simple line breaks.
-		par->simpleDocBookOnePar(buffer(), xs, runparams, text().outerFont(distance(begin, par)));
+		par->simpleDocBookOnePar(buffer(), xs2, runparams, text().outerFont(distance(begin, par)));
 
 		// New line after each paragraph of the ERT, save the last one.
 		++par;
 		if (par != end)
 			xs << "\n";
 	}
+
+	// Output the ERT as a comment with the appropriate escaping.
+	xs << XMLStream::ESCAPE_NONE << "<!-- ";
+	xs << XMLStream::ESCAPE_COMMENTS << os2.str();
 	xs << XMLStream::ESCAPE_NONE << " -->";
 }