From 64190a7a9bd900cc15dde29c88e0fb0c9ab9b082 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 23 Jan 2020 21:57:04 +0000 Subject: caption (23jan20) git-svn-id: svn://tug.org/texlive/trunk@53517 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/caption/subcaption.sty | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/caption') diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty index 52488f47d2d..2571116ecf8 100644 --- a/Master/texmf-dist/tex/latex/caption/subcaption.sty +++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty @@ -34,8 +34,8 @@ %% caption-deu.tex, caption-eng.tex, caption-rus.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{subcaption}[2020/01/03 v1.3b Sub-captions (AR)] -\RequirePackage{caption}[2019/09/01] % needs v3.3c or newer +\ProvidesPackage{subcaption}[2020/01/22 v1.3d Sub-captions (AR)] +\RequirePackage{caption}[2020/01/03] % needs v3.4h or newer \newcommand\subcaption@CheckCompatibility{% \@ifundefined{caption@ifcompatibility}{}{% \caption@ifcompatibility{% @@ -65,10 +65,6 @@ \let\subcaption@CheckCompatibility\@undefined \let\subcaption@EH\@undefined } -\caption@SetupOptions{subcaption}{\captionsetup[sub]{#2}}% -\caption@ExecuteOptions{subcaption}{% - size=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0} -\caption@ProcessOptions*{subcaption} \caption@ForEachType{\DeclareCaptionSubType{#1}} \caption@ifundefined\newsubfloat{}{% \renewcommand*\newsubfloat{\DeclareCaptionSubType}} @@ -105,7 +101,9 @@ \else \minipage[#1]#2{#3}% \fi\fi + \@subfloatboxreset \setcaptionsubtype\relax} +\providecommand*\@subfloatboxreset{} \newcommand*\subcaptionbox{% \caption@withoptargs{\caption@ibox\setcaptionsubtype}} \g@addto@macro\caption@subtypehook{% @@ -142,6 +140,10 @@ {\caption@Error{Undefined label format `#1'}}% {\expandafter\let\expandafter\subcaption@reffmt\csname caption@lfmt@#1\endcsname}} \subcaption@setrefformat{simple} +\caption@SetupOptions{subcaption}{\captionsetup[sub]{#2}}% +\caption@ExecuteOptions{subcaption}{% + size=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0} +\caption@ProcessOptions*{subcaption} \def\subfloat{% \@ifnextchar[\@subfloat\subfloat@} \long\def\@subfloat[#1]{% @@ -155,7 +157,8 @@ \ignorespaces} \def\subfloat@#1{% \setbox\@tempboxa\hbox{#1}% - \caption@iiiibox\setcaptionsubtype + \caption@iiiibox + \setcaptionsubtype {\phantomcaption\@gobble}{\phantomcaption\@gobble}% no box with \caption {}% no optional arguments for \caption {}% no sub-caption -- cgit v1.2.3