commit c4ed79bba6d50330c9ad562f33d8e9df3c015db8
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Tue Mar 17 10:24:16 2015 +0100
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 9960ef6..abc68c0 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1324,6 +1324,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 75c81ef..5be544e 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -888,12 +888,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";
diff --git a/status.21x b/status.21x
index f3cdc19..8302b5e 100644
--- a/status.21x
+++ b/status.21x
@@ -66,6 +66,9 @@ What's new
* DOCUMENT INPUT/OUTPUT
+- Fix LaTeX errors caused by too late loading of fixltx2e package
+ (bugs 9452, 9361).
+
- Do not output \protect unnecessarily before \caption (bug 9177).
- Do not output \protect unnecessarily in subfigure contents (bug 9421).
