From 4e320246605fb61cf69b3ce53fa9c4a2a9bce1d8 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 28 Aug 2019 23:41:01 +0000
Subject: caption (29aug19)

git-svn-id: svn://tug.org/texlive/trunk@51973 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/caption/caption.sty | 54 +++++++++++++++----------
 1 file changed, 32 insertions(+), 22 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/caption/caption.sty')

diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index ebff7ded1b4..f2579c08c20 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -6,7 +6,7 @@
 %%
 %% caption.dtx  (with options: `package')
 %% 
-%% Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
+%% Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
 %% 
 %% https://gitlab.com/axelsommerfeldt/caption
 %% 
@@ -37,7 +37,7 @@
 %%   caption-deu.tex, caption-eng.tex, and caption-rus.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2018/10/06 v3.3-154 Customizing captions (AR)]
+\ProvidesPackage{caption}[2019/04/01 v3.3a Customizing captions (AR)]
 \RequirePackage{caption3}[2018/09/12] % needs v1.8c or newer
 \caption@ifbool{documentclass}{}{%
   \caption@WarningNoLine{%
@@ -244,7 +244,7 @@
   \expandafter\let\expandafter\caption@KOMA@setcapwidth
                   \csname\string\setcapwidth\endcsname
   \@namedef{\string\setcapwidth}[#1]#2{%
-    \caption@KOMA@setcapwidth[#1]{#2}\caption@setcapwidth{#1}}
+    \caption@KOMA@setcapwidth[{#1}]{#2}\caption@setcapwidth{#1}}
   \newcommand*\caption@setcapwidth[1]{%
     \ifx\\#1\\\else
       \caption@ifundefined\cap@margin{}{%
@@ -261,11 +261,11 @@
   \expandafter\let\expandafter\caption@KOMA@setcapmargin
                   \csname\string\@setcapmargin\endcsname
   \@namedef{\string\@setcapmargin}[#1]#2{%
-    \caption@KOMA@setcapmargin[#1]{#2}\caption@setcapmargin}
+    \caption@KOMA@setcapmargin[{#1}]{#2}\caption@setcapmargin}
   \expandafter\let\expandafter\caption@KOMA@@setcapmargin
                   \csname\string\@@setcapmargin\endcsname
   \@namedef{\string\@@setcapmargin}[#1]#2{%
-    \caption@KOMA@@setcapmargin[#1]{#2}\caption@setcapmargin}
+    \caption@KOMA@@setcapmargin[{#1}]{#2}\caption@setcapmargin}
   \newcommand*\caption@setcapmargin{%
     \begingroup
       \let\onelinecaptionsfalse\relax
@@ -342,13 +342,21 @@
   \caption@ifhypcap\caption@@start\relax
   \M@gettitle{#2}}
 \long\def\caption@makecaption#1#2{%
-  \caption@iftop
-    {\vskip\belowcaptionskip}%
-    {\caption@rule\vskip\abovecaptionskip}%
+  \caption@make@above
   \caption@@make{#1}{#2}%
+  \caption@make@below}
+\newcommand*\caption@make@above{%
+  \caption@iftop
+    \caption@belowskip
+    {\caption@rule\caption@aboveskip}}
+\newcommand*\caption@make@below{%
   \caption@iftop
-    {\vskip\abovecaptionskip\caption@rule}%
-    {\vskip\belowcaptionskip}}
+    {\caption@aboveskip\caption@rule}%
+    \caption@belowskip}
+\newcommand*\caption@aboveskip{%
+  \vskip\abovecaptionskip}
+\newcommand*\caption@belowskip{%
+  \vskip\belowcaptionskip}
 \newcommand*\caption@redefine{}
 \g@addto@macro\caption@redefine{%
   \caption@setbool{incompatible}{0}%
@@ -718,7 +726,7 @@
     }}%
   \caption@CheckCommand\@caption{%
     % chkfloat.sty [20??/??/?? v0.? chkfloat: check for moved floats]
-    \def\@caption#1[#2]#3{\chkfloat@caption{#1}[#2]{#3}%
+    \def\@caption#1[#2]#3{\chkfloat@caption{#1}[{#2}]{#3}%
       \chkfloat@addcontentsline{#1}{#2}%
     }}%
   \caption@IfCheckCommand{}{%
@@ -762,7 +770,7 @@
     \let\caption@ORI@capstart\@undefined}%
   \let\caption@ORI@xfloat\@xfloat
   \def\@xfloat#1[#2]{%
-    \caption@ORI@xfloat{#1}[#2]%
+    \caption@ORI@xfloat{#1}[{#2}]%
     \caption@settype{#1}}%
 }
 \caption@AtBeginDocument{\caption@redefine}
@@ -1158,12 +1166,12 @@
   \expandafter\let\expandafter\caption@ORI@figure
     \csname\string\figure\endcsname
   \@namedef{\string\figure}[#1]{%
-    \caption@ORI@figure[#1]%
+    \caption@ORI@figure[{#1}]%
     \caption@settype{figure}}
   \expandafter\let\expandafter\caption@ORI@table
     \csname\string\table\endcsname
   \@namedef{\string\table}[#1]{%
-    \caption@ORI@table[#1]%
+    \caption@ORI@table[{#1}]%
     \caption@settype{table}}
 }{}
 \caption@ifundefined\scr@caption{}{%
@@ -1220,7 +1228,7 @@
   \@ifpackageloaded{#1}\@firstofone{%
     \caption@Debug{#1 package is not loaded (yet)\@gobble}%
     \caption@AtBeginDocument}{%
-      \caption@If@Package@Loaded{#1}[#2]{#3}{#4}}}
+      \caption@If@Package@Loaded{#1}[{#2}]{#3}{#4}}}
 \@onlypreamble\caption@@IfPackageLoaded
 \long\def\caption@If@Package@Loaded#1[#2]{%
   \@ifpackageloaded{#1}{%
@@ -1604,14 +1612,16 @@
       \caption@begin\LTcaptype
         \caption@normalsize
         \vskip-\ht\strutbox
-        \caption@iftop{\vskip\belowcaptionskip}{\vskip\abovecaptionskip}%
+        \caption@ifundefined\FBifcaptop{}{%
+          \let\caption@belowskip\@empty}%
+        \caption@make@above
         \caption@@make{#2}{#3}\endgraf
-        \caption@iftop{\vskip\abovecaptionskip}{\vskip\belowcaptionskip}%
+        \caption@make@below
       \caption@end}}%
   \renewcommand*\LT@listentry[2]{%
     \begingroup
       \caption@LT@settype{#1}%
-      \caption@listentry\@firstoftwo[#1]{#2}%
+      \caption@listentry\@firstoftwo[{#1}]{#2}%
     \endgroup\ignorespaces}%
   \newcommand*\caption@LT@settype[1]{%
     \caption@settype*{#1}%
@@ -1690,7 +1700,7 @@
       \caption@defrostHref
       \let\noindent\caption@ORI@noindent
       \noindent}%
-    \caption@ORI@ivparpic(#1,#2)(#3,#4)[#5][#6]{#7}%
+    \caption@ORI@ivparpic(#1,#2)(#3,#4)[{#5}][{#6}]{#7}%
     \let\noindent\caption@ORI@noindent}%
 }{%
   \let\piccaptiontype\@undefined
@@ -1714,7 +1724,7 @@
   \caption@setbool{needfreeze}{1}%
   \let\caption@ORI@SC@zfloat\SC@zfloat
   \def\SC@zfloat#1#2#3[#4]{%
-    \caption@ORI@SC@zfloat{#1}{#2}{#3}[#4]%
+    \caption@ORI@SC@zfloat{#1}{#2}{#3}[{#4}]%
     \SC@RestoreCommands
     \caption@freezetype{#2}%
     \let\SC@label\label}%
@@ -1764,7 +1774,7 @@
   \let\caption@ORI@xtablecaption\@xtablecaption
   \long\def\@xtablecaption[#1]#2{%
     \caption@gettitle{#2}%
-    \caption@ORI@xtablecaption[#1]{#2}}%
+    \caption@ORI@xtablecaption[{#1}]{#2}}%
   \long\def\ST@caption#1[#2]#3{\par%
     \caption@settype*{#1}%
     \caption@setoptions{supertabular}%
@@ -1784,7 +1794,7 @@
   \let\caption@ORI@xtablecaption\@xtablecaption
   \long\def\@xtablecaption[#1]#2{%
     \caption@gettitle{#2}%
-    \caption@ORI@xtablecaption[#1]{#2}}%
+    \caption@ORI@xtablecaption[{#1}]{#2}}%
   \long\def\ST@caption#1[#2]#3{\par%
     \caption@settype*{#1}%
     \caption@setoptions{xtabular}%
-- 
cgit v1.2.3

