lastpage (12aug11)

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

2 files changed, 82 insertions, 65 deletions

diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
index 52619046d94..dc2a7bae9f8 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage.sty
@@ -8,8 +8,14 @@
 %% 
 %% This is a generated file.
 %% 
-%% IMPORTANT NOTICE:
-%% The usual disclaimers apply:
+%% Project: lastpage
+%% Version: 2011/08/08 v1.2i
+%% 
+%% Copyright (C) 2010, 2011 by
+%%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
+%% Portions of code copyrighted by other people as marked.
+%% 
+%% The usual disclaimer applys:
 %% If it doesn't work right that's your problem.
 %% (Nevertheless, send an e-mail to the maintainer
 %%  when you find an error in this package.)
@@ -26,16 +32,14 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% The Current Maintainer of this work is H.-Martin Muench
-%% (Martin dot Muench at Uni-Bonn dot de).
+%% The Current Maintainer of this work is H.-Martin Muench.
 %% 
-%% This package was invented by Jeffrey P. Goldberg
-%%  (jeffrey+news at goldmark dot org).
+%% This package was invented by Jeffrey P. Goldberg.
 %% I thought that a replacement was needed and therefore created the
-%% pagesLTS package,
-%% http://www.ctan.org/tex-archive/macros/latex/contrib/pagesLTS/pagesLTS.dtx
+%% pageslts package,
+%% http://www.ctan.org/tex-archive/macros/latex/contrib/pageslts/pageslts.dtx
 %% or
-%% http://www.ctan.org/tex-archive/install/macros/latex/contrib/pagesLTS.tds.zip
+%% http://www.ctan.org/tex-archive/install/macros/latex/contrib/pageslts.tds.zip
 %% . 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.
@@ -43,19 +47,23 @@
 %% 
 %% This work consists of the main source file lastpage.dtx
 %% and the derived files
-%%    lastpage.sty, lastpage.ins, lastpage.drv,
-%%    lastpage-example.tex, lastpage.pdf.
+%%    lastpage.sty, lastpage.pdf, lastpage.ins, lastpage.drv,
+%%    lastpage-example.tex.
 %% 
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{lastpage}[2011/02/01 v1.2g
+\NeedsTeXFormat{LaTeX2e}[2009/09/24]
+\ProvidesPackage{lastpage}[2011/08/08 v1.2i
             Refers to last page's name (HMM; JPG)]%
 
 %% Allows for things like
-%% Page \thepage of \pageref{LastPage}
+%% Page \thepage\ of \pageref{LastPage}
 %% to get
 %% 'Page 7 of 9'.
-%% For LaTeX 2.09 use lastpage209.sty. -
-%% For LaTeX 2e maybe consider upgrading to the pagesLTS package.
+%% For LaTeX 2.09 use lastpage209.sty.
+%% For LaTeX 2e maybe consider upgrading to the pageslts package.
+%% lastpage may work with earlier versions of LaTeX2e,
+%% but this was not tested. Please consider updating your LaTeX
+%% contribution to the most recent version (if it is not already
+%% the most recent version).
 
 %% The recent version of the endfloat package is v2.4i as of 1995/10/11.
 %% The lastpage package is not fully compatible with version 2.0
@@ -66,42 +74,46 @@
 \gdef\lastpage@hyper{0}
 \gdef\lastpage@LTS{0}
 \def\lastpage@firstpage{1}
-\AtBeginDocument{
+
+\AtBeginDocument{%
   \@ifpackageloaded{hyperref}{\gdef\lastpage@hyper{1}}{}%
-  \@ifpackageloaded{pagesLTS}{%
-    \PackageWarning{lastpage}{Package pagesLTS found.\MessageBreak%
-      Therefore the lastpage package is no longer necessary.\MessageBreak%
+  \@ifpackageloaded{pageslts}{%
+    \PackageWarning{lastpage}{Package pageslts found.\MessageBreak%
+      Therefore the lastpage package is no longer\MessageBreak%
+      necessary.%
       }%
     \gdef\lastpage@LTS{1}%
-    \@ifpackagelater{pagesLTS}{2011/01/31}{% 2011/02/01 v1.1m
-      }{%
-      \PackageWarning{lastpage}{Outdated version of pagesLTS package found.\MessageBreak%
-        For a recent version, see e.g. at\MessageBreak%
-        http://www.ctan.org/tex-archive/ \MessageBreak%
-          macros/latex/contrib/pagesLTS/ \MessageBreak%
-        or\MessageBreak%
-        http://www.ctan.org/tex-archive/ \MessageBreak%
-          install/macros/latex/contrib/pagesLTS.tds.zip\MessageBreak%
-        !%
-        }%
-      }%
-    }{%
-    \PackageInfo{lastpage}{Please have a look at the pagesLTS package at\MessageBreak%
+   }{\PackageInfo{lastpage}{%
+       Please have a look at the pageslts package at\MessageBreak%
+       http://www.ctan.org/tex-archive/ \MessageBreak%
+         macros/latex/contrib/pageslts/ \MessageBreak%
+       or\MessageBreak%
+       http://www.ctan.org/tex-archive/ \MessageBreak%
+         install/macros/latex/contrib/pageslts.tds.zip\MessageBreak%
+       !}%
+   }%
+  \@ifpackageloaded{pagesLTS}{%
+    \PackageWarning{lastpage}{%
+      Outdated pagesLTS package found.\MessageBreak%
+      Please replace by a recent version of\MessageBreak%
+      pageslts package, see e.g. at\MessageBreak%
       http://www.ctan.org/tex-archive/ \MessageBreak%
-        macros/latex/contrib/pagesLTS/ \MessageBreak%
+        macros/latex/contrib/pageslts/ \MessageBreak%
       or\MessageBreak%
       http://www.ctan.org/tex-archive/ \MessageBreak%
-        install/macros/latex/contrib/pagesLTS.tds.zip\MessageBreak%
-      !%
-      }%
-    }%
-  \gdef\lastpage@putlabel{\relax}
+        install/macros/latex/contrib/pageslts.tds.zip\MessageBreak%
+      !\MessageBreak%
+      With pagesLTS as well as pageslts package\MessageBreak%
+      the lastpage package is no longer necessary.\MessageBreak%
+     }%
+    \gdef\lastpage@LTS{1}%
+   }{}%
+  \gdef\lastpage@putlabel{\relax}%
   }
 
-\newcommand{\lastpage@putl@bel}%
- {\@ifundefined{Hy@Warning}{% hyperref not loaded
-    }{% hyperref loaded
-      \gdef\lastpage@hyper{1}%
+\newcommand{\lastpage@putl@bel}{%
+  \@ifundefined{Hy@Warning}{%  hyperref not loaded
+    }{\gdef\lastpage@hyper{1}% hyperref loaded
      }%
   \ifx\lastpage@LTS\lastpage@one%
   \else%
@@ -115,9 +127,10 @@
       \endgroup
     \fi%
   \fi%
- }
-\newcommand{\lastpage@putlabelhyper}%
- {\ifHy@pageanchor
+  }
+
+\newcommand{\lastpage@putlabelhyper}{%
+  \ifHy@pageanchor%
   \else%
     \PackageError{lastpage}{hyperref option pageanchor disabled}{%
       The \string\pageref{LastPage} link doesn't work\MessageBreak%
@@ -137,7 +150,7 @@
         \else
           \Hy@unicodefalse
 %% Code not from hyperref package:                          %%
-%% The following lines are taken from the pagesLTS package, %%
+%% The following lines are taken from the pageslts package, %%
 %% which in turn got them from the hyperref package and     %%
 %% modified them.                                           %%
 %% Without the modification, after the first shipout "PD1"  %%
@@ -152,12 +165,12 @@
                 \pdfstringdef\Hy@temp{\thepage}%
 %% End of code from the hyperref package.                   %%
           \fi%
-%% The pagesLTS package would even check for fnsymbol page  %%
+%% The pageslts package would even check for fnsymbol page  %%
 %% numbering scheme and adapt the code correspondingly.     %%
           \else%
 %% Code from hyperref package again:                        %%
             \pdfstringdef\Hy@temp{\thepage}%
-%% Code from pagesLTS package again:                        %%
+%% Code from pageslts package again:                        %%
           \fi%
 %% Code from hyperref package again:                        %%
         \fi
@@ -173,15 +186,15 @@
 %% End of code from the hyperref package.                   %%
     \addtocounter{page}{+1}%
   \endgroup
- }
+  }
 
 \AtEndDocument{%
   \gdef\lastpage@putlabel{\relax}
   \if@filesw%
-    \message{AED: lastpage setting LastPage ^^J}%
+    \message{^^JAED: lastpage setting LastPage^^J}%
     \clearpage\lastpage@putl@bel%
   \else%
-    \PackageError{lastpage}{No auxiliary file allowed.}%
+    \PackageError{lastpage}{No auxiliary file allowed}%
      {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%
diff --git a/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty b/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
index 9e5799fea3a..7cb928ceb9a 100644
--- a/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
+++ b/Master/texmf-dist/tex/latex/lastpage/lastpage209.sty
@@ -8,8 +8,14 @@
 %% 
 %% This is a generated file.
 %% 
-%% IMPORTANT NOTICE:
-%% The usual disclaimers apply:
+%% Project: lastpage
+%% Version: 2011/08/08 v1.2i
+%% 
+%% Copyright (C) 2010, 2011 by
+%%     H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
+%% Portions of code copyrighted by other people as marked.
+%% 
+%% The usual disclaimer applys:
 %% If it doesn't work right that's your problem.
 %% (Nevertheless, send an e-mail to the maintainer
 %%  when you find an error in this package.)
@@ -26,16 +32,14 @@
 %% 
 %% This work has the LPPL maintenance status "maintained".
 %% 
-%% The Current Maintainer of this work is H.-Martin Muench
-%% (Martin dot Muench at Uni-Bonn dot de).
+%% The Current Maintainer of this work is H.-Martin Muench.
 %% 
-%% This package was invented by Jeffrey P. Goldberg
-%%  (jeffrey+news at goldmark dot org).
+%% This package was invented by Jeffrey P. Goldberg.
 %% I thought that a replacement was needed and therefore created the
-%% pagesLTS package,
-%% http://www.ctan.org/tex-archive/macros/latex/contrib/pagesLTS/pagesLTS.dtx
+%% pageslts package,
+%% http://www.ctan.org/tex-archive/macros/latex/contrib/pageslts/pageslts.dtx
 %% or
-%% http://www.ctan.org/tex-archive/install/macros/latex/contrib/pagesLTS.tds.zip
+%% http://www.ctan.org/tex-archive/install/macros/latex/contrib/pageslts.tds.zip
 %% . 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.
@@ -43,10 +47,10 @@
 %% 
 %% This work consists of the main source file lastpage.dtx
 %% and the derived files
-%%    lastpage.sty, lastpage.ins, lastpage.drv,
-%%    lastpage-example.tex, lastpage.pdf.
+%%    lastpage.sty, lastpage.pdf, lastpage.ins, lastpage.drv,
+%%    lastpage-example.tex.
 %% 
- % FOR LaTeX 2.09 ONLY - FOR LaTeX 2e USE lastpage.sty OR pagesLTS.sty!
+ % FOR LaTeX 2.09 ONLY - FOR LaTeX 2e USE lastpage.sty OR pageslts.sty!
  % This is lastpage209.sty invented by Jeffrey P. Goldberg
  % (jeffrey+news at goldmark dot org), maintained by
  % H.-Martin M\"{u}ench (Martin dot Muench at Uni-Bonn dot de).