static char const * const string_papersize[] = {
- "default", "custom", "letterpaper", "executivepaper", "legalpaper",
+ "default", "custom", "letterpaper", "legalpaper", "executivepaper",
"a3paper", "a4paper", "a5paper", "b3paper", "b4paper", "b5paper", ""
};
// For the case that caption is loaded before subfig, there is the subfig
// option "caption=false". This option also works when a koma-script class is
// used and koma's own caption commands are used instead of caption.
+ // We use \PassOptionsToPackage here because the user could have already
+ // loaded subfig in the preamble.
if (features.isRequired("subfig")) {
- atlyxpreamble += "\\usepackage{subfig}\n";
atlyxpreamble += "\\@ifundefined{showcaptionsetup}{}{%\n"
- " \\PassOptionsToPackage{caption=false}{subfig}}\n";
+ " \\PassOptionsToPackage{caption=false}{subfig}}\n"
+ "\\usepackage{subfig}\n";
}
// Itemize bullet settings need to be last in case the user