commit 119d38bedf7f69ca9bc249ba09c72ab34db6f327
Author: Juergen Spitzmueller <[email protected]>
Date: Wed May 13 08:48:08 2020 +0200
Move \PassOptionsToPackage before the first package loaded
Fixes #11862
(cherry picked from commit 2663e3845e6cc33ec543510aec16c7a37841e26d)
---
src/BufferParams.cpp | 6 +++---
status.23x | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 8b40867..9a15849 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1733,6 +1733,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");
@@ -2050,9 +2053,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
diff --git a/status.23x b/status.23x
index 0d0c181..02def57 100644
--- a/status.23x
+++ b/status.23x
@@ -73,7 +73,9 @@ What's new
- Fix reloading of changed include inset (bug 11842).
-- Don't output \maketitle twice with branches (bug 11787)
+- Don't output \maketitle twice with branches (bug 11787).
+
+- Output \PassOptionsToPackage before any package is loaded (bug 11862).
* USER INTERFACE
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
