Don't convert --- and -- to entities in XHTML listings output.

Fixes bug #8561.
(cherry picked from commit c4bed8dbe8)
This commit is contained in:
Richard Heck 2013-02-21 18:10:42 -05:00
parent f6f4a8ddf8
commit 0735ac84e2
2 changed files with 6 additions and 0 deletions

View File

@ -283,6 +283,9 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
out << html::StartTag("pre"); out << html::StartTag("pre");
OutputParams newrp = rp; OutputParams newrp = rp;
newrp.html_disable_captions = true; 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); docstring def = InsetText::insetAsXHTML(out, newrp, InsetText::JustText);
out << html::EndTag("pre"); out << html::EndTag("pre");

View File

@ -107,6 +107,9 @@ What's new
- Properly output alias for formatted chapter references, so prettyref - Properly output alias for formatted chapter references, so prettyref
documents work when converted tor refstyle. documents work when converted tor refstyle.
- Do not convert --- and -- to entities when outputting listings to
XHTML (bug 8561).
* USER INTERFACE * USER INTERFACE