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 --- .../texmf-dist/source/latex/caption/subcaption.dtx | 45 ++++++++++++---------- 1 file changed, 24 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/source/latex/caption') diff --git a/Master/texmf-dist/source/latex/caption/subcaption.dtx b/Master/texmf-dist/source/latex/caption/subcaption.dtx index 3b58669d79c..a3b8bdb2ee8 100644 --- a/Master/texmf-dist/source/latex/caption/subcaption.dtx +++ b/Master/texmf-dist/source/latex/caption/subcaption.dtx @@ -28,7 +28,7 @@ % caption-deu.tex, caption-eng.tex, caption-rus.tex. % % \fi -% \CheckSum{229} +% \CheckSum{232} % % \iffalse %<*driver> @@ -924,14 +924,14 @@ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/12/01] -\ProvidesPackage{subcaption}[2020/01/03 v1.3b Sub-captions (AR)] +\ProvidesPackage{subcaption}[2020/01/22 v1.3d Sub-captions (AR)] % \end{macrocode} % % \subsection{Initial code} % % Since we base on the \package{caption} package we load it here. % \begin{macrocode} -\RequirePackage{caption}[2019/09/01] % needs v3.3c or newer +\RequirePackage{caption}[2020/01/03] % needs v3.4h or newer % \end{macrocode} % % \begin{macro}{\subcaption@CheckCompatibility} @@ -986,23 +986,6 @@ % \end{macrocode} % \end{macro} % -% \iffalse -% \subsection{Declaration of options} -% We do not have own options. -% \fi -% -% \subsection{Execution of options} -% -% We use |\caption@ExecuteOptions| and |\caption@ProcessOptions| here to add -% the options to the `|sub|' option list instead of executing them immediately. -% \changes{v1.1}{2018/05/01}{Bugfix: Option \texttt{font+=small} changed to \texttt{size=smaller}} -% \begin{macrocode} -\caption@SetupOptions{subcaption}{\captionsetup[sub]{#2}}% -\caption@ExecuteOptions{subcaption}{% - size=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0} -\caption@ProcessOptions*{subcaption} -% \end{macrocode} -% % \subsection{Main code} % % \changes{v1.1}{2011/10/30}{Adapted to the newfloat package} @@ -1071,6 +1054,7 @@ % \begin{macro}{subfigure} % \begin{macro}{subtable} % \changes{v1.2}{2016/02/21}{Optional argument values `B' and `T' added} +% \changes{v1.3d}{2020/01/22}{Definition and usage of \cs{@subfloatboxreset} added} % This is just an ordinary \env{minipage} environment with % |\setcaptionsubtype| as first contents line. % It will be defined using the helper macro |\caption@For{sub|\-|type|\-|list}| @@ -1106,8 +1090,12 @@ \else \minipage[#1]#2{#3}% \fi\fi + \@subfloatboxreset \setcaptionsubtype\relax} % \end{macrocode} +% \begin{macrocode} +\providecommand*\@subfloatboxreset{} +% \end{macrocode} % \end{macro} % \end{macro} % @@ -1208,6 +1196,20 @@ % \end{macrocode} % \end{macro} % +% \subsection{Execution of options} +% +% We use |\caption@ExecuteOptions| and |\caption@ProcessOptions| here to add +% the options to the `|sub|' option list instead of executing them immediately. +% \changes{v1.1}{2018/05/01}{Bugfix: Option \texttt{font+=small} changed to \texttt{size=smaller}} +% \begin{macrocode} +\caption@SetupOptions{subcaption}{\captionsetup[sub]{#2}}% +\caption@ExecuteOptions{subcaption}{% + size=smaller,labelformat=parens,labelsep=space,skip=6pt,list=0,hypcap=0} +\caption@ProcessOptions*{subcaption} +% \end{macrocode} +% +% \subsection{Bonus material} +% % \subsubsection{The \cs{subfloat} command} % % \begin{macro}{\subfloat} @@ -1243,7 +1245,8 @@ % \begin{macrocode} \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