[LyX/2.1.x] Load amsthm after amsmath.

[Juergen Spitzmueller]

commit 4a83c642f9916611a30abf0d81c5a3037ac0fe1d
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sun Mar 22 11:14:08 2015 +0100

    Load amsthm after amsmath.
    
    This follows a strong advice in the amsthm manual and fixes #7233.

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 5be544e..73b048b 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -1287,8 +1287,6 @@ bool LaTeXFeatures::needBabelLangOptions() const
 string const LaTeXFeatures::loadAMSPackages() const
 {
        ostringstream tmp;
-       if (mustProvide("amsthm"))
-               tmp << "\\usepackage{amsthm}\n";
 
        if (mustProvide("amsmath")
            && params_.use_package("amsmath") != BufferParams::package_off) {
@@ -1301,6 +1299,9 @@ string const LaTeXFeatures::loadAMSPackages() const
                        tmp << "\\usepackage{amstext}\n";
        }
 
+       if (mustProvide("amsthm"))
+               tmp << "\\usepackage{amsthm}\n";
+
        if (mustProvide("amssymb")
            && params_.use_package("amssymb") != BufferParams::package_off)
                tmp << "\\usepackage{amssymb}\n";
diff --git a/status.21x b/status.21x
index 18fb5e0..6cca977 100644
--- a/status.21x
+++ b/status.21x
@@ -78,6 +78,9 @@ What's new
 - Fix LaTeX errors caused by too late loading of fixltx2e package
   (bugs 9452, 9361).
 
+- Fix loading order of amsmath and amsthm, thereby prevent a LaTeX
+  error (bug 7233).
+
 - Do not output \protect unnecessarily before \caption (bug 9177).
 
 - Do not output \protect unnecessarily in subfigure contents (bug 9421).