}
+Encoding const * InsetListings::forcedEncoding(Encoding const * inner_enc,
+ Encoding const * outer_enc) const
+{
+ // The listings package cannot deal with multi-byte-encoded
+ // 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"
+ || (buffer().params().encoding().package() == Encoding::japanese
+ && inner_enc->package() == Encoding::japanese)
+ || inner_enc->hasFixedWidth())
+ return 0;
+
+ // 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");
+}
+
+
void InsetListings::latex(otexstream & os, OutputParams const & runparams) const
{
string param_string = params().params();
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
bool encoding_switched = false;
Encoding const * const save_enc = runparams.encoding;
- // 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.
- bool const multibyte_possible = use_minted || runparams.isFullUnicode()
- || (buffer().params().encoding().package() == Encoding::japanese
- && runparams.encoding->package() == Encoding::japanese);
- if (!multibyte_possible && !runparams.encoding->hasFixedWidth()) {
+ Encoding const * const outer_encoding =
+ (runparams.local_font != 0) ?
+ runparams.local_font->language()->encoding()
+ : buffer().params().language->encoding();
+ Encoding const * fixedlstenc = forcedEncoding(runparams.encoding, outer_encoding);
+ if (fixedlstenc) {
// We need to switch to a singlebyte encoding, due to
// the restrictions of the listings package (see above).
// This needs to be consistent with
// LaTeXFeatures::getTClassI18nPreamble().
- Language const * const outer_language =
- (runparams.local_font != 0) ?
- runparams.local_font->language()
- : buffer().params().language;
- // We try if there's a singlebyte encoding for the current
- // language; if not, fall back to latin1.
- Encoding const * const lstenc =
- (outer_language->encoding()->hasFixedWidth()) ?
- outer_language->encoding()
- : encodings.fromLyXName("iso8859-1");
- switchEncoding(os.os(), buffer().params(), runparams, *lstenc, true);
- runparams.encoding = lstenc;
+ // 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;
}
&& 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)
os << "\\mintinline";
if (!param_string.empty())
os << "[" << from_utf8(param_string) << "]";
- os << "{" << minted_language << "}";
+ os << "{" << ascii_lowercase(minted_language) << "}";
} else {
os << "\\lstinline";
if (!param_string.empty())
os << breakln << "\\begin{minted}";
if (!param_string.empty())
os << "[" << param_string << "]";
- os << "{" << minted_language << "}\n"
+ os << "{" << ascii_lowercase(minted_language) << "}\n"
<< code << breakln << "\\end{minted}\n";
if (isfloat) {
if (!caption.str.empty())
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;
}
if (!uncodable.empty() && !runparams.silent) {
// issue a warning about omitted characters
// FIXME: should be passed to the error dialog
- if (!multibyte_possible && !runparams.encoding->hasFixedWidth())
+ if (fixedlstenc)
frontend::Alert::warning(_("Uncodable characters in listings inset"),
bformat(_("The following characters in one of the program listings are\n"
"not representable in the current encoding and have been omitted:\n%1$s.\n"
return true;
}
}
+ // fall through
default:
return InsetCaptionable::getStatus(cur, cmd, status);
}
// 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.
- cap.str = from_utf8(regex_replace(to_utf8(cap.str), reg, new_cap));
+ // Replace '\n' with an improbable character from Private Use Area-A
+ // and then return to '\n' after the regex replacement.
+ 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;
}
projects / lyx.git / blobdiff