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 53ebf0129c1859832fbd9b7c725b6dacdef324e0..032420bad62cf5d2ffd8095232687bf72faef706 100644 (file)
--- 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 5c70dfb867e639afe858a3a0da32cded586082c1..cf67cab22dd69c7e9a19dcf06b25bc555003bf2d 100644 (file)
--- 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";