texlive[67788] Master/texmf-dist: caption (1aug23)
commits+karl at tug.org
commits+karl at tug.org
Tue Aug 1 22:06:37 CEST 2023
Revision: 67788
http://tug.org/svn/texlive?view=revision&revision=67788
Author: karl
Date: 2023-08-01 22:06:37 +0200 (Tue, 01 Aug 2023)
Log Message:
-----------
caption (1aug23)
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/tex/latex/caption/caption.sty
trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
Added Paths:
-----------
trunk/Master/texmf-dist/source/latex/caption/captiondoc.cls
Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README 2023-08-01 20:06:20 UTC (rev 67787)
+++ trunk/Master/texmf-dist/doc/latex/caption/README 2023-08-01 20:06:37 UTC (rev 67788)
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2023-07-28
+Release 2023-07-31
Copyright (C) 1994-2023 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 2023-08-01 20:06:20 UTC (rev 67787)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2023-08-01 20:06:37 UTC (rev 67788)
@@ -31,7 +31,7 @@
%
% \fi
%
-% \CheckSum{2922}
+% \CheckSum{2923}
%
% \iffalse
%<*driver>
@@ -4521,7 +4521,7 @@
%
% Identify the current version of the package.
% \begin{macrocode}
-\ProvidesPackage{caption}[2023/07/28 v3.6m Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/07/31 v3.6n Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
@@ -4528,7 +4528,7 @@
%
% Load a matching version of the \pkg{caption} kernel.
% \begin{macrocode}
-\RequirePackage{caption3}[2023/07/28] % needs v2.4c or newer
+\RequirePackage{caption3}[2023/07/31] % needs v2.4d or newer
% \end{macrocode}
%
% \subsection{Check against unknown document classes}
@@ -6082,6 +6082,7 @@
% \begin{macro}{\caption at dblarg}
% \changes{v3.1}{2007/02/05}{This macro added}
% \changes{v3.3}{2012/03/25}{Support of option \opt{list-entry} added}
+% \changes{v3.6n}{2023/07/31}{Only an empty list-entry will expand to \cs{relax}, otherwise it remains unchanged}
% A |\relax| was added compared to |\@dblarg| so |\caption{}| will be
% expanded to |\caption[\relax]{}| (and not to |\caption[]{}|).
% Furthermore support for option \opt{list-entry} was added.
@@ -6093,12 +6094,14 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand\caption at xdblarg[2]{%
- #1[{#2\relax}]{#2}}
+ \caption at iftokens{#2}{#1[{#2}]{#2}}{#1[\relax]{}}}
% \end{macrocode}
% \begin{macrocode}
\long\def\caption at ydblarg#1[#2]#3{%
\caption at iflistheading{#1[{#3}]{#3}}{#1[{#2}]{#3}}}
% \end{macrocode}
+% \begin{macrocode}
+% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\caption at begin}
Modified: trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2023-08-01 20:06:20 UTC (rev 67787)
+++ trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2023-08-01 20:06:37 UTC (rev 67788)
@@ -31,7 +31,7 @@
%
% \fi
%
-% \CheckSum{3865}
+% \CheckSum{3853}
%
% \iffalse
%<*driver>
@@ -232,7 +232,7 @@
%
% Identify the current version of the package.
% \begin{macrocode}
-\ProvidesPackage{caption3}[2023/07/28 v2.4c caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2023/07/31 v2.4d caption3 kernel (AR)]
% \end{macrocode}
%
% \section{Generic helpers}
@@ -586,6 +586,20 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\caption at iftokens}
+% \changes{v2.4d}{2023/07/31}{This macro added}
+% |\caption at iftokens|\marg{arg}\marg{yes-code}\marg{no-code}\\
+% This helper command checks if the given argument contains one or more tokens, i.e. is not empty.
+% \begin{macrocode}
+\newcommand\caption at iftokens[1]{%
+ \if\relax\detokenize{#1}\relax
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\caption at AtBeginDocument}
% \changes{v1.1}{2007/04/13}{This macro and its usage added}
% \changes{v1.2e}{2010/01/09}{Adapted to the combine document class}
@@ -1553,6 +1567,7 @@
% \changes{v1.3}{2010/11/07}{Support for option \opt{calcmargin} added}
% \changes{v2.3}{2021/01/17}{Renamed from \cs{setcaptionmargin} to \cs{caption at setmargin}; sets \cs{caption at width} or \cs{caption at leftmargin} and \cs{caption at rightmargin} now}
% \changes{v2.3}{2021/01/19}{Only the left or right margin can be set by leaving the other value blank}
+% \changes{v2.4d}{2023/07/31}{Check for \cs{@empty} argument replaced by \cs{caption at iftokens}}
% |\caption at setmargin*|\marg{amount}\\
% sets the caption margin to the given \meta{amount}.
% \begin{macrocode}
@@ -1571,20 +1586,14 @@
% \end{macrocode}
% \begin{macrocode}
\def\caption@@@@setmargin#1,#2,#3\@nil{%
- \def\caption at tempa{#1#2}%
- \ifx\caption at tempa\@empty
- \caption at Error{Missing number}%
- \else
- \caption@@@@@setmargin{left}{#1}%
- \caption@@@@@setmargin{right}{#2}%
- \fi}
+ \caption at iftokens{#1#2}%
+ {\caption@@@@@setmargin{left}{#1}%
+ \caption@@@@@setmargin{right}{#2}}%
+ {\caption at Error{Missing number}}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\caption@@@@@setmargin[2]{%
- \def\caption at tempa{#2}%
- \ifx\caption at tempa\@empty \else
- \caption at setlength{#1margin}{#2}%
- \fi}
+ \caption at iftokens{#2}{\caption at setlength{#1margin}{#2}}{}}
% \end{macrocode}
% \end{macro}
%
@@ -2307,17 +2316,13 @@
% \changes{v1.4}{2011/10/05}{Pre-defined text format `empty' added}
% \changes{v1.7}{2015/09/16}{The text format `empty' now takes care of the \cs{label}}
% \changes{v2.3}{2020/12/26}{Clearance of \cs{caption at thelabel} replaced by \cs{caption at clrlabel}}
+% \changes{v2.4d}{2023/07/31}{Check for \cs{@empty} argument replaced by \cs{caption at iftokens}}
% \begin{macrocode}
\DeclareCaptionTextFormat{empty}{%
\caption at get@label#1\caption at makeanchor{}\@nil
\caption at thelabel\caption at clrlabel}
\long\def\caption at get@label#1\caption at makeanchor#2#3\@nil{%
- \def\caption at tempa{#2}%
- \ifx\caption at tempa\@empty
- \caption at getlabel{#1}%
- \else
- \caption at getlabel{#2}%
- \fi}
+ \caption at iftokens{#2}{\caption at getlabel{#2}}{\caption at getlabel{#1}}}
% \end{macrocode}
% \begin{macrocode}
\DeclareCaptionTextFormat{simple}{#1}
@@ -4757,6 +4762,7 @@
% \changes{v1.13}{2020/07/29}{We don't re-use existing counters anymore (This was a bad idea anyway)}
% \changes{v1.13b}{2022/04/06}{We don't re-use existing counters anymore (Part 2)}
% \changes{v2.4}{2022/04/06}{If a counter is already defined the counter source will be included in the resulting error message}
+% \changes{v2.4d}{2023/07/31}{Check for \cs{@empty} argument replaced by \cs{caption at iftokens}}
% |\DeclareCaptionSubType*|\oarg{numbering scheme}\marg{type}\\
% The starred variant provides the numbering format
% \meta{type}|.|\meta{subtype} while the non-starred variant simply uses
@@ -4839,15 +4845,12 @@
% \end{macrocode}
% \begin{macrocode}
\long\def\caption@@@declaresublistentry#1\@dottedtocline#2\caption at nil#3{%
- \def\@tempa{#1}%
% Does \l@(sub)subsection start with \@dottedtocline?
- \ifx\@tempa\@empty
+ \caption at iftokens{#1}%
+% No
+ {\caption@@@@declaresublistentry{#3}@{3.8em}{3.2em}\caption at nil}%
% Yes
- \caption@@@@declaresublistentry{#3}#2\caption at nil
- \else
-% No
- \caption@@@@declaresublistentry{#3}@{3.8em}{3.2em}\caption at nil
- \fi}
+ {\caption@@@@declaresublistentry{#3}#2\caption at nil}}
\@onlypreamble\caption@@@declaresublistentry
% \end{macrocode}
% \begin{macrocode}
Added: trunk/Master/texmf-dist/source/latex/caption/captiondoc.cls
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/captiondoc.cls (rev 0)
+++ trunk/Master/texmf-dist/source/latex/caption/captiondoc.cls 2023-08-01 20:06:37 UTC (rev 67788)
@@ -0,0 +1,121 @@
+%%
+%% This is file `captiondoc.cls',
+%% a common document class for all caption package bundle documentations.
+%%
+%% There is no need to distribute this file in tex/latex/caption since
+%% it's of no use for the end-user, it's only needed to compile the package
+%% documentations.
+%%
+%% Copyright (C) 2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%%
+%% https://gitlab.com/axelsommerfeldt/caption
+%%
+%% --------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Axel Sommerfeldt.
+%%
+%% This work consists of the files
+%% caption.ins, caption.dtx, caption-light.dtx, caption2.dtx, caption3.dtx,
+%% caption-ams-smf.dtx, caption-beamer.dtx, caption-elsarticle.dtx,
+%% caption-koma.dtx, caption-memoir.dtx, caption-ntg.dtx,
+%% caption-thesis.dtx, bicaption.dtx, ltcaption.dtx, subcaption.dtx,
+%% the derived files
+%% caption.sty, caption-light.sty, caption2.sty, caption3.sty,
+%% caption-ams-smf.sto, caption-beamer.sto, caption-elsarticle.sto,
+%% caption-koma.sto, caption-memoir.sto, caption-ntg.sto,
+%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{captiondoc}[2022/12/27 Document class used by caption documentation]
+
+\hbadness=9999 \newcount\hbadness \hfuzz=100pt % Make TeX shut up.
+
+\PassOptionsToPackage{breaklinks=true}{hyperref}
+
+\LoadClassWithOptions{ltxdoc}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+\addtolength\marginparwidth{15pt}
+\setlength\leftmargini{2em}% default = 2.5em
+
+\renewcommand\partname{Part}
+
+\RequirePackage{ifpdf}
+\ifpdf
+ \RequirePackage{mathptmx,courier}
+ \RequirePackage[scaled=0.90]{helvet}
+\fi
+
+\RequirePackage{hypdoc}
+\ifpdf\RequirePackage{hypdestopt}\fi
+\hypersetup{pdfstartpage={},pdfstartview={}}
+\hypersetup{breaklinks=true}
+\let\subsectionautorefname\sectionautorefname
+\let\subsubsectionautorefname\sectionautorefname
+
+\DeclareRobustCommand*\eTeX{\leavevmode\hbox{$\varepsilon$}-\TeX}
+
+\DeclareRobustCommand*\AmS{\texorpdfstring
+ {{\protect\usefont{OMS}{cmsy}{m}{n}A\kern-.1667em\lower.5ex\hbox{M}\kern-.125emS}}%
+ {AMS}}
+\DeclareRobustCommand*\KOMAScript{\textsf{K\kern.05em O\kern.05em M\kern.05em A\kern.1em-\kern.1em Script}}
+\DeclareRobustCommand*\NTG{NTG}
+\DeclareRobustCommand*\SmF{SMF}
+
+\newcommand*\NEWfeature{\NEW{New feature}}
+\newcommand*\NEWdescription{\NEW{New description}}
+\newcommand*\NEW[1]{\@ifstar{\@NEW{#1}{\vskip2pt}}{\@NEW{#1}{}}}
+\newcommand*\@NEW[3]{\MARGINSYM{#2\footnotesize#1\\#3}}
+\newcommand*\MARGINSYM[1]{\hskip 1sp \marginpar{\raggedleft\textcolor{blue}{{#1}}}}
+
+\newcommand*\LineBreak{\linebreak[3]}
+\newcommand*\PageBreak{\pagebreak[3]}
+
+\newcommand*\longref{\@ifstar{\@longref\ref}{\@longref\autoref}}
+\newcommand*\Longref{\@ifstar{\@longref\Ref}{\@longref\Autoref}}
+\def\@longref#1#2{#1{#2}: \textit{\nameref{#2}}}
+
+\newcommand*\See[1]{\nopagebreak{\small (See #1)}}
+
+\newenvironment{Options}[1]%
+ {\list{}{\renewcommand\makelabel[1]{\texttt{##1}\hfil}%
+ \settowidth\labelwidth{\texttt{#1\space}}%
+ \setlength\leftmargin{10pt}%
+ \addtolength\leftmargin{\labelwidth}%
+ \addtolength\leftmargin{\labelsep}}}%
+ {\endlist}
+
+\newcommand*\purerm[1]{{\upshape\mdseries\rmfamily #1}}
+\newcommand*\puresf[1]{{\upshape\mdseries\sffamily #1}}
+\newcommand*\purett[1]{{\upshape\mdseries\ttfamily #1}}
+\let\cls\puresf \let\pkg\puresf
+\let\env\purett \let\opt\purett
+
+\newcommand*\csmarg[1]{\texttt{\char`\{#1\char`\}}}
+\newcommand*\csoarg[1]{\texttt{\char`\[#1\char`\]}}
+\newcommand*\issue[2][GitLab]{#1 issue~\##2}
+\newcommand*\version[2][]{v$#2$}
+\newcommand*\changenote[1]{}
+
+\RequirePackage{marvosym}
+\newcommand*\INFO{\@ifstar{\@INFO{}}{\@INFO{\vbox to \ht\strutbox}}}
+\newcommand*\@INFO[1]{\MARGINSYM{#1{\LARGE\Info}}}
+
+\RequirePackage[alpine]{ifsym}
+\newenvironment{background}{\par\bigskip\csname background*\endcsname}{\csname endbackground*\endcsname}
+\newenvironment{background*}{\small\MARGINSYM{\Mountain}\ignorespaces}{\par}
+
+\RequirePackage[bottom]{footmisc}
+
+\endinput
+
Property changes on: trunk/Master/texmf-dist/source/latex/caption/captiondoc.cls
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2023-08-01 20:06:20 UTC (rev 67787)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2023-08-01 20:06:37 UTC (rev 67788)
@@ -46,8 +46,8 @@
\DeclareRelease{v3.4}{2019-11-24}{caption_2020-07-29.sty}
\DeclareRelease{v3.5}{2020-08-30}{caption_2020-10-26.sty}
\DeclareCurrentRelease{v3.6}{2022-02-20}
-\ProvidesPackage{caption}[2023/07/28 v3.6m Customizing captions (AR)]
-\RequirePackage{caption3}[2023/07/28] % needs v2.4c or newer
+\ProvidesPackage{caption}[2023/07/31 v3.6n Customizing captions (AR)]
+\RequirePackage{caption3}[2023/07/31] % needs v2.4d or newer
\caption at ifdocumentclass{unknown}%
{\caption at WarningNoLine{%
Unknown document class (or package),\MessageBreak
@@ -602,7 +602,7 @@
{\caption at ydblarg{#1}}%
{\caption at xdblarg{#1}}}
\newcommand\caption at xdblarg[2]{%
- #1[{#2\relax}]{#2}}
+ \caption at iftokens{#2}{#1[{#2}]{#2}}{#1[\relax]{}}}
\long\def\caption at ydblarg#1[#2]#3{%
\caption at iflistheading{#1[{#3}]{#3}}{#1[{#2}]{#3}}}
\newcommand*\caption at begin[1]{%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2023-08-01 20:06:20 UTC (rev 67787)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2023-08-01 20:06:37 UTC (rev 67788)
@@ -45,7 +45,7 @@
\DeclareRelease{v1.13}{2019-11-24}{caption3_2020-07-29.sty} % for caption v3.4
\DeclareRelease{v2.0} {2020-08-30}{caption3_2020-10-26.sty} % for caption v3.5
\DeclareCurrentRelease{v2.3}{2022-02-20} % for caption v3.6
-\ProvidesPackage{caption3}[2023/07/28 v2.4c caption3 kernel (AR)]
+\ProvidesPackage{caption3}[2023/07/31 v2.4d caption3 kernel (AR)]
\@ifundefined{kernel at ifnextchar}{\let\kernel at ifnextchar\@ifnextchar}{}
\providecommand*\@nameundef[1]{%
\expandafter\let\csname #1\endcsname\@undefined}
@@ -167,6 +167,12 @@
\expandafter\caption at tempb\expandafter{\caption at tempa}}
\DeclareRobustCommand*\caption at gobble{%
\caption at withoptargs\@gobbletwo}
+\newcommand\caption at iftokens[1]{%
+ \if\relax\detokenize{#1}\relax
+ \expandafter\@secondoftwo
+ \else
+ \expandafter\@firstoftwo
+ \fi}
\let\caption at begindocumenthook\@empty
\let\caption@@begindocumenthook\@empty
\def\caption at AtBeginDocument{%
@@ -540,18 +546,12 @@
#1{\caption at width\z@}%
\caption@@@@setmargin#2,#2,\@nil}
\def\caption@@@@setmargin#1,#2,#3\@nil{%
- \def\caption at tempa{#1#2}%
- \ifx\caption at tempa\@empty
- \caption at Error{Missing number}%
- \else
- \caption@@@@@setmargin{left}{#1}%
- \caption@@@@@setmargin{right}{#2}%
- \fi}
+ \caption at iftokens{#1#2}%
+ {\caption@@@@@setmargin{left}{#1}%
+ \caption@@@@@setmargin{right}{#2}}%
+ {\caption at Error{Missing number}}}
\newcommand*\caption@@@@@setmargin[2]{%
- \def\caption at tempa{#2}%
- \ifx\caption at tempa\@empty \else
- \caption at setlength{#1margin}{#2}%
- \fi}
+ \caption at iftokens{#2}{\caption at setlength{#1margin}{#2}}{}}
\newcommand*\caption at setwidth{%
\caption at resetcalcmargin
\caption@@setwidth}
@@ -788,12 +788,7 @@
\caption at get@label#1\caption at makeanchor{}\@nil
\caption at thelabel\caption at clrlabel}
\long\def\caption at get@label#1\caption at makeanchor#2#3\@nil{%
- \def\caption at tempa{#2}%
- \ifx\caption at tempa\@empty
- \caption at getlabel{#1}%
- \else
- \caption at getlabel{#2}%
- \fi}
+ \caption at iftokens{#2}{\caption at getlabel{#2}}{\caption at getlabel{#1}}}
\DeclareCaptionTextFormat{simple}{#1}
\DeclareCaptionTextFormat{period}{#1.}
\SetCaptionDefault{textformat}{simple}
@@ -1818,12 +1813,9 @@
\fi}
\@onlypreamble\caption@@declaresublistentry
\long\def\caption@@@declaresublistentry#1\@dottedtocline#2\caption at nil#3{%
- \def\@tempa{#1}%
- \ifx\@tempa\@empty
- \caption@@@@declaresublistentry{#3}#2\caption at nil
- \else
- \caption@@@@declaresublistentry{#3}@{3.8em}{3.2em}\caption at nil
- \fi}
+ \caption at iftokens{#1}%
+ {\caption@@@@declaresublistentry{#3}@{3.8em}{3.2em}\caption at nil}%
+ {\caption@@@@declaresublistentry{#3}#2\caption at nil}}
\@onlypreamble\caption@@@declaresublistentry
\def\caption@@@@declaresublistentry#1#2#3#4#5\caption at nil{%
\expandafter\caption@@@@@declaresublistentry\expandafter
More information about the tex-live-commits
mailing list.