texlive[55507] Master/texmf-dist: caption (10jun20)
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 10 22:47:28 CEST 2020
Revision: 55507
http://tug.org/svn/texlive?view=revision&revision=55507
Author: karl
Date: 2020-06-10 22:47:27 +0200 (Wed, 10 Jun 2020)
Log Message:
-----------
caption (10jun20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/caption/README
trunk/Master/texmf-dist/source/latex/caption/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
trunk/Master/texmf-dist/tex/latex/caption/caption.sty
trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty
Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README 2020-06-10 14:32:32 UTC (rev 55506)
+++ trunk/Master/texmf-dist/doc/latex/caption/README 2020-06-10 20:47:27 UTC (rev 55507)
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2020-05-10
+Release 2020-05-30
Copyright (C) 1994-2020 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 2020-06-10 14:32:32 UTC (rev 55506)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2020-06-10 20:47:27 UTC (rev 55507)
@@ -28,7 +28,7 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{2977}
+% \CheckSum{3022}
%
% \iffalse
%<*driver>
@@ -218,7 +218,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2020/05/10 v3.4j Customizing captions (AR)]
+\ProvidesPackage{caption}[2020/05/30 v3.4k Customizing captions (AR)]
% \end{macrocode}
%
% \section{Loading the kernel}
@@ -2444,6 +2444,77 @@
% \end{macrocode}
% \end{macro}
%
+% \subsection{The changepage package}
+% \changes{v3.4k}{2020/05/30}{Patch of the \package{changepage} package added}
+%
+% \begin{macrocode}
+\caption at IfPackageLoaded{changepage}[2008/07/23 memoir-v3.7k]{%
+% \end{macrocode}
+%
+% Both environments, \env{adjustwidth} and \env{adjustwidth*}, are starting a \env{list} \cs{item}.
+% But \cs{hsize} isn't set properly inside a \env{list} item, and therefore \cs{@makecaption}
+% (offered by document classes) doesn't work properly when used inside \env{adjustwidth}.
+% Therefore we try to detect the situation ``Are we inside a adjustwidth environment?''
+% inside \cs{@makecaption} and fix this. (Sigh!)
+%
+% We cannot simply set and test a flag here since our adjustment to \cs{hsize} should
+% not be done within a \cs{parbox} within a adjustwidth environment for example,
+% and therefore we store \cs{hsize} and \cs{linewidth}, and test \cs{hsize} and \cs{linewidth}
+% against the stored values instead. If they are equal we are (hopefully) quite save
+% to assume that we are now inside a plain \env{adjustwidth} environment and therefore need
+% to fix \cs{hsize} before typesetting the caption. (Deep sigh!)
+%
+% \begin{macro}{\caption at adjustwidth@hsize}
+% \begin{macro}{\caption at adjustwidth@linewidth}
+% \begin{macrocode}
+ \newdimen\caption at adjustwidth@hsize
+ \newdimen\caption at adjustwidth@linewidth
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\caption at set@adjustwidth}
+% \changes{v3.4k}{2020/05/30}{This macro and its usage added}
+% Store the values of \cs{hsize} and \cs{linewidth}.
+% \begin{macrocode}
+ \providecommand*\caption at set@adjustwidth{%
+ \caption at adjustwidth@hsize\hsize
+ \caption at adjustwidth@linewidth\linewidth}%
+% \end{macrocode}
+% \begin{macrocode}
+ \providecommand*\caption at patch@changepage[1]{%
+ \expandafter\let\csname caption@#1\expandafter\endcsname\csname #1\endcsname
+ \expandafter\renewcommand\csname #1\endcsname[2]{%
+ \@nameuse{caption@#1}{##1}{##2}%
+ \caption at set@adjustwidth}}%
+ \caption at patch@changepage{adjustwidth}%
+ \caption at patch@changepage{adjustwidth*}%
+ \let\caption at patch@changepage\relax
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\caption at test@adjustwidth}
+% \changes{v3.4k}{2020/05/30}{This macro and its usage added}
+% Test if the values of \cs{hsize} and \cs{linewidth} are identical to
+% the ones stored in the \env{adjustwidth} environment.
+% If yes, set \cs{hsize} to the correct value.
+% \begin{macrocode}
+ \providecommand\caption at test@adjustwidth{%
+ \ifdim\hsize=\caption at adjustwidth@hsize
+ \ifdim\linewidth=\caption at adjustwidth@linewidth
+ \hsize=\linewidth
+ \fi
+ \fi}%
+% \end{macrocode}
+% \begin{macrocode}
+\AtBeginCaption{\caption at test@adjustwidth}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+ }{}%
+% \end{macrocode}
+%
% \subsection{The chkfloat package}
% \changes{v3.3}{2018/09/06}{Support of the \package{chkfloat} package added}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2020-06-10 14:32:32 UTC (rev 55506)
+++ trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2020-06-10 20:47:27 UTC (rev 55507)
@@ -28,12 +28,12 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{3573}
+% \CheckSum{3576}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption3.drv}[2015/09/15 v1.8 Implementation of the caption kernel]
+\ProvidesFile{caption3.drv}[2020/05/30 v1.12 Implementation of the caption kernel]
\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
%\errorcontextlines=3
%
@@ -57,7 +57,7 @@
\ifpdf\usepackage{hypdestopt}\fi
\hypersetup{pdfkeywords={LaTeX, package, caption},pdfstartpage={},pdfstartview={}}
%
-\usepackage{caption3}[2019/09/09]
+\usepackage{caption3}[2020/05/30]
%
\DeclareRobustCommand*\AmS{\texorpdfstring
{{\protect\usefont{OMS}{cmsy}{m}{n}A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}%
@@ -191,7 +191,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2020/05/10 v1.11 caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2020/05/30 v1.12 caption3 kernel (AR)]
% \end{macrocode}
%
% \section{Workaround for bug in package \package{arabtex}}
@@ -1770,10 +1770,19 @@
\DeclareCaptionLabelSeparator{period}{. }
\DeclareCaptionLabelSeparator{space}{ }
\DeclareCaptionLabelSeparator*{quad}{\quad}
-\DeclareCaptionLabelSeparator*{newline}{\\}
+\DeclareCaptionLabelSeparator*{newline}{\captionnewline}
\DeclareCaptionLabelSeparator*{endash}{\space\textendash\space}
% \end{macrocode}
%
+% \begin{macro}{\captionnewline}
+% \changes{v1.12}{2020/05/30}{This macro added}
+% Will be used in the caption label separator |new|\-|line|,
+% and re-defined for |long|\-|table| environments.
+% \begin{macrocode}
+\newcommand*\captionnewline{\\}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\caption at setdefaultlabelsep}
% \changes{v1.2d}{2009/03/29}{This macro added}
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx 2020-06-10 14:32:32 UTC (rev 55506)
+++ trunk/Master/texmf-dist/source/latex/caption/ltcaption.dtx 2020-06-10 20:47:27 UTC (rev 55507)
@@ -2,7 +2,7 @@
%
% This is file `ltcaption.dtx'.
%
-% Copyright (C) 2007-2013 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 2007-2020 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -28,7 +28,7 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{378}
+% \CheckSum{381}
%
% \iffalse
%<*driver>
@@ -464,7 +464,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{ltcaption}[2018/08/26 v1.4a longtable captions (AR)]
+\ProvidesPackage{ltcaption}[2020/05/30 v1.4b longtable captions (AR)]
% \end{macrocode}
%
% \begin{macrocode}
@@ -554,6 +554,7 @@
%
% \begin{macro}{\LT at array}
% \changes{v1.1a}{2008/03/21}{Improved redefinition of \cs{refstepcounter} etc.}
+% \changes{v1.4b}{2020/05/30}{Re-definition of \cs{captionnewline} added}
% We insert our stuff into the definition of |\LT at array| here.
% Since the \package{hyperref} package patches |\LT at array| as well
% and since this only works with the original definition of |\LT at array|,
@@ -582,7 +583,11 @@
% \begin{macrocode}
\def\lst@@caption{\relax}%
% \end{macrocode}
+% Re-define |\caption|\-|newline| so |\par| will be used inside longtables instead of |\\|.
% \begin{macrocode}
+ \def\captionnewline{\par}%
+% \end{macrocode}
+% \begin{macrocode}
\ltcaption at ORI@LT at array}}
% \end{macrocode}
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2020-06-10 14:32:32 UTC (rev 55506)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2020-06-10 20:47:27 UTC (rev 55507)
@@ -34,7 +34,7 @@
%% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2020/05/10 v3.4j Customizing captions (AR)]
+\ProvidesPackage{caption}[2020/05/30 v3.4k Customizing captions (AR)]
\RequirePackage{caption3}[2020/05/10] % needs v1.10 or newer
\caption at ifbool{documentclass}{}{%
\caption at WarningNoLine{%
@@ -910,6 +910,28 @@
}{}%
\caption at undefbool{needfreeze}}
\let\caption at warmup\relax
+\caption at IfPackageLoaded{changepage}[2008/07/23 memoir-v3.7k]{%
+ \newdimen\caption at adjustwidth@hsize
+ \newdimen\caption at adjustwidth@linewidth
+ \providecommand*\caption at set@adjustwidth{%
+ \caption at adjustwidth@hsize\hsize
+ \caption at adjustwidth@linewidth\linewidth}%
+ \providecommand*\caption at patch@changepage[1]{%
+ \expandafter\let\csname caption@#1\expandafter\endcsname\csname #1\endcsname
+ \expandafter\renewcommand\csname #1\endcsname[2]{%
+ \@nameuse{caption@#1}{##1}{##2}%
+ \caption at set@adjustwidth}}%
+ \caption at patch@changepage{adjustwidth}%
+ \caption at patch@changepage{adjustwidth*}%
+ \let\caption at patch@changepage\relax
+ \providecommand\caption at test@adjustwidth{%
+ \ifdim\hsize=\caption at adjustwidth@hsize
+ \ifdim\linewidth=\caption at adjustwidth@linewidth
+ \hsize=\linewidth
+ \fi
+ \fi}%
+\AtBeginCaption{\caption at test@adjustwidth}
+ }{}%
\caption at IfPackageLoaded{chkfloat}[2012/08/19 v0.1]{%
\caption at ifdefined\chkfloat at addcontentsline{%
\renewcommand\caption at chkfloat{\chkfloat at addcontentsline}%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2020-06-10 14:32:32 UTC (rev 55506)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2020-06-10 20:47:27 UTC (rev 55507)
@@ -34,7 +34,7 @@
%% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption3}[2020/05/10 v1.11 caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2020/05/30 v1.12 caption3 kernel (AR)]
\providecommand\caption at FixArabTeX{%
\def\caption at tempa##1{}%
\ifx\caption at tempa\@gobble
@@ -659,8 +659,9 @@
\DeclareCaptionLabelSeparator{period}{. }
\DeclareCaptionLabelSeparator{space}{ }
\DeclareCaptionLabelSeparator*{quad}{\quad}
-\DeclareCaptionLabelSeparator*{newline}{\\}
+\DeclareCaptionLabelSeparator*{newline}{\captionnewline}
\DeclareCaptionLabelSeparator*{endash}{\space\textendash\space}
+\newcommand*\captionnewline{\\}
\newcommand*\caption at setdefaultlabelsep[1]{%
\ifx\caption at lsep\caption at lsep@default
\caption at set@default at labelsep{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty 2020-06-10 14:32:32 UTC (rev 55506)
+++ trunk/Master/texmf-dist/tex/latex/caption/ltcaption.sty 2020-06-10 20:47:27 UTC (rev 55507)
@@ -34,7 +34,7 @@
%% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{ltcaption}[2018/08/26 v1.4a longtable captions (AR)]
+\ProvidesPackage{ltcaption}[2020/05/30 v1.4b longtable captions (AR)]
\@ifpackageloaded{longtable}{}{%
\PackageError{ltcaption}{longtable package not loaded, aborting}{RTFM}}
\providecommand*\LTcaptype{table}
@@ -64,6 +64,7 @@
\def\hyper at makecurrent{%
\caption at LTtype\caption at LT@makecurrent}%
\def\lst@@caption{\relax}%
+ \def\captionnewline{\par}%
\ltcaption at ORI@LT at array}}
\newcommand*\caption at LTtype[2]{%
\edef\caption at LT@tempa{#2}%
More information about the tex-live-commits
mailing list.