lastpage update (27aug10)

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

3 files changed, 95 insertions, 44 deletions

diff --git a/Master/texmf-dist/source/latex/lastpage/lastpage.drv b/Master/texmf-dist/source/latex/lastpage/lastpage.drv
index 885cc7bd181..1cefd58fff6 100644
--- a/Master/texmf-dist/source/latex/lastpage/lastpage.drv
+++ b/Master/texmf-dist/source/latex/lastpage/lastpage.drv
@@ -47,7 +47,7 @@
 %%    lastpage-example.tex, lastpage.pdf.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesFile{lastpage.drv}[2010/08/25 v1.2d
+\ProvidesFile{lastpage.drv}[2010/09/12 v1.2e
             Refers to last page's name (HMM)]%
 \documentclass{ltxdoc}[2007/11/11]% v2.0u
 \usepackage{holtxdoc}[2010/04/18]% v0.18
diff --git a/Master/texmf-dist/source/latex/lastpage/lastpage.dtx b/Master/texmf-dist/source/latex/lastpage/lastpage.dtx
index a8007bea090..ae137a3f2a8 100644
--- a/Master/texmf-dist/source/latex/lastpage/lastpage.dtx
+++ b/Master/texmf-dist/source/latex/lastpage/lastpage.dtx
@@ -1,9 +1,9 @@
 % \iffalse meta-comment
 %
 % lastpage package
-% file version: v1.2d
-% file date:          2010/08/25
-% documentation date: 2010/08/25
+% file version: v1.2e
+% file date:          2010/09/12
+% documentation date: 2010/09/12
 %
 % Copyright (C) 2010 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)
 % Portions of code copyrighted by other people as marked.
@@ -97,7 +97,7 @@
 \obeyspaces
 \Msg{******************************************************}
 \Msg{* Installation                                       *}
-\Msg{* Package: lastpage v1.2d 2010/08/25 LaTeX2e package *}
+\Msg{* Package: lastpage v1.2e 2010/09/12 LaTeX2e package *}
 \Msg{* Refers to last page's name (HMM)                   *}
 \Msg{******************************************************}
 
@@ -203,7 +203,7 @@ and the derived files
 %    \begin{macrocode}
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesFile{lastpage.drv}[2010/08/25 v1.2d
+\ProvidesFile{lastpage.drv}[2010/09/12 v1.2e
             Refers to last page's name (HMM)]%
 \documentclass{ltxdoc}[2007/11/11]% v2.0u
 \usepackage{holtxdoc}[2010/04/18]% v0.18
@@ -321,7 +321,7 @@ and the derived files
 %
 % \fi
 %
-% \CheckSum{141}
+% \CheckSum{147}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -373,13 +373,13 @@ and the derived files
 % \DoNotIndex{\makeatletter,\makeatother,\mathord,\normalsize,\rm,\fancyhdr}
 %
 % \title{The \textsf{lastpage} package\footnote{This file%
-%        has version number v1.2d, last%
-%        revised 2010/08/25, documentation dated 2010/08/25.}}
+%        has version number v1.2e, last%
+%        revised 2010/09/12, documentation dated 2010/09/12.}}
 % \author{invented by Jeffrey P. Goldberg\\
 % (\texttt{jeffrey+news at goldmark dot org})\\
 % now maintained by H.-Martin M\"{u}nch\\
 % (\texttt{Martin dot Muench at Uni-Bonn dot de})}
-% \date{2010/08/25}
+% \date{2010/09/12}
 %
 % \maketitle
 %
@@ -436,7 +436,9 @@ and the derived files
 % If you are more ambitiouse in respect to your aims with this package,
 % you might want to have a look at the \textsf{pagesLTS} package
 % (see section~\ref{sec:Alternatives}: Alternatives).
-%\newpage
+%
+% \newpage
+%
 % \section{Usage}
 %
 % \indent Just load the package placing
@@ -468,8 +470,10 @@ and the derived files
 %
 % \textquotedblleft\mbox{\textsl{DRAFT \today}\hspace{1cm}page 7 of 9}\textquotedblright\\
 %
-% \noindent in the compiled document (cf.~the \texttt{lastpage-example} file)\\
-% (when using the \textsf{hyperref} package, the references are even hyperlinked).
+% \noindent in the compiled document (cf.~the \texttt{lastpage-example} file).\\
+% If the \textsf{hyperref} package is used, the references are hyperlinked
+% to their aims. If these hyperlinks shall be suppressed, |\pageref*{...}|
+% instead of |\pageref{...}| can be used.\\
 %
 % \section{A lot of WARNINGS\label{sec:warn}}
 %
@@ -843,7 +847,7 @@ and the derived files
  pdfpagelayout=SinglePage%
 }
 %% If you disable hyperref, you must also remove the one \href in this example.
-\usepackage{lastpage}[2010/08/25]% v1.2d
+\usepackage{lastpage}[2010/09/12]% v1.2e
 \makeatletter
 \renewcommand{\@evenfoot}%
  {\normalsize\slshape \today\hfil \upshape page {\thepage} of \pageref{LastPage}}
@@ -858,7 +862,7 @@ and the derived files
 \markboth{Example for lastpage}{Example for lastpage}
 
 This example demonstrates the use of package\newline
-\textsf{lastpage}, v1.2d as of 2010/08/25 (HMM; JPG).\newline
+\textsf{lastpage}, v1.2e as of 2010/09/12 (HMM; JPG).\newline
 The package takes no options.\newline
 For more details please see the documentation!\newline
 
@@ -867,6 +871,17 @@ For more details please see the documentation!\newline
 package (or remove the package call from the preamble of
 this document).\newline
 
+
+\textbf{Hyperlinks or not:} If the \textsf{hyperref} package is loaded,
+the references are also hyperlinked:\newline
+\smallskip
+Last page's name (LastPage): \pageref{LastPage}\newline
+\noindent If the \textsf{hyperref} package is loaded, but the hyperlinks
+of the references shall be suppressed, \texttt{\textbackslash pageref*\{...\}}
+can be used:\newline
+\smallskip
+Last page's name (LastPage): \pageref*{LastPage}\newline
+
 \textbf{Trademarks} appear throughout this example without any
 trademark symbol; they are the property of their respective
 trademark owner. There is no intention of infringement; the
@@ -874,7 +889,7 @@ usage is to the benefit of the trademark owner.\newline
 
 \textbf{Tip}: Use \textit{logical page numbers} for
 the display of the pdf!\newline
-(In Adobe Reader 9.3.3: \underline{E}dit $>$
+(In Adobe Reader 9.3.4: \underline{E}dit $>$
 Prefere\underline{n}ces (Ctrl+k) $>$ Page Display $>$
 Page Content and Information $>$ Use logical page
 \nolinebreak{\underline{n}umbers.)}\newline
@@ -937,7 +952,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{lastpage}[2010/08/25 v1.2d
+\ProvidesPackage{lastpage}[2010/09/12 v1.2e
             Refers to last page's name (HMM; JPG)]%
 
 %    \end{macrocode}
@@ -1013,7 +1028,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
       Therefore the lastpage package is no longer necessary.\MessageBreak%
       }%
     \gdef\lastpage@LTS{1}%
-    \@ifpackagelater{pagesLTS}{2010/08/24}{% 2010/08/25 v1.1i
+    \@ifpackagelater{pagesLTS}{2010/09/11}{% 2010/09/12 v1.1j
       }{%
       \PackageWarning{lastpage}{Outdated version of pagesLTS package found.\MessageBreak%
         For a recent version, see e.g. at\MessageBreak%
@@ -1035,6 +1050,23 @@ I do NOT think, that it is necessary to print THIS file, really\newline
       !%
       }%
     }%
+%    \end{macrocode}
+%
+% |\lastpage@putlabel|, used by older versions of this package,
+% is redefined e.\,g. by \textsf{revtex} and \textsf{hyperref}.
+% While now |\lastpage@putl@bel| is used instead, \textsf{revtex}
+% or \textsf{hyperref} could also define a lable \texttt{LastPage},
+% which then would be multiply defined. (Which is no big issue,
+% if it is associated with the same page.) Therefore we define
+%
+%    \begin{macrocode}
+  \gdef\lastpage@putlabel{\relax}
+%    \end{macrocode}
+%
+% Because |\lastpage@putlabel| might be (re)defined later, depending on the order
+% in which the packages are loaded, we will do this again |\AtEndDocument|.
+%
+%    \begin{macrocode}
   }
 
 %    \end{macrocode}
@@ -1107,8 +1139,6 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %    \end{macrocode}
 % \end{macro}
 %
-% \pagebreak
-%
 % \begin{macro}{\lastpage@putlabelhyper}%
 % \indent When \textsf{hyperref} has been loaded, the label is set with the\\
 % |\lastpage@putlabelhyper| command. If the \textsf{hyperref} package is used,
@@ -1211,11 +1241,18 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 % \end{macro}
 %
 % \begin{macro}{\AtEndDocument}
-% \indent |\AtEndDocument| it is checked whether writing to files is allowed
-% (otherwise, only an error message is issued and nothing done).
+% \indent |\AtEndDocument| we again (re)define |\lastpage@putlabel| to do
+% nothing.
 %
 %    \begin{macrocode}
 \AtEndDocument{%
+  \gdef\lastpage@putlabel{\relax}
+%    \end{macrocode}
+%
+% It is checked whether writing to files is allowed
+% (otherwise, only an error message is issued and nothing done).
+%
+%    \begin{macrocode}
   \if@filesw%
 %    \end{macrocode}
 %
@@ -1286,7 +1323,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 % \begin{description}
 % \item[-] \TeX Format \LaTeXe, 1994/06/01, v2$\varepsilon $, \CTAN{}
 %
-% \item[-] package \textsf{lastpage}, 2010/08/25, v1.2d,\\
+% \item[-] package \textsf{lastpage}, 2010/09/12, v1.2e,\\
 %   \CTAN{macros/latex/contrib/lastpage/lastpage.dtx}
 % \end{description}
 % and can use
@@ -1301,7 +1338,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 % \begin{description}
 % \item[-] \TeX Format \LaTeX, v2.09
 %
-% \item[-] package \textsf{lastpage209}, 2010/08/25, v1.2d, included in \\
+% \item[-] package \textsf{lastpage209}, 2010/09/12, v1.2e, included in \\
 %   \CTAN{macros/latex/contrib/lastpage/lastpage.dtx}%
 % \end{description}
 % and does not work with \textsf{hyperref}, which needs \LaTeX2e.\\
@@ -1310,7 +1347,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 % The |lastpage-example.tex| requires the same file as all
 % documents using the \textsf{lastpage} package, i.\,e.
 % \begin{description}
-% \item[-] package \textsf{lastpage}, 2010/08/25, v1.2d,\\
+% \item[-] package \textsf{lastpage}, 2010/09/12, v1.2e,\\
 %   \CTAN{macros/latex/contrib/pagesLTS/pagesLTS.dtx}\\
 %   (Well, it is the example file for this package, and because you are reading the
 %    documentation for the \textsf{lastpage} package, it can be assumed that you already
@@ -1360,7 +1397,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 % \DescribeMacro{zref}
 % As possible alternatives in section~\ref{sec:Alternatives}, Alternatives, there are listed
 % \begin{description}
-% \item[-] package \textsf{pagesLTS}, 2009/06/24, v1.1c,\\
+% \item[-] package \textsf{pagesLTS}, 2009/09/12, v1.1j,\\
 %   \CTAN{macros/latex/contrib/pagesLTS/pagesLTS.dtx}
 %
 % \item[-] package \textsf{papermas}, 2009/06/24, v1.0c; the \textsf{papermas} package
@@ -1414,7 +1451,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %  That package allows to \textquotedblleft hide\textquotedblright\ some (hyperlinked)
 %  text when printing the document while keeping the layout.
 %
-% \item[lastpage] 2010/08/25, v1.2d, \CTAN{macros/latex/contrib/lastpage/lastpage.dtx} and
+% \item[lastpage] 2010/09/12, v1.2e, \CTAN{macros/latex/contrib/lastpage/lastpage.dtx} and
 %  \CTAN{install/macros/latex/contrib/lastpage.tds.zip}\\
 %  The package described in this very documentation:\\
 %  This package allows to refer to the (maybe not so) last page.
@@ -1422,7 +1459,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %  The \textsf{pagesLTS} package is much more mighty, but needs more resources
 %  (e.\,g.~new counters).
 %
-% \item[pagesLTS] 2010/08/25, v1.1i, \CTAN{macros/latex/contrib/pagesLTS/pagesLTS.dtx} and
+% \item[pagesLTS] 2010/09/12, v1.1j, \CTAN{macros/latex/contrib/pagesLTS/pagesLTS.dtx} and
 %  \CTAN{install/macros/latex/contrib/pagesLTS.tds.zip}\\
 %  That package allows to refer to the (very) last page, gives the total number of
 %  pages, references to special pages, facilitates the use of nearly any pagenumbering
@@ -1436,7 +1473,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %  Further that package allows to compute \textquotedblleft base to the power of
 %  exponent\textquotedblright\ inside \LaTeX.
 %
-% \item[undolabl] 2010/07/29, v1.0f, \CTAN{macros/latex/contrib/undolabl/undolabl.dtx} and
+% \item[undolabl] 2010/09/12, v1.0g, \CTAN{macros/latex/contrib/undolabl/undolabl.dtx} and
 %  \CTAN{install/macros/latex/contrib/undolabl.tds.zip}\\
 %  That package allows to override existing labels, especially automatically generated ones.
 %  \textit{The main code of that package was invented by }\\
@@ -1453,29 +1490,36 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %
 % \subsection{Package, unpacking TDS}
 %
-% \paragraph{Package.} This package is available on \CTAN{}
+% \paragraph{Package.} This package is available on \CTAN{}.
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/lastpage/lastpage.dtx}]\hspace*{0.1cm} \\
 %       The source file.
-% \item[\CTAN{macros/latex/contrib/lastpage/lastpage.ins}]\hspace*{0.1cm} \\
-%       The installation file.
-% \item[\CTAN{macros/latex/contrib/lastpage/lastpage.drv}]\hspace*{0.1cm} \\
-%       The driver to generate the documentation.
-% \item[\CTAN{macros/latex/contrib/lastpage/ltxdoc.cfg}]\hspace*{0.1cm} \\
-%       The \LaTeX documentation configuration file, also for generating the documentation.
 % \item[\CTAN{macros/latex/contrib/lastpage/lastpage.pdf}]\hspace*{0.1cm} \\
 %       The documentation.
-% \item[\CTAN{macros/latex/contrib/lastpage/lastpage.sty}]\hspace*{0.1cm} \\
-%       The \xext{sty}le file.
-% \item[\CTAN{macros/latex/contrib/lastpage/lastpage-example.tex}]\hspace*{0.1cm} \\
-%       The example file.
 % \item[\CTAN{macros/latex/contrib/lastpage/lastpage-example.pdf}]\hspace*{0.1cm} \\
 %       The compiled example file, as it should look like.
+% \item[\CTAN{macros/latex/contrib/lastpage/README}]\hspace*{0.1cm} \\
+%       The README file.
+% \end{description}
+% There is also a lastpage.tds.zip available:
+% \begin{description}
 % \item[\CTAN{install/macros/latex/contrib/lastpage.tds.zip}]\hspace*{0.1cm} \\
 %       Everything in TDS compliant, compiled format.
 % \end{description}
+% which additionally contains\\
+% \begin{tabular}{ll}
+% lastpage.ins & The installation file.\\
+% lastpage.drv & The driver to generate the documentation.\\
+% ltxdoc.cfg & The \LaTeX\ documentation configuration file,\\
+%            & also for generating the documentation.\\
+% lastpage.sty & The \xext{sty}le file.\\
+% lastpage209.sty & The \xext{sty}le file for \LaTeX209\ \textbf{only}.\\
+% lastpage-example.tex & The example file.%
+% \end{tabular}
 %
-% For required other packages, see the preceding subsection.
+% \bigskip
+%
+% \noindent For required other packages, see the preceding subsection.
 %
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
@@ -1631,7 +1675,7 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 % know about creating a file in \xfile{dtx} format, ok, say it: copying),
 % and the \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex}
 % newsgroups for their help in all things \TeX. Thanks for bug reports go
-% to Ulrike Fischer and Sebastian Bank.
+% to Ulrike Fischer, Sebastian Bank, and James Hedges.
 %
 % \pagebreak
 %
@@ -1715,10 +1759,17 @@ I do NOT think, that it is necessary to print THIS file, really\newline
 %     \item Removed wrong \% from the driver file.
 %   \end{Version}
 %   \begin{Version}{2010/08/25 v1.2d}
-%     \item Bug fix: \textsf{tcilatex} defines the |\hyperref| command, therefore
+%     \item Bug fix: also \textsf{tcilatex} defines the |\hyperref| command, therefore
 %             for \textsf{hyperref} package detection this had to be changed to
 %             |\Hy@Warning|.
 %   \end{Version}
+%   \begin{Version}{2010/09/12 v1.2e}
+%     \item James Hedges (Thanks!) pointed out, that there was no instruction
+%             in the documentation about suppressing hyperlinks: added (also
+%             to the example).
+%     \item The recent version of the Adobe Reader is 9.3.4.
+%     \item Diverse small changes.
+%   \end{Version}
 % \end{History}
 %
 % % \PrintChanges
diff --git a/Master/texmf-dist/source/latex/lastpage/lastpage.ins b/Master/texmf-dist/source/latex/lastpage/lastpage.ins
index b88bae50d20..cf2bc412ba9 100644
--- a/Master/texmf-dist/source/latex/lastpage/lastpage.ins
+++ b/Master/texmf-dist/source/latex/lastpage/lastpage.ins
@@ -51,7 +51,7 @@
 \obeyspaces
 \Msg{******************************************************}
 \Msg{* Installation                                       *}
-\Msg{* Package: lastpage v1.2d 2010/08/25 LaTeX2e package *}
+\Msg{* Package: lastpage v1.2e 2010/09/12 LaTeX2e package *}
 \Msg{* Refers to last page's name (HMM)                   *}
 \Msg{******************************************************}