From c2b77b4b887eba9dfa698b9a70e5e73b0f5bbcfa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 3 Feb 2016 23:00:45 +0000 Subject: caption (3feb16) git-svn-id: svn://tug.org/texlive/trunk@39562 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/caption/bicaption.sty | 57 +++++++++++++++++----- Master/texmf-dist/tex/latex/caption/caption.sty | 21 +++++--- Master/texmf-dist/tex/latex/caption/caption3.sty | 34 ++++++++++--- Master/texmf-dist/tex/latex/caption/subcaption.sty | 6 ++- 4 files changed, 89 insertions(+), 29 deletions(-) (limited to 'Master/texmf-dist/tex/latex/caption') diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty index 05f7e511911..f018a58e35f 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-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2016 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.sty 111 2015-09-17 09:48:20Z sommerfeldt $ +\caption@tempa $Id: bicaption.sty 136 2016-02-02 09:41:30Z sommerfeldt $ \ProvidesPackage{bicaption}[\caption@tempa v1.1-\caption@tempb Bilingual Captions (AR)] -\RequirePackage{caption}[2015/09/01] % needs v3.3 or newer +\RequirePackage{caption}[2016/02/01] % needs v3.3-134 or newer \caption@AtBeginDocument{\caption@ifcompatibility{% \caption@Error{% The `bicaption' package does not work correctly\MessageBreak @@ -109,6 +109,9 @@ \caption@ProcessOptions*{bicaption} \let\bicaption@addcontentsline@ORI\caption@addcontentsline \renewcommand*\caption@addcontentsline[2]{% + \caption@ifundefined\bicaption@LT@setup{}{% + \bicaption@LT@setup + \global\let\bicaption@LT@setup\@undefined}% \caption@ifundefined\bicaption@lentry {\bicaption@addcontentsline@ORI{#1}{#2}}% {\expandafter\bicaption@addcontentsline\expandafter @@ -136,13 +139,15 @@ \caption@ifcontentsline{#2}{% \bicaption@selectlanguage\@secondoftwo \bicaption@addcontentsline@ORI{#1}{#2}}} -\let\caption@@make@ORI\caption@@make \renewcommand\caption@@make[2]{% \caption@ifundefined\bicaption@text - {\caption@@make@ORI{#1}{#2}}% + {\begingroup + \caption@@make@{#1}{#2}% + \endgroup}% {\expandafter\bicaption@@make\expandafter {\bicaption@text}{#1}{#2}% - \global\let\bicaption@text\@undefined}} + \global\let\bicaption@text\@undefined}% + \caption@@make@epilogue} \newcommand\bicaption@@make[3]{% \caption@setoptions{bi}% \ifnum\bicaption@lang=0\relax @@ -157,16 +162,17 @@ \else \begingroup \caption@setoptions{bi-first}% - \caption@@make@ORI{#2}{#3}% + \caption@@make@{#2}{#3}% \endgroup \fi \ifnum\bicaption@lang=1\relax \else \begingroup \caption@setoptions{bi-second}% - \caption@@make@ORI{#2}{#1}% + \caption@@make@{#2}{#1}% \endgroup - \fi} + \fi +} \newcommand\bicaption{\@bicaption\caption} \newcommand\bicaptionbox{\@bicaption\captionbox} \newcommand\bisubcaption{\@bicaption\subcaption} @@ -174,11 +180,11 @@ \newcommand\bisubcaptionbox{\@bicaption\subcaptionbox} \let\subbicaptionbox\bisubcaptionbox \newcommand*\@bicaption[1]{% - \def\bicaption@cmd{#1}% \@ifstar - {\l@addto@macro\bicaption@cmd*% + {\def\bicaption@cmd{\bicaption@star{#1}}% \@@bicaption}% - {\caption@dblarg\@@@bicaption}} + {\def\bicaption@cmd{#1}% + \caption@dblarg\@@@bicaption}} \newcommand\@@bicaption[1]{% \@@@@bicaption{}{#1}[]} \long\def\@@@bicaption[#1]#2{% @@ -190,6 +196,33 @@ \bicaption@cmd[{#3}]{#4}}% {\bicaption@setup{#3}{#4}% \bicaption@cmd[{#1}]{#2}}} +\long\def\bicaption@star#1[#2]{#1*} +\newcommand\LT@bicaption{% + \noalign\bgroup + \@ifstar + {\gdef\bicaption@cmd{\LT@c@ption\@gobble}% + \LT@@bicaption}% + {\gdef\bicaption@cmd{\LT@c@ption\@firstofone}% + \caption@dblarg\LT@@@bicaption}} +\newcommand\LT@@bicaption[1]{% + \LT@@@@bicaption{}{#1}[]} +\long\def\LT@@@bicaption[#1]#2{% + \caption@dblarg{\LT@@@@bicaption{#1}{#2}}} +\long\def\LT@@@@bicaption#1#2[#3]#4{% + \gdef\bicaption@LTsetup{% + \caption@getlabel#2\label{}\@nil + \bicaption@LT@setup}% + \gdef\bicaption@LT@setup{% + \bicaption@ifswap + {\bicaption@setup{#1}{#2}}% + {\bicaption@setup{#3}{#4}}}% + \bicaption@ifswap + {\egroup\bicaption@cmd[{#3}]{#4}}% + {\egroup\bicaption@cmd[{#1}]{#2}}} +\g@addto@macro\caption@LT@setup{% + \caption@ifundefined\bicaption@LTsetup{}{% + \bicaption@LTsetup + \global\let\bicaption@LTsetup\@undefined}} \newcommand\bicaption@setup[2]{% \def\bicaption@lentry{#1}% \def\bicaption@text{\ignorespaces#2}} diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty index 5e80c921d5c..5668328743a 100644 --- a/Master/texmf-dist/tex/latex/caption/caption.sty +++ b/Master/texmf-dist/tex/latex/caption/caption.sty @@ -6,7 +6,7 @@ %% %% caption.dtx (with options: `package') %% -%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2016 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: caption.sty 111 2015-09-17 09:48:20Z sommerfeldt $ +\caption@tempa $Id: caption.sty 136 2016-02-02 09:41:30Z sommerfeldt $ \ProvidesPackage{caption}[\caption@tempa v3.3-\caption@tempb Customizing captions (AR)] -\RequirePackage{caption3}[2015/09/01] % needs v1.7 or newer +\RequirePackage{caption3}[2016/02/01] % needs v1.7-130 or newer \caption@ifbool{documentclass}{}{% \caption@WarningNoLine{% Unsupported document class (or package) detected,\MessageBreak @@ -1529,7 +1529,12 @@ %% \let\@currentHlabel\Hy@LT@currentHlabel \def\ContinuedFloat{\noalign{% \caption@Error{\noexpand\ContinuedFloat outside float}}}% + \let\bicaption\LT@bicaption \caption@ORI@LT@array}}% + \def\LT@capti@n{% + \@ifstar + {\egroup\LT@c@ption\@gobble[]}% + {\egroup\caption@xdblarg{\LT@c@ption\@firstofone}}} \long\def\LT@c@ption#1[#2]#3{% \LT@makecaption#1{\csname fnum@\LTcaptype\endcsname}{#3}% \LT@captionlistentry{#2}}% @@ -1541,6 +1546,7 @@ \fi \caption@setoptions{longtable}% \caption@setoptions{@longtable}% + \caption@LT@setup \caption@setautoposition{\ifcase\LT@rows t\else b\fi}% \caption@startrue#1\caption@starfalse \caption@prepare@stepcounter\LTcaptype{LT}% @@ -1552,6 +1558,7 @@ \caption@iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}% \caption@end}}% }{} +\providecommand*\caption@LT@setup{} \caption@IfPackageLoaded{picinpar}{% \long\def\figwindow[#1,#2,#3,#4] {% \caption@window{figure}% @@ -1732,15 +1739,15 @@ \caption@IfPackageLoaded{threeparttable}[2003/06/13 v3.0]{% \let\caption@ORI@threeparttable\threeparttable \renewcommand*\threeparttable{% - \caption@settype{table}% - \caption@setposition a% ? + \caption@settype{\@ifundefined{@captype}{table}{\@captype}}% +%%% \caption@setposition a% ? \caption@clearmargin \caption@setoptions{threeparttable}% \caption@ORI@threeparttable}% \let\caption@ORI@measuredfigure\measuredfigure \renewcommand*\measuredfigure{% - \caption@settype{figure}% - \caption@setposition a% ? + \caption@settype{\@ifundefined{@captype}{figure}{\@captype}}% +%%% \caption@setposition a% ? \caption@clearmargin \caption@setoptions{measuredfigure}% \caption@ORI@measuredfigure}% diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty index 27fcf88e2c9..d082e95f366 100644 --- a/Master/texmf-dist/tex/latex/caption/caption3.sty +++ b/Master/texmf-dist/tex/latex/caption/caption3.sty @@ -6,7 +6,7 @@ %% %% caption3.dtx (with options: `package') %% -%% Copyright (C) 1994-2015 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -39,7 +39,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: caption3.sty 115 2015-09-20 15:20:31Z sommerfeldt $ +\caption@tempa $Id: caption3.sty 136 2016-02-02 09:41:30Z sommerfeldt $ \ProvidesPackage{caption3}[\caption@tempa v1.7-\caption@tempb caption3 kernel (AR)] \providecommand*\@nameundef[1]{% \expandafter\let\csname #1\endcsname\@undefined} @@ -1364,6 +1364,10 @@ \newcommand\caption@make[2]{\caption@@make{\caption@lfmt{#1}{#2}}} \newcommand\caption@@make[2]{% \begingroup + \caption@@make@{#1}{#2}% + \endgroup + \caption@@make@epilogue} +\newcommand\caption@@make@[2]{% \caption@stepthecounter \caption@beginhook \caption@box\linewidth{% @@ -1391,8 +1395,8 @@ \fi \hspace\caption@tempdima }% - \caption@endhook - \endgroup + \caption@endhook} +\newcommand\caption@@make@epilogue{% \global\caption@starfalse} \newcommand*\caption@calcmargin{% \caption@calcmargin@hook @@ -1480,13 +1484,27 @@ \@setpar{\@@par\caption@@par}\caption@@par \caption@applyfont \caption@fmt - {\ifcaption@star\else{\captionlabelfont#1}\fi}% - {\ifcaption@star\else{\caption@iflf\captionlabelfont\caption@lsep}\fi}% + {\ifcaption@star\else + \begingroup + \captionlabelfont + #1% + \endgroup + \fi}% + {\ifcaption@star\else + \begingroup + \caption@iflf\captionlabelfont + \relax\caption@lsep + \endgroup + \fi}% {{\captiontextfont - \caption@ifstrut{\vrule\@height\ht\strutbox\@width\z@}{}% + \caption@ifstrut + {\vrule\@height\ht\strutbox\@width\z@}% + {}% \nobreak\hskip\z@skip % enable hyphenation \caption@tfmt{#2}% - \caption@ifstrut{\ifhmode\@finalstrut\strutbox\fi}{}% + \caption@ifstrut + {\ifhmode\@finalstrut\strutbox\fi}% + {}% \par}}} \newcommand\caption@ifempty[1]{% \caption@if@empty{#1}% diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty index 2afa81d0727..68a9bf6d27c 100644 --- a/Master/texmf-dist/tex/latex/caption/subcaption.sty +++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty @@ -6,7 +6,7 @@ %% %% subcaption.dtx (with options: `package') %% -%% Copyright (C) 1994-2013 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) +%% Copyright (C) 1994-2016 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm) %% %% http://sourceforge.net/projects/latex-caption/ %% @@ -39,7 +39,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: subcaption.sty 100 2015-09-15 17:00:16Z sommerfeldt $ +\caption@tempa $Id: subcaption.sty 136 2016-02-02 09:41:30Z sommerfeldt $ \ProvidesPackage{subcaption}[\caption@tempa v1.1-\caption@tempb Sub-captions (AR)] \RequirePackage{caption}[2012/03/25] % needs v3.3 or newer \caption@AtBeginDocument{\caption@ifcompatibility{% @@ -63,6 +63,8 @@ font+=small,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0} \caption@ProcessOptions*{subcaption} \caption@ForEachType{\DeclareCaptionSubType{#1}} +\caption@ifundefined\newsubfloat{}{% + \renewcommand*\newsubfloat{\DeclareCaptionSubType}} \def\subcaption{% \caption@iftype {\setcaptionsubtype*\caption}% -- cgit v1.2.3