Load rotfloat and rotating after graphicx.

Fixes: #11502
(cherry picked from commit f937b5eb7a)
This commit is contained in:
Juergen Spitzmueller 2019-08-14 15:16:10 +02:00
parent c1c94010e4
commit 8831d50936
2 changed files with 9 additions and 2 deletions

View File

@ -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";

View File

@ -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