The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 0735ac84e2596dd95c212eabe7d75bf46e7aa186 Author: Richard Heck <[email protected]> Date: Thu Feb 21 18:10:42 2013 -0500 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 6156f88..19a8105 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 4e16788..b204da4 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 ----------------------------------------------------------------------- Summary of changes: src/insets/InsetListings.cpp | 3 +++ status.20x | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
