[LyX/master] Move \PassOptionsToPackage before the first package loaded

Juergen Spitzmueller spitz at lyx.org
Wed May 13 06:26:52 UTC 2020


commit 2663e3845e6cc33ec543510aec16c7a37841e26d
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Wed May 13 08:48:08 2020 +0200

    Move \PassOptionsToPackage before the first package loaded
    
    Fixes #11862
---
 src/BufferParams.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 750c6e8..e266a0f 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1735,6 +1735,9 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 	os << '{' << from_ascii(tclass.latexname()) << "}\n";
 	// end of \documentclass defs
 
+	// The package options (via \PassOptionsToPackage)
+	os << from_ascii(features.getPackageOptions());
+
 	// if we use fontspec or newtxmath, we have to load the AMS packages here
 	string const ams = features.loadAMSPackages();
 	bool const ot1 = (main_font_encoding() == "default" || main_font_encoding() == "OT1");
@@ -2013,9 +2016,6 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 			os << "\\synctex=-1\n";
 	}
 
-	// The package options (via \PassOptionsToPackage)
-	os << from_ascii(features.getPackageOptions());
-
 	// due to interferences with babel and hyperref, the color package has to
 	// be loaded (when it is not already loaded) before babel when hyperref
 	// is used with the colorlinks option, see


More information about the lyx-cvs mailing list