caption (23jan20)

git-svn-id: svn://tug.org/texlive/trunk@53517 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 35 insertions, 29 deletions

diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README
index 79aee4f0f03..fc43fccd45d 100644
--- a/Master/texmf-dist/doc/latex/caption/README
+++ b/Master/texmf-dist/doc/latex/caption/README
@@ -1,7 +1,7 @@
 ==========================================================================
 
 The `caption' package bundle
-Release 2020-01-03
+Release 2020-01-22
 Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 
 License: LPPL = LaTeX Project Public Licence
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
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