From: Juergen Spitzmueller <spitz@lyx.org>
Date: Wed, 14 Aug 2019 13:16:10 +0000 (+0200)
Subject: Load rotfloat and rotating after graphicx.
X-Git-Tag: 2.3.4~64
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8831d50936dd2656d13c3475d781195c83a79466;p=features.git

Load rotfloat and rotating after graphicx.

Fixes: #11502
(cherry picked from commit f937b5eb7a64a51cc47b4835da768556317facc6)
---

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 268910ae5b..7af795d54b 100644
--- 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 7befdb71e1..b435fa1e24 100644
--- 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