Load rotfloat and rotating after graphicx.

Fixes: #11502
(cherry picked from commit f937b5eb7a64a51cc47b4835da768556317facc6)

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 268910ae5b87725cf0b7c9f266b60771ec687919..7af795d54b43072f07f5c16a86c1415705e9a224 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -963,7 +963,6 @@ char const * simplefeatures[] = {
        "array",
        "verbatim",
        "longtable",
-       "rotating",
        "latexsym",
        "pifont",
        // subfig is handled in BufferParams.cpp
@@ -975,7 +974,6 @@ char const * simplefeatures[] = {
          the `float' package. See the caption package documentation
          for explanation.*/
        "float",
-       "rotfloat",
        "wrapfig",
        "booktabs",
        "dvipost",
@@ -1246,6 +1244,13 @@ string const LaTeXFeatures::getPackages() const
                                 << "]{graphicx}\n";
        }
 
+       // These must be loaded after graphicx, since they try
+       // to load graphicx without options
+       if (mustProvide("rotating"))
+               packages << "\\usepackage{rotating}\n";
+       if (mustProvide("rotfloat"))
+               packages << "\\usepackage{rotfloat}\n";
+
        // lyxskak.sty --- newer chess support based on skak.sty
        if (mustProvide("chess"))
                packages << "\\usepackage[ps,mover]{lyxskak}\n";

diff --git a/status.23x b/status.23x
index 7befdb71e13689fd5d8c1306343826e883c499e5..b435fa1e245b3ebfbf43280ec442f2f8338c5663 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -98,6 +98,8 @@ What's new
 
 - Fix colored and shaded boxes with RTL documents (bug 8642).
 
+- Fix loading order problem with rotfloat/rotating and graphicx (bug 11502).
+
 
 * USER INTERFACE