texlive[51996] Master/texmf-dist: caption (30aug19)
commits+karl at tug.org
commits+karl at tug.org
Fri Aug 30 23:10:15 CEST 2019
Revision: 51996
http://tug.org/svn/texlive?view=revision&revision=51996
Author: karl
Date: 2019-08-30 23:10:15 +0200 (Fri, 30 Aug 2019)
Log Message:
-----------
caption (30aug19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/caption/README
trunk/Master/texmf-dist/source/latex/caption/caption.dtx
trunk/Master/texmf-dist/tex/latex/caption/caption.sty
Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README 2019-08-30 21:10:00 UTC (rev 51995)
+++ trunk/Master/texmf-dist/doc/latex/caption/README 2019-08-30 21:10:15 UTC (rev 51996)
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2019-08-28
+Release 2019-08-29
Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
License: LPPL = LaTeX Project Public Licence
Modified: trunk/Master/texmf-dist/source/latex/caption/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2019-08-30 21:10:00 UTC (rev 51995)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2019-08-30 21:10:15 UTC (rev 51996)
@@ -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,7 +1593,6 @@
% \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.
@@ -1600,7 +1599,7 @@
% \begin{macrocode}
\let\caption at ORI@xfloat\@xfloat
\def\@xfloat#1[#2]{%
- \caption at ORI@xfloat{#1}[{#2}]%
+ \caption at ORI@xfloat{#1}[#2]%
\caption at settype{#1}}%
% \end{macrocode}
% \end{macro}
@@ -2645,13 +2644,12 @@
% \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 at ORI@figure
\csname\string\figure\endcsname
\@namedef{\string\figure}[#1]{%
- \caption at ORI@figure[{#1}]%
+ \caption at ORI@figure[#1]%
\caption at settype{figure}}
% \end{macrocode}
% \begin{macrocode}
@@ -2658,7 +2656,7 @@
\expandafter\let\expandafter\caption at ORI@table
\csname\string\table\endcsname
\@namedef{\string\table}[#1]{%
- \caption at ORI@table[{#1}]%
+ \caption at ORI@table[#1]%
\caption at 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 at defrostHref
\let\noindent\caption at ORI@noindent
\noindent}%
- \caption at ORI@ivparpic(#1,#2)(#3,#4)[{#5}][{#6}]{#7}%
+ \caption at ORI@ivparpic(#1,#2)(#3,#4)[#5][#6]{#7}%
\let\noindent\caption at 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 at freeze} instead of \cs{caption at freeze*} now}
% \changes{v3.3}{2013/05/01}{Usage of \cs{caption at freeze} replaced by \cs{caption at 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 at freeze} and \cs{caption at warmup} will work correctly.
% \begin{macrocode}
- \caption at ORI@SC at zfloat{#1}{#2}{#3}[{#4}]%
+ \caption at ORI@SC at zfloat{#1}{#2}{#3}[#4]%
\SC at RestoreCommands
% \end{macrocode}
% Since the sidecap package uses our |\caption| code outside the
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2019-08-30 21:10:00 UTC (rev 51995)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2019-08-30 21:10:15 UTC (rev 51996)
@@ -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 at ifbool{documentclass}{}{%
\caption at WarningNoLine{%
@@ -770,7 +770,7 @@
\let\caption at ORI@capstart\@undefined}%
\let\caption at ORI@xfloat\@xfloat
\def\@xfloat#1[#2]{%
- \caption at ORI@xfloat{#1}[{#2}]%
+ \caption at ORI@xfloat{#1}[#2]%
\caption at settype{#1}}%
}
\caption at AtBeginDocument{\caption at redefine}
@@ -1166,12 +1166,12 @@
\expandafter\let\expandafter\caption at ORI@figure
\csname\string\figure\endcsname
\@namedef{\string\figure}[#1]{%
- \caption at ORI@figure[{#1}]%
+ \caption at ORI@figure[#1]%
\caption at settype{figure}}
\expandafter\let\expandafter\caption at ORI@table
\csname\string\table\endcsname
\@namedef{\string\table}[#1]{%
- \caption at ORI@table[{#1}]%
+ \caption at ORI@table[#1]%
\caption at settype{table}}
}{}
\caption at ifundefined\scr at caption{}{%
@@ -1700,7 +1700,7 @@
\caption at defrostHref
\let\noindent\caption at ORI@noindent
\noindent}%
- \caption at ORI@ivparpic(#1,#2)(#3,#4)[{#5}][{#6}]{#7}%
+ \caption at ORI@ivparpic(#1,#2)(#3,#4)[#5][#6]{#7}%
\let\noindent\caption at ORI@noindent}%
}{%
\let\piccaptiontype\@undefined
@@ -1724,7 +1724,7 @@
\caption at setbool{needfreeze}{1}%
\let\caption at ORI@SC at zfloat\SC at zfloat
\def\SC at zfloat#1#2#3[#4]{%
- \caption at ORI@SC at zfloat{#1}{#2}{#3}[{#4}]%
+ \caption at ORI@SC at zfloat{#1}{#2}{#3}[#4]%
\SC at RestoreCommands
\caption at freezetype{#2}%
\let\SC at label\label}%
More information about the tex-live-commits
mailing list