diff options
author | Karl Berry <karl@freefriends.org> | 2015-09-17 23:49:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-09-17 23:49:07 +0000 |
commit | 9fd7d087755d8f3890acd6ca639d5a725ed3b176 (patch) | |
tree | 766d2dfd21af44a1422fc88f130525e752ac712d /Master/texmf-dist/tex/latex/caption/bicaption.sty | |
parent | 6aabc6a32e1008cffcec6edce62975ba5f015436 (diff) |
caption (17sep15)
git-svn-id: svn://tug.org/texlive/trunk@38393 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption/bicaption.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/caption/bicaption.sty | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty index 27735cb0998..05f7e511911 100644 --- a/Master/texmf-dist/tex/latex/caption/bicaption.sty +++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty @@ -6,7 +6,7 @@ %% %% bicaption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -39,9 +39,9 @@ \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 89 2013-05-02 07:05:20Z sommerfeldt $ +\caption@tempa $Id: bicaption.sty 111 2015-09-17 09:48:20Z sommerfeldt $ \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] -\RequirePackage{caption}[2012/12/26] % needs v3.3 or newer +\RequirePackage{caption}[2015/09/01] % needs v3.3 or newer \caption@AtBeginDocument{\caption@ifcompatibility{% \caption@Error{% The `bicaption' package does not work correctly\MessageBreak @@ -152,8 +152,8 @@ {}% \fi \ifnum\bicaption@lang=2\relax - \bicaption@label - \global\let\bicaption@label\relax + \caption@thelabel + \global\let\caption@thelabel\relax \else \begingroup \caption@setoptions{bi-first}% @@ -184,37 +184,12 @@ \long\def\@@@bicaption[#1]#2{% \caption@dblarg{\@@@@bicaption{#1}{#2}}} \long\def\@@@@bicaption#1#2[#3]#4{% - \bicaption@getlabel#2\label{}\@nil + \caption@getlabel#2\label{}\@nil \bicaption@ifswap {\bicaption@setup{#1}{#2}% \bicaption@cmd[{#3}]{#4}}% {\bicaption@setup{#3}{#4}% \bicaption@cmd[{#1}]{#2}}} -\long\def\bicaption@getlabel#1\label#2#3\@nil{% - \def\@tempa{#2}% - \ifx\@tempa\@empty - \let\bicaption@label\relax - \else - \def\@tempb{*}% - \ifx\@tempa\@tempb - \def\bicaption@label{\label*}% - \bicaption@@getlabel#3\@nil - \else - \def\bicaption@label{\label}% - \bicaption@@getlabel{#2}#3\@nil - \fi - \fi} -\long\def\bicaption@@getlabel#1#2\@nil{% - \def\@tempa{#1}% - \def\@tempb{[}% - \ifx\@tempa\@tempb - \bicaption@@@getlabel#1#2\@nil - \else - \l@addto@macro\bicaption@label{{#1}}% - \fi} -\long\def\bicaption@@@getlabel[#1]#2\@nil{% - \l@addto@macro\bicaption@label{[{#1}]}% - \bicaption@@getlabel#2\@nil} \newcommand\bicaption@setup[2]{% \def\bicaption@lentry{#1}% \def\bicaption@text{\ignorespaces#2}} |