1 files changed, 87 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/caption/caption3.sty b/Master/texmf-dist/tex/latex/caption/caption3.sty
index a36da9db442..3f51ac858c6 100644
--- a/Master/texmf-dist/tex/latex/caption/caption3.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption3.sty
@@ -8,7 +8,7 @@
 %% 
 %% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
-%% https://github.com/axelsommerfeldt/latex-caption
+%% https://github.com/axelsommerfeldt/caption
 %% 
 %% --------------------------------------------------------------------------
 %% 
@@ -37,7 +37,7 @@
 %%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2018/04/15 v1.7-167 caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2018/05/27 v1.8a caption3 kernel (AR)]
 \providecommand\caption@FixArabTeX{%
   \def\caption@tempa##1{}%
   \ifx\caption@tempa\@gobble
@@ -313,7 +313,7 @@
   \expandafter\caption@ifempty@list\csname caption@opt@#2\endcsname
     {\caption@removefromoptlist{#2}}{}%
   \caption@tempa{\caption@Warning{%
-    Option `#1' was not in list `#2'\MessageBreak}}}
+    Option `#1' was not in list `#2'}}}
 \newcommand*\showcaptionsetup[2][\@firstofone]{%
   \@bsphack
     \GenericWarning{}{%
@@ -655,6 +655,7 @@
 \DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{\nobreakspace}(#2)}
 \DeclareCaptionLabelFormat{brace}{\bothIfFirst{#1}{\nobreakspace}#2)}
 \DeclareCaptionLabelFormat{autodot}{\bothIfFirst{#1}{\nobreakspace}#2\autodot}
+\DeclareCaptionLabelFormat{unnumbered}{#1}
 \def\caption@lfmt@default{\caption@lfmt@simple}
 \newcommand\DeclareCaptionLabelSeparator{%
   \caption@teststar\caption@declarelabelseparator\@gobble\@firstofone}
@@ -789,12 +790,70 @@
 \DeclareCaptionFont{rm}{\rmfamily}
 \DeclareCaptionFont{sf}{\sffamily}
 \DeclareCaptionFont{tt}{\ttfamily}
+\DeclareCaptionFont{tiny}{\tiny}
 \DeclareCaptionFont{scriptsize}{\scriptsize}
 \DeclareCaptionFont{footnotesize}{\footnotesize}
 \DeclareCaptionFont{small}{\small}
 \DeclareCaptionFont{normalsize}{\normalsize}
 \DeclareCaptionFont{large}{\large}
 \DeclareCaptionFont{Large}{\Large}
+\DeclareCaptionFont{LARGE}{\LARGE}
+\DeclareCaptionFont{huge}{\huge}
+\DeclareCaptionFont{Huge}{\Huge}
+\newcommand\caption@smaller{%
+  \ifx\@currsize\tiny
+    \relax
+  \else\ifx\@currsize\scriptsize
+    \tiny
+  \else\ifx\@currsize\footnotesize
+    \scriptsize
+  \else\ifx\@currsize\small
+    \footnotesize
+  \else\ifx\@currsize\normalsize
+    \small
+  \else\ifx\@currsize\large
+    \normalsize
+  \else\ifx\@currsize\Large
+    \large
+  \else\ifx\@currsize\LARGE
+    \Large
+  \else\ifx\@currsize\huge
+    \LARGE
+  \else\ifx\@currsize\Huge
+    \huge
+  \else
+    \caption@Warning{%
+      Cannot determine current font size.\MessageBreak
+      Try setting it with `size=' explicitly}%
+  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+\DeclareCaptionFont{smaller}{\caption@smaller}
+\newcommand\caption@larger{%
+  \ifx\@currsize\tiny
+    \scriptsize
+  \else\ifx\@currsize\scriptsize
+    \footnotesize
+  \else\ifx\@currsize\footnotesize
+    \small
+  \else\ifx\@currsize\small
+    \normalsize
+  \else\ifx\@currsize\normalsize
+    \large
+  \else\ifx\@currsize\large
+    \Large
+  \else\ifx\@currsize\Large
+    \LARGE
+  \else\ifx\@currsize\LARGE
+    \huge
+  \else\ifx\@currsize\huge
+    \Huge
+  \else\ifx\@currsize\Huge
+    \relax
+  \else
+    \caption@Warning{%
+      Cannot determine current font size.\MessageBreak
+      Try setting it with `size=' explicitly}%
+  \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
+\DeclareCaptionFont{larger}{\caption@larger}
 \DeclareCaptionFont{sansmath}{\sansmath}
 \DeclareCaptionFont{singlespacing}{%
   \caption@ifundefined\setspace@singlespace{}{%
@@ -1124,11 +1183,15 @@
         \endgroup\expandafter\@secondoftwo
       \fi}
   \DeclareCaptionLabelFormat{default}{%
-    \caption@ifbeamertemplate{numbered}{%
-      \caption@lfmt@simple{#1}{#2}}{#1}}
+    \caption@ifbeamertemplate{numbered}%
+      \caption@lfmt@simple
+      \caption@lfmt@unnumbered
+    {#1}{#2}}
   \DeclareCaptionLabelFormat{default@magyar}{%
-    \caption@ifbeamertemplate{numbered}{%
-      \caption@lfmt@simple@magyar{#1}{#2}}{#1}}
+    \caption@ifbeamertemplate{numbered}%
+      \caption@lfmt@simple@magyar
+      \caption@lfmt@unnumbered
+    {#1}{#2}}
   \@ifundefined{@@magyar@captionfix}\AtBeginDocument\@firstofone{%
     \@ifundefined{@@magyar@captionfix}{}{%
       \g@addto@macro\@@magyar@captionfix{%
@@ -1143,8 +1206,10 @@
     \usebeamerfont*{caption}%
     \usebeamercolor[fg]{caption}}
   \DeclareCaptionDefaultFont{labelfont}{%
+    \setbeamercolor*{caption}{}% avoid setting "caption" color additionally
     \usebeamercolor[fg]{caption name}%
-    \usebeamerfont*{caption name}}
+    \setbeamerfont*{caption}{}% avoid setting "caption" font additionally
+    \usebeamerfont{caption name}}
   \DeclareCaptionDefaultJustification{\raggedright}
   \DeclareOption{beamerclass}{%
     \renewcommand\caption@ifslc{%
@@ -1467,14 +1532,20 @@
 \newcommand*\caption@singleline{%
   \caption@xsetup\caption@opt@singleline
   \let\caption@fmt\caption@slfmt}
-\newcommand*\caption@prepareslc{%
+\@ifundefined{caption@prepareslc}\def\g@addto@macro\caption@prepareslc{%
   \let\label\caption@gobble
+  \let\hypertarget\@gobbletwo
   \let\caption@footnotemark@ORI\footnotemark
   \def\footnote{\caption@withoptargs\caption@footnote}%
   \def\footnotemark{\caption@withoptargs\caption@footnotemark}%
   \let\@footnotetext\caption@gobble
+  \let\caption@endnotemark@ORI\endnotemark
+  \def\endnote{\caption@withoptargs\caption@endnote}%
+  \def\endnotemark{\caption@withoptargs\caption@endnotemark}%
   \let\@endnotetext\caption@gobble
   \let\pagenote\caption@gobble
+  \let\acused\@gobble
+  \let\AC@placelabel\@gobble
   \let\glsunset\@gobble
 }
 \newcommand\caption@footnote[2]{%
@@ -1484,6 +1555,13 @@
     \let\stepcounter\caption@l@stepcounter
     \caption@footnotemark@ORI#1%
   \endgroup}
+\newcommand\caption@endnote[2]{%
+  \caption@endnotemark{#1}}
+\newcommand\caption@endnotemark[1]{%
+  \begingroup
+    \let\stepcounter\caption@l@stepcounter
+    \caption@endnotemark@ORI#1
+  \endgroup}
 \newcommand*\caption@l@stepcounter[1]{%
   \advance\csname c@#1\endcsname\@ne\relax}
 \newcommand*\caption@applyfont{%