X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLaTeXFeatures.cpp;h=a9ad21ca2c6e028674dfb95189fa677b7e76b879;hb=e41c790f9156e3b889e4b4f48653380c7a5c737d;hp=268910ae5b87725cf0b7c9f266b60771ec687919;hpb=7f58601c0057d4450f567cec4e6f7e057cd3749f;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 268910ae5b..a9ad21ca2c 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",
@@ -1022,7 +1020,6 @@ char const * simplefeatures[] = {
 	"todonotes",
 	"forest",
 	"varwidth",
-	"tablefootnote",
 	"environ"
 };
 
@@ -1246,6 +1243,16 @@ 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";
+	// and this must be loaded after rotating
+	if (mustProvide("tablefootnote"))
+		packages << "\\usepackage{tablefootnote}\n";
+
 	// lyxskak.sty --- newer chess support based on skak.sty
 	if (mustProvide("chess"))
 		packages << "\\usepackage[ps,mover]{lyxskak}\n";