turnthepath 1.3a (24mar11)

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

7 files changed, 198 insertions, 108 deletions

diff --git a/Master/texmf-dist/doc/latex/turnthepage/README b/Master/texmf-dist/doc/latex/turnthepage/README
index 7c984ff6258..0feb8d10a89 100755
--- a/Master/texmf-dist/doc/latex/turnthepage/README
+++ b/Master/texmf-dist/doc/latex/turnthepage/README
@@ -1,5 +1,5 @@
-This is the README file of the turnthepage package v1.2 by Merciadri Luca
-and Marc van Dongen.
+This is the README file of the turnthepage package v1.3a by Merciadri Luca,
+Marc van Dongen and Martin Münch.
 
 To use the turnthepage package correctly, please install the .sty
 file in your LaTeX distribution, or use it in the directories of your
diff --git a/Master/texmf-dist/doc/latex/turnthepage/turnthepage.forlisting b/Master/texmf-dist/doc/latex/turnthepage/turnthepage.forlisting
deleted file mode 100755
index a2069690978..00000000000
--- a/Master/texmf-dist/doc/latex/turnthepage/turnthepage.forlisting
+++ /dev/null
@@ -1,50 +0,0 @@
-%% 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 0a600c10f53..e088689b8e2 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 806e676d1b5..c0733604cb7 100755
--- a/Master/texmf-dist/doc/latex/turnthepage/turnthepage.tex
+++ b/Master/texmf-dist/doc/latex/turnthepage/turnthepage.tex
@@ -10,6 +10,7 @@
 
 \renewcommand{\captionfont}{\small}
 \renewcommand{\captionlabelfont}{\bfseries}
+\newcommand{\etex}{$\epsilon$-\TeX}
 
 \usepackage[protrusion=true,draft=false,final,verbose=true,babel=true]{microtype}
 
@@ -33,7 +34,7 @@
 }}
 
 \title{The \textbf{turnthepage} package}
-\author{Merciadri Luca, Marc van Dongen}
+\author{Luca Merciadri, Marc van Dongen, Martin M\"unch}
 \date{\today}
 
 \usepackage{makeidx}
@@ -64,15 +65,16 @@ On some exams' sheets, some professors or lecturers like to indicate to the read
 
 This package can thus be used for exams, or special documents printed `twoside.'
 
-\section{Use}
+\section{General Use}
 \subsection{Loading the Package}
-To \textit{load the package}, please use
+The general method to \textit{load the package} is to use
 \begin{center}
 \begin{verbatim}
-\usepackage[options]{turnthepage}
+\usepackage[option]{turnthepage}
 \end{verbatim}
 \end{center}
 \subsection{Available Options}
+\label{subsec:ao}
 The \textit{following options are available}:
 \begin{itemize}
 \item \verb|short|: will display `/\ldots' at the bottom of each odd page, in its right corner, \index{\texttt{short}}
@@ -87,12 +89,24 @@ As the package calls \verb|\turnthepage| where it needs to be placed, you can de
 \end{verbatim}
 after the preamble.
 
-\section{Implementation}
-Here is the code of \verb|turnthepage.sty|:
-\lstset{language=TEX, basicstyle=\normalsize, keywordstyle=\bfseries, commentstyle=\itshape, keywords={}, emph={}, emphstyle=\bfseries, numbers=left, stringstyle=\ttseries, showstringspaces=false, stepnumber=2, numbersep=5pt, showspaces=false, showtabs=false, backgroundcolor=\color{white}}
+The package is composed of three \verb|.sty| files: one for the \etex{} version (with the \verb|zref-abspage| and \verb|zref-lastpage| packages), one for the non-\etex{} version (with the \verb|pagesLTS| package), and one main file. The main file (\verb|turnthepage.sty|) will automatically load \verb|turnpageetex.sty| if \etex{} is found, and \verb|turnpagewoetex.sty| if no \etex{} is detected.
+
+You can decide to force the use of either \verb|turnpageetex.sty| or \verb|turnpagewoetex.sty| (provided you have the related \LaTeX{} installation) using
+\begin{verbatim}
+\usepackage[option]{turnpageetex}
+\end{verbatim}
+or
+\begin{verbatim}
+\usepackage[option]{turnpagewoetex}
+\end{verbatim}
+where, in both cases, \verb|option| is an element as defined at Subsection \ref{subsec:ao}. Notice the missing \verb|the| after \verb|turn| in these two specific files.
+
+%\section{Implementation}
+%Here is the code of \verb|turnthepage.sty|:
+%\lstset{language=TEX, basicstyle=\normalsize, keywordstyle=\bfseries, commentstyle=\itshape, keywords={}, emph={}, emphstyle=\bfseries, numbers=left, stringstyle=\ttseries, showstringspaces=false, stepnumber=2, numbersep=5pt, showspaces=false, showtabs=false, backgroundcolor=\color{white}}
 
 %\begin{lstlisting}[frame=single]
-\lstinputlisting[lastline=80]{turnthepage.forlisting}
+%\lstinputlisting[lastline=80]{turnthepage.forlisting}
 %\end{lstlisting}
 
 \section{Bugs}
@@ -103,14 +117,36 @@ There is currently only one `bug:'
 
 
 \section{Version History}
+\label{sec:vh}
 \begin{enumerate}
+\addtocounter{enumi}{-1}
  \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.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.
+ \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,
+ \item \verb|v1.3a|: Mr. Martin M\"unch told me by pers. comm. that the package cannot be used on all \LaTeX{} distributions, when they are not \etex{} capable. Fortunately, he had previously implemented the \verb|pagesLTS| package, which does not rely on \etex. It allowed him to write three files:
+\begin{itemize}
+ \item \verb|turnpageetex|: old \verb|turnthepage|'s equivalent (using \etex),
+ \item \verb|turnpagewoetex|: old \verb|turnthepage|'s equivalent using \verb|pagesLTS|,
+ \item \verb|turnthepage|: main file.
+\end{itemize}
+The package now works for users who do not have \etex: when invoking \verb|turnthepage|, the \verb|turnthepage| package decides to use either \verb|turnpageetex| or  \verb|turnpagewoetex| depending on \etex{} availability. It is also possible to use e.g. the \verb|turnpagewoetex| package independently. You simply need to replace
+\begin{verbatim}
+\usepackage[option]{turnthepage}
+\end{verbatim}
+by
+\begin{verbatim}
+\usepackage[option]{turnpagewoetex}
+\end{verbatim}
+and the same remark applies for \verb|turnpageetex|. Many thanks go to Mr. Martin M\"unch for this, who also added info messages depending on the package's status so that the user is now more aware about what's going on.
 \end{enumerate}
 
 \section{Thanks}
-Many thanks go to Marc van Dongen for his help at \cite{mvd1}, and to Philipp Stephani at \cite{ps}.
+Many thanks go to
+\begin{itemize}
+\item Marc van Dongen for his help at \cite{mvd1},
+\item Martin M\"unch for his personal communications and his version of \verb|turnthepage| without \etex,
+\item Philipp Stephani at \cite{ps}.
+\end{itemize}
 
 \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/turnpageetex.sty b/Master/texmf-dist/tex/latex/turnthepage/turnpageetex.sty
new file mode 100644
index 00000000000..16c225574e0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/turnthepage/turnpageetex.sty
@@ -0,0 +1,59 @@
+% This is file `turnpageetex.sty' v1.3a by Merciadri Luca.
+% Thanks to Marc van Dongen and Martin Muench for their help.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{turnpageetex}[2011/03/24 1.3a
+            Indicating to turn the page (LM)]
+
+\PackageInfo{turnpageetex}{This is turnthepage with using e-TeX.}
+
+\RequirePackage{atbegshi}
+\RequirePackage{picture}
+\RequirePackage{zref-abspage}
+\RequirePackage{zref-lastpage}
+
+\ifx\turnthepage\undefined
+ \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.}}}
+\else
+ \newcommand{\turnp@agewarn}{%
+   \PackageWarning{turnpageetex}{Command turnthepage was already defined.\MessageBreak%
+     Now redefining it.}}
+ \DeclareOption{short}{\turnp@agewarn \renewcommand{\turnthepage}{/\ldots}}
+ \DeclareOption{english}{\turnp@agewarn \renewcommand{\turnthepage}{\textit{Turn the page.}}}
+ \DeclareOption{francais}{\turnp@agewarn \renewcommand{\turnthepage}{\textit{Tournez la page.}}}
+ \DeclareOption{nederlands}{\turnp@agewarn \renewcommand{\turnthepage}{\textit{Sla de pagina om.}}}
+ \DeclareOption{deutsch}{\turnp@agewarn \renewcommand{\turnthepage}{\textit{Bitte wenden.}}}
+\fi
+
+\ProcessOptions
+
+\ifx\turnthepage\undefined
+ \providecommand{\turnthepage}{ }
+ \PackageWarning{turnpageetex}{No option for package turnthepage\MessageBreak%
+  (or turnpageetex) choosen!\MessageBreak%
+   There will be no information regarding\MessageBreak%
+   the need to turn the page!\MessageBreak%
+   }
+\fi
+
+\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%
+}}
diff --git a/Master/texmf-dist/tex/latex/turnthepage/turnpagewoetex.sty b/Master/texmf-dist/tex/latex/turnthepage/turnpagewoetex.sty
new file mode 100644
index 00000000000..5f6b8b0c7b0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/turnthepage/turnpagewoetex.sty
@@ -0,0 +1,61 @@
+% This is file `turnpagewoetex.sty' v1.3a by Merciadri Luca.
+% Thanks to Marc van Dongen and Martin Muench for their help.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{turnpagewoetex}[2011/03/24 1.3a
+            Indicating to turn the page (LM)]
+
+\PackageInfo{turnpagewoetex}{This is turnthepage without using e-TeX.}
+
+\RequirePackage{atbegshi}
+\RequirePackage{picture}
+\RequirePackage{alphalph}
+\RequirePackage{pagesLTS}
+
+\ifx\turnthepage\undefined
+ \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.}}}
+\else
+ \newcommand{\turnp@agewarn}{%
+   \PackageWarning{turnpageetex}{Command turnthepage was already defined.\MessageBreak%
+     Now redefining it.}}
+ \DeclareOption{short}{\turnp@agewarn \renewcommand{\turnthepage}{/\ldots}}
+ \DeclareOption{english}{\turnp@agewarn \renewcommand{\turnthepage}{\textit{Turn the page.}}}
+ \DeclareOption{francais}{\turnp@agewarn \renewcommand{\turnthepage}{\textit{Tournez la page.}}}
+ \DeclareOption{nederlands}{\turnp@agewarn \renewcommand{\turnthepage}{\textit{Sla de pagina om.}}}
+ \DeclareOption{deutsch}{\turnp@agewarn \renewcommand{\turnthepage}{\textit{Bitte wenden.}}}
+\fi
+
+\ProcessOptions
+
+\ifx\turnthepage\undefined
+ \providecommand{\turnthepage}{ }
+ \PackageWarning{turnpagewoetex}{No option for package turnthepage\MessageBreak%
+   (or turnpagewoetex) choosen!\MessageBreak%
+   There will be no information regarding\MessageBreak%
+   the need to turn the page!\MessageBreak%
+   }
+\fi
+
+\AtBeginShipout{%
+\AtBeginShipoutUpperLeft{%
+     \ifodd\value{CurrentPage}
+       % The \value{CurrentPage} is already 1 higher than the current page number here.
+     \else
+      \ifnum\value{pagesLTS.pagenr}>\value{CurrentPage}
+        \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%
+}}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/turnthepage/turnthepage.sty b/Master/texmf-dist/tex/latex/turnthepage/turnthepage.sty
index d987e55f87b..554cd6fce20 100644
--- a/Master/texmf-dist/tex/latex/turnthepage/turnthepage.sty
+++ b/Master/texmf-dist/tex/latex/turnthepage/turnthepage.sty
@@ -1,50 +1,34 @@
-%% This is file `turnthepage.sty' v1.2 by Merciadri Luca.
-% Thanks to Marc van Dongen for his help.
+% This is file `turnthepage.sty' v1.3a by Merciadri Luca.
+% Thanks to Marc van Dongen and Martin Muench for their 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}
+\NeedsTeXFormat{LaTeX2e}[1994/06/01]
+\ProvidesPackage{turnthepage}[2011/03/24 v1.3a
+            Loading turnthepage package (LM)]
 
-\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%
-}}
+\DeclareOption{short}{\providecommand{\turnp@geoption}{short}}
+\DeclareOption{english}{\providecommand{\turnp@geoption}{english}}
+\DeclareOption{francais}{\providecommand{\turnp@geoption}{francais}}
+\DeclareOption{nederlands}{\providecommand{\turnp@geoption}{nederlands}}
+\DeclareOption{deutsch}{\providecommand{\turnp@geoption}{deutsch}}
 
 \ProcessOptions
-\relax
+
+\ifx\turnp@geoption\undefined
+ \providecommand{\turnp@geoption}{ }
+\fi
+
+\newif\ifetex
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname eTeXversion\endcsname\relax
+ \etexfalse
+\else
+ \etextrue
+\fi
+
+\ifetex
+ \PackageInfo{turnthepage}{e-TeX found, loading package turnpageetex.}
+ \RequirePackage[\turnp@geoption]{turnpageetex}
+\else
+ \PackageInfo{turnthepage}{e-TeX not found, loading package turnpagewoetex.}
+ \RequirePackage[\turnp@geoption]{turnpagewoetex}
+\fi
\ No newline at end of file