Restore XHTML output for InsetListings.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32515 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 0174a977f875511590944fdf1edb944e82121ddd..e20d3c76df477b23ce7415066d4d7dfde29d152c 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -26,6 +26,7 @@
 #include "Language.h"
 #include "MetricsInfo.h"
 #include "output_latex.h"
+#include "output_xhtml.h"
 #include "TextClass.h"
 
 #include "support/debug.h"
@@ -267,34 +268,37 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
 }
 
 
-docstring InsetListings::xhtml(odocstream & os, OutputParams const & rp) const
+docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
 {
-       odocstringstream out;
+       odocstringstream ods;
+       XHTMLStream out(ods);
 
        bool const isInline = params().isInline();
        if (isInline) 
-               out << "<br />\n";
+               out << CompTag("br");
        else {
-               out << "<div class='float float-listings'>\n";
+               out << StartTag("div", "class='float float-listings'");
                docstring caption = getCaptionHTML(rp);
                if (!caption.empty())
-                       out << "<div class='float-caption'>" << caption << "</div>\n";
+                       out << StartTag("div", "class='float-caption'") 
+                           << caption << EndTag("div");
        }
 
-       out << "<pre>\n";
+       out << StartTag("pre");
        OutputParams newrp = rp;
        newrp.html_disable_captions = true;
        docstring def = InsetText::xhtml(out, newrp);
-       out << "\n</pre>\n";
+       out << EndTag("pre");
 
        if (isInline) {
-               out << "<br />\n";
-               os << out.str();
+               out << CompTag("br");
+               // escaping will already have been done
+               os << XHTMLStream::NextRaw() << ods.str();
        } else {
-               out <<  "</div>";
+               out << EndTag("div");
                // In this case, this needs to be deferred, but we'll put it
                // before anything the text itself deferred.
-               def = out.str() + '\n' + def;
+               def = ods.str() + '\n' + def;
        }
        return def;
 }

diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index 4459c9ee14a742cb45c89a0352c4584044e73419..fc2ba3bd5ad564461236726684f24300604a2d88 100644 (file)
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -57,7 +57,7 @@ private:
        ///
        int latex(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(odocstream &, OutputParams const &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///