caption (15apr13)

git-svn-id: svn://tug.org/texlive/trunk@29955 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 27 insertions, 19 deletions

diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty
index f3ca79f4242..d6a126aad03 100644
--- a/Master/texmf-dist/tex/latex/caption/bicaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty
@@ -24,16 +24,22 @@
 %% 
 %% This Current Maintainer of this work is Axel Sommerfeldt.
 %% 
-%% This work consists of the files caption.ins, caption.dtx, caption2.dtx,
-%% caption3.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx, and newfloat.dtx,
-%% the derived files caption.sty, caption2.sty, caption3.sty,
-%% bicaption.sty, ltcaption.sty, subcaption.sty, and newfloat.sty,
-%% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+%% This work consists of the files
+%%   CHANGELOG, README, SUMMARY, caption.ins,
+%%   caption.dtx, caption2.dtx, caption3.dtx,
+%%   bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+%%   newfloat.dtx, and totalcount.dtx
+%% the derived files
+%%   caption.sty, caption2.sty, caption3.sty,
+%%   bicaption.sty, ltcaption.sty, subcaption.sty,
+%%   newfloat.sty, and totalcount.sty
+%% and the user manuals
+%%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
 \def\caption@tempa$Id: #1 #2 #3-#4-#5 #6${%
   \def\caption@tempa{#3/#4/#5 }\def\caption@tempb{#2 }}
-\caption@tempa $Id: bicaption.sty 62 2013-02-03 10:40:15Z sommerfeldt $
+\caption@tempa $Id: bicaption.sty 68 2013-03-10 09:31:58Z sommerfeldt $
 \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)]
 \RequirePackage{caption}[2012/12/26] % needs v3.3 or newer
 \caption@AtBeginDocument{\caption@ifcompatibility{%
@@ -110,20 +116,22 @@
      \global\let\bicaption@lentry\@undefined}}
 \newcommand\bicaption@addcontentsline[3]{%
   \begingroup
+    \let\caption@addsubcontentslines\@gobble
     \caption@setoptions{bi}%
-  \ifnum\bicaption@lang=2\relax \else
-    \begingroup
-      \caption@setoptions{bi-first}%
-      \bicaption@@addcontentsline{#2}{#3}%
-    \endgroup
-  \fi
-  \ifnum\bicaption@lang=1\relax \else
-    \begingroup
-      \caption@setoptions{bi-second}%
-      \bicaption@@addcontentsline{#2}{#1}%
-    \endgroup
-  \fi
-  \endgroup}
+    \ifnum\bicaption@lang=2\relax \else
+      \begingroup
+        \caption@setoptions{bi-first}%
+        \bicaption@@addcontentsline{#2}{#3}%
+      \endgroup
+    \fi
+    \ifnum\bicaption@lang=1\relax \else
+      \begingroup
+        \caption@setoptions{bi-second}%
+        \bicaption@@addcontentsline{#2}{#1}%
+      \endgroup
+    \fi
+  \endgroup
+  \caption@addsubcontentslines{#2}}
 \newcommand*\bicaption@@addcontentsline[2]{%
   \caption@ifcontentsline{#2}{%
     \bicaption@selectlanguage\@secondoftwo