lastpage (4sep21)

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

2 files changed, 29 insertions, 20 deletions

diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
index d69eb93960c..909e3f88771 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
@@ -9,9 +9,9 @@
 %% This is a generated file.
 %% 
 %% Project: lastpage
-%% Version: 2015/03/29 v1.2m
+%% Version: 2021/09/03 v1.2n
 %% 
-%% Copyright (C) 2010 - 2015 by
+%% Copyright (C) 2010 - 2021 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 %% Portions of code copyrighted by other people as marked.
 %% 
@@ -24,9 +24,9 @@
 %% conditions of the LaTeX Project Public License, either
 %% version 1.3c of this license or (at your option) any later
 %% version. This version of this license is in
-%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 %% and the latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
+%%    https://www.latex-project.org/lppl.txt
 %% and version 1.3c or later is part of all distributions of
 %% LaTeX version 2005/12/01 or later.
 %% 
@@ -56,7 +56,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[2014/05/01]
 \ProvidesPackage{lastpage}%
-  [2015/03/29 v1.2m Refers to last page's name (HMM; JPG)]%
+  [2021/09/03 v1.2n Refers to last page's name (HMM; JPG)]%
 
 %% lastpage may work with earlier versions of LaTeX,
 %% but this was not tested. Please consider updating
@@ -82,6 +82,7 @@
 \def\lastpage@one{1}
 \gdef\lastpage@hyper{0}
 \gdef\lastpage@nameref{0}
+\gdef\lastpage@french{0}
 \gdef\lastpage@LTS{0}
 \def\lastpage@firstpage{1}
 
@@ -89,6 +90,8 @@
   \@ifpackageloaded{tikz}{\gdef\lastpage@tikz{1}}{}%
   \@ifpackageloaded{hyperref}{\gdef\lastpage@hyper{1}}{}%
   \@ifpackageloaded{nameref}{\gdef\lastpage@nameref{1}}{}%
+  \@ifpackageloaded{french}{\gdef\lastpage@french{1}}{}%
+  \@ifpackageloaded{frenchle}{\gdef\lastpage@french{1}}{}%
   \@ifpackageloaded{pageslts}{%
     \PackageWarning{lastpage}{Package pageslts found.\MessageBreak%
       Therefore the lastpage package is no longer\MessageBreak%
@@ -236,6 +239,9 @@
        {The lastpage package was not allowed to write to an .aux file.\MessageBreak%
         This package does not work without access to an .aux file.\MessageBreak%
         Press Ctrl+Z to exit.\MessageBreak%
+        But it is OK if the .aux file was already updated\MessageBreak%
+        by a previouse compiler run\MessageBreak%
+        and would not have changed anyway.\MessageBreak%
        }%
     \fi%
   \fi%
@@ -248,25 +254,28 @@
   \fi%
   }
 
+\gdef\lastpage@lastpage{\relax}%
+\gdef\lastpage@lastpageHy{\relax}%
+
 \AtEndDocument{%
   \gdef\lastpage@putlabel{\relax}%
   \ifx\lastpage@LTS\lastpage@one%
   \else%
-    \@ifundefined{lastpage@lastpage}%
-     {\gdef\lastpage@lastpage{LastpagePackageError}%
-     % If there really is a page numbered (!) "LastpagePackageError",
-     % you will get the rerun warning whether it is necessary or not.
+    \ifx\lastpage@lastpage\relax%
       \PackageWarning{lastpage}{Rerun to get the references right}%
-     }{% already defined, nothing to be done.
-     }%
-    \@ifundefined{lastpage@lastpageHy}%
-     {\gdef\lastpage@lastpageHy{LastpagePackageError}%
-     }{% already defined, nothing to be done.
-     }%
+    \fi%
+    \ifx\lastpage@lastpageHy\relax%
+      \PackageWarning{lastpage}{Rerun to get the references right}%
+    \fi%
   \fi%
   \if@filesw%
     \message{^^JAED: lastpage setting LastPage^^J}%
-    \clearpage\lastpage@putl@bel%
+    \@ifundefined{clearpage}{\relax}{\clearpage}%
+    \ifx\lastpage@french\lastpage@one% french or frenchle loaded
+      \addtocounter{page}{+1}\lastpage@putl@bel\addtocounter{page}{-1}%
+    \else% neither one loaded
+      \lastpage@putl@bel%
+    \fi%
   \else%
     \ifx\lastpage@LTS\lastpage@one%
     \else%
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
index 1b5a8125d69..909ef009ca6 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
@@ -9,9 +9,9 @@
 %% This is a generated file.
 %% 
 %% Project: lastpage
-%% Version: 2015/03/29 v1.2m
+%% Version: 2021/09/03 v1.2n
 %% 
-%% Copyright (C) 2010 - 2015 by
+%% Copyright (C) 2010 - 2021 by
 %%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
 %% Portions of code copyrighted by other people as marked.
 %% 
@@ -24,9 +24,9 @@
 %% conditions of the LaTeX Project Public License, either
 %% version 1.3c of this license or (at your option) any later
 %% version. This version of this license is in
-%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%    https://www.latex-project.org/lppl/lppl-1-3c.txt
 %% and the latest version of this license is in
-%%    http://www.latex-project.org/lppl.txt
+%%    https://www.latex-project.org/lppl.txt
 %% and version 1.3c or later is part of all distributions of
 %% LaTeX version 2005/12/01 or later.
 %%