From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 17 Mar 2015 09:24:16 +0000 (+0100)
Subject: fixltx2e must be loaded as early as possible
X-Git-Tag: 2.2.0alpha1~1147
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7aad787047e095957cd8bdbb755df51dacc36091;p=features.git

fixltx2e must be loaded as early as possible

Fixes: #9452, #9361

This reverts the 'fix' to #7233, which must be solved differently.
---

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 53ebf0129c..032420bad6 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1326,6 +1326,11 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 	// are doing!
 	if (features.mustProvide("fix-cm"))
 		os << "\\RequirePackage{fix-cm}\n";
+	// Likewise for fixltx2e. If other packages conflict with this policy,
+	// treat it as a package bug (and report it!)
+	// See http://www.latex-project.org/cgi-bin/ltxbugs2html?pr=latex/4407
+	if (features.mustProvide("fixltx2e"))
+		os << "\\RequirePackage{fixltx2e}\n";
 
 	os << "\\documentclass";
 
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 5c70dfb867..cf67cab22d 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -896,12 +896,6 @@ string const LaTeXFeatures::getPackages() const
 	if (!params_.useNonTeXFonts && !use_newtxmath && !amsPackages.empty())
 		packages << amsPackages;
 
-	// fixltx2e must be loaded after amsthm, since amsthm produces an error with
-	// the redefined \[ command (bug 7233). Load it as early as possible, since
-	// other packages might profit from it.
-	if (mustProvide("fixltx2e"))
-		packages << "\\usepackage{fixltx2e}\n";
-
 	if (mustProvide("cancel") &&
 	    params_.use_package("cancel") != BufferParams::package_off)
 		packages << "\\usepackage{cancel}\n";