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 6156f8883fd696f390146d34b821b7c9df9b0240..19a8105dbf11cd32fc74f7663baebc43a53f7091 100644 (file)
--- 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 4e16788d60ecb0d3ecfacef226230aa81be3d678..b204da427a1a0c4b1b49743e991f52e4978d5c7a 100644 (file)
--- 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