From: Georg Baum <Georg.Baum@post.rwth-aachen.de>
Date: Wed, 12 Jan 2011 19:54:46 +0000 (+0000)
Subject: Fix bug #7233: amsthm does not work with the redefined \[ command of fixltx2e.
X-Git-Tag: 2.0.0~1124
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c99a8a702c285bbc961171d402dcffb458a12c0c;p=features.git

Fix bug #7233: amsthm does not work with the redefined \[ command of fixltx2e.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37187 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 6593960241..090a1d84d7 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -581,7 +581,6 @@ char const * simplefeatures[] = {
 	"framed",
 	"soul",
 	"textcomp",
-	"fixltx2e",
 	"pmboxdraw",
 	"bbding",
 	"ifsym",
@@ -701,6 +700,12 @@ string const LaTeXFeatures::getPackages() const
 	if (!params_.useNonTeXFonts && !loadAMSPackages().empty())
 		packages << loadAMSPackages();
 
+	// fixltx2e must be loaded after amsthm, since amsthm produces an error with
+	// the redefined \[ command (bug 7233). Load is as early as possible, since
+	// other packages might profit from it.
+	if (mustProvide("fixltx2e"))
+		packages << "\\usepackage{fixltx2e}\n";
+
 	// wasysym is a simple feature, but it must be after amsmath if both
 	// are used
 	// wasysym redefines some integrals (e.g. iint) from amsmath. That