summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-08-30 21:10:15 +0000
committerKarl Berry <karl@freefriends.org>2019-08-30 21:10:15 +0000
commit8c83871ae7341e118ed64698f9cb90dd4c8d6a62 (patch)
tree372a598da35789a4983eafa0a1a249fd1f6b5754 /Master
parent13f72ad9babb05ef7faaf9118d42cb6e3a26f067 (diff)
caption (30aug19)
git-svn-id: svn://tug.org/texlive/trunk@51996 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/caption/README2
-rw-r--r--Master/texmf-dist/source/latex/caption/caption.dtx16
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty12
3 files changed, 13 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README
index cf4f488e52d..080ffb9761b 100644
--- a/Master/texmf-dist/doc/latex/caption/README
+++ b/Master/texmf-dist/doc/latex/caption/README
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2019-08-28
+Release 2019-08-29
Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
License: LPPL = LaTeX Project Public Licence
diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index c33e91239fb..5b838318d92 100644
--- a/Master/texmf-dist/source/latex/caption/caption.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption.dtx
@@ -220,7 +220,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2019/04/01 v3.3a Customizing captions (AR)]
+\ProvidesPackage{caption}[2019/08/29 v3.3b Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
@@ -1593,14 +1593,13 @@
% \begin{macro}{\@xfloat}
% \changes{v3.1}{2007/05/09}{This re-definition added}
% \changes{v3.1b}{2007/09/22}{Will now be redefined in compatibility mode, too}
-% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% We redefine |\@xfloat| so inside floating environments our
% type-specific options will be used, a \package{hyperref}
% anchor will be set etc.
% \begin{macrocode}
\let\caption@ORI@xfloat\@xfloat
\def\@xfloat#1[#2]{%
- \caption@ORI@xfloat{#1}[{#2}]%
+ \caption@ORI@xfloat{#1}[#2]%
\caption@settype{#1}}%
% \end{macrocode}
% \end{macro}
@@ -2645,20 +2644,19 @@
% \changes{v3.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
% \begin{macro}{\table}
% \changes{v3.1f}{2007/12/17}{This re-definition for \class{beamer} document class added}
-% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% We redefine |figure| \& |table| so our type-specific options will be used etc.
% \begin{macrocode}
\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}}
% \end{macrocode}
% \begin{macrocode}
\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}}
% \end{macrocode}
% \end{macro}
@@ -4311,7 +4309,6 @@
%
% \begin{macro}{\ivparpic}
-% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% We need to set our \package{hyperref} anchor here.
% Not bullet-proof since we have to redefine |\noindent| here!
% \begin{macrocode}
@@ -4322,7 +4319,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}%
% \end{macrocode}
% \end{macro}
@@ -4410,7 +4407,6 @@
% \changes{v3.1c}{2007/10/06}{\cs{caption} will be saved \& restored now}
% \changes{v3.2a}{2011/08/17}{Bugfix: Uses \cs{caption@freeze} instead of \cs{caption@freeze*} now}
% \changes{v3.3}{2013/05/01}{Usage of \cs{caption@freeze} replaced by \cs{caption@freezetype}}
-% \changes{v3.3}{2018/12/26}{Bugfix: Missing curly braces added}
% This macro will be called at the start of the environment, here is a good
% opportunity to do some adaptations to |\caption| and |\captionsetup|.
% \begin{macrocode}
@@ -4420,7 +4416,7 @@
% First we use the original definition, but restore \cs{caption} and \cs{label}
% so \cs{caption@freeze} and \cs{caption@warmup} will work correctly.
% \begin{macrocode}
- \caption@ORI@SC@zfloat{#1}{#2}{#3}[{#4}]%
+ \caption@ORI@SC@zfloat{#1}{#2}{#3}[#4]%
\SC@RestoreCommands
% \end{macrocode}
% Since the sidecap package uses our |\caption| code outside the
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index f2579c08c20..e667b34e08c 100644
--- a/Master/texmf-dist/tex/latex/caption/caption.sty
+++ b/Master/texmf-dist/tex/latex/caption/caption.sty
@@ -37,7 +37,7 @@
%% caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2019/04/01 v3.3a Customizing captions (AR)]
+\ProvidesPackage{caption}[2019/08/29 v3.3b Customizing captions (AR)]
\RequirePackage{caption3}[2018/09/12] % needs v1.8c or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -770,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}
@@ -1166,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{}{%
@@ -1700,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
@@ -1724,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}%