anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixltx2e must be loaded as early as possible

Browse Source 
Fixes: #9452, #9361

This reverts the 'fix' to #7233, which must be solved differently.
This commit is contained in:
Juergen Spitzmueller 2015-03-17 10:24:16 +01:00
parent 5b80d57d1d
commit 7aad787047
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BufferParams.cpp
View File

@ -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";

6
src/LaTeXFeatures.cpp
View File

@ -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";