Author: baum
Date: Wed Jan 12 20:54:46 2011
New Revision: 37187
URL: http://www.lyx.org/trac/changeset/37187

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

Modified:
   lyx-devel/trunk/src/LaTeXFeatures.cpp

Modified: lyx-devel/trunk/src/LaTeXFeatures.cpp
==============================================================================
--- lyx-devel/trunk/src/LaTeXFeatures.cpp       Wed Jan 12 17:04:59 2011        
(r37186)
+++ lyx-devel/trunk/src/LaTeXFeatures.cpp       Wed Jan 12 20:54:46 2011        
(r37187)
@@ -581,7 +581,6 @@
        "framed",
        "soul",
        "textcomp",
-       "fixltx2e",
        "pmboxdraw",
        "bbding",
        "ifsym",
@@ -701,6 +700,12 @@
        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

Reply via email to