Output a parbreak after a command.

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

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 4baaff0d470cf4e8c28c4785ace2513f036e698c..3d8225e08af4c95bad4e59025f55c568acc34917 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -50,9 +50,6 @@ using namespace lyx::support;
 namespace lyx {
 
 
-char const lstinline_delimiters[] =
-       "!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm";
-
 InsetListings::InsetListings(Buffer * buf, InsetListingsParams const & par)
        : InsetCollapsable(buf)
 {
@@ -202,18 +199,19 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                        code += "\n";
        }
        if (isInline) {
-               char const * delimiter = lstinline_delimiters;
-               for (; delimiter != '\0'; ++delimiter)
-                       if (!contains(code, *delimiter))
-                               break;
+               static const docstring delimiters =
+                               from_utf8("!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm");
+
+               size_t pos = delimiters.find_first_not_of(code);
+
                // This code piece contains all possible special character? !!!
                // Replace ! with a warning message and use ! as delimiter.
-               if (*delimiter == '\0') {
+               if (pos == string::npos) {
                        docstring delim_error = "<" + _("LyX Warning: ")
                                + _("no more lstline delimiters available") + ">";
                        code = subst(code, from_ascii("!"), delim_error);
-                       delimiter = lstinline_delimiters;
-                       if (!runparams.dryrun) {
+                       pos = 0;
+                       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"
@@ -223,12 +221,14 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                                  "must investigate!"));
                        }
                }
-               if (param_string.empty())
-                       os << "\\lstinline" << *delimiter;
-               else
-                       os << "\\lstinline[" << from_utf8(param_string) << "]" << *delimiter;
-                os << code
-                   << *delimiter;
+               docstring const delim(1, delimiters[pos]);
+               os << "\\lstinline";
+               if (!param_string.empty())
+                       os << "[" << from_utf8(param_string) << "]";
+               else if (pos >= delimiters.find('Q'))
+                       // We need to terminate the command before the delimiter
+                       os << " ";
+                os << delim << code << delim;
        } else {
                OutputParams rp = runparams;
                rp.moving_arg = true;
@@ -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);