Cocoa based Qt-4.6 needs to paint every character separately to match metrics computa...

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

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 8276f4301b75f657c5545335b8842050ad4bbc6c..cb3e9b56cbde4774f05a398620a393c25b812b6e 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
@@ -143,11 +142,12 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
        bool encoding_switched = false;
        Encoding const * const save_enc = runparams.encoding;
 
-       if (runparams.flavor != OutputParams::XETEX
+       if (!runparams.isFullUnicode()
            && !runparams.encoding->hasFixedWidth()) {
                // We need to switch to a singlebyte encoding, since the
                // listings package cannot deal with multi-byte-encoded
-               // glyphs (not needed with XeTeX).
+               // glyphs (not needed with full-unicode aware backends
+               // such as XeTeX).
                Language const * const outer_language =
                        (runparams.local_font != 0) ?
                                runparams.local_font->language()
@@ -158,8 +158,8 @@ 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);
+               pair<bool, int> const c = switchEncoding(os.os(),
+                               buffer().params(), runparams, *lstenc, true);
                runparams.encoding = lstenc;
                encoding_switched = true;
        }
@@ -199,10 +199,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;
@@ -237,9 +235,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())
@@ -247,15 +245,13 @@ 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);
+               pair<bool, int> const c = switchEncoding(os.os(),
+                               buffer().params(), runparams, *save_enc, true);
                runparams.encoding = save_enc;
        }
 
@@ -267,8 +263,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;
 }
 
 
@@ -297,7 +291,7 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
        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
@@ -308,7 +302,7 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
 }
 
 
-docstring InsetListings::contextMenu(BufferView const &, int, int) const
+docstring InsetListings::contextMenuName() const
 {
        return from_ascii("context-listings");
 }
@@ -319,6 +313,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;
        }
@@ -388,9 +383,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->getOptArg(os, runparams);
+       ins->getArgument(os, runparams);
        // the caption may contain \label{} but the listings
        // package prefer caption={}, label={}
        docstring cap = ods.str();