summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/caption/bicaption.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-15 22:23:40 +0000
committerKarl Berry <karl@freefriends.org>2013-04-15 22:23:40 +0000
commitc55f2ef12e38e9282affe822bee7b395651844b7 (patch)
treebc0e3a9621623275ab3a0336937e0afffb018a19 /Master/texmf-dist/source/latex/caption/bicaption.dtx
parent0639a522410335d1b0ada2c404a8e8b7b6b408c6 (diff)
caption (15apr13)
git-svn-id: svn://tug.org/texlive/trunk@29955 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/caption/bicaption.dtx')
-rw-r--r--Master/texmf-dist/source/latex/caption/bicaption.dtx37
1 files changed, 20 insertions, 17 deletions
diff --git a/Master/texmf-dist/source/latex/caption/bicaption.dtx b/Master/texmf-dist/source/latex/caption/bicaption.dtx
index e5fc48b2722..b68cec1aa87 100644
--- a/Master/texmf-dist/source/latex/caption/bicaption.dtx
+++ b/Master/texmf-dist/source/latex/caption/bicaption.dtx
@@ -2,10 +2,10 @@
%
% This is file `bicaption.dtx'.
%
-% $Id: bicaption.dtx 63 2013-02-03 13:27:05Z sommerfeldt $
+% $Id: bicaption.dtx 68 2013-03-10 09:31:58Z sommerfeldt $
% $HeadURL: svn+ssh://sommerfeldt@svn.code.sf.net/p/latex-caption/code/trunk/source/bicaption.dtx $
%
-% Copyright (C) 2010-2012 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+% Copyright (C) 2010-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -28,7 +28,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{394}
+% \CheckSum{398}
%
% \iffalse
%<*driver>
@@ -799,7 +799,7 @@
\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.dtx 63 2013-02-03 13:27:05Z sommerfeldt $
+\caption@tempa $Id: bicaption.dtx 68 2013-03-10 09:31:58Z sommerfeldt $
\ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)]
% \end{macrocode}
% \begin{macrocode}
@@ -998,11 +998,13 @@
%
% \begin{macro}{\bicaption@addcontentsline}
% \changes{v1.0}{2011/08/31}{This macro added}
+% \changes{v1.1}{2013/03/10}{Bugfix: Delayed usage of \cs{caption@addsubcontentslines} added}
% |\bicaption@addcontentsline|\marg{list entry \#2}\marg{type}\marg{list entry \#1}\par
% Typeset both captions using the original version of |\caption@add|\-|contents|\-|line|.
% \begin{macrocode}
\newcommand\bicaption@addcontentsline[3]{%
\begingroup
+ \let\caption@addsubcontentslines\@gobble
% \end{macrocode}
% Execute the options setup with |\captionsetup[bi]{|\ldots|}|.
% \begin{macrocode}
@@ -1010,24 +1012,25 @@
% \end{macrocode}
% Do the first list entry, if requested.
% \begin{macrocode}
- \ifnum\bicaption@lang=2\relax \else
- \begingroup
- \caption@setoptions{bi-first}%
- \bicaption@@addcontentsline{#2}{#3}%
- \endgroup
- \fi
+ \ifnum\bicaption@lang=2\relax \else
+ \begingroup
+ \caption@setoptions{bi-first}%
+ \bicaption@@addcontentsline{#2}{#3}%
+ \endgroup
+ \fi
% \end{macrocode}
% Do the second list entry, if requested.
% \begin{macrocode}
- \ifnum\bicaption@lang=1\relax \else
- \begingroup
- \caption@setoptions{bi-second}%
- \bicaption@@addcontentsline{#2}{#1}%
- \endgroup
- \fi
+ \ifnum\bicaption@lang=1\relax \else
+ \begingroup
+ \caption@setoptions{bi-second}%
+ \bicaption@@addcontentsline{#2}{#1}%
+ \endgroup
+ \fi
% \end{macrocode}
% \begin{macrocode}
- \endgroup}
+ \endgroup
+ \caption@addsubcontentslines{#2}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\bicaption@@addcontentsline[2]{%