tex2lyx/text.cpp: fix typos

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

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 14ac5a5287ae650eaf78544833821cbd107a0154..0d61af671a02f8a45877b2011389674da79c13ee 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -24,9 +24,11 @@
 #include "FuncStatus.h"
 #include "InsetCaption.h"
 #include "Language.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "output_latex.h"
 #include "output_xhtml.h"
+#include "OutputParams.h"
 #include "TextClass.h"
 
 #include "support/debug.h"
@@ -38,7 +40,7 @@
 #include "frontends/alert.h"
 #include "frontends/Application.h"
 
-#include <boost/regex.hpp>
+#include "support/regex.h"
 
 #include <sstream>
 
@@ -47,7 +49,6 @@ using namespace lyx::support;
 
 namespace lyx {
 
-using boost::regex;
 
 char const lstinline_delimiters[] =
        "!*()-=+|;:'\"`,<.>/?QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm";
@@ -73,7 +74,8 @@ Inset::DisplayType InsetListings::display() const
 
 void InsetListings::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-       Counters & cnts = buffer().masterBuffer()->params().documentClass().counters();
+       Counters & cnts =
+               buffer().masterBuffer()->params().documentClass().counters();
        string const saveflt = cnts.current_float();
 
        // Tell to captions what the current float is
@@ -124,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
@@ -141,9 +142,12 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
        bool encoding_switched = false;
        Encoding const * const save_enc = runparams.encoding;
 
-       if (!runparams.encoding->hasFixedWidth()) {
-               // We need to switch to a singlebyte encoding, since the listings
-               // package cannot deal with multiple-byte-encoded glyphs
+       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 full-unicode aware backends
+               // such as XeTeX).
                Language const * const outer_language =
                        (runparams.local_font != 0) ?
                                runparams.local_font->language()
@@ -154,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;
        }
@@ -173,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: ")
@@ -195,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;
@@ -233,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())
@@ -243,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;
        }
 
@@ -263,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;
 }
 
 
@@ -293,7 +289,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
@@ -304,17 +300,18 @@ 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";
 }
 
 
 void InsetListings::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action_) {
+       switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
+               cur.recordUndoInset(ATOMIC_UNDO, this);
                InsetListings::string2params(to_utf8(cmd.argument()), params());
                break;
        }
@@ -333,7 +330,7 @@ void InsetListings::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
-       switch (cmd.action_) {
+       switch (cmd.action()) {
                case LFUN_INSET_MODIFY:
                case LFUN_INSET_DIALOG_UPDATE:
                        status.setEnabled(true);
@@ -384,9 +381,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();