summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/caption
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-01-23 03:01:31 +0000
committerNorbert Preining <norbert@preining.info>2020-01-23 03:01:31 +0000
commitf7e5d81fe9880913485f7f8c541eeca7adf4c195 (patch)
tree0b41345ec70871a9cc8b6641f360f2c85ca0af22 /macros/latex/contrib/caption
parentbe88ab29c165e6b16091443c3e8f36c4febf8a27 (diff)
CTAN sync 202001230301
Diffstat (limited to 'macros/latex/contrib/caption')
-rw-r--r--macros/latex/contrib/caption/README2
-rw-r--r--macros/latex/contrib/caption/subcaption.dtx45
2 files changed, 25 insertions, 22 deletions
diff --git a/macros/latex/contrib/caption/README b/macros/latex/contrib/caption/README
index 79aee4f0f0..fc43fccd45 100644
--- a/macros/latex/contrib/caption/README
+++ b/macros/latex/contrib/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/macros/latex/contrib/caption/subcaption.dtx b/macros/latex/contrib/caption/subcaption.dtx
index 3b58669d79..a3b8bdb2ee 100644
--- a/macros/latex/contrib/caption/subcaption.dtx
+++ b/macros/latex/contrib/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