From a77f52d8c904326838bc0523faffdc79bdff0f6e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 16 Jul 2010 23:46:46 +0000 Subject: pageslts update (15jul10) git-svn-id: svn://tug.org/texlive/trunk@19487 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pageslts/README | 2 +- .../doc/latex/pageslts/pagesLTS-example.pdf | Bin 463052 -> 463079 bytes .../doc/latex/pageslts/pagesLTS-example.tex | 6 +- Master/texmf-dist/doc/latex/pageslts/pagesLTS.pdf | Bin 944241 -> 959511 bytes .../texmf-dist/source/latex/pageslts/pagesLTS.drv | 4 +- .../texmf-dist/source/latex/pageslts/pagesLTS.dtx | 214 ++++++++++++++++----- .../texmf-dist/source/latex/pageslts/pagesLTS.ins | 4 +- Master/texmf-dist/tex/latex/pageslts/pagesLTS.sty | 65 ++++++- 8 files changed, 227 insertions(+), 68 deletions(-) diff --git a/Master/texmf-dist/doc/latex/pageslts/README b/Master/texmf-dist/doc/latex/pageslts/README index 2c2b4b20407..b9edbaf7cd1 100644 --- a/Master/texmf-dist/doc/latex/pageslts/README +++ b/Master/texmf-dist/doc/latex/pageslts/README @@ -1,4 +1,4 @@ -README for pagesLTS package, 2010/06/24, v1.1c +README for pagesLTS package, 2010/07/15, v1.1d TABLE OF CONTENTS diff --git a/Master/texmf-dist/doc/latex/pageslts/pagesLTS-example.pdf b/Master/texmf-dist/doc/latex/pageslts/pagesLTS-example.pdf index b7519c348c8..6b033304c51 100644 Binary files a/Master/texmf-dist/doc/latex/pageslts/pagesLTS-example.pdf and b/Master/texmf-dist/doc/latex/pageslts/pagesLTS-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/pageslts/pagesLTS-example.tex b/Master/texmf-dist/doc/latex/pageslts/pagesLTS-example.tex index e24eafbe2d5..c01090d1aec 100644 --- a/Master/texmf-dist/doc/latex/pageslts/pagesLTS-example.tex +++ b/Master/texmf-dist/doc/latex/pageslts/pagesLTS-example.tex @@ -60,7 +60,7 @@ \usepackage{lipsum}[2005/01/26]% v1.0 \usepackage[draft]{showkeys}[2007/08/07]% v3.15 %% Use final instead of draft to hide the keys. %% -\usepackage{hyperref}[2010/06/04]% v6.81f +\usepackage{hyperref}[2010/06/18]% v6.81g \hypersetup{% extension=pdf,% plainpages=false,% @@ -76,7 +76,7 @@ pdfpagelayout=SinglePage,% bookmarksopen=true% } -\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2010/06/24]% v1.1c +\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2010/07/15]% v1.1d %% These are the default options. %% \makeatletter \renewcommand{\@evenfoot}% @@ -112,7 +112,7 @@ \markboth{Example for pagesLTS}{Example for pagesLTS} This example demonstrates the most common uses of package\\ -\textsf{pagesLTS}, v1.1c as of 2010/06/24 (HMM).\\ +\textsf{pagesLTS}, v1.1d as of 2010/07/15 (HMM).\\ The used options were \texttt{pagecontinue=true}, \texttt{alphMult=ab}, \texttt{AlphMulti=AB}, \linebreak \texttt{fnsymbolmult=true}, diff --git a/Master/texmf-dist/doc/latex/pageslts/pagesLTS.pdf b/Master/texmf-dist/doc/latex/pageslts/pagesLTS.pdf index 158245ec116..cfa8bf375ee 100644 Binary files a/Master/texmf-dist/doc/latex/pageslts/pagesLTS.pdf and b/Master/texmf-dist/doc/latex/pageslts/pagesLTS.pdf differ diff --git a/Master/texmf-dist/source/latex/pageslts/pagesLTS.drv b/Master/texmf-dist/source/latex/pageslts/pagesLTS.drv index c06ec5d2934..aafca5e2fce 100644 --- a/Master/texmf-dist/source/latex/pageslts/pagesLTS.drv +++ b/Master/texmf-dist/source/latex/pageslts/pagesLTS.drv @@ -55,7 +55,7 @@ %% pagesLTS-example.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesFile{pagesLTS.drv}[2010/06/24 v1.1c% +\ProvidesFile{pagesLTS.drv}[2010/07/15 v1.1d% Refers to special pages' numbers/names (HMM)]% \documentclass[landscape]{ltxdoc}[2007/11/11]% v2.0u \usepackage{geometry}[2010/03/13]% v5.3 @@ -67,7 +67,7 @@ %% recent version). %% Warning: holtxdoc, 2010/04/24 v0.19, requires the packages %% hypdoc, 2010/03/26, v1.9 -%% hyperref, 2010/03/30, v6.80u (latest: 2010/06/04 v6.81f) +%% hyperref, 2010/03/30, v6.80u (latest: 2010/06/18 v6.81g) %% pdftexcmds, 2010/04/01, v0.9 %% ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7) %% hologo, 2010/04/24, v1.2 diff --git a/Master/texmf-dist/source/latex/pageslts/pagesLTS.dtx b/Master/texmf-dist/source/latex/pageslts/pagesLTS.dtx index fc94e2912a7..109e9af3d60 100644 --- a/Master/texmf-dist/source/latex/pageslts/pagesLTS.dtx +++ b/Master/texmf-dist/source/latex/pageslts/pagesLTS.dtx @@ -1,9 +1,9 @@ % \iffalse meta-comment % -% pagesLTS package -% file version: v1.1c -% file date: 2010/06/24 -% documentation date: 2010/06/24 +% pagesLTS package (when searching on CTAN, look for pageslts) +% file version: v1.1d +% file date: 2010/07/15 +% documentation date: 2010/07/15 % % 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. @@ -89,7 +89,7 @@ \obeyspaces \Msg{******************************************************} \Msg{* Installation *} -\Msg{* Package: pagesLTS v1.1c 2010/06/24 LaTeX2e package *} +\Msg{* Package: pagesLTS v1.1d 2010/07/15 LaTeX2e package *} \Msg{* Refers to special pages' numbers/names (HMM) *} \Msg{******************************************************} @@ -154,9 +154,9 @@ and the derived files \file{pagesLTS.ins}{\from{pagesLTS.dtx}{install}}% \file{pagesLTS.drv}{\from{pagesLTS.dtx}{driver}}% \file{ltxdoc.cfg}{\from{pagesLTS.dtx}{ltxdoc}}% - %%\file{lastpage209.sty}{\from{pagesLTS.dtx}{lastpage209}}% \usedir{tex/latex/muench/pagesLTS}% \file{pagesLTS.sty}{\from{pagesLTS.dtx}{package}}% + %%\file{lastpage209.sty}{\from{pagesLTS.dtx}{lastpage209}}% \usedir{doc/latex/muench/pagesLTS}% \file{pagesLTS-example.tex}{\from{pagesLTS.dtx}{example}}% } @@ -203,7 +203,7 @@ and the derived files % \begin{macrocode} %<*driver> \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesFile{pagesLTS.drv}[2010/06/24 v1.1c% +\ProvidesFile{pagesLTS.drv}[2010/07/15 v1.1d% Refers to special pages' numbers/names (HMM)]% \documentclass[landscape]{ltxdoc}[2007/11/11]% v2.0u \usepackage{geometry}[2010/03/13]% v5.3 @@ -215,7 +215,7 @@ and the derived files %% recent version). %% Warning: holtxdoc, 2010/04/24 v0.19, requires the packages %% hypdoc, 2010/03/26, v1.9 -%% hyperref, 2010/03/30, v6.80u (latest: 2010/06/04 v6.81f) +%% hyperref, 2010/03/30, v6.80u (latest: 2010/06/18 v6.81g) %% pdftexcmds, 2010/04/01, v0.9 %% ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7) %% hologo, 2010/04/24, v1.2 @@ -382,11 +382,11 @@ and the derived files % \DoNotIndex{{pagesLTS.arabic, pagesLTS.roman, pagesLTS.Roman, pagesLTS.alph, pagesLTS.Alph,\ldots }} % % \title{The \textsf{pagesLTS} package\footnote{This file% -% has version number v1.1c, last% -% revised 2010/06/24, documentation dated 2010/06/24.}} +% has version number v1.1d, last% +% revised 2010/07/15, documentation dated 2010/07/15.}} % \author{H.-Martin M\"{u}nch\\ % (\texttt{Martin dot Muench at Uni-Bonn dot de})} -% \date{2010/06/24} +% \date{2010/07/15} % % \maketitle % @@ -810,7 +810,7 @@ and the derived files % neither \texttt{LastPage} nor \texttt{VeryLastPage} give % the total \textbf{number} of pages. % For example, for a document with VI+36 pages, both give -% \textquotedblleft 36\textquotedblright as reference to the last page. +% \textquotedblleft 36\textquotedblright\ as reference to the last page. % While this is correct, the total number of pages is 42, and this is % given by the reference to \texttt{LastPage\underline{s}}: % \nolinebreak{|\lastpageref{LastPage|\underline{|s|}|}|} (note the @@ -932,7 +932,7 @@ and the derived files % \DescribeMacro{LastPages} % \indent For remediation the label % \nolinebreak{\texttt{LastPage}\textbf{\underline{s}}} -% (with \textquotedblleft s\textquotedblright at its end) is +% (with \textquotedblleft s\textquotedblright\ at its end) is % introduced. Please then refer to this label by % |\lastpageref{LastPages}| instead of \texttt{LastPage} or % \texttt{VeryLastPage}.\\ @@ -1154,8 +1154,13 @@ and the derived files % |\usepackage[pagecontinue=false,alphMult=0,AlphMulti=0,fnsymbolmult=false,romanMult=false,RomanMulti=false]{pagesLTS}|,\\ % if the behaviour of the \textsf{lastpage} package should be simulated. % Using the \textsf{lastpage} before the \textsf{pagesLTS} before the -% \textsf{hyperref} [2010/06/04 v6.81f] +% \textsf{hyperref} [2010/06/18 v6.81g] % package results in multiply definitions of the |LastPage| label. +% While the \textsf{pagesLTS} package cancels the command |\lastpage@putlabel| +% from the \textsf{lastpage} package (because it does this itself, and better), +% \textsf{hyperref} redefines |\lastpage@putlabel| and thereby reintroduces it again +% (\textsf{hyperref} should probably check for the version of this \textsf{lastpage} +% package and/or whether the \textsf{pagesLTS} package was also loaded.) % % \subsection{Using an unknown page numbering scheme\label{sec:unknown}} % @@ -1326,7 +1331,7 @@ and the derived files % \item[-] \textquotedblleft There is a package \textsf{nofm.sty} % available, but some versions of it are defective, and most % don't work with \textsf{fancyhdr} because they take over the -% complete page layout.\textquotedblright (Piet van Oostrum: +% complete page layout.\textquotedblright\ (Piet van Oostrum: % Page layout in \LaTeX, March~2, 2004, section~16; fancyhdr.pdf)\\ % \textsf{nofm} as of 1991/02/25 (without version number), available at\\ % \url{ftp://tug.ctan.org/pub/tex-archive/obsolete/macros/latex209/contrib/misc/nofm.sty},\\ @@ -1374,7 +1379,7 @@ and the derived files \usepackage{lipsum}[2005/01/26]% v1.0 \usepackage[draft]{showkeys}[2007/08/07]% v3.15 %% Use final instead of draft to hide the keys. %% -\usepackage{hyperref}[2010/06/04]% v6.81f +\usepackage{hyperref}[2010/06/18]% v6.81g \hypersetup{% extension=pdf,% plainpages=false,% @@ -1390,7 +1395,7 @@ and the derived files pdfpagelayout=SinglePage,% bookmarksopen=true% } -\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2010/06/24]% v1.1c +\usepackage[pagecontinue=true,alphMult=ab,AlphMulti=AB,fnsymbolmult=true,romanMult=true,RomanMulti=true]{pagesLTS}[2010/07/15]% v1.1d %% These are the default options. %% \makeatletter \renewcommand{\@evenfoot}% @@ -1426,7 +1431,7 @@ and the derived files \markboth{Example for pagesLTS}{Example for pagesLTS} This example demonstrates the most common uses of package\\ -\textsf{pagesLTS}, v1.1c as of 2010/06/24 (HMM).\\ +\textsf{pagesLTS}, v1.1d as of 2010/07/15 (HMM).\\ The used options were \texttt{pagecontinue=true}, \texttt{alphMult=ab}, \texttt{AlphMulti=AB}, \linebreak \texttt{fnsymbolmult=true}, @@ -2319,7 +2324,7 @@ was added.)\\ % % \begin{macrocode} \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesPackage{pagesLTS}[2010/06/24 v1.1c +\ProvidesPackage{pagesLTS}[2010/07/15 v1.1d Refers to special pages' numbers/names (HMM)]% % \end{macrocode} @@ -2327,7 +2332,7 @@ was added.)\\ % A short description of the \textsf{pagesLTS} package: % % \begin{macrocode} -%% Allow for things like\\ +%% Allows for things like\\ %% |Page \thepage\ (\theCurrentPage; local: \theCurrentPageLocal) of % %% \lastpageref{pagesLTS.roman}(\lastpageref{pagesLTS.roman.local}) + % %% \lastpageref{pagesLTS.Roman}(\lastpageref{pagesLTS.Roman.local}) + % @@ -2368,7 +2373,7 @@ was added.)\\ % is used twice (or even more often). % % \begin{macrocode} -\RequirePackage{undolabl}[2010/06/24]% v1.0c +\RequirePackage{undolabl}[2010/07/15]% v1.0d % \end{macrocode} % % We must not forget to give the source of |Prelim@EveryShipout|: @@ -2654,6 +2659,7 @@ was added.)\\ \def\pagesLTS@eso{0} \def\pagesLTS@esov{0} \def\lastpageref{\lastpagereftxt} +\def\pagesLTS@undolable{none} % \end{macrocode} % % \newpage @@ -3003,7 +3009,7 @@ was added.)\\ % and zero values, and to values greater than % \textquotedblleft z\textquotedblright\ or % \textquotedblleft Z\textquotedblright\ with the -% \textsf{alphalph} package. -- +% \textsf{alphalph} package.~-- % If |\pagesLTS@alphMult| was zero, nothing is done. % % \begin{macrocode} @@ -3126,7 +3132,7 @@ was added.)\\ % \end{macrocode} % % If the page numbering scheme is \textit{not} \textsf{fnsymbol}, -% a numbered label is written: +% a~numbered label is written: % % \begin{macrocode} \else% @@ -3536,8 +3542,25 @@ was added.)\\ \fi% \if@filesw% \overridelabel{pagesLTS.\pagesLTS@pnc}% - \immediate\write\@auxout{\string - \undonewlabel{pagesLTS.\pagesLTS@pnc.local}{\on@line}}% +% \end{macrocode} +% +% The \textsf{undolabl} package has been updated and now uses |\undonewlabel| with only +% one argument. +% +% \begin{macrocode} + \def\pagesLTS@uv{new}% + \ifx\pagesLTS@undolable\pagesLTS@uv% + \immediate\write\@auxout{\string + \undonewlabel{pagesLTS.\pagesLTS@pnc.local}}% + \else% + \def\pagesLTS@uv{old}% + \ifx\pagesLTS@undolable\pagesLTS@uv% + \immediate\write\@auxout{\string + \undonewlabel{pagesLTS.\pagesLTS@pnc.local}{\on@line}}% + \else% + \relax % Error: no undolable package at all, message given above + \fi + \fi \fi% \addtocounter{page}{+1} \pagesLTS@putlabel{pagesLTS.\pagesLTS@pnc.local}{\theCurrentPageLocal}% @@ -3559,8 +3582,6 @@ was added.)\\ % \end{macrocode} % \end{macro} % -% \pagebreak -% % \begin{macro}{\EveryShipout} % \indent At the end of each shipout, the following commands are executed: % @@ -3827,6 +3848,8 @@ was added.)\\ \fi% % \end{macrocode} % +% \pagebreak +% % After the writeout we restore the page number again, % since there might be other things still to be done. % @@ -4068,11 +4091,45 @@ was added.)\\ \global\def\pagesLTS@hyper{1}% % \end{macrocode} % +% and whether the \textsf{pdfpages} package is loaded: +% +% \begin{macrocode} + \@ifpackageloaded{pdfpages}% + {\PackageWarning{pagesLTS}{Package pdfpages detected.\MessageBreak% + Using hyperref with pdfpages can cause problems.\MessageBreak% + See ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/pax/ \MessageBreak% + for project pax (PDFAnnotExtractor).\MessageBreak% + }% + }{\relax}% +% \end{macrocode} +% +% The \textsf{undolabl} package has been updated and now uses |\undonewlabel| with only +% one argument. +% +% \begin{macrocode} + \@ifpackageloaded{undolabl}% + {\@ifpackagelater{undolabl}{2010/07/14}% 2010/07/15 v1.0d + {\gdef\pagesLTS@undolable{new}% + }{\gdef\pagesLTS@undolable{old}% + \PackageWarning{pagesLTS}{Obsolete version of undolabl package used.\MessageBreak% + See ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/undolabl/ \MessageBreak% + for a new version.\MessageBreak% + }% + } + }{\gdef\pagesLTS@undolable{none}% + \PackageError{pagesLTS}{Package undolabl missing}{% + Package undolable not found.\MessageBreak% + The pagesLTS package needs the undolable package.\MessageBreak% + Please see the pagesLTS documentation on how to get it.\MessageBreak% + }% + } +% \end{macrocode} +% % Additionally a version check of the available \textsf{hyperref} % package is performed and if need be a warning is issued: % % \begin{macrocode} - \@ifpackagelater{hyperref}{2010/06/03}{% 2010/06/04 v6.81f + \@ifpackagelater{hyperref}{2010/06/17}{% 2010/06/18 v6.81g \relax}{% \PackageWarningNoLine{pagesLTS}{Old hyperref package detected:\MessageBreak% There is a newer version of the\MessageBreak% @@ -4081,12 +4138,45 @@ was added.)\\ }% }% %% pagesLTS supports the use of the package hyperref by - %% Heiko Oberdiek (hyperref version 2010/06/04 v6.81f). + %% Heiko Oberdiek (hyperref version 2010/06/18 v6.81g). %% pagesLTS may work with earlier versions of this packages, %% but this was not tested. +% \end{macrocode} +% +% The \textsf{hyperref} package redefines the |\lastpage@putlabel| command +% of the \textsf{lastpage} package and further does something, +% if the \textsf{revtex4} class is used. With |\pagesLTS@putlabelhyper| +% instead of |\lastpage@putlabel| the code from the \textsf{hyperref} package +% is this: +% +% \begin{macrocode} + %% Code from hyperref package, where \lastpage@putlabel was replaced + %% by \pagesLTS@putlabelhyper. But what does it do/what is it good for? + %% + %% \@ifclassloaded{revtex4}{% + %% \begingroup + %% \toks@\expandafter{\pagesLTS@putlabelhyper}% + %% \edef\x{\endgroup + %% \def\noexpand\pagesLTS@putlabelhyper{% + %% \noexpand\stepcounter{page}% + %% \the\toks@ + %% \noexpand\addtocounter{page}\noexpand\m@ne + %% }% + %% }% + %% \x + %% }{}% + %% +% \end{macrocode} +% +% Without knowing what it does, I did not want to use the code. +% If you can explain it to me, please send me an e-mail, thanks! +% +% \begin{macrocode} }% % \end{macrocode} % +% \pagebreak +% % If no \textsf{hyperref} package in use is detected, a warning is issued, too: % % \begin{macrocode} @@ -4099,8 +4189,6 @@ was added.)\\ % \end{macrocode} % \end{macro} % -% \pagebreak -% % \begin{macro}{\AtEndDocument} % \indent |\AtEndDocument| we put in a |\message| to show, % in what order things (which were called) are done @@ -4161,6 +4249,8 @@ was added.)\\ \fi% % \end{macrocode} % +% \pagebreak +% % If the \textsf{hyperref} package is in use, and the page numbering scheme % of the last page is \textsf{fnsymbol}, everything is quite more complicated. % Therefore |\lastpageref| is switched from simple |\lastpagereftxt| @@ -4233,8 +4323,6 @@ was added.)\\ \addtocounter{CurrentPage}{+1}% % \end{macrocode} % -% \pagebreak -% % The \texttt{VeryLastPage} label is set here, and when % |\lastpageref{VeryLastPage}| instead of |\lastpageref{LastPage}| is used, % it should really point to the last page. @@ -4335,7 +4423,7 @@ was added.)\\ % % \item[-] package \textsf{kvoptions}, 2010/02/22, v3.7, \CTAN{macros/latex/contrib/oberdiek/kvoptions.dtx} % -% \item[-] package \textsf{undolabl}, 2010/06/04, v1.0c, \CTAN{macros/latex/contrib/undolabl.dtx}\\ +% \item[-] package \textsf{undolabl}, 2010/07/15, v1.0d, \CTAN{macros/latex/contrib/undolabl.dtx}\\ % \end{description} % % \DescribeMacro{lastpage209.sty} @@ -4354,8 +4442,7 @@ was added.)\\ % The |pagesLTS-example.tex| requires the same files as all % documents using the \textsf{pagesLTS} package, and additionally: % \begin{description} -% \item[-] class \textsf{article}, 2007/10/19, v1.4h, from \textsf{classes.dtx}:\\ -% \CTAN{macros/latex/base/classes.dtx} +% \item[-] class \textsf{article}, 2007/10/19, v1.4h, from \textsf{classes.dtx}: \CTAN{macros/latex/base/classes.dtx} % % \item[-] package \textsf{alphalph}, 2010/04/18, v2.3, \CTAN{macros/latex/contrib/oberdiek/alphalph.dtx} % @@ -4363,9 +4450,9 @@ was added.)\\ % % \item[-] package \textsf{showkeys}, 2007/08/07, v3.15, \CTAN{macros/latex/required/tools/showkeys.dtx} % -% \item[-] package \textsf{hyperref}, 2010/06/04, v6.81f, \CTAN{macros/latex/contrib/hyperref.zip} +% \item[-] package \textsf{hyperref}, 2010/06/18, v6.81g, \CTAN{macros/latex/contrib/hyperref.zip} % -% \item[-] package \textsf{pagesLTS}, 2010/06/24, v1.1c, \CTAN{macros/latex/contrib/pagesLTS/pagesLTS.dtx}\\ +% \item[-] package \textsf{pagesLTS}, 2010/07/15, v1.1d, \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{pagesLTS} package, it can be assumed that you already % have some version of it -- is it the current one?) @@ -4373,8 +4460,7 @@ was added.)\\ % % \DescribeMacro{papermas} % The \textsf{papermas} package is not required, but requires itself the -% the \textsf{pagesLTS} package and can be considered as kind of add-on. -% It should become available at CTAN soon: +% the \textsf{pagesLTS} package and can be considered as kind of add-on: % \begin{description} % \item[-] package \textsf{papermas}, 2010/06/24, v1.0c, \CTAN{macros/latex/contrib/papermas/papermas.dtx} % \end{description} @@ -4398,7 +4484,7 @@ was added.)\\ % \DescribeMacro{fancyhdr} % \DescribeMacro{nccfancyhdr} % Neither \textsf{fancyhdr} nor \textsf{nccfancyhdr} package is required -% (the \textsf{lastpage} package used its precessor \textsf{fancyheadings}), +% (the \textsf{lastpage} package used its predecessor \textsf{fancyheadings}), % but because they were mentioned, also they are listed here: % \begin{description} % \item[-] package \textsf{fancyhdr}, 2005/03/22, v3.2, \CTAN{macros/latex/contrib/fancyhdr.zip} @@ -4437,10 +4523,13 @@ was added.)\\ % \textsf{kvoptions}, \textsf{alphalph}, \textsf{zref}) % are also available in a TDS compliant ZIP archive:\\ % \CTAN{install/macros/latex/contrib/oberdiek.tds.zip}.\\ +% +% \pagebreak +% % \textbf{Warning}: holtxdoc, 2010/04/24 v0.19, requires the packages % \begin{description} % \item[-] hypdoc, 2010/03/26, v1.9 -% \item[-] hyperref, 2010/03/30, v6.80u (latest: 2010/06/04, v6.81f) +% \item[-] hyperref, 2010/03/30, v6.80u (latest: 2010/06/18, v6.81g) % \item[-] pdftexcmds, 2010/04/01, v0.9 % \item[-] ltxcmds, 2010/03/09, v1.4 (latest: 2010/04/26, v1.7) % \item[-] hologo, 2010/04/24, v1.2 @@ -4448,7 +4537,7 @@ was added.)\\ % \end{description} % (or more recent versions) and does neither work with % nor check for earlier versions!\\ -% (It is probably best to download\\ +% (It is probably best to download % \CTAN{install/macros/latex/contrib/oberdiek.tds.zip} % and use this, because the packages in there should be both % recent and compatible.)\\ @@ -4456,10 +4545,13 @@ was added.)\\ % \DescribeMacro{M\"{u}nch} % Packages of mine:\\ % \begin{description} -% \item[undolabl] 2010/06/24, v1.0c, \CTAN{macros/latex/contrib/undolabl.dtx}\\ -% That package allows to override existing labels, especially automatically generated ones. +% \item[undolabl] 2010/07/15, v1.0d, \CTAN{macros/latex/contrib/undolabl.dtx}\\ +% That package allows to override existing labels, especially automatically generated ones.\\ +% (Code initally by Ulrich Dietz on \Newsgroup{comp.text.tex} at +% \texttt{Mon,~21~Apr~2008~23:04:03~+0200}, see e.\,g. +% \url{http://groups.google.de/group/comp.text.tex/msg/af6cfe93917097da}.) % -% \item[pagesLTS] 2010/06/24, v1.1c, \CTAN{macros/latex/contrib/pagesLTS.dtx}\\ +% \item[pagesLTS] 2010/07/15, v1.1d, \CTAN{macros/latex/contrib/pagesLTS.dtx}\\ % The package described in this very documentation. % % \item[papermas] 2010/06/24, v1.0c, \CTAN{macros/latex/contrib/papermas.dtx}\\ @@ -4477,7 +4569,7 @@ was added.)\\ % % \subsection{Package, unpacking TDS} % -% \paragraph{Package.} This package is available on \CTAN{} +% \paragraph{Package.} This package is available on \CTAN{} (when searching on CTAN, look for pageslts). % \begin{description} % \item[\CTAN{macros/latex/contrib/pagesLTS/pagesLTS.dtx}]\hspace*{0.1cm} \\ % The source file. @@ -4495,8 +4587,8 @@ was added.)\\ % The example file. % \item[\CTAN{macros/latex/contrib/pagesLTS/pagesLTS-example.pdf}]\hspace*{0.1cm} \\ % The compiled example file, as it should look like. -% \item[\CTAN{install/macros/latex/contrib/pagesLTS/pagesLTS.tds.zip}]\hspace*{0.1cm} \\ -% Everything in TDS compliant, compiled format (submitted, should become available soon). +% \item[\CTAN{install/macros/latex/contrib/pagesLTS.tds.zip}]\hspace*{0.1cm} \\ +% Everything in TDS compliant, compiled format. % \end{description} % % For required other packages, see the preceding subsection. @@ -4645,7 +4737,6 @@ was added.)\\ % % \begin{itemize} % \item Include a correct checksum for \textsf{pagesLTS}. -% \item Insert the final reference where to get the \xfile{tds.zip} file at \CTAN{}. % \end{itemize} % % \pagebreak @@ -4665,7 +4756,7 @@ was added.)\\ % Martin Schr\"{o}der (martin at oneiros dot de) for his \textsf{prelim2e} package, % from which I got the |Prelim@EveryShipout| code, % Ulrich Diez (eu\_angelion at web dot de) for his code -% for my \textsf{undolabl} package, which allows overwriting of labels, +% for the \textsf{undolabl} package, which allows overwriting of labels, % Andres L\"{o}h (andres at cs dot uu dot nl) % for the code to determine the current page numbering scheme, % and the \Newsgroup{comp.text.tex} and \Newsgroup{de.comp.text.tex} @@ -4747,11 +4838,27 @@ was added.)\\ % \begin{Version}{2010/06/24 v1.1c} % \item \textsf{holtxdoc} warning in \xfile{drv} updated. % \item Removed CRLF line endings from the \xfile{dtx} file. -% \item Corrected the location of the package at CTAN. (TDS still missing due to packaging error.) +% \item Corrected the location of the package at CTAN. +% (In this version \xfile{TDS} was still missing due to packaging error.) % \item Corrected Message format in pagesLTS.\xfile{ins}. % \item Updated references to other packages: \textsf{hyperref}, \textsf{undolabl}, and \textsf{papermas}. % \item Added a list of my other packages. % \end{Version} +% \begin{Version}{2010/07/15 v1.1d} +% \item Added the |\@ifclassloaded{revtex4}| code for |\lastpage@putlabel| (changed to +% |\pagesLTS@putlabelhyper|) from the \textsf{hyperref} package \textbf{as comment}~- +% what is the meaning of that code? +% \item In the documentation added the explanation of the occurence of multiply definitions +% of the |LastPage| label whith \textsf{lastpage}, \textsf{pagesLTS}, \textsf{hyperref} +% package (in that order). +% \item Corrected the given location of the \textsf{pagesLTS.tds.zip} file at CTAN. +% \item Updated references to other packages: \textsf{hyperref} and \textsf{undolabl}. +% \item Updated to new version of \textsf{undolabl} package [2010/07/15] v1.0d, +% which uses |\undonewlabel| with only one instead of two arguments. +% \item Added a warning message, if \textsf{hyperref} \textit{and} \textsf{pdfpages} are \textit{both} used. +% (Should not \textsf{hyperref} give this warning?) +% \item The usual correction of typos and minor details in the documentation. +% \end{Version} % \end{History} % % % \PrintChanges @@ -4759,7 +4866,8 @@ was added.)\\ % \bigskip % % When you find a mistake or have a suggestion for an improvement of this package, -% please send an e-mail to the maintainer, thanks! (Please see BUG REPORTS in the README.) +% please send an e-mail to the maintainer, thanks!\\ +% (Please see BUG REPORTS in the README.) % % \bigskip % diff --git a/Master/texmf-dist/source/latex/pageslts/pagesLTS.ins b/Master/texmf-dist/source/latex/pageslts/pagesLTS.ins index 2572080ccd5..d80ec5857de 100644 --- a/Master/texmf-dist/source/latex/pageslts/pagesLTS.ins +++ b/Master/texmf-dist/source/latex/pageslts/pagesLTS.ins @@ -59,7 +59,7 @@ \obeyspaces \Msg{******************************************************} \Msg{* Installation *} -\Msg{* Package: pagesLTS v1.1c 2010/06/24 LaTeX2e package *} +\Msg{* Package: pagesLTS v1.1d 2010/07/15 LaTeX2e package *} \Msg{* Refers to special pages' numbers/names (HMM) *} \Msg{******************************************************} @@ -124,9 +124,9 @@ and the derived files \file{pagesLTS.ins}{\from{pagesLTS.dtx}{install}}% \file{pagesLTS.drv}{\from{pagesLTS.dtx}{driver}}% \file{ltxdoc.cfg}{\from{pagesLTS.dtx}{ltxdoc}}% - %%\file{lastpage209.sty}{\from{pagesLTS.dtx}{lastpage209}}% \usedir{tex/latex/muench/pagesLTS}% \file{pagesLTS.sty}{\from{pagesLTS.dtx}{package}}% + %%\file{lastpage209.sty}{\from{pagesLTS.dtx}{lastpage209}}% \usedir{doc/latex/muench/pagesLTS}% \file{pagesLTS-example.tex}{\from{pagesLTS.dtx}{example}}% } diff --git a/Master/texmf-dist/tex/latex/pageslts/pagesLTS.sty b/Master/texmf-dist/tex/latex/pageslts/pagesLTS.sty index 71fb920792f..fc00157aafc 100644 --- a/Master/texmf-dist/tex/latex/pageslts/pagesLTS.sty +++ b/Master/texmf-dist/tex/latex/pageslts/pagesLTS.sty @@ -55,10 +55,10 @@ %% pagesLTS-example.tex. %% \NeedsTeXFormat{LaTeX2e}[1994/06/01] -\ProvidesPackage{pagesLTS}[2010/06/24 v1.1c +\ProvidesPackage{pagesLTS}[2010/07/15 v1.1d Refers to special pages' numbers/names (HMM)]% -%% Allow for things like\\ +%% Allows for things like\\ %% |Page \thepage\ (\theCurrentPage; local: \theCurrentPageLocal) of % %% \lastpageref{pagesLTS.roman}(\lastpageref{pagesLTS.roman.local}) + % %% \lastpageref{pagesLTS.Roman}(\lastpageref{pagesLTS.Roman.local}) + % @@ -73,7 +73,7 @@ \RequirePackage{atveryend}[2010/03/24]% v1.5 \RequirePackage{everyshi}[2001/05/15]%v 3.00 \RequirePackage{kvoptions}[2010/02/22]% v3.7 -\RequirePackage{undolabl}[2010/06/24]% v1.0c +\RequirePackage{undolabl}[2010/07/15]% v1.0d %% pagesLTS package uses Prelim@EveryShipout code from the %% prelim2e package [2009/05/29 v1.3] by Martin Schr\"{o}der, thanks! @@ -269,6 +269,7 @@ \def\pagesLTS@eso{0} \def\pagesLTS@esov{0} \def\lastpageref{\lastpagereftxt} +\def\pagesLTS@undolable{none} \def\pagesLTS@messageNPN{% The pagesLTS package was used, but\MessageBreak% \textbackslash pagenumbering\MessageBreak% @@ -609,8 +610,19 @@ \fi% \if@filesw% \overridelabel{pagesLTS.\pagesLTS@pnc}% - \immediate\write\@auxout{\string - \undonewlabel{pagesLTS.\pagesLTS@pnc.local}{\on@line}}% + \def\pagesLTS@uv{new}% + \ifx\pagesLTS@undolable\pagesLTS@uv% + \immediate\write\@auxout{\string + \undonewlabel{pagesLTS.\pagesLTS@pnc.local}}% + \else% + \def\pagesLTS@uv{old}% + \ifx\pagesLTS@undolable\pagesLTS@uv% + \immediate\write\@auxout{\string + \undonewlabel{pagesLTS.\pagesLTS@pnc.local}{\on@line}}% + \else% + \relax % Error: no undolable package at all, message given above + \fi + \fi \fi% \addtocounter{page}{+1} \pagesLTS@putlabel{pagesLTS.\pagesLTS@pnc.local}{\theCurrentPageLocal}% @@ -869,7 +881,30 @@ pagesLTS supports hyperref. Congratulations!\MessageBreak% }% \global\def\pagesLTS@hyper{1}% - \@ifpackagelater{hyperref}{2010/06/03}{% 2010/06/04 v6.81f + \@ifpackageloaded{pdfpages}% + {\PackageWarning{pagesLTS}{Package pdfpages detected.\MessageBreak% + Using hyperref with pdfpages can cause problems.\MessageBreak% + See ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/pax/ \MessageBreak% + for project pax (PDFAnnotExtractor).\MessageBreak% + }% + }{\relax}% + \@ifpackageloaded{undolabl}% + {\@ifpackagelater{undolabl}{2010/07/14}% 2010/07/15 v1.0d + {\gdef\pagesLTS@undolable{new}% + }{\gdef\pagesLTS@undolable{old}% + \PackageWarning{pagesLTS}{Obsolete version of undolabl package used.\MessageBreak% + See ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/undolabl/ \MessageBreak% + for a new version.\MessageBreak% + }% + } + }{\gdef\pagesLTS@undolable{none}% + \PackageError{pagesLTS}{Package undolabl missing}{% + Package undolable not found.\MessageBreak% + The pagesLTS package needs the undolable package.\MessageBreak% + Please see the pagesLTS documentation on how to get it.\MessageBreak% + }% + } + \@ifpackagelater{hyperref}{2010/06/17}{% 2010/06/18 v6.81g \relax}{% \PackageWarningNoLine{pagesLTS}{Old hyperref package detected:\MessageBreak% There is a newer version of the\MessageBreak% @@ -878,9 +913,25 @@ }% }% %% pagesLTS supports the use of the package hyperref by - %% Heiko Oberdiek (hyperref version 2010/06/04 v6.81f). + %% Heiko Oberdiek (hyperref version 2010/06/18 v6.81g). %% pagesLTS may work with earlier versions of this packages, %% but this was not tested. + %% Code from hyperref package, where \lastpage@putlabel was replaced + %% by \pagesLTS@putlabelhyper. But what does it do/what is it good for? + %% + %% \@ifclassloaded{revtex4}{% + %% \begingroup + %% \toks@\expandafter{\pagesLTS@putlabelhyper}% + %% \edef\x{\endgroup + %% \def\noexpand\pagesLTS@putlabelhyper{% + %% \noexpand\stepcounter{page}% + %% \the\toks@ + %% \noexpand\addtocounter{page}\noexpand\m@ne + %% }% + %% }% + %% \x + %% }{}% + %% }% {\PackageWarning{pagesLTS}{Package hyperref NOT detected.\MessageBreak% pagesLTS would support hyperref. The page references\MessageBreak% -- cgit v1.2.3