texlive[68425] Master/texmf-dist: caption (1oct23)
commits+karl at tug.org
commits+karl at tug.org
Sun Oct 1 22:11:11 CEST 2023
Revision: 68425
https://tug.org/svn/texlive?view=revision&revision=68425
Author: karl
Date: 2023-10-01 22:11:11 +0200 (Sun, 01 Oct 2023)
Log Message:
-----------
caption (1oct23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/caption/README
trunk/Master/texmf-dist/doc/latex/caption/subcaption.pdf
trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx
trunk/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
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/fallback/v3.1/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption.dtx
trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx
trunk/Master/texmf-dist/tex/latex/caption/caption-koma.sto
trunk/Master/texmf-dist/tex/latex/caption/caption-memoir.sto
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/caption_2010-01-09.sty
trunk/Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty
trunk/Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty
trunk/Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty
trunk/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty
Modified: trunk/Master/texmf-dist/doc/latex/caption/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/caption/README 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/doc/latex/caption/README 2023-10-01 20:11:11 UTC (rev 68425)
@@ -1,7 +1,7 @@
==========================================================================
The `caption' package bundle
-Release 2023-07-31
+Release 2023-09-08
Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
License: LPPL = LaTeX Project Public Licence
@@ -10,16 +10,24 @@
Home page:
https://gitlab.com/axelsommerfeldt/caption
-Important note:
- The packages offered by this bundle are incompatible to the most recent
- LaTeX release (2023/06/01), therefore I wouldn't use them.
- But if the goal is compiling already existing documents which are using
- one or more of them, please add
- \RequirePackage[2022/11/01]{latexrelease}
- to your document file, before the usage of \documentclass.
- One user has reported that including the `hyperref` package has helped,
- so you could try this as an alternative.
+If you need help for installation please visit:
+ 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/
+ https://topanswers.xyz/tex
+ https://tex.stackexchange.com/
+ https://golatex.de/ (German)
+ https://texwelt.de/ (German)
+
+If you think you may have found a bug in these packages,
+or want to report a suggestion for improvement, please either visit
+ https://gitlab.com/axelsommerfeldt/caption/issues
+or send an e-mail to
+ axel.sommerfeldt at f-m.fm
+
--------------------------------------------------------------------------
The `caption' package v3.6 offers customization of captions of floating
Modified: trunk/Master/texmf-dist/doc/latex/caption/subcaption.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-koma.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -31,7 +31,7 @@
%
% \fi
%
-% \CheckSum{255}
+% \CheckSum{262}
%
% \iffalse
%<*driver>
@@ -169,7 +169,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-koma.sto}[2022/12/27 v2.0c Adaption of the caption package to the KOMA-Script document classes (AR)]
+\ProvidesFile{caption-koma.sto}[2023/09/08 v2.0e Adaption of the caption package to the KOMA-Script document classes (AR)]
% \end{macrocode}
%
% \section{Margin or width}
@@ -284,25 +284,32 @@
%
% \begin{macro}{\ifonelinecaptions}
% \changes{v1.1g}{2008/03/01}{\cs{def} changed to \cs{g at addto@macro}}
-% Patch |\onelinecaptionstrue| and |onelinecaptionsfalse| so they will set the corresponding \pkg{caption3} setting, too.
+% \changes{v2.0d}{2023/09/08}{Re-written using \cs{DeclareCaptionSinglelinecheck} and \cs{SetCaptionDefault}}
+% Define an own single-line-check which depends on |\ifonelinecaptions| offered by \KOMAScript.
% \begin{macrocode}
-\g at addto@macro\onelinecaptionstrue{\caption at setsinglelinecheck{true}}%
-\g at addto@macro\onelinecaptionsfalse{\caption at setsinglelinecheck{false}}%
+\DeclareCaptionSinglelinecheck{koma}{%
+ \ifonelinecaptions
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
% \end{macrocode}
+% Make this new single-line-check the default one.
% \begin{macrocode}
-\ifonelinecaptions
- \onelinecaptionstrue
-\else
- \onelinecaptionsfalse
-\fi
+\SetCaptionDefault{singlelinecheck}{koma}
% \end{macrocode}
+% Patch |\onelinecaptionstrue| and |onelinecaptionsfalse| so they will set the corresponding \pkg{caption3} setting, too.
+% \begin{macrocode}
+\g at addto@macro\onelinecaptionstrue{\caption at setsinglelinecheck{koma}}
+\g at addto@macro\onelinecaptionsfalse{\caption at setsinglelinecheck{koma}}
+% \end{macrocode}
% \end{macro}
%
% \section{Format}
%
-% The `default' caption format was taken from \KOMAScript\ \cs{@makecaption} and adapted.
+% The `koma' caption format was taken from \KOMAScript\ \cs{@makecaption} and adapted.
% \begin{macrocode}
-\DeclareCaptionFormat{default}[#1#2#3\par]{%
+\DeclareCaptionFormat{koma}[#1#2#3\par]{%
\ifdofullc at p
\caption at useformat{hang}{#1}{#2}{#3}%
\else
@@ -315,20 +322,30 @@
\fi\fi
#3\par
\fi}
+% \end{macrocode}
+% \begin{macrocode}
+\SetCaptionDefault{format}{koma}
+% \end{macrocode}
%
% \section{Label format}
%
-% The `fallback' caption label format maps to `autodot'.
% \begin{macrocode}
-\SetCaptionFallback{labelformat}{autodot}
+\DeclareCaptionLabelFormat{koma}{\bothIfFirst{#1}{\nobreakspace}#2\autodot}
% \end{macrocode}
+% The `fallback' caption label format maps to `koma'.
+% \begin{macrocode}
+\SetCaptionFallback{labelformat}{koma}
+% \end{macrocode}
%
% \section{Label separator}
%
% The `default' caption label separator maps to \cs{captionformat}.
% \begin{macrocode}
-\DeclareCaptionLabelSeparator{default}{\captionformat}
+\DeclareCaptionLabelSeparator{koma}{\captionformat}
% \end{macrocode}
+% \begin{macrocode}
+\SetCaptionDefault{labelseparator}{koma}
+% \end{macrocode}
%
% \section{Fonts}
%
@@ -396,7 +413,7 @@
% \changes{v1.5}{2013/02/15}{Support of \cs{if at figurecaptionabove} added}
% Patch |\@figurecaptionabovetrue| and |\@figurecaptionabovefalse| so they will set the \pkg{caption3} position setting, too.
% \begin{macrocode}
-\caption at ifdefined\@figurecaptionabovetrue{%
+\@ifundefined{@figurecaptionabovetrue}{}{%
\g at addto@macro\@figurecaptionabovetrue{\captionsetup*[figure]{position=t}}%
\g at addto@macro\@figurecaptionabovefalse{\captionsetup*[figure]{position=b}}%
% \end{macrocode}
@@ -405,7 +422,7 @@
\@figurecaptionabovetrue
\else
\@figurecaptionabovefalse
- \fi}{}
+ \fi}
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/caption-memoir.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption-memoir.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/caption-memoir.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -31,7 +31,7 @@
%
% \fi
%
-% \CheckSum{69}
+% \CheckSum{90}
%
% \iffalse
%<*driver>
@@ -155,7 +155,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-memoir.sto}[2022/03/02 v2.2b Adaption of the caption package to the memoir document class (AR)]
+\ProvidesFile{caption-memoir.sto}[2023/09/08 v2.2c Adaption of the caption package to the memoir document class (AR)]
% \end{macrocode}
%
% \section{Adaptions already included in the caption package}
@@ -277,6 +277,30 @@
\fi}}%
% \end{macrocode}
%
+% \section{Side captions}
+%
+% \begin{macro}{\endsidecaption}
+% \changes{v2.2c}{2023/09/08}{This re-definition added}
+% The \env{sidecaption} environment uses |\ref|\-|step|\-|counter| (if \pkg{hyperref} is not loaded)
+% or |\H at ref|\-|step|\-|counter| plus |\hyper at make|\-|current| (if \pkg{hyperref} is loaded).
+% We need to patch it so |\caption at ref|\-|step|\-|counter| is used instead to get a proper hyperlink reference.
+% Since the definition could be overwritten by |memhfixc.sty|, we need to define it using |\At|\-|Begin|\-|Document|.
+% \begin{macrocode}
+\AtBeginDocument{\renewcommand*\endsidecaption{%
+ \m at mscapend@fbox
+ \caption at refstepcounter\@captype
+ \m at mscaplabel
+ \csname m at mscapcheckside\endcsname %<--- added 2012/08/19
+ \begin{lrbox}{\m at mscap@capbox}%
+ \begin{minipage}[c]{\sidecapwidth}%
+ \sidecapstyle
+ \@caption\@captype[\m at mscap@fortoc]{\m at mscap@forcap}
+ \end{minipage}%
+ \end{lrbox}%
+ \m at mscapopboxes}}
+% \end{macrocode}
+% \end{macro}
+%
% \section{TODO}
%
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/caption/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/caption.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -31,12 +31,12 @@
%
% \fi
%
-% \CheckSum{2923}
+% \CheckSum{2925}
%
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption.drv}[2023/07/10 v3.6 The caption package]
+\ProvidesFile{caption.drv}[2023/09/07 v3.6 The caption package]
%\errorcontextlines=3
%
\documentclass{captiondoc}
@@ -3619,19 +3619,6 @@
% package only \emph{one} caption can be placed. (This is due implementation design.)
%
% \Message
-% |Option clash for package caption.|
-% \Or[but sometimes also]
-% |Missing \begin{document}.|
-% \Description
-% \Thispackage\ has already been loaded by some other \LaTeX\ package,
-% so you can't do that again specifying different options.
-% A candidate causing this could be the \pkg{subfig} package; if this is
-% the case, please load \thispackage\ \emph{before} the \pkg{subfig}
-% package or specify the option |caption=|\x|false| while loading the
-% \pkg{subfig} package.
-% \par\See{the \pkg{subfig} package\cite{subfig} documentation}
-%
-% \Message
% |Paragraph ended before \caption at makecurrent was complete.|
% \Or
% |Paragraph ended before \caption at prepareanchor was complete.|
@@ -4521,7 +4508,7 @@
%
% Identify the current version of the package.
% \begin{macrocode}
-\ProvidesPackage{caption}[2023/07/31 v3.6n Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.6o Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
@@ -6212,13 +6199,14 @@
% \end{macro}
%
% \begin{macro}{\caption at gettitle}
-% \changes{v3.1}{2007/05/05}{This macro definition added}
+% \changes{v3.1l}{2010/01/09}{This macro and its usage added to adapt the definition of \cs{@currentlabelname} to recent versions of \pkg{nameref}}
+% \changes{v3.6o}{2023/08/05}{Support for older versions of \pkg{nameref} revised to make it compatible with \LaTeX\ 2023-06-01}
% This one is needed for support of the \pkg{nameref} package.
% \begin{macrocode}
\newcommand\caption at gettitle[1]{%
\caption at ifdefined\NR at gettitle
- {\NR at gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR at gettitle{#1}}% % support for recent versions of nameref package
+ {\caption at ifdefined\NR at sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/caption3.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/caption3.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -31,7 +31,7 @@
%
% \fi
%
-% \CheckSum{3853}
+% \CheckSum{3855}
%
% \iffalse
%<*driver>
@@ -1178,6 +1178,11 @@
\@onlypreamble\caption at SetupOptions@list
% \end{macrocode}
% \begin{macrocode}
+%% Unfortunately we have to patch internal \LaTeX\ code here
+%% to get rid of unnecessary ``Option clash'' error messages.
+%% I have asked Frank Mittelbach and David Carlisle in 2018
+%% and have asked Frank again in 2020 for a proper interface instead of
+%% this dirty hack, but my requests got declined.
\let\caption at onefilewithoptions\@onefilewithoptions
\def\@onefilewithoptions#1[#2]{%
\begingroup
@@ -2118,7 +2123,7 @@
\DeclareCaptionLabelFormat{simple}{\bothIfFirst{#1}{\nobreakspace}#2}
\DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{\nobreakspace}(#2)}
\DeclareCaptionLabelFormat{brace}{\bothIfFirst{#1}{\nobreakspace}#2)}
-\DeclareCaptionLabelFormat{autodot}{\bothIfFirst{#1}{\nobreakspace}#2\autodot}
+\DeclareCaptionLabelFormat{autodot}{\bothIfFirst{#1}{\nobreakspace}#2\autodot} % obsolete, use `koma' instead
\DeclareCaptionLabelFormat{unnumbered}{#1}
% \end{macrocode}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/fallback/v3.1/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/fallback/v3.1/caption.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/fallback/v3.1/caption.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -2,7 +2,7 @@
%
% This is file `caption.dtx'.
%
-% Copyright (C) 1994-2010 Axel Sommerfeldt (caption at sommerfee.de)
+% Copyright (C) 1994-2023 Axel Sommerfeldt (caption at sommerfee.de)
%
% --------------------------------------------------------------------------
%
@@ -24,7 +24,7 @@
% user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{7219}
+% \CheckSum{7220}
%
% \iffalse
%<*driver>
@@ -3757,7 +3757,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.1n Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.1o Customizing captions (AR)]
%\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}}
% \end{macrocode}
%
@@ -4814,13 +4814,14 @@
% \end{macro}
%
% \begin{macro}{\caption at gettitle}
-% \changes{v3.1}{2007/05/05}{This macro and its usage added}
+% \changes{v3.1l}{2010/01/09}{This macro and its usage added to adapt the definition of \cs{@currentlabelname} to recent versions of \package{nameref}}
+% \changes{v3.1o}{2023/08/05}{Support for older versions of \package{nameref} revised to make it compatible with \LaTeX\ 2023-06-01}
% This one is needed for support of the \package{nameref} package.
% \begin{macrocode}
\newcommand\caption at gettitle[1]{%
\@ifundefined{NR at gettitle}%
- {\def\@currentlabelname{#1}}%
- {\NR at gettitle{#1}}}
+ {\@ifundefined{NR at sect}{}{\def\@currentlabelname{#1}}}% support for older versions of nameref package
+ {\NR at gettitle{#1}}} % support for recent versions of nameref package
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/fallback/v3.2/caption.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -2,7 +2,7 @@
%
% This is file `caption.dtx'.
%
-% Copyright (C) 1994-2011 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3535}
+% \CheckSum{3537}
%
% \iffalse
%<*driver>
@@ -220,7 +220,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.2f Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.2g Customizing captions (AR)]
%\@ifundefined{PackageRedefines}{}{\PackageRedefines{caption}{caption}}
% \end{macrocode}
%
@@ -2036,13 +2036,14 @@
% \end{macro}
%
% \begin{macro}{\caption at gettitle}
-% \changes{v3.1}{2007/05/05}{This macro and its usage added}
+% \changes{v3.1l}{2010/01/09}{This macro and its usage added to adapt the definition of \cs{@currentlabelname} to recent versions of \package{nameref}}
+% \changes{v3.2g}{2023/08/05}{Support for older versions of \package{nameref} revised to make it compatible with \LaTeX\ 2023-06-01}
% This one is needed for support of the \package{nameref} package.
% \begin{macrocode}
\newcommand\caption at gettitle[1]{%
\caption at ifundefined\NR at gettitle
- {\def\@currentlabelname{#1}}%
- {\NR at gettitle{#1}}}
+ {\caption at ifundefined\NR at sect{}{\def\@currentlabelname{#1}}}% support for older versions of nameref package
+ {\NR at gettitle{#1}}} % support for recent versions of nameref package
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/fallback/v3.3/caption.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -2,7 +2,7 @@
%
% This is file `caption.dtx'.
%
-% Copyright (C) 1994-2019 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -25,7 +25,7 @@
% and the user manuals caption-deu.tex, caption-eng.tex, and caption-rus.tex.
%
% \fi
-% \CheckSum{3695}
+% \CheckSum{3697}
%
% \iffalse
%<*driver>
@@ -220,7 +220,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.3e Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.3f Customizing captions (AR)]
% \end{macrocode}
%
% \subsection{Loading the kernel}
@@ -2385,13 +2385,14 @@
% \end{macro}
%
% \begin{macro}{\caption at gettitle}
-% \changes{v3.1}{2007/05/05}{This macro and its usage added}
+% \changes{v3.1l}{2010/01/09}{This macro and its usage added to adapt the definition of \cs{@currentlabelname} to recent versions of \package{nameref}}
+% \changes{v3.3f}{2023/08/05}{Support for older versions of \package{nameref} revised to make it compatible with \LaTeX\ 2023-06-01}
% This one is needed for support of the \package{nameref} package.
% \begin{macrocode}
\newcommand\caption at gettitle[1]{%
\caption at ifundefined\NR at gettitle
- {\def\@currentlabelname{#1}}%
- {\NR at gettitle{#1}}}
+ {\caption at ifundefined\NR at sect{}{\def\@currentlabelname{#1}}}% support for older versions of nameref package
+ {\NR at gettitle{#1}}} % support for recent versions of nameref package
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/fallback/v3.4/caption.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -2,7 +2,7 @@
%
% This is file `caption.dtx'.
%
-% Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -28,7 +28,7 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{2986}
+% \CheckSum{2988}
%
% \iffalse
%<*driver>
@@ -218,7 +218,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.4o Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.4p Customizing captions (AR)]
% \end{macrocode}
%
% \section{Loading the kernel}
@@ -1868,13 +1868,14 @@
% \end{macro}
%
% \begin{macro}{\caption at gettitle}
-% \changes{v3.1}{2007/05/05}{This macro and its usage added}
+% \changes{v3.1l}{2010/01/09}{This macro and its usage added to adapt the definition of \cs{@currentlabelname} to recent versions of \package{nameref}}
+% \changes{v3.4p}{2023/08/05}{Support for older versions of \package{nameref} revised to make it compatible with \LaTeX\ 2023-06-01}
% This one is needed for support of the \package{nameref} package.
% \begin{macrocode}
\newcommand\caption at gettitle[1]{%
\caption at ifdefined\NR at gettitle
- {\NR at gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR at gettitle{#1}}% % support for recent versions of nameref package
+ {\caption at ifdefined\NR at sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/fallback/v3.5/caption.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -2,7 +2,7 @@
%
% This is file `caption.dtx'.
%
-% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%
% --------------------------------------------------------------------------
%
@@ -32,7 +32,7 @@
% caption-deu.tex, caption-eng.tex, caption-rus.tex.
%
% \fi
-% \CheckSum{2703}
+% \CheckSum{2705}
%
% \iffalse
%<*driver>
@@ -241,7 +241,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.5i Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.5j Customizing captions (AR)]
% \end{macrocode}
%
% \section{Loading the kernel}
@@ -1708,13 +1708,14 @@
% \end{macro}
%
% \begin{macro}{\caption at gettitle}
-% \changes{v3.1}{2007/05/05}{This macro and its usage added}
+% \changes{v3.1l}{2010/01/09}{This macro and its usage added to adapt the definition of \cs{@currentlabelname} to recent versions of \package{nameref}}
+% \changes{v3.5j}{2023/08/05}{Support for older versions of \package{nameref} revised to make it compatible with \LaTeX\ 2023-06-01}
% This one is needed for support of the \package{nameref} package.
% \begin{macrocode}
\newcommand\caption at gettitle[1]{%
\caption at ifdefined\NR at gettitle
- {\NR at gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR at gettitle{#1}}% % support for recent versions of nameref package
+ {\caption at ifdefined\NR at sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/source/latex/caption/subcaption.dtx 2023-10-01 20:11:11 UTC (rev 68425)
@@ -36,7 +36,7 @@
% \iffalse
%<*driver>
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{subcaption.drv}[2023/07/10 v1.6 Adds a sub-caption feature to the caption package]
+\ProvidesFile{subcaption.drv}[2023/08/13 v1.6 Adds a sub-caption feature to the caption package]
%\errorcontextlines=3
%
\documentclass{captiondoc}
@@ -834,7 +834,7 @@
% | |\textcolor{blue}{\cs{phantomcaption}}|\label{cat}|\\
% | \includegraphics{elephant_with_b}|\\
% | |\textcolor{blue}{\cs{phantomcaption}}|\label{elephant}|\\
-% | \end{subcaptionblock}|\\
+% | \end{subcaptiongroup}|\\
% | \captionsetup{subrefformat=parens}|\\
% | \caption{Two animals: \subref{cat} a cat,|\\
% | and \subref{elephant} an elephant}|\\
@@ -888,7 +888,7 @@
% | \includegraphics{elephant_with_b}|\\
% | |\textcolor{blue}{\cs{captionlistentry}\csmarg{An elephant}}\\
% | \label{elephant}|\\
-% | \end{subcaptionblock}|\\
+% | \end{subcaptiongroup}|\\
% | \captionsetup{subrefformat=parens}|\\
% | \caption{Two animals: \subref{cat} a cat,|\\
% | and \subref{elephant} an elephant}|\\
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption-koma.sto
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption-koma.sto 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption-koma.sto 2023-10-01 20:11:11 UTC (rev 68425)
@@ -6,7 +6,7 @@
%%
%% caption-koma.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-koma.sto}[2022/12/27 v2.0c Adaption of the caption package to the KOMA-Script document classes (AR)]
+\ProvidesFile{caption-koma.sto}[2023/09/08 v2.0e Adaption of the caption package to the KOMA-Script document classes (AR)]
\expandafter\let\expandafter\caption at koma@setcapwidth
\csname\string\setcapwidth\endcsname
\@namedef{\string\setcapwidth}[#1]#2{%
@@ -97,14 +97,16 @@
\newcommand*\caption at setcapindent{%
\captionsetup{indent=\ifdim\cap at indent<\z@\z@\else\cap at indent\fi}}
\caption at ifdefined\cap at indent{\caption at setcapindent}{}
-\g at addto@macro\onelinecaptionstrue{\caption at setsinglelinecheck{true}}%
-\g at addto@macro\onelinecaptionsfalse{\caption at setsinglelinecheck{false}}%
-\ifonelinecaptions
- \onelinecaptionstrue
-\else
- \onelinecaptionsfalse
-\fi
-\DeclareCaptionFormat{default}[#1#2#3\par]{%
+\DeclareCaptionSinglelinecheck{koma}{%
+ \ifonelinecaptions
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi}
+\SetCaptionDefault{singlelinecheck}{koma}
+\g at addto@macro\onelinecaptionstrue{\caption at setsinglelinecheck{koma}}
+\g at addto@macro\onelinecaptionsfalse{\caption at setsinglelinecheck{koma}}
+\DeclareCaptionFormat{koma}[#1#2#3\par]{%
\ifdofullc at p
\caption at useformat{hang}{#1}{#2}{#3}%
\else
@@ -117,8 +119,11 @@
\fi\fi
#3\par
\fi}
-\SetCaptionFallback{labelformat}{autodot}
-\DeclareCaptionLabelSeparator{default}{\captionformat}
+\SetCaptionDefault{format}{koma}
+\DeclareCaptionLabelFormat{koma}{\bothIfFirst{#1}{\nobreakspace}#2\autodot}
+\SetCaptionFallback{labelformat}{koma}
+\DeclareCaptionLabelSeparator{koma}{\captionformat}
+\SetCaptionDefault{labelseparator}{koma}
\DeclareCaptionFont{scr at font}{\scr at fnt@caption}
\DeclareCaptionFont{scr at labelfont}{\scr at fnt@captionlabel}
\SetCaptionDefault{font}{scr at font}
@@ -140,7 +145,7 @@
\else
\@tablecaptionabovefalse
\fi
-\caption at ifdefined\@figurecaptionabovetrue{%
+\@ifundefined{@figurecaptionabovetrue}{}{%
\g at addto@macro\@figurecaptionabovetrue{\captionsetup*[figure]{position=t}}%
\g at addto@macro\@figurecaptionabovefalse{\captionsetup*[figure]{position=b}}%
\if at figurecaptionabove
@@ -147,7 +152,7 @@
\@figurecaptionabovetrue
\else
\@figurecaptionabovefalse
- \fi}{}
+ \fi}
\AtCaptionPackage{%
\let\caption at koma@figureposition\KV at caption@figureposition
\DeclareCaptionOption{figureposition}{%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption-memoir.sto
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption-memoir.sto 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption-memoir.sto 2023-10-01 20:11:11 UTC (rev 68425)
@@ -6,7 +6,7 @@
%%
%% caption-memoir.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-memoir.sto}[2022/03/02 v2.2b Adaption of the caption package to the memoir document class (AR)]
+\ProvidesFile{caption-memoir.sto}[2023/09/08 v2.2c Adaption of the caption package to the memoir document class (AR)]
\providecommand*\AtCaptionSingleLineCheck{\g at addto@macro\caption at prepareslc} % for caption v3.5
\AtCaptionSingleLineCheck{%
\let\pagenote\caption at gobble}
@@ -68,6 +68,18 @@
\else
#2%
\fi}}%
+\AtBeginDocument{\renewcommand*\endsidecaption{%
+ \m at mscapend@fbox
+ \caption at refstepcounter\@captype
+ \m at mscaplabel
+ \csname m at mscapcheckside\endcsname %<--- added 2012/08/19
+ \begin{lrbox}{\m at mscap@capbox}%
+ \begin{minipage}[c]{\sidecapwidth}%
+ \sidecapstyle
+ \@caption\@captype[\m at mscap@fortoc]{\m at mscap@forcap}
+ \end{minipage}%
+ \end{lrbox}%
+ \m at mscapopboxes}}
\endinput
%%
%% End of file `caption-memoir.sto'.
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption.sty 2023-10-01 20:11:11 UTC (rev 68425)
@@ -46,7 +46,7 @@
\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/31 v3.6n Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.6o Customizing captions (AR)]
\RequirePackage{caption3}[2023/07/31] % needs v2.4d or newer
\caption at ifdocumentclass{unknown}%
{\caption at WarningNoLine{%
@@ -628,8 +628,8 @@
\let\caption at defrostHref\relax
\newcommand\caption at gettitle[1]{%
\caption at ifdefined\NR at gettitle
- {\NR at gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR at gettitle{#1}}% % support for recent versions of nameref package
+ {\caption at ifdefined\NR at sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
\newcommand*\subcaptionsetup{%
\caption at teststar\@subcaptionsetup*{}}
\newcommand*\@subcaptionsetup[1]{%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption3.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption3.sty 2023-10-01 20:11:11 UTC (rev 68425)
@@ -405,6 +405,11 @@
\@onlypreamble\caption at SetupOptions
\newcommand*\caption at SetupOptions@list{}
\@onlypreamble\caption at SetupOptions@list
+%% Unfortunately we have to patch internal \LaTeX\ code here
+%% to get rid of unnecessary ``Option clash'' error messages.
+%% I have asked Frank Mittelbach and David Carlisle in 2018
+%% and have asked Frank again in 2020 for a proper interface instead of
+%% this dirty hack, but my requests got declined.
\let\caption at onefilewithoptions\@onefilewithoptions
\def\@onefilewithoptions#1[#2]{%
\begingroup
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption_2010-01-09.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption_2010-01-09.sty 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption_2010-01-09.sty 2023-10-01 20:11:11 UTC (rev 68425)
@@ -6,7 +6,7 @@
%%
%% fallback/v3.1/caption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.1n Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.1o Customizing captions (AR)]
\newcommand*\caption at Info[1]{\PackageInfo{caption}{#1\@gobble}}
\@onlypreamble\caption at Info
\RequirePackage{caption3}[=2008/08/24] % needs v1.1j or newer
@@ -435,8 +435,8 @@
\let\caption at defrostHref\relax
\newcommand\caption at gettitle[1]{%
\@ifundefined{NR at gettitle}%
- {\def\@currentlabelname{#1}}%
- {\NR at gettitle{#1}}}
+ {\@ifundefined{NR at sect}{}{\def\@currentlabelname{#1}}}% support for older versions of nameref package
+ {\NR at gettitle{#1}}} % support for recent versions of nameref package
\def\caption at caption{%
\caption at iftype
{\caption at checkgrouplevel\@empty\caption
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption_2011-11-10.sty 2023-10-01 20:11:11 UTC (rev 68425)
@@ -6,7 +6,7 @@
%%
%% fallback/v3.2/caption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.2f Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.2g Customizing captions (AR)]
\RequirePackage{caption3}[=2011/08/30] % needs v1.4 or newer
\caption at ifbool{documentclass}{}{%
\caption at WarningNoLine{%
@@ -900,8 +900,8 @@
\let\caption at defrostHref\relax
\newcommand\caption at gettitle[1]{%
\caption at ifundefined\NR at gettitle
- {\def\@currentlabelname{#1}}%
- {\NR at gettitle{#1}}}
+ {\caption at ifundefined\NR at sect{}{\def\@currentlabelname{#1}}}% support for older versions of nameref package
+ {\NR at gettitle{#1}}} % support for recent versions of nameref package
\def\caption at DeclareSubType sub#1\@nil{%
\caption at Debug{Initializing subtype for `#1'\@gobble}%
\@namedef{caption at c@#1}{0}%
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption_2019-09-01.sty 2023-10-01 20:11:11 UTC (rev 68425)
@@ -6,7 +6,7 @@
%%
%% fallback/v3.3/caption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.3e Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.3f Customizing captions (AR)]
\RequirePackage{caption3}[=2019/09/01] % needs v1.8d or newer
\caption at ifbool{documentclass}{}{%
\caption at WarningNoLine{%
@@ -1053,8 +1053,8 @@
\let\caption at defrostHref\relax
\newcommand\caption at gettitle[1]{%
\caption at ifundefined\NR at gettitle
- {\def\@currentlabelname{#1}}%
- {\NR at gettitle{#1}}}
+ {\caption at ifundefined\NR at sect{}{\def\@currentlabelname{#1}}}% support for older versions of nameref package
+ {\NR at gettitle{#1}}} % support for recent versions of nameref package
\def\caption at DeclareSubType sub#1\@nil{%
\caption at Debug{Initializing subtype for `#1'\@gobble}%
\@namedef{caption at beginsub#1}{\caption at beginsubfloat{#1}}}
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption_2020-07-29.sty 2023-10-01 20:11:11 UTC (rev 68425)
@@ -6,7 +6,7 @@
%%
%% fallback/v3.4/caption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.4o Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.4p Customizing captions (AR)]
\RequirePackage{caption3}[=2020/07/29] % needs v1.13 or newer
\caption at ifbool{documentclass}{}{%
\caption at WarningNoLine{%
@@ -666,8 +666,8 @@
\let\caption at defrostHref\relax
\newcommand\caption at gettitle[1]{%
\caption at ifdefined\NR at gettitle
- {\NR at gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR at gettitle{#1}}% % support for recent versions of nameref package
+ {\caption at ifdefined\NR at sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
\newcommand*\caption at subtypehook{%
\ifx\caption\caption at subcaption \else
\caption at warmup
Modified: trunk/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty 2023-10-01 20:10:59 UTC (rev 68424)
+++ trunk/Master/texmf-dist/tex/latex/caption/caption_2020-10-26.sty 2023-10-01 20:11:11 UTC (rev 68425)
@@ -6,7 +6,7 @@
%%
%% fallback/v3.5/caption.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2022 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
+%% Copyright (C) 1994-2023 Axel Sommerfeldt (axel.sommerfeldt at f-m.fm)
%%
%% https://gitlab.com/axelsommerfeldt/caption
%%
@@ -36,7 +36,7 @@
%% caption-thesis.sto, bicaption.sty, ltcaption.sty, subcaption.sty.
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{caption}[2022/07/10 v3.5i Customizing captions (AR)]
+\ProvidesPackage{caption}[2023/08/05 v3.5j Customizing captions (AR)]
\RequirePackage{caption3}[=2020/10/06] % needs v2.2b or newer
\caption at ifbool{documentclass}{}{%
\caption at WarningNoLine{%
@@ -568,8 +568,8 @@
\let\caption at defrostHref\relax
\newcommand\caption at gettitle[1]{%
\caption at ifdefined\NR at gettitle
- {\NR at gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR at gettitle{#1}}% % support for recent versions of nameref package
+ {\caption at ifdefined\NR at sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
\newcommand*\caption at subtypehook{%
\ifx\caption\caption at subcaption \else
\caption at warmup
More information about the tex-live-commits
mailing list.