anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 11:16:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Load listings after babel (bug #8995)

Browse Source 
Babel makes the character ':' active in french documents, and the listings
package cannot cope with that if it is loaded before babel. If it is loaded
after babel it works. This makes the french EmbeddedObjects manual compilable.
This commit is contained in:
Georg Baum 2014-02-26 20:43:04 +01:00
parent 31230697cb
commit f4dd0ba561
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/BufferParams.cpp
View File

@ -1280,6 +1280,15 @@ void BufferParams::validate(LaTeXFeatures & features) const
if (pdfoptions().colorlinks) if (pdfoptions().colorlinks)
features.require("color"); features.require("color");
} }
if (!listings_params.empty()) {
// do not test validity because listings_params is
// supposed to be valid
string par =
InsetListingsParams(listings_params).separatedParams(true);
// we can't support all packages, but we should load the color package
if (par.find("\\color", 0) != string::npos)
features.require("color");
}
// some languages are only available via polyglossia // some languages are only available via polyglossia
if (features.runparams().flavor == OutputParams::XETEX if (features.runparams().flavor == OutputParams::XETEX
@ -1530,21 +1539,6 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
os << "}\n"; os << "}\n";
} }
if (!listings_params.empty() || features.isRequired("listings"))
os << "\\usepackage{listings}\n";
if (!listings_params.empty()) {
os << "\\lstset{";
// do not test validity because listings_params is
// supposed to be valid
string par =
InsetListingsParams(listings_params).separatedParams(true);
// we can't support all packages, but we should load the color package
if (par.find("\\color", 0) != string::npos)
features.require("color");
os << from_utf8(par)
<< "}\n";
}
if (!features.isProvided("geometry") if (!features.isProvided("geometry")
&& (use_geometry || nonstandard_papersize)) { && (use_geometry || nonstandard_papersize)) {
odocstringstream ods; odocstringstream ods;
@ -1943,7 +1937,8 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
+ atlyxpreamble + "\\makeatother\n\n"; + atlyxpreamble + "\\makeatother\n\n";
// We try to load babel late, in case it interferes with other packages. // We try to load babel late, in case it interferes with other packages.
// Jurabib, hyperref and varioref have to be called after babel, though. // Jurabib, hyperref, varioref and listings (bug 8995) have to be
// called after babel, though.
if (use_babel && !features.isRequired("jurabib") if (use_babel && !features.isRequired("jurabib")
&& !features.isRequired("hyperref") && !features.isRequired("hyperref")
&& !features.isRequired("varioref") && !features.isRequired("varioref")
@ -1955,6 +1950,17 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
features.needBabelLangOptions())) + '\n'; features.needBabelLangOptions())) + '\n';
lyxpreamble += from_utf8(features.getBabelPostsettings()); lyxpreamble += from_utf8(features.getBabelPostsettings());
} }
if (!listings_params.empty() || features.isRequired("listings"))
lyxpreamble += "\\usepackage{listings}\n";
if (!listings_params.empty()) {
lyxpreamble += "\\lstset{";
// do not test validity because listings_params is
// supposed to be valid
string par =
InsetListingsParams(listings_params).separatedParams(true);
lyxpreamble += from_utf8(par);
lyxpreamble += "}\n";
}
// xunicode needs to be loaded at least after amsmath, amssymb, // xunicode needs to be loaded at least after amsmath, amssymb,
// esint and the other packages that provide special glyphs // esint and the other packages that provide special glyphs