Fix wrong painting of lines right of multicol

[lyx.git] / src / insets / InsetListings.cpp

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 4baaff0d470cf4e8c28c4785ace2513f036e698c..32211bb0aac784aedcb4fc3055e934b9440c80f5 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -213,7 +213,7 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                                + _("no more lstline delimiters available") + ">";
                        code = subst(code, from_ascii("!"), delim_error);
                        delimiter = lstinline_delimiters;
-                       if (!runparams.dryrun) {
+                       if (!runparams.dryrun && !runparams.silent) {
                                // FIXME: warning should be passed to the error dialog
                                frontend::Alert::warning(_("Running out of delimiters"),
                                _("For inline program listings, one character must be reserved\n"
@@ -253,7 +253,7 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                runparams.encoding = save_enc;
        }
 
-       if (!uncodable.empty()) {
+       if (!uncodable.empty() && !runparams.silent) {
                // issue a warning about omitted characters
                // FIXME: should be passed to the error dialog
                frontend::Alert::warning(_("Uncodable characters in listings inset"),
@@ -277,6 +277,7 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
                docstring caption = getCaptionHTML(rp);
                if (!caption.empty())
                        out << html::StartTag("div", "class='float-caption'") 
+                           << XHTMLStream::ESCAPE_NONE
                            << caption << html::EndTag("div");
        }
 
@@ -290,6 +291,9 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
        out << html::StartTag(tag, attr);
        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(tag);