de.po

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

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index d106da39092d5ab721fd2f475bf0b9817cfd9757..b50e92623e4489181489cbf73f23737aa85be4f5 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -120,11 +120,10 @@ void InsetListings::read(Lexer & lex)
 
 
 Encoding const * InsetListings::forcedEncoding(Encoding const * inner_enc,
-                                                                                          Encoding const * outer_enc) const
+                                              Encoding const * outer_enc) const
 {
        // The listings package cannot deal with multi-byte-encoded
-       // glyphs, except if full-unicode aware backends
-       // such as XeTeX or LuaTeX are used, and with pLaTeX.
+       // glyphs, except for Xe/LuaTeX (with non-TeX fonts) or pLaTeX.
        // Minted can deal with all encodings.
        if (buffer().params().use_minted
                || inner_enc->name() == "utf8-plain"
@@ -135,6 +134,8 @@ Encoding const * InsetListings::forcedEncoding(Encoding const * inner_enc,
 
        // We try if there's a singlebyte encoding for the outer
        // language; if not, fall back to latin1.
+       // Power-users can set inputenc to utf8-plain to bypass this workaround
+       // and provide alternatives in the user-preamble.
        return (outer_enc->hasFixedWidth()) ?
                        outer_enc : encodings.fromLyXName("iso8859-1");
 }
@@ -169,8 +170,20 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                param_string = getStringFromVector(opts, ",");
        }
        // Minted needs a language specification
-       if (minted_language.empty())
-               minted_language = "TeX";
+       if (minted_language.empty()) {
+               // If a language has been set globally, use that,
+               // otherwise use TeX by default
+               string const & blp = buffer().params().listings_params;
+               size_t start = blp.find("language=");
+               if (start != string::npos) {
+                       start += strlen("language=");
+                       size_t len = blp.find(",", start);
+                       if (len != string::npos)
+                               len -= start;
+                       minted_language = blp.substr(start, len);
+               } else
+                       minted_language = "TeX";
+       }
 
        // get the paragraphs. We can not output them directly to given odocstream
        // because we can not yet determine the delimiter character of \lstinline
@@ -192,6 +205,9 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                // the restrictions of the listings package (see above).
                // This needs to be consistent with
                // LaTeXFeatures::getTClassI18nPreamble().
+               // We need to put this into a group in order to prevent encoding leaks
+               // (happens with cprotect).
+               os << "\\bgroup";
                switchEncoding(os.os(), buffer().params(), runparams, *fixedlstenc, true);
                runparams.encoding = fixedlstenc;
                encoding_switched = true;
@@ -201,7 +217,7 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
                                && par->getInset(0)->lyxCode() == CAPTION_CODE;
 
        while (par != end) {
-               pos_type siz = par->size();
+               pos_type const siz = par->size();
                bool captionline = false;
                for (pos_type i = 0; i < siz; ++i) {
                        if (i == 0 && par->isInset(i) && i + 1 == siz)
@@ -337,7 +353,9 @@ void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
 
        if (encoding_switched){
                // Switch back
-               switchEncoding(os.os(), buffer().params(), runparams, *save_enc, true);
+               switchEncoding(os.os(), buffer().params(),
+                              runparams, *save_enc, true, true);
+               os << "\\egroup" << breakln;
                runparams.encoding = save_enc;
        }
 
@@ -523,12 +541,15 @@ TexString InsetListings::getCaption(OutputParams const & runparams) const
        // NOTE that } is not allowed in blah2.
        regex const reg("(.*)\\\\label\\{(.*?)\\}(.*)");
        string const new_cap("$1$3},label={$2");
+       // Remove potential \protect'ion of \label.
+       docstring capstr = subst(cap.str, from_ascii("\\protect\\label"),
+                                from_ascii("\\label"));
        // TexString validity: the substitution preserves the number of newlines.
        // Moreover we assume that $2 does not contain newlines, so that the texrow
        // information remains accurate.
        // Replace '\n' with an improbable character from Private Use Area-A
        // and then return to '\n' after the regex replacement.
-       docstring const capstr = subst(cap.str, char_type('\n'), 0xffffd);
+       capstr = subst(capstr, char_type('\n'), 0xffffd);
        cap.str = subst(from_utf8(regex_replace(to_utf8(capstr), reg, new_cap)),
                        0xffffd, char_type('\n'));
        return cap;