summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/caption
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-23 21:57:04 +0000
committerKarl Berry <karl@freefriends.org>2020-01-23 21:57:04 +0000
commit64190a7a9bd900cc15dde29c88e0fb0c9ab9b082 (patch)
treeff2d5679a28498bbcb252e9be56e93f58f2e2229 /Master/texmf-dist/tex/latex/caption
parent1535dded3abe5cf9a26354e80ba3e9e9ab8baa26 (diff)
caption (23jan20)
git-svn-id: svn://tug.org/texlive/trunk@53517 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/caption')
-rw-r--r--Master/texmf-dist/tex/latex/caption/subcaption.sty17
1 files changed, 10 insertions, 7 deletions
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