turnthepage 1.2 (31jan11)

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

7 files changed, 68 insertions, 65 deletions

diff --git a/Master/texmf-dist/doc/latex/turnthepage/Makefile b/Master/texmf-dist/doc/latex/turnthepage/Makefile
index 598251f4366..11e2e979d1c 100644
--- a/Master/texmf-dist/doc/latex/turnthepage/Makefile
+++ b/Master/texmf-dist/doc/latex/turnthepage/Makefile
@@ -569,10 +569,7 @@ GRAY	?= $(call get-default,$(GREY),)
 # register (starting at '0') and run the macro once for each line of the
 # original script:
 #
-# 0i	-e :s/\$/$$/eg
-:s/'/'"'"'/eg
-^Ela'A' \:noh
-j
+# 0i	-e :s/\$/$$/eg
:s/'/'"'"'/eg
^Ela'A' \:noh
j
 
 # don't call this directly - it is here to avoid calling wildcard more than
 # once in remove-files.
diff --git a/Master/texmf-dist/doc/latex/turnthepage/README b/Master/texmf-dist/doc/latex/turnthepage/README
index 8e869892138..7c984ff6258 100755
--- a/Master/texmf-dist/doc/latex/turnthepage/README
+++ b/Master/texmf-dist/doc/latex/turnthepage/README
@@ -1,4 +1,4 @@
-This is the README file of the turnthepage package v1.1 by Merciadri Luca
+This is the README file of the turnthepage package v1.2 by Merciadri Luca
 and Marc van Dongen.
 
 To use the turnthepage package correctly, please install the .sty
diff --git a/Master/texmf-dist/doc/latex/turnthepage/turnthepage-bib.bib b/Master/texmf-dist/doc/latex/turnthepage/turnthepage-bib.bib
index bc264715a0d..841b8b418db 100755
--- a/Master/texmf-dist/doc/latex/turnthepage/turnthepage-bib.bib
+++ b/Master/texmf-dist/doc/latex/turnthepage/turnthepage-bib.bib
@@ -3,3 +3,8 @@ author = {Van Dongen, Marc and Merciadri, Luca},
 title = {{Turn the Page, comp.text.tex}},
 year = 2011,
 }
+@misc{ps,
+author = {Stephani, Philipp and Merciadri, Luca},
+title = {{New on CTAN: turnthepage}},
+year = 2010,
+}
diff --git a/Master/texmf-dist/doc/latex/turnthepage/turnthepage.forlisting b/Master/texmf-dist/doc/latex/turnthepage/turnthepage.forlisting
index 52157d3af97..a2069690978 100755
--- a/Master/texmf-dist/doc/latex/turnthepage/turnthepage.forlisting
+++ b/Master/texmf-dist/doc/latex/turnthepage/turnthepage.forlisting
@@ -1,50 +1,50 @@
-%% This is file `turnthepage.sty' v1.1 by Merciadri Luca.
-% Thanks to Marc van Dongen for his help.
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turnthepage}[2011/01/21 Indicating to turn the page]
-\PackageInfo{turnthepage}{This is turnthepage.}
-\RequirePackage{atbegshi}
-\RequirePackage{refcount}
-\RequirePackage{picture}
-\RequirePackage{lastpage}
-
-\DeclareOption{short}{%
-\providecommand{\turnthepage}{/\ldots}
-}
-
-\DeclareOption{english}{%
-\providecommand{\turnthepage}{\textit{Turn the page.}}
-}
-
-\DeclareOption{francais}{%
-\providecommand{\turnthepage}{\textit{Tournez la page.}}
-}
-
-\DeclareOption{nederlands}{%
-\providecommand{\turnthepage}{\textit{Sla de pagina om.}}
-}
-
-\DeclareOption{deutsch}{%
-\providecommand{\turnthepage}{\textit{Eine Seite drehen.}}
-}
-
-\AtBeginShipout{%
-\AtBeginShipoutUpperLeft{%
-    \ifodd\thepage%
-    \ifnum\getpagerefnumber{LastPage}>\thepage%
-        \dimen1=1in
-        \advance\dimen1 by \textwidth
-        \advance\dimen1 by \oddsidemargin
-        \dimen3=1in
-        \advance\dimen3 by \topmargin
-        \advance\dimen3 by \headheight
-        \advance\dimen3 by \headsep
-        \advance\dimen3 by \textheight
-        \advance\dimen3 by \footskip
-        \put(\dimen1,-\dimen3){\llap{\turnthepage}}%
-    \fi\fi%
-}}
-
-\ProcessOptions
-\relax
+%% This is file `turnthepage.sty' v1.2 by Merciadri Luca.

+% Thanks to Marc van Dongen for his help.

+

+\NeedsTeXFormat{LaTeX2e}

+\ProvidesPackage{turnthepage}[2011/01/31 Indicating to turn the page]

+\PackageInfo{turnthepage}{This is turnthepage.}

+\RequirePackage{atbegshi}

+\RequirePackage{picture}

+\RequirePackage{zref-abspage}

+\RequirePackage{zref-lastpage}

+

+\DeclareOption{short}{%

+\providecommand{\turnthepage}{/\ldots}

+}

+

+\DeclareOption{english}{%

+\providecommand{\turnthepage}{\textit{Turn the page.}}

+}

+

+\DeclareOption{francais}{%

+\providecommand{\turnthepage}{\textit{Tournez la page.}}

+}

+

+\DeclareOption{nederlands}{%

+\providecommand{\turnthepage}{\textit{Sla de pagina om.}}

+}

+

+\DeclareOption{deutsch}{%

+\providecommand{\turnthepage}{\textit{Bitte wenden.}}

+}

+

+\AtBeginShipout{%

+\AtBeginShipoutUpperLeft{%

+    \ifodd\c@page

+    \ifnum\zref@extract{LastPage}{abspage}>\c@abspage

+        \dimen1=1in

+        \advance\dimen1 by \textwidth

+        \advance\dimen1 by \oddsidemargin

+        \dimen3=1in

+        \advance\dimen3 by \topmargin

+        \advance\dimen3 by \headheight

+        \advance\dimen3 by \headsep

+        \advance\dimen3 by \textheight

+        \advance\dimen3 by \footskip

+        \put(\dimen1,-\dimen3){\llap{\turnthepage}}%

+    \fi\fi%

+}}

+

+\ProcessOptions

+\relax

diff --git a/Master/texmf-dist/doc/latex/turnthepage/turnthepage.pdf b/Master/texmf-dist/doc/latex/turnthepage/turnthepage.pdf
index b5c1ad52cfc..0a600c10f53 100644
--- a/Master/texmf-dist/doc/latex/turnthepage/turnthepage.pdf
+++ b/Master/texmf-dist/doc/latex/turnthepage/turnthepage.pdf
diff --git a/Master/texmf-dist/doc/latex/turnthepage/turnthepage.tex b/Master/texmf-dist/doc/latex/turnthepage/turnthepage.tex
index 99b773f6750..806e676d1b5 100755
--- a/Master/texmf-dist/doc/latex/turnthepage/turnthepage.tex
+++ b/Master/texmf-dist/doc/latex/turnthepage/turnthepage.tex
@@ -79,7 +79,7 @@ The \textit{following options are available}:
 \item \verb|english|: will display `\textit{Turn the page.}' at the bottom of each odd page, in its right corner, \index{\texttt{english}}
 \item \verb|francais|: will display `\textit{Tournez la page.}' at the bottom of each odd page, in its right corner, \index{\texttt{francais}}
 \item \verb|nederlands|: will display `\textit{Sla de pagina om.}' at the bottom of each odd page, in its right corner, \index{\texttt{nederlands}}
-\item \verb|deutsch|: will display `\textit{Eine Seite drehen.}' at the bottom of each odd page, in its right corner, \index{\texttt{deutsch}}
+\item \verb|deutsch|: will display `\textit{Bitte wenden.}' at the bottom of each odd page, in its right corner, \index{\texttt{deutsch}}
 \end{itemize}
 As the package calls \verb|\turnthepage| where it needs to be placed, you can define \verb|\turnthepage| as you want. For example, if you want a more polite way to say it, you can use
 \begin{verbatim}
@@ -105,11 +105,12 @@ There is currently only one `bug:'
 \section{Version History}
 \begin{enumerate}
  \item \verb|v1.0|: package is introduced to the \LaTeX{} world (happy new 2011 year!),
- \item \verb|v1.1|: new options are added thanks to Mr. van Dongen's suggestions: \verb|english| now replaces \verb|long|, and \verb|francais|, \verb|nederlands|, \verb|deutsch| are implemented as translations of `Turn the page.' in French, Dutch, and German.
+ \item \verb|v1.1|: new options are added thanks to Mr. van Dongen's suggestions: \verb|english| now replaces \verb|long|, and \verb|francais|, \verb|nederlands|, \verb|deutsch| are implemented as translations of `Turn the page.' in French, Dutch, and German,
+ \item \verb|v1.2|: in \verb|v1.1|, setting page numbering to `arabic' lead to errors. As a result, Mr. Philipp Stephani proposed to use \verb|zref-abspage| and \verb|zref-lastpage| at the place of \verb|lastpage|. After some slight modifications, one can now use any page numbering style. This manual uses the old version of the macro, when the package is the new version.
 \end{enumerate}
 
 \section{Thanks}
-Many thanks go to Marc van Dongen for his help at \cite{mvd1}.
+Many thanks go to Marc van Dongen for his help at \cite{mvd1}, and to Philipp Stephani at \cite{ps}.
 
 \section{Contact}
 If you have any question concerning this package (limitations, bugs, \ldots), please contact me at \href{mailto:Luca.Merciadri@student.ulg.ac.be}{Luca.Merciadri@student.ulg.ac.be}.
diff --git a/Master/texmf-dist/tex/latex/turnthepage/turnthepage.sty b/Master/texmf-dist/tex/latex/turnthepage/turnthepage.sty
index 52157d3af97..d987e55f87b 100644
--- a/Master/texmf-dist/tex/latex/turnthepage/turnthepage.sty
+++ b/Master/texmf-dist/tex/latex/turnthepage/turnthepage.sty
@@ -1,13 +1,13 @@
-%% This is file `turnthepage.sty' v1.1 by Merciadri Luca.
+%% This is file `turnthepage.sty' v1.2 by Merciadri Luca.
 % Thanks to Marc van Dongen for his help.
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turnthepage}[2011/01/21 Indicating to turn the page]
+\ProvidesPackage{turnthepage}[2011/01/31 Indicating to turn the page]
 \PackageInfo{turnthepage}{This is turnthepage.}
 \RequirePackage{atbegshi}
-\RequirePackage{refcount}
 \RequirePackage{picture}
-\RequirePackage{lastpage}
+\RequirePackage{zref-abspage}
+\RequirePackage{zref-lastpage}
 
 \DeclareOption{short}{%
 \providecommand{\turnthepage}{/\ldots}
@@ -26,13 +26,13 @@
 }
 
 \DeclareOption{deutsch}{%
-\providecommand{\turnthepage}{\textit{Eine Seite drehen.}}
+\providecommand{\turnthepage}{\textit{Bitte wenden.}}
 }
 
 \AtBeginShipout{%
 \AtBeginShipoutUpperLeft{%
-    \ifodd\thepage%
-    \ifnum\getpagerefnumber{LastPage}>\thepage%
+    \ifodd\c@page
+    \ifnum\zref@extract{LastPage}{abspage}>\c@abspage
         \dimen1=1in
         \advance\dimen1 by \textwidth
         \advance\dimen1 by \oddsidemargin