CTAN sync 202407040303

4 files changed, 94 insertions, 40 deletions

diff --git a/macros/latex/contrib/lastpage/README b/macros/latex/contrib/lastpage/README
index 4545b13a60..d9c21d30e2 100644
--- a/macros/latex/contrib/lastpage/README
+++ b/macros/latex/contrib/lastpage/README
@@ -1,4 +1,4 @@
-README for lastpage package, 2024-04-27, v2.1a
+README for lastpage package, 2024-07-03, v2.1b
 
 
 TABLE OF CONTENTS
diff --git a/macros/latex/contrib/lastpage/lastpage-example.pdf b/macros/latex/contrib/lastpage/lastpage-example.pdf
index 6d1c748525..9752f36fd7 100644
--- a/macros/latex/contrib/lastpage/lastpage-example.pdf
+++ b/macros/latex/contrib/lastpage/lastpage-example.pdf
diff --git a/macros/latex/contrib/lastpage/lastpage.dtx b/macros/latex/contrib/lastpage/lastpage.dtx
index 104d6b8418..171c7388de 100644
--- a/macros/latex/contrib/lastpage/lastpage.dtx
+++ b/macros/latex/contrib/lastpage/lastpage.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: lastpage.dtx
-% Version: 2024-04-27 v2.1a
+% Version: 2024-07-03 v2.1b
 % Info: Refers to last page's name
 %
 % Copyright © 2010 - 2024 by
@@ -65,7 +65,7 @@
 \input docstrip.tex
 \Msg{**********************************************************************}
 \Msg{* Installation                                                       *}
-\Msg{* Package: lastpage 2024-04-27 v2.1a Refers to last page's name (HMM)*}
+\Msg{* Package: lastpage 2024-07-03 v2.1b Refers to last page's name (HMM)*}
 \Msg{**********************************************************************}
 
 \keepsilent
@@ -77,7 +77,7 @@
 This is a generated file.
 
 Project: lastpage
-Version: 2024-04-27 v2.1a
+Version: 2024-07-03 v2.1b
 Info: Refers to last page's name
 
 Copyright (C) 2010 - 2024 by
@@ -100,10 +100,9 @@ The Current Maintainer of this work is H.-Martin Muench.
 
 This package was invented by Jeffrey P. Goldberg.
 I thought that a replacement was needed and therefore created the pageslts package,
-https://ctan.org/pkg/pageslts
-. Nevertheless, for compatibility with existing documents/packages as well as for
-the low amount of resources needed by the lastpage package (no new counter!),
-I updated this package.
+https://ctan.org/pkg/pageslts. Nevertheless, for compatibility with existing
+documents/packages as well as for the low amount of resources needed by the
+lastpage package (no new counter!), I updated this package.
 Thanks go to Jeffrey P. Goldberg for allowing me to do this.
 
 While this package allows for things like "Page slash thepage{} of slash pageref{LastPage}"
@@ -185,8 +184,8 @@ In memoriam
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}[2023-11-01]
 \ProvidesFile{lastpage.drv}%
-  [2024-04-27 v2.1a Refers to last page's name (HMM)]
-\documentclass{ltxdoc}[2023/03/28]% v2.1j Standard LaTeX documentation class
+  [2024-07-03 v2.1b Refers to last page's name (HMM)]
+\documentclass{ltxdoc}[2024/02/08]% v2.1j Standard LaTeX documentation class
 \usepackage{holtxdoc}[2019/12/09]%  v0.30 Private additional ltxdoc support (HO)
 \hypersetup{%
  pdfsubject={Refers to last page's name (HMM; JPG)},%
@@ -250,7 +249,7 @@ In memoriam
 % \DoNotIndex{\today,\upshape,\url,\usepackage,\value,\verb,\wd,\write}
 %
 % \title{The \xpackage{lastpage} package}
-% \date{2024-04-27 v2.1a}
+% \date{2024-07-03 v2.1b}
 % \author{H.-Martin Münch\\\xemail{Martin.Muench at Uni-Bonn.de}\\
 %   invented by Jeffrey P. Goldberg\\\xemail{jeffrey+news at goldmark.org}}
 %
@@ -559,6 +558,18 @@ In memoriam
 % but |\lastpage@putlabel| was replaced by |\lastpage@putl@bel|.
 % Because \linebreak |\lastpage@putlabel| is no longer called, now there should not be any
 % double definitions of the \texttt{lastpage} label.
+%
+% \subsection{\texttt{\textbackslash pagenumbering\{fnsymbol\}}}
+% When using the foot-note-symbols as page numbers,
+% it can be necessary to declare in the document's preamble:
+% \begin{verbatim}
+% \DeclareTextCommand{\textasteriskcentered}{PD1}{*}
+% \DeclareTextCommand{\textdagger}{PD1}{†}
+% %\DeclareTextCommand{\textdaggerdbl}{PD1}{‡)% seems to neither work nor be necessary
+% \DeclareTextCommand{\textsection}{PD1}{§}
+% \DeclareTextCommand{\textparagraph}{PD1}{¶}
+% \DeclareTextCommand{\textbardbl}{PD1}{‖}
+% \end{verbatim}
 % \newpage
 %
 % \section{Alternatives\label{sec:Alternatives}}
@@ -574,7 +585,7 @@ In memoriam
 %  \textbf{Note: The current version 2015/12/21 v1.2f of the \pkg{pageslts} package
 %  has not yet been updated to the new hook mechanism. In special cases (for example }%
 %  |\pagenumbering{fnsymbol}|\textbf{) the current version of that package combined
-%  with a current \LaTeX-format fails. Together with about 80~other packages
+%  with a current \LaTeX-format fails. Together with several other packages
 %  (small to large, public as well as private, some probably obsolete) it is
 %  in the update queue.}\newline
 %  The \xpackage{pageslts} package first started as a revision of this
@@ -723,14 +734,14 @@ In memoriam
 %
 %    \begin{macrocode}
 %<*example>
-\documentclass[british]{article}[2023/05/17]% v1.4n Standard LaTeX document class
+\documentclass[british]{article}[2024/02/08]% v1.4n Standard LaTeX document class
 \makeatletter
 \@ifl@t@r\fmtversion{2022/11/01}{%
   \AddToHook{enddocument/afterlastpage}[lastpage]{%
          \message{^^JLaTeX Info: Executing hook `enddocument/afterlastpage'.}}%
 }{\AtEndDocument{\message{^^JLaTeX Info: Executing hook `AtEndDocument'.}}%
  }
-\usepackage[draft]{showkeys}[2023/07/08]% v3.19 Show cite and label keys (DPC, MH)
+\usepackage[draft]{showkeys}[2024/05/23]% v3.21 Show cite and label keys (DPC, MH)
 %%      Use final instead of draft to hide the keys. %%
 \usepackage[pdfpagelabels=true,hyperindex=false]{hyperref}[2024-01-20]% v7.01h
 %% Hypertext links for LaTeX
@@ -746,7 +757,7 @@ In memoriam
  pdfpagelayout=SinglePage%
 }
 \@ifpackageloaded{hyperref}{}{\usepackage{url}[2013/09/16]}% v3.4
-\usepackage{lastpage}[2024/04/27]% v2.1a
+\usepackage{lastpage}[2024/07/03]% v2.1b
 \renewcommand{\@evenfoot}{%
  \normalsize\slshape \today\hfil \upshape %
  page \thepage{} of \pageref{LastPage}}
@@ -758,7 +769,7 @@ In memoriam
 \section*{Example for lastpage}
 \markboth{Example for lastpage}{Example for lastpage}
 This example demonstrates the use of package\newline
-\textsf{lastpage}, v2.1a as of 2024-04-27 (HMM; JPG).\newline
+\textsf{lastpage}, v2.1b as of 2024-07-03 (HMM; JPG).\newline
 The package takes no options.\newline
 For more details please see the documentation!\newline
 
@@ -783,7 +794,7 @@ trademark owner. There is no intention of infringement; the
 usage is to the benefit of the trademark owner.\newline
 
 \textbf{Tip}: Use \textit{logical page numbers}
-for the display of the pdf (in Adobe Acrobat Reader 2024.002.20687:
+for the display of the pdf (in Adobe Acrobat Reader 2024.002.20895:
 Edit $>$ Preferences $>$ Page Display $>$
 Page Content and Information: Use logical page numbers)!\newline
 
@@ -837,8 +848,8 @@ The code does not generally work even without hyperref.
 \end{verbatim}
 \end{quote}
 
-\noindent does work, because \verb|\lastpage@lastpage| contains the name
-of the page, \mbox{example:}
+\noindent does work (two compilations needed), because \verb|\lastpage@lastpage|
+contains the name of the page, \mbox{example:}
 \begin{verbatim}
 Page \thepage{} is (not) page \makeatletter\lastpage@lastpage\makeatother.
 \end{verbatim}
@@ -894,7 +905,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % \DescribeMacro{lastpage.sty}
 % We first need to determine whether we are on \TeX~2.09 or \LaTeX2e.\newline
 % (That line, which is too long for the documentation, reads:\newline
-% |\def\loadlastpage{\ProvidesPackage{lastpage}[2024/04/27 v2.1a lastpage:|\linebreak
+% |\def\loadlastpage{\ProvidesPackage{lastpage}[2024/07/03 v2.1b lastpage:|\linebreak
 % | 2.09 or 2e? (HMM)]\relax\RequirePackage{lastpage2e}}|.)
 %
 %    \begin{macrocode}
@@ -902,7 +913,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 %% Part of the "lastpage" package
 %% loads either lastpage2.09.sty for TeX 2.09 or lastpage2e.sty for LaTeX 2e
 %% with code from https://groups.google.com/g/comp.text.tex/c/-Qmhj1ZI4xM
-\def\loadlastpage{\ProvidesPackage{lastpage}[2024/04/27 v2.1a lastpage: 2.09 or 2e? (HMM)]\relax\RequirePackage{lastpage2e}}
+\def\loadlastpage{\ProvidesPackage{lastpage}[2024/07/03 v2.1b lastpage: 2.09 or 2e? (HMM)]\relax\RequirePackage{lastpage2e}}
 \begingroup \expandafter \ifx \csname documentclass\endcsname\relax
 \endgroup \expandafter \input{lastpage209.sty}
 \else \endgroup \expandafter \loadlastpage
@@ -942,7 +953,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 %<*lastpage2e>
 %% Part of the "lastpage" package
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{lastpage2e}[2024/04/27 v2.1a %
+\ProvidesPackage{lastpage2e}[2024/07/03 v2.1b %
   Decide which 2e lastpage version to use (HMM)]
 \@ifl@t@r\fmtversion{2023/06/01}{\RequirePackage{lastpagemodern}}{%
                                  \RequirePackage{lastpageclassic}}
@@ -957,7 +968,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 %<*lastpageclassic>
 %% Part of the "lastpage" package
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{lastpageclassic}[2024/04/27 v2.1a %
+\ProvidesPackage{lastpageclassic}[2024/07/03 v2.1b %
   Refers to last page's name (HMM; JPG)]
 %% allows for things like "Page \thepage{} of \pageref{LastPage}"
 %% to get "Page 7 of 9"
@@ -1375,7 +1386,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 %<*lastpagemodern>
 %% Part of the "lastpage" package
 \NeedsTeXFormat{LaTeX2e}[2023-06-01]
-\ProvidesPackage{lastpagemodern}[2024-04-27 v2.1a %
+\ProvidesPackage{lastpagemodern}[2024-07-03 v2.1b %
   Refers to last page's name (HMM; JPG)]
 %% allows for things like "Page \thepage{} of \pageref{LastPage}"
 %% to get "Page 7 of 9" or "Page VII of IX";
@@ -1463,8 +1474,47 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\lastpage@makeHy}
+% Just once we need the page from |\@currentHpage| without any \mbox{\textquotedblleft |page.|\textquotedblright :}
+%    \begin{macrocode}
+\newcommand{\lastpage@makeHy}{%
+  \gdef\lastpage@Hy{}%
+  \IfPackageLoadedTF{hyperref}{%
+    \ifHy@pageanchor%
+      \@ifundefined{@currentHpage}{%
+        \PackageError{lastpage}{%
+          Kernel command \string\@currentHpage\space is undefined}{%
+          Please contact the lastpage maintainer.}%
+%    \end{macrocode}
+% |\gdef\lastpage@Hy{}|, but that was already done at the beginning of this command.
+%    \begin{macrocode}
+      }{\xdef\lastpage@Hptest{Doc-Start}%
+        \ifx\lastpage@Hptest\@currentHpage\relax%
+          \gdef\lastpage@Hy{\@currentHpage}%
+        \else%
+          \edef\lastpage@Hptest{\@currentHpage}%
+          \ifx\lastpage@Hptest\empty\relax%
+%    \end{macrocode}
+% |\gdef\lastpage@Hy{}|, but that was already done at the beginning of this command.
+%    \begin{macrocode}
+          \else%
+%    \end{macrocode}
+% |\@currentHpage| should be |page.<some number>|, |\lastpage@rmpage| removes the
+% \mbox{\textquotedblleft |page.|\textquotedblright .}
+%    \begin{macrocode}
+            \gdef\lastpage@Hy{\lastpage@rmpage{\@currentHpage}}%
+          \fi%
+        \fi%
+       }%
+    \fi%
+    }{}%
+  }%
+
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\lastpage@rmpage}
-% Just once we need |\@currentHpage| without the \mbox{\textquotedblleft |page.|\textquotedblright :}
+% |\lastpage@rmpage| removes the \mbox{\textquotedblleft |page.|\textquotedblright ,}
+%  but just boldly assumes that |#1| is now |page.<some number>|.
 %    \begin{macrocode}
 %% similar to https://tex.stackexchange.com/a/12811/6865
 \def\lastpage@rmpage#1{\expandafter\lastpage@currentH#1\relax}
@@ -1529,15 +1579,13 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
         {\@kernel@reserved@label@data}}%
        }%
 %    \end{macrocode}
-% \pagebreak
 % \noindent We also save the values, so that we can later (next rerun) check,
 % whether they have been saved in the \xfile{aux} file.
 %
 %    \begin{macrocode}
       \protected@iwrite\@auxout{}{%
         \string\gdef\string\lastpage@lastpage{\thepage}}%
-      \gdef\lastpage@Hy{\IfPackageLoadedTF{hyperref}{%
-        \ifHy@pageanchor\lastpage@rmpage{\@currentHpage}\fi}{}}%
+      \lastpage@makeHy%
       \protected@iwrite\@auxout{}{%
         \string\gdef\string\lastpage@lastpageHy{\lastpage@Hy}}%
 %    \end{macrocode}
@@ -1679,7 +1727,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % \begin{description}
 % \item[-] \TeX Format \LaTeXe{}: \url{https://www.CTAN.org}
 %
-% \item[-] document class \xclass{ltxdoc}, 2023/03/28, v2.1j,
+% \item[-] document class \xclass{ltxdoc}, 2024/02/08, v2.1j,
 %   \url{https://ctan.org/pkg/ltxdoc}
 %
 % \item[-] package \xpackage{holtxdoc}, 2019/12/09, v0.30,
@@ -1692,7 +1740,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % \begin{description}
 % \item[-] \TeX, \url{https://www.CTAN.org}
 %
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-03, v2.1b,
 %   \url{https://ctan.org/pkg/lastpage}
 % \end{description}
 %
@@ -1702,7 +1750,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % \begin{description}
 % \item[-] \TeX-format \LaTeX{}, v2.09
 %
-% \item[-] package \xpackage{lastpage209}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage209}, 2024-07-03, v2.1b,
 %   \url{https://ctan.org/pkg/lastpage}
 % \end{description}
 % and does not work with \xpackage{hyperref}, which needs \LaTeX2e{}.\smallskip
@@ -1714,7 +1762,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % \item[-] \TeX-format \LaTeXe{} 1994/12/01 or newer,
 %   \url{https://www.CTAN.org}
 %
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-03, v2.1b,
 %   \url{https://ctan.org/pkg/lastpage}
 % \end{description}
 %
@@ -1725,7 +1773,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % \item[-] \TeX-format \LaTeXe{} between 1994/12/01 and 2023-05-31,\newline
 %   \url{https://www.CTAN.org}
 %
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-03, v2.1b,
 %   \url{https://ctan.org/pkg/lastpage}
 % \end{description}
 % and can use
@@ -1742,13 +1790,13 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % \item[-] \TeX-format \LaTeXe{} 2023-06-01 or newer,\newline
 %   \url{https://www.CTAN.org}
 %
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-03, v2.1b,
 %   \url{https://ctan.org/pkg/lastpage}
 % \end{description}
 % and can use
 % \begin{description}
 % \item[-] package \xpackage{hyperref}, 2023-11-07 and newer
-%   (tested with: 2024-01-20, v7.01h),
+%   (tested with: 2024-05-23, v7.01i),
 %   \url{https://ctan.org/pkg/hyperref}
 % \end{description}
 % \pagebreak
@@ -1757,7 +1805,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % The |lastpage-example.tex| requires the same file as all
 % documents using the \xpackage{lastpage} package, i.\,e.
 % \begin{description}
-% \item[-] package \xpackage{lastpage}, 2024-04-27, v2.1a,
+% \item[-] package \xpackage{lastpage}, 2024-07-03, v2.1b,
 %   \url{https://ctan.org/pkg/lastpage}\newline
 %   (Well, it is the example file for this package, and because you are reading the
 %    documentation for the \xpackage{lastpage} package, it can be assumed that you already
@@ -1765,13 +1813,13 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % \end{description}
 % and additionally:
 % \begin{description}
-% \item[-] class \xpackage{article}, 2023-05-17, v1.4n, from \xpackage{classes}:
+% \item[-] class \xpackage{article}, 2024-02-08, v1.4n, from \xpackage{classes}:
 %           \url{https://ctan.org/pkg/classes}
 %
-% \item[-] package \xpackage{showkeys}, 2023-07-08, v3.19,
+% \item[-] package \xpackage{showkeys}, 2024-05-23, v3.21,
 %   \url{https://ctan.org/pkg/showkeys}
 %
-% \item[-] package \xpackage{hyperref}, 2024-01-20, v7.01h,
+% \item[-] package \xpackage{hyperref}, 2024-05-23, v7.01i,
 %   \url{https://ctan.org/pkg/hyperref}
 % \end{description}
 %
@@ -2038,7 +2086,7 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 % to update it. Further I would like to thank \textsc{Heiko Oberdiek}
 % for providing a~lot~(!) of useful packages (from which I also learned everything
 % I know about creating a file in \xfile{dtx} format, OK, say it: copying).
-% Thanks for bug reports go to \textsc{Ulrike Fischer} (twice),
+% Thanks for bug reports go to \textsc{Ulrike Fischer} (several times),
 % \textsc{Sebastian Bank}, \textsc{James Hedges}, \textsc{Mikhail Titov},
 % \textsc{Micha\l{} Herman}, \textsc{Matteo Gamboz}, and \textsc{James Small}.
 % Thanks to \textsc{Sven Siegmund} for pointing out a necessary further
@@ -2237,6 +2285,12 @@ To see the content of the \texttt{enddocument/afterlastpage}-hook
 %     \item |\lastpage@IfNumericTF| is no longer needed, but has not been removed
 %             so as not to break older documents that use it in a different context.
 %   \end{Version}
+%   \begin{Version}{2024-07-03 v2.1b}
+%     \item The \xclass{beamer} class loads \xpackage{hyperref} partially,
+%             so that \xpackage{hyperref} is incorrectly detected as having been loaded.
+%             The defining operation for |\lastpage@Hy| has been changed to catch this
+%             and other different cases.
+%   \end{Version}
 % \end{History}
 % \bigskip
 %
diff --git a/macros/latex/contrib/lastpage/lastpage.pdf b/macros/latex/contrib/lastpage/lastpage.pdf
index 02cb1362b7..70a678fe59 100644
--- a/macros/latex/contrib/lastpage/lastpage.pdf
+++ b/macros/latex/contrib/lastpage/lastpage.pdf