BufferParams.cpp: follow Jürgen's advice to load subfig after \PassOptionsToPackage

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24753 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 19eebccf5b85ea822924548db1d84a7f48d4cdb1..fef48f7ee9ca73f690771e41fbb1d31a4da14b43 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1303,10 +1303,12 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        // 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