Fix logic of new InsetFlex::updateBuffer() routine from a9614f1.

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

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index ad274434d76c85ef58e24c735c485a8083e9b18f..63621e103332983748d93555ed7595a52d478085 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -126,12 +126,11 @@ void InsetListings::read(Lexer & lex)
 }
 
 
-int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
+void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
 {
        string param_string = params().params();
        // NOTE: I use {} to quote text, which is an experimental feature
        // of the listings package (see page 25 of the manual)
-       int lines = 0;
        bool const isInline = params().isInline();
        // get the paragraphs. We can not output them directly to given odocstream
        // because we can not yet determine the delimiter character of \lstinline
@@ -159,8 +158,7 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
                        (outer_language->encoding()->hasFixedWidth()) ?
                                outer_language->encoding() 
                                : encodings.fromLyXName("iso8859-1");
-               pair<bool, int> const c = switchEncoding(os, buffer().params(),
-                               runparams, *lstenc, true);
+               switchEncoding(os.os(), buffer().params(), runparams, *lstenc, true);
                runparams.encoding = lstenc;
                encoding_switched = true;
        }
@@ -178,7 +176,7 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
                        // we can only output characters covered by the current
                        // encoding!
                        try {
-                               if (runparams.encoding->latexChar(c) == docstring(1, c))
+                               if (runparams.encoding->encodable(c))
                                        code += c;
                                else if (runparams.dryrun) {
                                        code += "<" + _("LyX Warning: ")
@@ -200,10 +198,8 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
                ++par;
                // for the inline case, if there are multiple paragraphs
                // they are simply joined. Otherwise, expect latex errors.
-               if (par != end && !isInline && !captionline) {
+               if (par != end && !isInline && !captionline)
                        code += "\n";
-                       ++lines;
-               }
        }
        if (isInline) {
                char const * delimiter = lstinline_delimiters;
@@ -238,9 +234,9 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
                rp.moving_arg = true;
                docstring const caption = getCaption(rp);
                if (param_string.empty() && caption.empty())
-                       os << "\n\\begin{lstlisting}\n";
+                       os << breakln << "\\begin{lstlisting}\n";
                else {
-                       os << "\n\\begin{lstlisting}[";
+                       os << breakln << "\\begin{lstlisting}[";
                        if (!caption.empty()) {
                                os << "caption={" << caption << '}';
                                if (!param_string.empty())
@@ -248,15 +244,12 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
                        }
                        os << from_utf8(param_string) << "]\n";
                }
-               lines += 2;
-               os << code << "\n\\end{lstlisting}\n";
-               lines += 2;
+               os << code << breakln << "\\end{lstlisting}\n";
        }
 
        if (encoding_switched){
                // Switch back
-               pair<bool, int> const c = switchEncoding(os, buffer().params(),
-                               runparams, *save_enc, true);
+               switchEncoding(os.os(), buffer().params(), runparams, *save_enc, true);
                runparams.encoding = save_enc;
        }
 
@@ -268,8 +261,6 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
                                  "not representable in the current encoding and have been omitted:\n%1$s."),
                        uncodable));
        }
-
-       return lines;
 }
 
 
@@ -286,19 +277,30 @@ 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");
        }
 
-       out << html::StartTag("pre");
+       InsetLayout const & il = getLayout();
+       string const tag = il.htmltag();
+       string attr = "class ='listings";
+       string const lang = params().getParamValue("language");
+       if (!lang.empty())
+               attr += " " + lang;
+       attr += "'";
+       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("pre");
+       out << html::EndTag(tag);
 
        if (isInline) {
                out << html::CompTag("br");
                // escaping will already have been done
-               os << XHTMLStream::NextRaw() << ods.str();
+               os << XHTMLStream::ESCAPE_NONE << ods.str();
        } else {
                out << html::EndTag("div");
                // In this case, this needs to be deferred, but we'll put it
@@ -309,9 +311,9 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
 }
 
 
-docstring InsetListings::contextMenu(BufferView const &, int, int) const
+string InsetListings::contextMenuName() const
 {
-       return from_ascii("context-listings");
+       return "context-listings";
 }
 
 
@@ -320,6 +322,7 @@ void InsetListings::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
+               cur.recordUndoInset(ATOMIC_UNDO, this);
                InsetListings::string2params(to_utf8(cmd.argument()), params());
                break;
        }
@@ -343,9 +346,12 @@ bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd,
                case LFUN_INSET_DIALOG_UPDATE:
                        status.setEnabled(true);
                        return true;
-               case LFUN_CAPTION_INSERT:
-                       status.setEnabled(!params().isInline());
-                       return true;
+               case LFUN_CAPTION_INSERT: {
+                       if (params().isInline()) {
+                               status.setEnabled(false);
+                               return true;
+                       }
+               }
                default:
                        return InsetCollapsable::getStatus(cur, cmd, status);
        }
@@ -389,9 +395,11 @@ docstring InsetListings::getCaption(OutputParams const & runparams) const
        if (ins == 0)
                return docstring();
 
+       TexRow texrow;
        odocstringstream ods;
-       ins->getOptArg(ods, runparams);
-       ins->getArgument(ods, runparams);
+       otexstream os(ods, texrow);
+       ins->getArgs(os, runparams);
+       ins->getArgument(os, runparams);
        // the caption may contain \label{} but the listings
        // package prefer caption={}, label={}
        docstring cap = ods.str();