Properly handle the bicaption package (bug #9449)

This commit is contained in:
Juergen Spitzmueller 2015-03-16 20:31:38 +01:00
parent 477fddebe5
commit f305f0b4d8
4 changed files with 59 additions and 5 deletions

View File

@ -281,6 +281,7 @@
\TestPackage{authordate1-4}
\TestPackage{babel}
\TestPackage{bibtopic}
\TestPackage{bicaption}
\TestPackage{bidi}
\TestPackage{bm}
\TestPackage{booktabs}

View File

@ -6095,12 +6095,65 @@ 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
PDF Comments module
\end_layout

View File

@ -30,9 +30,7 @@ Style "Caption setup"
LabelFont
Color Green
EndFont
BabelPreamble
\usepackage{bicaption} % for multilingual captions
EndBabelPreamble
Requires bicaption
End

View File

@ -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()) {