Load rotfloat and rotating after graphicx.

Fixes: #11502
This commit is contained in:
Juergen Spitzmueller 2019-08-14 15:16:10 +02:00
parent 1929caf4b7
commit f937b5eb7a

View File

@ -956,7 +956,6 @@ char const * simplefeatures[] = {
"verbatim", "verbatim",
"cprotect", "cprotect",
"longtable", "longtable",
"rotating",
"latexsym", "latexsym",
"pifont", "pifont",
// subfig is handled in BufferParams.cpp // subfig is handled in BufferParams.cpp
@ -968,7 +967,6 @@ char const * simplefeatures[] = {
the `float' package. See the caption package documentation the `float' package. See the caption package documentation
for explanation.*/ for explanation.*/
"float", "float",
"rotfloat",
"wrapfig", "wrapfig",
"booktabs", "booktabs",
"dvipost", "dvipost",
@ -1244,6 +1242,13 @@ string const LaTeXFeatures::getPackages() const
<< "]{graphicx}\n"; << "]{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 // lyxskak.sty --- newer chess support based on skak.sty
if (mustProvide("chess")) if (mustProvide("chess"))
packages << "\\usepackage[ps,mover]{lyxskak}\n"; packages << "\\usepackage[ps,mover]{lyxskak}\n";