caption (4jan20)

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

7 files changed, 213 insertions, 175 deletions

diff --git a/Master/texmf-dist/tex/latex/caption/bicaption.sty b/Master/texmf-dist/tex/latex/caption/bicaption.sty
index 49579629b62..046bede13e7 100644
--- a/Master/texmf-dist/tex/latex/caption/bicaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/bicaption.sty
@@ -6,7 +6,7 @@
 %%
 %% bicaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% https://gitlab.com/axelsommerfeldt/caption
 %% 
@@ -25,16 +25,13 @@
 %% 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{bicaption}[2016/03/27 v1.2 Bilingual Captions (AR)]
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index a876598fd56..f905114ef8f 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -34,8 +34,8 @@
 %%   caption-deu.tex, caption-eng.tex, caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2020/01/01 v3.4c Customizing captions (AR)]
-\RequirePackage{caption3}[2019/12/31] % needs v1.8f or newer
+\ProvidesPackage{caption}[2020/01/03 v3.4h Customizing captions (AR)]
+\RequirePackage{caption3}[2020/01/03] % needs v1.8h or newer
 \caption@ifbool{documentclass}{}{%
   \caption@WarningNoLine{%
     Unknown document class (or package),\MessageBreak
@@ -93,7 +93,8 @@
 \newcommand*\caption@NewFloat[1]{%
   \let\KV@prefix@ORI\KV@prefix
   \let\@tempc@ORI\@tempc
-  \caption@ifpackageloaded{newfloat}{#1}{}%
+  \caption@ifdefined\newfloatsetup{}{\RequirePackage{newfloat}}%
+  #1%
   \let\@tempc\@tempc@ORI
   \let\KV@prefix\KV@prefix@ORI}
 \DeclareCaptionOption*{config}[caption]{%
@@ -433,31 +434,42 @@
   \caption@teststar{\caption@@@settype{#1}}\@firstoftwo\@secondoftwo}
 \newcommand*\caption@@@settype[3]{%
   \caption@Debug{#1type=#3}%
-  \caption@checkgrouplevel{#1}{%
-    \captionsetup{#1type#2*\@empty=...}#2{ or
-                  \@backslashchar#1captionof}{}}%
-  \edef\caption@tempa{#3}%
-  \expandafter\ifx\csname @#1captype\endcsname\caption@tempa \else
-    \ifcaptionsetup@star\else\@nameuse{caption@#1type@warning}\fi
-  \fi
-  \expandafter\let\csname @#1captype\endcsname\caption@tempa
-  \@nameuse{caption@#1typehook}%
-  \caption@setoptions{#3}%
-  \ifx\caption@opt\relax
-    \@nameundef{caption@#1type@warning}%
-  \else
-    \@namedef{caption@#1type@warning}{\caption@Warning{%
-      The #1caption type was already set to
-      `\csname @#1captype\endcsname'\MessageBreak}}%
-  \fi
-  #2{}{%
-    \let\@currentlabel\caption@undefinedlabel
-    \ifx\caption@x@label\@undefined
-      \let\caption@x@label\label
-      \let\label\caption@xlabel
-    \fi
-    \caption@start}}
+  \@nameuse{caption@check#1type}{#3}%
+    {\caption@checkgrouplevel{#1}{%
+       \captionsetup{#1type#2*\@empty=...}#2{ or
+                     \@backslashchar#1captionof}{}}%
+     \edef\caption@tempa{#3}%
+     \expandafter\ifx\csname @#1captype\endcsname\caption@tempa \else
+       \ifcaptionsetup@star\else\@nameuse{caption@#1type@warning}\fi
+     \fi
+     \expandafter\let\csname @#1captype\endcsname\caption@tempa
+     \@nameuse{caption@#1typehook}%
+     \caption@setoptions{#3}%
+     \ifx\caption@opt\relax
+       \@nameundef{caption@#1type@warning}%
+     \else
+       \@namedef{caption@#1type@warning}{\caption@Warning{%
+         The #1type was already set to
+         `\csname @#1captype\endcsname'\MessageBreak}}%
+     \fi
+     #2{}{%
+       \let\@currentlabel\caption@undefinedlabel
+       \ifx\caption@x@label\@undefined
+         \let\caption@x@label\label
+         \let\label\caption@xlabel
+       \fi
+       \caption@start}}}
 \newcommand*\caption@iftype{\caption@ifdefined\@captype}
+\newcommand*\caption@checktype[1]{%
+  \caption@ifsubtype{#1}%
+     {\caption@Error{Should not be used with subtype `#1'}%
+      \@gobble}%
+     \@firstofone}
+\newcommand*\caption@checksubtype[1]{%
+  \caption@ifsubtype{#1}%
+     \@firstofone
+     {\caption@Error{Undefined subtype `#1'}%
+      \@gobble}}
 \caption@ifeTeX{%
   \newcommand*\caption@checkgrouplevel[2]{%
     \@ifundefined{#1caption@grouplevel}{%
@@ -727,6 +739,7 @@
         \caption@Error{##2 inside \@subcaptype}%
       \fi}%
     \let\caption\caption@subcaption
+    \let\@caption\caption@@caption
     \let\phantomcaption\caption@subphantom
     \let\captionlistentry\caption@sublistentry
     \let\caption@refstepcounter\caption@@@refstepcounter
@@ -1175,30 +1188,29 @@
     \renewcommand*\caption@hypcapspace{\hypcapspace}%
   \fi}{}
 \caption@IfPackageLoaded{listings}[2004/02/13 v1.2]{%
-%%  \caption@setbool{lst@Init}{0}%
-%%  \lst@AddToHook{Init}{\caption@setbool{lst@Init}{1}}%
+  \caption@setbool{lst@Init}{0}%
+  \lst@AddToHook{Init}{\caption@setbool{lst@Init}{1}}%
   \let\caption@ORI@lst@MakeCaption\lst@MakeCaption
   \def\lst@MakeCaption#1{% #1 is `t' or `b'
     \begingroup
-%%      \caption@Debug{%
-%%        linewidth=\lst@linewidth,
-%%        xleftmargin=\lst@xleftmargin,\MessageBreak
-%%        xrightmargin=\lst@xrightmargin,
-%%        resetmargins=\lst@ifresetmargins true\else false\fi}%
-%%      \caption@iflst@Init{}{%\lsthk@PreInit\lsthk@Init => has unwanted side-effects (like an extra horizontal line)
-%%        \linewidth\lst@linewidth\relax
-%%        \lst@ifresetmargins
-%%          \advance\linewidth\@totalleftmargin
-%%          \advance\linewidth\rightmargin
-%%          \@totalleftmargin\z@
-%%        \fi
-%%        \advance\linewidth-\lst@xleftmargin
-%%        \advance\linewidth-\lst@xrightmargin
-%%        \advance\@totalleftmargin\lst@xleftmargin\relax}%
-      \l@addto@macro\caption@beginhook{%
-        \@tempdima\leftmargin
-        \multiply\@tempdima\@listdepth
-        \hskip-\@tempdima\relax}%
+%%    \caption@Debug{%
+%%      linewidth=\lst@linewidth,
+%%      xleftmargin=\lst@xleftmargin,\MessageBreak
+%%      xrightmargin=\lst@xrightmargin,
+%%      resetmargins=\lst@ifresetmargins true\else false\fi}%
+%%    \caption@iflst@Init{}{%
+%%      \linewidth\lst@linewidth\relax
+%%      \lst@ifresetmargins
+%%        \advance\linewidth\@totalleftmargin
+%%        \advance\linewidth\rightmargin
+%%        \@totalleftmargin\z@
+%%      \fi
+%%      \advance\linewidth-\lst@xleftmargin
+%%      \advance\linewidth-\lst@xrightmargin
+%%      \advance\@totalleftmargin\lst@xleftmargin\relax}%
+      \caption@iflst@Init{}{%
+        \edef\caption@lst@leftskip{\noexpand\hskip-\the\@totalleftmargin\noexpand\relax}%
+        \l@addto@macro\caption@beginhook\caption@lst@leftskip}%
       \caption@setposition{#1}%
       \caption@iftop{%
         \@tempdima\belowcaptionskip
@@ -1274,6 +1286,17 @@
     \fi
     \caption@setoptions{longtable}%
     \caption@setoptions{@longtable}}%
+  \caption@AtBeginDocument{\caption@ifdefined\flrow@setlist@{%
+    \caption@InfoNoLine{Fixing longtable code of `floatrow' package}%
+    \let\caption@flrow@setlist@\flrow@setlist@
+    \renewcommand\flrow@setlist@[1]{%
+      \def\caption@tempa{{table}{longtable}}%
+      \def\caption@tempb{#1}%
+      \ifx\caption@tempa\caption@tempb
+        \def\@captype{table}%
+      \fi
+      \caption@flrow@setlist@{#1}}%
+  }{}}%
 }{}
 \providecommand*\caption@LT@setup{}
 \caption@IfPackageLoaded{picinpar}{%
diff --git a/Master/texmf-dist/tex/latex/caption/caption2.sty b/Master/texmf-dist/tex/latex/caption/caption2.sty
index e8095fa6c3a..686fff86ae4 100644
--- a/Master/texmf-dist/tex/latex/caption/caption2.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption2.sty
@@ -6,7 +6,7 @@
 %%
 %% caption2.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2018 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{caption2}[2015/09/15 v2.2d Customising captions (AR)]
+\ProvidesPackage{caption2}[2020/01/02 v2.2e Customising captions (AR)]
 \PackageWarning{caption2}{%
   ****************************************************\MessageBreak
   THIS PACKAGE IS OBSOLETE:\MessageBreak
@@ -47,7 +44,12 @@
   NOT be used for NEW documents! New documents should\MessageBreak
   use the regular `caption' package v3.x instead.\MessageBreak
   ****************************************************\@gobbletwo}%
-\RequirePackage{caption3}[2007/09/01] % needs v3.1 or newer
+\RequirePackage{caption3}[2019/12/31] % should be used with v1.8f or newer
+\let\captionsetup\@undefined
+\let\clearcaptionsetup\@undefined
+\let\showcaptionsetup\@undefined
+\let\DeclareCaptionType\@undefined
+\let\DeclareCaptionSubType\@undefined
 \@ifpackageloaded{caption}{%
   \PackageError{caption2}{%
     You can't use both, the (current) caption *and*\MessageBreak
@@ -208,7 +210,7 @@
 \DeclareOption{ruled}{\caption@ruledtrue}
 \DeclareOption{boxed}{}
 \DeclareOption{ignoreLTcapwidth}{\ignoreLTcapwidthtrue}
-\DeclareOption{debug}{\captionsetup{debug}}
+\DeclareOption{debug}{\caption@setup{debug}}
 \newif\ifcaption@twozero
 \normalcaptionparams
 \ExecuteOptions{none,normal}
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index 5a07a5c487c..efc38bb05d3 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -6,7 +6,7 @@
 %%
 %% caption3.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
 %% 
@@ -34,7 +34,7 @@
 %%   caption-deu.tex, caption-eng.tex, caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2019/12/31 v1.8f caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2020/01/03 v1.8h caption3 kernel (AR)]
 \providecommand\caption@FixArabTeX{%
   \def\caption@tempa##1{}%
   \ifx\caption@tempa\@gobble
@@ -252,13 +252,21 @@
        \caption@setup@options@i{#1}{@\caption@thecounter}}}%
     {\caption@setup@options@{#1}}}
 \newcommand*\caption@setup@options@i[4]{%
-  \caption@setup@options@{#1}{#2}%
-  \caption@declare@option{#2}[]{\captionsetup#3{#4}}}
+  \caption@declare@option{#2}[]{\captionsetup#3{#4}}%
+  \caption@setup@options@{#1}{#2}}
 \newcommand*\caption@setup@options@[2]{%
   \@bsphack
     \ifcaptionsetup@star\captionsetup@starfalse\else\caption@addtooptlist{#1}\fi
+    \caption@checkoptions{#2}%
     \expandafter\caption@l@addto@list\csname caption@opt@#1\endcsname{#2}%
   \@esphack}
+\newcommand*\caption@checkoptions[1]{%
+  \begingroup
+    \caption@prepare@optioncheck
+    \caption@setup{#1}%
+  \endgroup}
+\newcommand*\caption@prepare@optioncheck{%
+  \def\@captype{figure}}
 \newcommand*\clearcaptionsetup{%
   \caption@teststar@\@clearcaptionsetup\@gobble\@firstofone}
 \newcommand*\@clearcaptionsetup[1]{%
@@ -712,8 +720,11 @@
   \caption@@getlabel#2\@nil}
 \let\caption@thelabel\relax
 \newcommand*\DeclareCaptionFont[2]{%
-  \define@key{caption@fnt}{#1}[]{\l@addto@macro\caption@fnt{#2}}}
+  \define@key{caption@fnt}{#1}[]{\caption@addto@fnt{#2}}}
 \@onlypreamble\DeclareCaptionFont
+\newcommand*\caption@addto@fnt[1]{%
+  \caption@check@ragged{#1}%
+  \l@addto@macro\caption@fnt{#1}}
 \newcommand*\DeclareCaptionDefaultFont[2]{%
   \global\@namedef{caption#1@default}{#2}}
 \@onlypreamble\DeclareCaptionDefaultFont
@@ -826,9 +837,13 @@
 \DeclareCaptionFont{singlespacing}{%
   \caption@ifdefined\setspace@singlespace{%
     \setstretch\setspace@singlespace}{}}% normally 1
-\DeclareCaptionFont{onehalfspacing}{\onehalfspacing}
-\DeclareCaptionFont{doublespacing}{\doublespacing}
-\DeclareCaptionFont{stretch}{\setstretch{#1}}
+\DeclareCaptionFont{onehalfspacing}{%
+  \caption@setspace{onehalfspacing}\onehalfspacing\relax}
+\DeclareCaptionFont{doublespacing}{%
+  \caption@setspace{doublespacing}\doublespacing\relax}
+\DeclareCaptionFont{stretch}{%
+  \caption@setspace{stretch}\setstretch\@gobble{#1}}
+\newcommand*\caption@setspace{\caption@ifpackageloaded{setspace}}
 \DeclareCaptionFont{normal}{%
   \caption@font*{%
     \KV@caption@fnt@normalcolor\@unused
@@ -870,54 +885,54 @@
   \leftskip\z@\@plus 1fil%
   \rightskip\z@\@plus -1fil%
   \parfillskip\z@\@plus 2fil\relax}
-\DeclareCaptionJustification{Centering}{%
-  \caption@ragged\Centering\centering}
-\DeclareCaptionJustification{RaggedLeft}{%
-  \caption@ragged\RaggedLeft\raggedleft}
-\DeclareCaptionJustification{RaggedRight}{%
-  \caption@ragged\RaggedRight\raggedright}
+\DeclareCaptionJustification{Centering}{\caption@Centering}
+\DeclareCaptionJustification{RaggedLeft}{\caption@RaggedLeft}
+\DeclareCaptionJustification{RaggedRight}{\caption@RaggedRight}
+\newcommand*\caption@Centering{%
+  \caption@ragged{Centering}\Centering\centering}
+\newcommand*\caption@RaggedLeft{%
+  \caption@ragged{RaggedLeft}\RaggedLeft\raggedleft}
+\newcommand*\caption@RaggedRight{%
+  \caption@ragged{RaggedRight}\RaggedRight\raggedright}
 \newcommand*\caption@ragged{\caption@ifpackageloaded{ragged2e}}
-\newcommand*\caption@ifpackageloaded[1]{%
-  \@ifundefined{caption@ifpkg@#1}%
-    {\caption@RequirePackage{#1}%
-     \caption@pkg@true{#1}}%
-    {}%
-  \caption@ifpkg{#1}}
-\AtBeginDocument{\renewcommand*\caption@ifpackageloaded[1]{%
-  \@ifundefined{caption@ifpkg@#1}%
-    {\caption@addto@pkg@list{#1}%
-     \caption@pkg@false{#1}%
-     \caption@Warning{%
-       `#1' support has been changed.\MessageBreak
-       Rerun to get captions right}}%
-    {}%
-  \caption@ifpkg{#1}}}
-\newcommand*\caption@ifpkg[1]{%
-  \csname caption@ifpkg@#1\endcsname}
-\newcommand*\caption@pkg@true[1]{%
-  \global\expandafter\let\csname caption@ifpkg@#1\endcsname\@firstoftwo}
-\newcommand*\caption@pkg@false[1]{%
-  \global\expandafter\let\csname caption@ifpkg@#1\endcsname\@secondoftwo}
+\newcommand*\caption@ifpackageloaded[4]{%
+  \caption@ifdefined#3#3{%
+    \caption@Error{Option `#2' requires the `#1' package\MessageBreak
+      (or an alternative definition of \string#3)}%
+    #4}}
 \newcommand*\caption@pkg@list{}
-\newcommand*\caption@addto@pkg@list[1]{%
-  \protected@write\@auxout{}{%
-    \string\@cons\string\caption@pkg@list{{#1}}}}
-\AtBeginDocument{%
+\caption@AtBeginDocument{%
   \def\caption@tempa{\endgroup}%
   \begingroup
   \def\@elt#1{%
     \g@addto@macro\caption@tempa{%
-      \caption@RequirePackage{#1}%
-      \@namedef{caption@ifpkg@#1}{%
-        \caption@addto@pkg@list{#1}%
-        \caption@pkg@true{#1}%
-        \caption@ifpkg{#1}}}}%
+      \caption@InfoNoLine{Load package `#1'}%
+      \RequirePackage{#1}\relax}}%
   \caption@pkg@list
   \caption@tempa}
-\newcommand*\caption@RequirePackage[1]{%
-  \caption@Info{We need package `#1'}%
-  \RequirePackage{#1}}
-\@onlypreamble\caption@RequirePackage
+\@ifpackageloaded{ragged2e}{\let\caption@check@ragged\@gobble}{%
+  \newcommand*\caption@check@ragged[1]{%
+    \begingroup
+      \def\caption@tempa{#1}%
+      \caption@check@ragged@{Centering}%
+      \caption@check@ragged@{RaggedLeft}%
+      \caption@check@ragged@{RaggedRight}%
+    \endgroup}%
+  \newcommand*\caption@check@ragged@[1]{%
+    \expandafter\def\expandafter\caption@tempb\expandafter{\csname caption@#1\endcsname}%
+    \ifx\caption@tempa\caption@tempb % our definition of `ragged2e' option?
+      \@ifundefined{#1}{%
+        \caption@Info{Usage of `ragged2e' command \expandafter\string\csname #1\endcsname\space detected}%
+        \@cons\caption@pkg@list{{ragged2e}}% load `ragged2e' package later on
+        \global\let\caption@check@ragged\@gobble}{}%
+    \fi
+  }%
+  \caption@AtBeginDocument{%
+    \let\caption@check@ragged\@gobble
+    \let\caption@check@ragged@\@undefined}}
+%%\@ifl@aded{dtx}{subfig}{\RequirePackage{ragged2e}\relax}{} % not needed
+\DeclareCaptionOption{lofdepth}[2]{\caption@ifdefined\c@lofdepth{\setcounter{lofdepth}{#1}}{}}
+\DeclareCaptionOption{lotdepth}[2]{\caption@ifdefined\c@lotdepth{\setcounter{lotdepth}{#1}}{}}
 \caption@ifundefined\abovecaptionskip{%
   \newlength\abovecaptionskip\setlength\abovecaptionskip{10\p@}}{}
 \caption@ifundefined\belowcaptionskip{%
@@ -1485,10 +1500,10 @@
   \caption@ifdefined\ForEachFloatingEnvironment
     {\ForEachFloatingEnvironment{#1}}%
     {\def\@elt##1{#1}%
-      \caption@ifdefined\c@figure\@elt\@gobble{figure}%
-      \caption@ifdefined\c@table\@elt\@gobble{table}%
-      \let\@elt\relax
-      \newfloat@addtohook{#1}}}
+     \caption@ifdefined\c@figure\@elt\@gobble{figure}%
+     \caption@ifdefined\c@table\@elt\@gobble{table}%
+     \let\@elt\relax
+     \newfloat@addtohook{#1}}}
 \providecommand\newfloat@addtohook[1]{%
   \toks@=\expandafter{\newfloat@hook{##1}#1}%
   \edef\@tempa{\def\noexpand\newfloat@hook####1{\the\toks@}}%
@@ -1503,14 +1518,16 @@
 \def\caption@@declaresubtype#1[#2]#3{%
   \@ifundefined{c@#3}%
     {\caption@Error{No float type '#3' defined}}%
-    {\@ifundefined{c@sub#3}%
-       {\caption@Debug{New subtype `sub#3'}%
-        \newcounter{sub#3}%
-        \@addtoreset{sub#3}{#3}%
-        \@namedef{ext@sub#3}{\csname ext@#3\endcsname}%
-        \caption@declaresublistentry{#3}%
-        \@cons\caption@subtypelist{{#3}}}%
-       {\caption@Debug{Modify caption `sub#3'}}%
+    {\caption@ifsubtype{sub#3}%
+     {\caption@Debug{Modify subtype `sub#3'}}%
+     {\caption@Debug{New subtype `sub#3'}%
+      \@ifundefined{c@sub#3}%
+        {\newcounter{sub#3}\relax}%
+        {\caption@Warning{Using already defined counter `sub#3'}}%
+      \@addtoreset{sub#3}{#3}%
+      \@namedef{ext@sub#3}{\csname ext@#3\endcsname}%
+      \caption@declaresublistentry{#3}%
+      \@cons\caption@subtypelist{{#3}}}%
      \caption@ifdefined\contentsuse{%
        \contentsuse{sub#3}{\csname ext@sub#3\endcsname}}{}%
      \@namedef{sub#3name}{}%
@@ -1566,6 +1583,17 @@
   \fi}
 \@onlypreamble\caption@@@@@@declaresublistentry
 \newcommand*\caption@subtypelist{}
+\newcommand*\caption@ifsubtype[1]{%
+  \begingroup
+    \let\next\@secondoftwo
+    \edef\@tempa{#1}%
+    \def\@elt##1{%
+      \def\@tempb{sub##1}%
+      \ifx\@tempa\@tempb
+        \let\next\@firstoftwo
+     \fi}%
+    \caption@subtypelist
+  \expandafter\endgroup\next}
 \newcommand*\caption@restorecounters{%
   \caption@restore@counters
   \global\let\caption@restore@counters\@empty}
diff --git a/Master/texmf-dist/tex/latex/caption/ltcaption.sty b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
index 29cb3172678..f76bfec9b11 100644
--- a/Master/texmf-dist/tex/latex/caption/ltcaption.sty
+++ b/Master/texmf-dist/tex/latex/caption/ltcaption.sty
@@ -6,7 +6,7 @@
 %%
 %% ltcaption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% https://gitlab.com/axelsommerfeldt/caption
 %% 
@@ -25,16 +25,13 @@
 %% 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{ltcaption}[2018/08/26 v1.4a longtable captions (AR)]
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'.
diff --git a/Master/texmf-dist/tex/latex/caption/totalcount.sty b/Master/texmf-dist/tex/latex/caption/totalcount.sty
index 4fe459bfde3..a4bbd5786a5 100644
--- a/Master/texmf-dist/tex/latex/caption/totalcount.sty
+++ b/Master/texmf-dist/tex/latex/caption/totalcount.sty
@@ -6,7 +6,7 @@
 %%
 %% totalcount.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% https://gitlab.com/axelsommerfeldt/caption
 %% 
@@ -25,16 +25,13 @@
 %% 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{totalcount}[2018/01/21 v1.0a Total values of counters (AR)]