anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Let "provides [fontspec|listings|subfig] 1" work.

Browse Source 
(cherry picked from commit f46a52d97f)
This commit is contained in:
Richard Heck 2016-06-21 10:50:42 -04:00
parent a5f749bd1e
commit 46133b26be
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BufferParams.cpp
View File

@ -1582,7 +1582,8 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
os << from_ascii(ams);
if (useNonTeXFonts) {
os << "\\usepackage{fontspec}\n";
if (!features.isProvided("fontspec"))
os << "\\usepackage{fontspec}\n";
if (features.mustProvide("unicode-math")
&& features.isAvailable("unicode-math"))
os << "\\usepackage{unicode-math}\n";
@ -2047,7 +2048,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";
@ -2108,7 +2109,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{";

3
status.22x
View File

@ -28,6 +28,9 @@ What's new
- Changed the display of buttons for collapsed branches. We now display the
same thing as if the branches were open (bug 10213).
- "Provides <package> 1" now works with fontspec, subfig, and listings (bug
10257).
- Added a new module "Title and Preamble Hacks".