mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
Let "provides [fontspec|listings|subfig] 1" work.
This commit is contained in:
parent
7d456a93e4
commit
f46a52d97f
@ -1589,6 +1589,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
|
||||
os << from_ascii(ams);
|
||||
|
||||
if (useNonTeXFonts) {
|
||||
if (!features.isProvided("fontspec"))
|
||||
os << "\\usepackage{fontspec}\n";
|
||||
if (features.mustProvide("unicode-math")
|
||||
&& features.isAvailable("unicode-math"))
|
||||
@ -2054,7 +2055,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
|
||||
// koma's own caption commands are used instead of caption. We
|
||||
// use \PassOptionsToPackage here because the user could have
|
||||
// already loaded subfig in the preamble.
|
||||
if (features.isRequired("subfig")) {
|
||||
if (features.mustProvide("subfig")) {
|
||||
atlyxpreamble += "\\@ifundefined{showcaptionsetup}{}{%\n"
|
||||
" \\PassOptionsToPackage{caption=false}{subfig}}\n"
|
||||
"\\usepackage{subfig}\n";
|
||||
@ -2115,7 +2116,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
|
||||
}
|
||||
if (features.isRequired("bicaption"))
|
||||
lyxpreamble += "\\usepackage{bicaption}\n";
|
||||
if (!listings_params.empty() || features.isRequired("listings"))
|
||||
if (!listings_params.empty() || features.mustProvide("listings"))
|
||||
lyxpreamble += "\\usepackage{listings}\n";
|
||||
if (!listings_params.empty()) {
|
||||
lyxpreamble += "\\lstset{";
|
||||
|
Loading…
Reference in New Issue
Block a user