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

Fix loading order of fancyhdr (#13118)

Browse Source 
This must be loaded after geometry (amends ca4fc01847)
This commit is contained in:
Juergen Spitzmueller 2024-11-01 14:49:29 +01:00
parent a7845b561e
commit 561aa8bb32
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/BufferParams.cpp
View File

@ -2176,12 +2176,6 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
features.require("papersize"); features.require("papersize");
} }
if (tokenPos(tclass.opt_pagestyle(), '|', pagestyle) >= 0) {
if (pagestyle == "fancy")
os << "\\usepackage{fancyhdr}\n";
os << "\\pagestyle{" << from_ascii(pagestyle) << "}\n";
}
// only output when the background color is not default // only output when the background color is not default
if (isbackgroundcolor) { if (isbackgroundcolor) {
// only require color here, the background color will be defined // only require color here, the background color will be defined

6
src/LaTeXFeatures.cpp
View File

@ -1381,6 +1381,12 @@ string const LaTeXFeatures::getPackages() const
if (!params_.set_geometry.empty()) if (!params_.set_geometry.empty())
packages << params_.set_geometry; packages << params_.set_geometry;
if (tokenPos(params_.documentClass().opt_pagestyle(), '|', params_.pagestyle) >= 0) {
if (params_.pagestyle == "fancy")
packages << "\\usepackage{fancyhdr}\n";
packages << "\\pagestyle{" << params_.pagestyle << "}\n";
}
// These must be loaded after graphicx, since they try // These must be loaded after graphicx, since they try
// to load graphicx without options // to load graphicx without options
if (mustProvide("rotating")) if (mustProvide("rotating"))