Fix loading order of fancyhdr (#13118)

This must be loaded after geometry (amends ca4fc01847)

(cherry picked from commit 561aa8bb32)

src/BufferParams.cpp

@@ -2119,12 +2119,6 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 		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
 	if (isbackgroundcolor) {
 		// only require color here, the background color will be defined

src/LaTeXFeatures.cpp

@@ -1389,6 +1389,12 @@ string const LaTeXFeatures::getPackages() const
 	if (!params_.set_geometry.empty())
 		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
 	// to load graphicx without options
 	if (mustProvide("rotating"))

status.24x

@@ -70,6 +70,8 @@ What's new
 
 - Fix LaTeX error with listings, book classes and utf8 encoding.
 
+- Fix loading order of fancyhdr (bug 13118).
+
 
 * USER INTERFACE