caption (4jan20)

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

1 files changed, 26 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/latex/caption/subcaption.sty b/Master/texmf-dist/tex/latex/caption/subcaption.sty
index 0f03f498edd..52488f47d2d 100644
--- a/Master/texmf-dist/tex/latex/caption/subcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/subcaption.sty
@@ -6,7 +6,7 @@
 %%
 %% subcaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% https://gitlab.com/axelsommerfeldt/caption
 %% 
@@ -25,19 +25,16 @@
 %% This Current Maintainer of this work is Axel Sommerfeldt.
 %% 
 %% This work consists of the files
-%%   CHANGELOG, README, SUMMARY, caption.ins,
-%%   caption.dtx, caption2.dtx, caption3.dtx,
-%%   bicaption.dtx, ltcaption.dtx, subcaption.dtx,
-%%   newfloat.dtx, and totalcount.dtx
+%%   caption.ins, caption.dtx, caption2.dtx, caption3.dtx,
+%%   bicaption.dtx, ltcaption.dtx, subcaption.dtx, totalcount.dtx,
 %% the derived files
 %%   caption.sty, caption2.sty, caption3.sty,
-%%   bicaption.sty, ltcaption.sty, subcaption.sty,
-%%   newfloat.sty, and totalcount.sty
+%%   bicaption.sty, ltcaption.sty, subcaption.sty, totalcount.sty,
 %% and the user manuals
-%%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
+%%   caption-deu.tex, caption-eng.tex, caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{subcaption}[2019/09/01 v1.3a Sub-captions (AR)]
+\ProvidesPackage{subcaption}[2020/01/03 v1.3b Sub-captions (AR)]
 \RequirePackage{caption}[2019/09/01] % needs v3.3c or newer
 \newcommand\subcaption@CheckCompatibility{%
   \@ifundefined{caption@ifcompatibility}{}{%
@@ -145,29 +142,26 @@
     {\caption@Error{Undefined label format `#1'}}%
     {\expandafter\let\expandafter\subcaption@reffmt\csname caption@lfmt@#1\endcsname}}
 \subcaption@setrefformat{simple}
-\caption@ifundefined\subfloat{%
-  \newcommand*\subfloat{%
-    \@ifnextchar[\@subfloat\subfloat@}
-  \long\def\@subfloat[#1]{%
-    \@ifnextchar[{\@@subfloat{#1}}{\@@@subfloat\subcaptionbox{#1}}}
-  \long\def\@@subfloat#1[#2]{\@@@subfloat{\subcaptionbox[{#1}]}{#2}}
-  \newcommand\@@@subfloat[3]{%
-    \caption@getlabel#3\label{}\@nil
-    #1{#2\caption@thelabel}{\let\label\caption@gobble#3}%
-    \global\let\caption@thelabel\relax
-    \ignorespaces}
-  \newcommand*\subfloat@[1]{%
-    \setbox\@tempboxa\hbox{#1}%
-    \caption@iiiibox\setcaptionsubtype
-      {\phantomcaption\@gobble}{\phantomcaption\@gobble}% no box with \caption
-      {}% no optional arguments for \caption
-      {}% no sub-caption
-      [\wd\@tempboxa][\caption@hj@default]%
-      {\unhbox\@tempboxa}%
-    \ignorespaces}
-}{%
-  \PackageInfo{subcaption}{\protect\subfloat\space is already defined\@gobble}
-}
+\def\subfloat{%
+  \@ifnextchar[\@subfloat\subfloat@}
+\long\def\@subfloat[#1]{%
+  \@ifnextchar[{\@@subfloat{#1}}{\@@@subfloat\subcaptionbox{#1}}}
+\long\def\@@subfloat#1[#2]{%
+  \@@@subfloat{\subcaptionbox[{#1}]}{#2}}
+\long\def\@@@subfloat#1#2#3{%
+  \caption@getlabel#3\label{}\@nil
+  #1{#2\caption@thelabel}{\let\label\caption@gobble#3}%
+  \global\let\caption@thelabel\relax
+  \ignorespaces}
+\def\subfloat@#1{%
+  \setbox\@tempboxa\hbox{#1}%
+  \caption@iiiibox\setcaptionsubtype
+    {\phantomcaption\@gobble}{\phantomcaption\@gobble}% no box with \caption
+    {}% no optional arguments for \caption
+    {}% no sub-caption
+    [\wd\@tempboxa][\caption@hj@default]%
+    {\unhbox\@tempboxa}%
+  \ignorespaces}
 \endinput
 %%
 %% End of file `subcaption.sty'.