From 2a18b2a5cc01a172d7e0d82ca91e0c0ae406563b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 13 May 2008 20:46:49 +0000 Subject: [PATCH] =?utf8?q?BufferParams.cpp:=20follow=20J=C3=BCrgen's=20adv?= =?utf8?q?ice=20to=20load=20subfig=20after=20\PassOptionsToPackage?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24753 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferParams.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 -- 2.39.2