Fix caption numbering of child documents.

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 19eebccf5b85ea822924548db1d84a7f48d4cdb1..da5098a1c44dc42bad293979028322347a6ddfd2 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -68,7 +68,7 @@ static char const * const string_quotes_language[] = {
 
 
 static char const * const string_papersize[] = {
-       "default", "custom", "letterpaper", "executivepaper", "legalpaper",
+       "default", "custom", "letterpaper", "legalpaper", "executivepaper",
        "a3paper", "a4paper", "a5paper", "b3paper", "b4paper", "b5paper", ""
 };
 
@@ -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