summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-05 20:50:33 +0000
committerKarl Berry <karl@freefriends.org>2018-10-05 20:50:33 +0000
commite20ac72552b2412459373e4e7be505028cf1ab36 (patch)
treec543be39f5cb3f37d5d3808cf58a0b031a74f9ce /Master
parent16e714e26f9fa1e4fc534e9eb4423f32b8e519f6 (diff)
caption (5oct18)
git-svn-id: svn://tug.org/texlive/trunk@48835 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/caption/README8
-rw-r--r--Master/texmf-dist/source/latex/caption/caption.dtx19
-rw-r--r--Master/texmf-dist/tex/latex/caption/caption.sty14
3 files changed, 22 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/latex/caption/README b/Master/texmf-dist/doc/latex/caption/README
index e5b57fd3aca..73388ad4465 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 2018-09-12
+Release 2018-10-05
Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt@f-m.fm)
License: LPPL = LaTeX Project Public Licence
@@ -11,9 +11,9 @@ Home page:
https://gitlab.com/axelsommerfeldt/caption
If you need help for installation please visit:
- https://www.tex.ac.uk/cgi-bin/texfaq2html?label=inst-miktexstar
- https://www.tex.ac.uk/cgi-bin/texfaq2html?label=installthings
- https://www.tex.ac.uk/cgi-bin/texfaq2html?label=privinst
+ https://texfaq.org/FAQ-inst-miktexstar
+ https://texfaq.org/FAQ-installthings
+ https://texfaq.org/FAQ-privinst
If you need help using these packages please visit:
https://latex.org/forum/
diff --git a/Master/texmf-dist/source/latex/caption/caption.dtx b/Master/texmf-dist/source/latex/caption/caption.dtx
index ed00fb9143e..a1bc86168a6 100644
--- a/Master/texmf-dist/source/latex/caption/caption.dtx
+++ b/Master/texmf-dist/source/latex/caption/caption.dtx
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3693}
+% \CheckSum{3695}
%
% \iffalse
%<*driver>
@@ -218,7 +218,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2018/09/12 v3.3-152 Customizing captions (AR)]
+\ProvidesPackage{caption}[2018/10/05 v3.3-153 Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
@@ -3827,6 +3827,7 @@
% \changes{v3.1a}{2007/09/16}{Bugfix: This redefinition will always be done \cs{AtBeginDocument}}
% \changes{v3.1g}{2008/01/20}{Bugfix in \cs{captionlistentry}: Table counter will not be incremented anymore, \cs{nameref} works}
% \changes{v3.3}{2016/01/31}{Support for \cs{bicaption} added}
+% \changes{v3.3}{2018/10/05}{Definition of \cs{captionlistentry} fixed}
% We redefine |\LT@array| here to get |\captionsetup|\marg{options}
% working inside |longtable|s.
% \Note{Since the \package{hyperref} package patches \cs{LT@array} as well
@@ -3858,8 +3859,8 @@
% \begin{macrocode}
\def\captionlistentry{%
\noalign\bgroup
- \@ifstar{\egroup\LT@listentry}% gobble *
- {\egroup\LT@listentry}}%
+ \@ifstar{\egroup\LT@listentry\LTcaptype}% gobble *
+ {\egroup\LT@listentry\LTcaptype}}%
% \end{macrocode}
% |\ContinuedFloat| for longtable:\\
% {\small(Commented out, since it's not deeply tested and quite useless anyway)}
@@ -3918,7 +3919,7 @@
\def\LT@capti@n{%
\@ifstar
{\egroup\LT@c@ption\@gobble[]}%
- {\egroup\caption@xdblarg{\LT@c@ption\@firstofone}}}
+ {\egroup\caption@xdblarg{\LT@c@ption\@firstofone}}}%
% \end{macrocode}
% \end{macro}
%
@@ -4013,20 +4014,22 @@
%
% \begin{macro}{\LT@listentry}
% \changes{v3.3}{2018/08/26}{This macro added}
+% \changes{v3.3}{2018/10/05}{\cs{ignorespaces} added}
% \begin{macrocode}
\renewcommand*\LT@listentry[2]{%
\begingroup
\caption@LT@settype{#1}%
\caption@listentry\@firstoftwo[#1]{#2}%
- \endgroup}%
+ \endgroup\ignorespaces}%
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption@LT@settype}
% \changes{v3.3}{2018/08/26}{This macro added}
+% \changes{v3.3}{2018/10/05}{Uses argument no. 1 instead of \cs{LTcaptype}}
% \begin{macrocode}
\newcommand*\caption@LT@settype[1]{%
- \caption@settype*\LTcaptype
+ \caption@settype*{#1}%
% \end{macrocode}
% If |\LTcapwidth| is not set to its default value |4in| we assume
% that it shall overwrite our own setting.
@@ -4042,7 +4045,7 @@
% \end{macrocode}
% Finally set options applied by |\captionsetup| inside the longtable.
% \begin{macrocode}
- \caption@setoptions{@longtable}}
+ \caption@setoptions{@longtable}}%
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/tex/latex/caption/caption.sty b/Master/texmf-dist/tex/latex/caption/caption.sty
index 0636ca6d7e5..47e5522ebc4 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}[2018/09/12 v3.3-152 Customizing captions (AR)]
+\ProvidesPackage{caption}[2018/10/05 v3.3-153 Customizing captions (AR)]
\RequirePackage{caption3}[2018/09/12] % needs v1.8c or newer
\caption@ifbool{documentclass}{}{%
\caption@WarningNoLine{%
@@ -1582,8 +1582,8 @@
\def\@captionabovefalse{\LT@captionsetup{position=b}}%
\def\captionlistentry{%
\noalign\bgroup
- \@ifstar{\egroup\LT@listentry}% gobble *
- {\egroup\LT@listentry}}%
+ \@ifstar{\egroup\LT@listentry\LTcaptype}% gobble *
+ {\egroup\LT@listentry\LTcaptype}}%
%% \let\Hy@LT@currentHlabel\@currentHlabel
%% \let\@currentHlabel\Hy@LT@currentHlabel
\def\ContinuedFloat{\noalign{%
@@ -1593,7 +1593,7 @@
\def\LT@capti@n{%
\@ifstar
{\egroup\LT@c@ption\@gobble[]}%
- {\egroup\caption@xdblarg{\LT@c@ption\@firstofone}}}
+ {\egroup\caption@xdblarg{\LT@c@ption\@firstofone}}}%
\renewcommand\LT@makecaption[3]{%
\caption@LT@make{%
\caption@LT@settype\LTcaptype
@@ -1612,14 +1612,14 @@
\begingroup
\caption@LT@settype{#1}%
\caption@listentry\@firstoftwo[#1]{#2}%
- \endgroup}%
+ \endgroup\ignorespaces}%
\newcommand*\caption@LT@settype[1]{%
- \caption@settype*\LTcaptype
+ \caption@settype*{#1}%
\ifdim\LTcapwidth=4in \else
\setcaptionwidth\LTcapwidth
\fi
\caption@setoptions{longtable}%
- \caption@setoptions{@longtable}}
+ \caption@setoptions{@longtable}}%
}{}
\providecommand*\caption@LT@setup{}
\caption@IfPackageLoaded{picinpar}{%