summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/caption/caption.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/caption/caption.dtx')
-rw-r--r--macros/latex/contrib/caption/caption.dtx26
1 files changed, 7 insertions, 19 deletions
diff --git a/macros/latex/contrib/caption/caption.dtx b/macros/latex/contrib/caption/caption.dtx
index 8315f780b3..6d1dc52834 100644
--- a/macros/latex/contrib/caption/caption.dtx
+++ b/macros/latex/contrib/caption/caption.dtx
@@ -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@makecurrent was complete.|
% \Or
% |Paragraph ended before \caption@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@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@gettitle[1]{%
\caption@ifdefined\NR@gettitle
- {\NR@gettitle{#1}}%
- {\def\@currentlabelname{#1}}}
+ {\NR@gettitle{#1}}% % support for recent versions of nameref package
+ {\caption@ifdefined\NR@sect{\def\@currentlabelname{#1}}{}}} % support for older versions of nameref package
% \end{macrocode}
% \end{macro}
%