From: Uwe Stöhr <uwestoehr@web.de>
Date: Tue, 13 May 2008 20:46:49 +0000 (+0000)
Subject: BufferParams.cpp: follow Jürgen's advice to load subfig after \PassOptionsToPackage
X-Git-Tag: 1.6.10~4810
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2a18b2a5cc01a172d7e0d82ca91e0c0ae406563b;p=features.git

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 19eebccf5b..fef48f7ee9 100644
--- 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