lastpage (3jul24)

git-svn-id: svn://tug.org/texlive/trunk@71694 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 48 insertions, 31 deletions

diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
index 154c0bdf712..f4c21b94158 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
@@ -9,7 +9,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
@@ -32,10 +32,9 @@
 %% 
 %% 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}"
@@ -60,7 +59,7 @@
 %% 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
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
index f93a6d0f1ae..337089853c4 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
@@ -9,7 +9,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
@@ -32,10 +32,9 @@
 %% 
 %% 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}"
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage2e.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage2e.sty
index 50d8183d2a5..0df2fd719b1 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage2e.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage2e.sty
@@ -9,7 +9,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
@@ -32,10 +32,9 @@
 %% 
 %% 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}"
@@ -59,7 +58,7 @@
 %% 
 %% 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}}
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpageclassic.sty b/Master/texmf-dist/tex/latex/lastpage/lastpageclassic.sty
index d7a4b6ce9af..db6768c8625 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpageclassic.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpageclassic.sty
@@ -9,7 +9,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
@@ -32,10 +32,9 @@
 %% 
 %% 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}"
@@ -59,7 +58,7 @@
 %% 
 %% 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"
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpagemodern.sty b/Master/texmf-dist/tex/latex/lastpage/lastpagemodern.sty
index efeedd84bb3..9e566ce539b 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpagemodern.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpagemodern.sty
@@ -9,7 +9,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
@@ -32,10 +32,9 @@
 %% 
 %% 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}"
@@ -59,7 +58,7 @@
 %% 
 %% 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";
@@ -94,6 +93,29 @@
   \if@nobreak\ifvmode\nobreak\fi\fi%
   }
 
+\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.}%
+      }{\xdef\lastpage@Hptest{Doc-Start}%
+        \ifx\lastpage@Hptest\@currentHpage\relax%
+          \gdef\lastpage@Hy{\@currentHpage}%
+        \else%
+          \edef\lastpage@Hptest{\@currentHpage}%
+          \ifx\lastpage@Hptest\empty\relax%
+          \else%
+            \gdef\lastpage@Hy{\lastpage@rmpage{\@currentHpage}}%
+          \fi%
+        \fi%
+       }%
+    \fi%
+    }{}%
+  }%
+
 %% similar to https://tex.stackexchange.com/a/12811/6865
 \def\lastpage@rmpage#1{\expandafter\lastpage@currentH#1\relax}
 \def\lastpage@currentH#1.#2\relax{#2}
@@ -125,8 +147,7 @@
        }%
       \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}}%
       \addtocounter{page}{+1}%