tex2lyx/text.cpp: fix typos

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

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index c10c54bdd1455f0a886faffb6ed0832b5d75bcd5..0d61af671a02f8a45877b2011389674da79c13ee 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -126,12 +126,11 @@ void InsetListings::read(Lexer & lex)
 }
 
 
-int InsetListings::latex(otexstream & 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(otexstream & os, OutputParams const & runparams) const
                        (outer_language->encoding()->hasFixedWidth()) ?
                                outer_language->encoding() 
                                : encodings.fromLyXName("iso8859-1");
-               pair<bool, int> const c = switchEncoding(os.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(otexstream & 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(otexstream & 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,8 +233,6 @@ int InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                OutputParams rp = runparams;
                rp.moving_arg = true;
                docstring const caption = getCaption(rp);
-               // clear counter
-               os.countLines();
                if (param_string.empty() && caption.empty())
                        os << breakln << "\\begin{lstlisting}\n";
                else {
@@ -251,13 +245,11 @@ int InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                        os << from_utf8(param_string) << "]\n";
                }
                os << code << breakln << "\\end{lstlisting}\n";
-               lines += os.countLines();
        }
 
        if (encoding_switched){
                // Switch back
-               pair<bool, int> const c = switchEncoding(os.os(),
-                               buffer().params(), runparams, *save_enc, true);
+               switchEncoding(os.os(), buffer().params(), runparams, *save_enc, true);
                runparams.encoding = save_enc;
        }
 
@@ -269,8 +261,6 @@ int InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                                  "not representable in the current encoding and have been omitted:\n%1$s."),
                        uncodable));
        }
-
-       return lines;
 }
 
 
@@ -310,9 +300,9 @@ docstring InsetListings::xhtml(XHTMLStream & os, OutputParams const & rp) const
 }
 
 
-docstring InsetListings::contextMenuName() const
+string InsetListings::contextMenuName() const
 {
-       return from_ascii("context-listings");
+       return "context-listings";
 }
 
 
@@ -391,8 +381,9 @@ docstring InsetListings::getCaption(OutputParams const & runparams) const
        if (ins == 0)
                return docstring();
 
+       TexRow texrow;
        odocstringstream ods;
-       otexstream os(ods);
+       otexstream os(ods, texrow);
        ins->getOptArg(os, runparams);
        ins->getArgument(os, runparams);
        // the caption may contain \label{} but the listings