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-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ce28714a92f87fc5a9b4b8f4e232ab718cdf318c;p=features.git

Load rotfloat and rotating after graphicx.

Fixes: #11502
---

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 7a74291b75..251f5bf8f2 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -956,7 +956,6 @@ char const * simplefeatures[] = {
 	"verbatim",
 	"cprotect",
 	"longtable",
-	"rotating",
 	"latexsym",
 	"pifont",
 	// subfig is handled in BufferParams.cpp
@@ -968,7 +967,6 @@ char const * simplefeatures[] = {
 	  the `float' package. See the caption package documentation
 	  for explanation.*/
 	"float",
-	"rotfloat",
 	"wrapfig",
 	"booktabs",
 	"dvipost",
@@ -1244,6 +1242,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";