From: Richard Heck <rgheck@lyx.org>
Date: Thu, 21 Feb 2013 23:10:42 +0000 (-0500)
Subject: Don't convert --- and -- to entities in XHTML listings output.
X-Git-Tag: 2.0.6~89
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0735ac84e2596dd95c212eabe7d75bf46e7aa186;p=features.git

Don't convert --- and -- to entities in XHTML listings output.
Fixes bug #8561.
(cherry picked from commit c4bed8dbe802303c9249114d025119ca80b42936)
---

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 6156f8883f..19a8105dbf 100644
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -283,6 +283,9 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
 	out << html::StartTag("pre");
 	OutputParams newrp = rp;
 	newrp.html_disable_captions = true;
+	// We don't want to convert dashes here. That's the only conversion we
+	// do for XHTML, so this is safe.
+	newrp.pass_thru = true;
 	docstring def = InsetText::insetAsXHTML(out, newrp, InsetText::JustText);
 	out << html::EndTag("pre");
 
diff --git a/status.20x b/status.20x
index 4e16788d60..b204da427a 100644
--- a/status.20x
+++ b/status.20x
@@ -107,6 +107,9 @@ What's new
 - Properly output alias for formatted chapter references, so prettyref
   documents work when converted tor refstyle.
 
+- Do not convert --- and -- to entities when outputting listings to 
+  XHTML (bug 8561).
+
 
 * USER INTERFACE