From f305f0b4d857f0781b7a45380e583bc5315e12ad Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 16 Mar 2015 20:31:38 +0100
Subject: [PATCH] Properly handle the bicaption package (bug #9449)

---
 lib/chkconfig.ltx            |  1 +
 lib/doc/LaTeXConfig.lyx      | 55 +++++++++++++++++++++++++++++++++++-
 lib/layouts/bicaption.module |  4 +--
 src/BufferParams.cpp         |  4 ++-
 4 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index d2a53b4069..7429f60d10 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -281,6 +281,7 @@
 \TestPackage{authordate1-4}
 \TestPackage{babel}
 \TestPackage{bibtopic}
+\TestPackage{bicaption}
 \TestPackage{bidi}
 \TestPackage{bm}
 \TestPackage{booktabs}
diff --git a/lib/doc/LaTeXConfig.lyx b/lib/doc/LaTeXConfig.lyx
index d269b56a32..7395f9df38 100644
--- a/lib/doc/LaTeXConfig.lyx
+++ b/lib/doc/LaTeXConfig.lyx
@@ -6095,10 +6095,63 @@ enumitem
  itemize, description).
  It is used by the Linguistics module to fine tune the appearance of numbered
  subexamples.
-\change_inserted -712698321 1404379467
+\change_inserted -712698321 1426533959
+
+\end_layout
+
+\begin_layout Subsection
+
+\change_inserted -712698321 1426533969
+Multilingual Captions module
+\end_layout
+
+\begin_layout Subsubsection
+
+\change_inserted -712698321 1426533976
+bicaption
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1426533959
+Found: 
+\begin_inset Info
+type  "package"
+arg   "bicaption"
+\end_inset
+
 
 \end_layout
 
+\begin_layout Description
+
+\change_inserted -712698321 1426533992
+CTAN: 
+\family typewriter
+macros/latex/contrib/caption/
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1426534118
+Notes: The package 
+\family sans
+bicaption
+\family default
+ enables pairs of captions (in different languages), with control of other
+ options similar to that provided by the caption package.
+ Languages to be used are selected using 
+\family sans
+babel
+\family default
+.
+ This package is part of the 
+\family sans
+caption
+\family default
+ bundle.
+\end_layout
+
 \begin_layout Subsection
 
 \change_inserted -712698321 1404379473
diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module
index dbfad7418c..f0518458a4 100644
--- a/lib/layouts/bicaption.module
+++ b/lib/layouts/bicaption.module
@@ -30,9 +30,7 @@ Style "Caption setup"
 	LabelFont
 	  Color		Green
 	EndFont
-	BabelPreamble
-	\usepackage{bicaption} % for multilingual captions
-	EndBabelPreamble
+	Requires	bicaption
 End
 
 
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 978bc50506..5cf529c430 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1952,7 +1952,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 			+ atlyxpreamble + "\\makeatother\n\n";
 
 	// We try to load babel late, in case it interferes with other packages.
-	// Jurabib, hyperref, varioref and listings (bug 8995) have to be
+	// Jurabib, hyperref, varioref, bicaption and listings (bug 8995) have to be
 	// called after babel, though.
 	if (use_babel && !features.isRequired("jurabib")
 	    && !features.isRequired("hyperref")
@@ -1965,6 +1965,8 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
 						   features.needBabelLangOptions())) + '\n';
 		lyxpreamble += from_utf8(features.getBabelPostsettings());
 	}
+	if (features.isRequired("bicaption"))
+		lyxpreamble += "\\usepackage{bicaption}\n";
 	if (!listings_params.empty() || features.isRequired("listings"))
 		lyxpreamble += "\\usepackage{listings}\n";
 	if (!listings_params.empty()) {
-- 
2.39.2