atbegshi 1.2 (oberdiek 20apr07)

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

16 files changed, 617 insertions, 43 deletions

diff --git a/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
new file mode 100644
index 00000000000..854e6e0cd59
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/atbegshi.sty
@@ -0,0 +1,575 @@
+%%
+%% This is file `atbegshi.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% atbegshi.dtx  (with options: `package')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2007 by Heiko Oberdiek <oberdiek@uni-freiburg.de>
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in
+%%    http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%% 
+%% This work consists of the main source file atbegshi.dtx
+%% and the derived files
+%%    atbegshi.sty, atbegshi.pdf, atbegshi.ins, atbegshi.drv,
+%%    atbegshi-test1.tex, atbegshi-test2.tex.
+%% 
+\expandafter\edef\csname AtBegShi@End\endcsname{%
+  \catcode40 \the\catcode40\relax % (
+  \catcode41 \the\catcode41\relax % )
+  \catcode44 \the\catcode44\relax % ,
+  \catcode45 \the\catcode45\relax % -
+  \catcode46 \the\catcode46\relax % .
+  \catcode58 \the\catcode58\relax % :
+  \catcode61 \the\catcode61\relax % =
+  \catcode64 \the\catcode64\relax % @
+  \catcode94 \the\catcode94\relax % ^
+  \catcode96 \the\catcode96\relax % `
+  \noexpand\endinput
+}
+\catcode40 12 % (
+\catcode41 12 % )
+\catcode44 12 % ,
+\catcode45 12 % -
+\catcode46 12 % .
+\catcode58 12 % :
+\catcode61 12 % =
+\catcode64 11 % @
+\catcode94 7  % ^
+\catcode96 12 % `
+\begingroup
+  \expandafter\let\expandafter\x\csname ver@atbegshi.sty\endcsname
+  \ifcase 0%
+    \ifx\x\relax % plain
+    \else
+      \ifx\x\empty % LaTeX
+      \else
+        1%
+      \fi
+    \fi
+  \else
+    \expandafter\ifx\csname PackageInfo\endcsname\relax
+      \def\x#1#2{%
+        \immediate\write-1{Package #1 Info: #2.}%
+      }%
+    \else
+      \def\x#1#2{\PackageInfo{#1}{#2, stopped}}%
+    \fi
+    \x{atbegshi}{The package is already loaded}%
+    \endgroup
+    \expandafter\endinput
+  \fi
+\endgroup
+\begingroup
+  \expandafter\ifx\csname ProvidesPackage\endcsname\relax
+    \def\x#1#2#3[#4]{\endgroup
+      \immediate\write-1{Package: #3 #4}%
+      \xdef#1{#4}%
+    }%
+  \else
+    \def\x#1#2[#3]{\endgroup
+      #2[{#3}]%
+      \ifx#1\relax
+        \xdef#1{#3}%
+      \fi
+    }%
+  \fi
+\expandafter\x\csname ver@atbegshi.sty\endcsname
+\ProvidesPackage{atbegshi}%
+  [2007/04/19 v1.2 At begin shipout hook (HO)]
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname PackageWarning\endcsname\relax
+  \def\AtBegShi@Warning#1{%
+    \begingroup
+      \newlinechar=10 %
+      \def\@spaces{\space\space\space\space}%
+      \def\MessageBreak{%
+        ^^J(atbegshi)\@spaces\@spaces\@spaces\@spaces
+      }%
+      \immediate\write16{%
+        ^^JPackage atbegshi Warning: #1 %
+        on input line \the\inputlineno.^^J%
+      }%
+    \endgroup
+  }%
+\else
+  \def\AtBegShi@Warning{%
+    \PackageWarning{atbegshi}%
+  }%
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname PackageInfo\endcsname\relax
+  \def\AtBegShi@Info#1{%
+    \begingroup
+      \newlinechar=10 %
+      \def\@spaces{\space\space\space\space}%
+      \def\MessageBreak{%
+        ^^J(atbegshi) \@spaces\@spaces\@spaces
+      }%
+      \immediate\write-1{%
+        ^^JPackage atbegshi Info: #1.^^J%
+      }%
+    \endgroup
+  }%
+\else
+  \def\AtBegShi@Info#1{%
+    \begingroup
+      \def\on@line{}%
+      \PackageInfo{atbegshi}{#1}%
+    \endgroup
+  }%
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname @ifdefinable\endcsname\relax
+  \def\AtBegShi@CheckDefinable#1{%
+    \ifcase\ifx#1\relax
+             \@ne
+           \else
+             \ifx#1\@undefined
+               \@ne
+             \else
+               \z@
+             \fi
+           \fi
+      \errmessage{%
+        Package atbegshi: \string#1\space
+        is already defined%
+      }%
+      \endgroup
+    \fi
+  }%
+\else
+  \def\AtBegShi@CheckDefinable#1{%
+    \@ifdefinable{#1}{}%
+  }%
+\fi
+\newif\ifAtBegShi@Discarded
+\AtBegShi@CheckDefinable\AtBeginShipoutDiscard
+\def\AtBeginShipoutDiscard{%
+  \deadcycles=\z@
+  \global\AtBegShi@Discardedtrue
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname currentgrouplevel\endcsname\relax
+  \catcode`X=9  % ignore
+  \catcode`E=14 % comment
+\else
+  \catcode`X=14 % comment
+  \catcode`E=9  % ignore
+\fi
+\def\AtBegShi@Shipout{%
+X \begingroup
+X \setbox\AtBeginShipoutBox=\hbox\bgroup
+X \kern\p@
+E \edef\AtBegShi@GroupLevel{\number\currentgrouplevel}%
+  \afterassignment\AtBegShi@Test
+X \global
+  \setbox\AtBeginShipoutBox=%
+}
+\def\AtBegShi@Test{%
+X \ifdim\lastkern=\z@
+X   \aftergroup\egroup
+X   \aftergroup\endgroup
+X   \expandafter\aftergroup
+X \else
+X   \egroup
+X   \endgroup
+E \ifnum\AtBegShi@GroupLevel=\currentgrouplevel
+E \else
+E   \expandafter\aftergroup
+  \fi
+  \AtBegShi@Output
+}
+\catcode`\X=11 %
+\catcode`\E=11 %
+\def\AtBegShi@Output{%
+  \ifvoid\AtBeginShipoutBox
+    \AtBegShi@Warning{Ignoring void shipout box}%
+  \else
+    \let\AtBegShi@OrgProtect\protect
+    \csname set@typeset@protect\endcsname
+    \global\AtBegShi@Discardedfalse
+    \AtBegShi@Hook
+    \AtBegShi@HookNext
+    \gdef\AtBegShi@HookNext{}%
+    \ifAtBegShi@Discarded
+      \AtBegShi@Info{Shipout page discarded}%
+      \global\AtBegShi@Discardedfalse
+      \begingroup
+        \setbox\AtBeginShipoutBox\box\AtBeginShipoutBox
+      \endgroup
+      \let\protect\AtBegShi@OrgProtect
+    \else
+      \AtBegShi@First
+      \let\protect\AtBegShi@OrgProtect
+      \AtBegShi@OrgShipout\box\AtBeginShipoutBox
+    \fi
+  \fi
+}
+\def\AtBegShi@First{%
+  \begingroup
+    \def\@empty{}%
+    \ifx\AtBegShi@HookFirst\@empty
+    \else
+      \setbox\z@=\vbox{%
+        \begingroup
+          \AtBegShi@HookFirst
+        \endgroup
+      }%
+      \wd\z@=\z@
+      \ht\z@=\z@
+      \dp\z@=\z@
+      \global\setbox\AtBeginShipoutBox=\vbox{%
+        \baselineskip\z@skip
+        \lineskip\z@skip
+        \lineskiplimit\z@
+        \copy\z@
+        \copy\AtBeginShipoutBox
+      }%
+    \fi
+    \global\let\AtBegShi@First\@empty
+    \global\let\AtBeginShipoutFirst\AtBegShi@FirstDisabled
+  \endgroup
+}
+\gdef\AtBegShi@Hook{}
+\gdef\AtBegShi@HookNext{}
+\gdef\AtBegShi@HookFirst{}
+\AtBegShi@CheckDefinable\AtBeginShipout
+\def\AtBeginShipout{%
+  \AtBegShi@AddHook\AtBegShi@Hook
+}
+\AtBegShi@CheckDefinable\AtBeginShipoutNext
+\def\AtBeginShipoutNext{%
+  \AtBegShi@AddHook\AtBegShi@HookNext
+}
+\AtBegShi@CheckDefinable\AtBeginShipoutFirst
+\def\AtBeginShipoutFirst{%
+  \AtBegShi@AddTo\AtBegShi@HookFirst
+}
+\long\def\AtBegShi@FirstDisabled#1{%
+  \AtBegShi@Warning{%
+    First page is already shipped out, ignoring\MessageBreak
+    \string\AtBeginShipoutFirst
+  }%
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname g@addto@macro\endcsname\relax
+  \long\def\AtBegShi@AddTo#1#2{%
+    \begingroup
+      \toks\z@\expandafter{#1#2}%
+      \xdef#1{\the\toks\z@}%
+    \endgroup
+  }%
+\else
+  \let\AtBegShi@AddTo\g@addto@macro
+\fi
+\long\def\AtBegShi@AddHook#1#2{%
+  \AtBegShi@AddTo#1{\AtBegShi@Item{#2}}%
+}
+\long\def\AtBegShi@Item#1{%
+  \ifAtBegShi@Discarded
+  \else
+    #1%
+    \ifvoid\AtBeginShipoutBox
+      \AtBegShi@Warning{%
+        Shipout box was voided by hook,\MessageBreak
+        ignoring shipout box%
+      }%
+      \AtBeginShipoutDiscard
+    \fi
+  \fi
+}
+\AtBegShi@CheckDefinable\AtBeginShipoutInit
+\def\AtBeginShipoutInit{%
+  \csname newbox\endcsname\AtBeginShipoutBox
+  \AtBegShi@CheckDefinable\AtBegShi@OrgShipout
+  \global\let\AtBegShi@OrgShipout\shipout
+  \global\let\shipout\AtBegShi@Shipout
+  \gdef\AtBeginShipoutInit{}%
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname AtBeginDocument\endcsname\relax
+  \AtBeginShipoutInit
+\else
+  \AtBeginDocument{\AtBeginShipoutInit}%
+\fi
+\def\AtBegShi@AbortIfUndefined#1{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname#1\endcsname\relax
+    \expandafter\AtBegShi@End
+  \fi
+}
+\AtBegShi@AbortIfUndefined{currentgrouplevel}
+\AtBegShi@AbortIfUndefined{AtBeginDocument}
+\AtBegShi@AbortIfUndefined{@ifpackageloaded}
+\AtBegShi@AbortIfUndefined{@ifclassloaded}
+\def\AtBegShi@PatchCrop{%
+  \begingroup
+    \def\AtBegShi@Crop@shipout{%
+      \afterassignment\CROP@ship
+      \setbox\@cclv=%
+    }%
+    \def\AtBegShi@Crop@ship{%
+      \ifvoid\@cclv
+        \expandafter\aftergroup
+      \fi
+      \CROP@@ship
+    }%
+    \def\AtBegShi@Crop@shiplist{%
+      \lineskip\z@
+      \lineskiplimit\z@
+      \baselineskip\z@
+      \CROP@kernel
+      \box\@cclv
+    }%
+    \def\AtBegShi@Crop@@ship{%
+      \CROP@shipout\vbox{%
+        \CROP@shiplist
+      }%
+    }%
+    \ifx\AtBegShi@Crop@ship\CROP@ship
+      \ifx\AtBegShi@Crop@shiplist\CROP@shiplist
+        \ifx\AtBegShi@Crop@@ship\CROP@@ship
+          \let\AtBegShi@found\relax
+          \ifx\shipout\AtBegShi@Crop@shipout
+            \def\AtBegShi@found{\shipout}%
+          \else\ifx\AtBegShi@OrgShipout\AtBegShi@Crop@shipout
+            \def\AtBegShi@found{\AtBegShi@OrgShipout}%
+          \else\ifx\@EveryShipout@Org@Shipout\AtBegShi@Crop@shipout
+            \def\AtBegShi@found{\@EveryShipout@Org@Shipout}%
+          \else\ifx\GPTorg@shipout\AtBegShi@Crop@shipout
+            \def\AtBegShi@found{\GPTorg@shipout}%
+          \else\ifx\THBorg@shipout\AtBegShi@Crop@shipout
+            \def\AtBegShi@found{\THBorg@shipout}%
+          \else\ifx\mem@oldshipout\AtBegShi@Crop@shipout
+            \def\AtBegShi@found{\mem@oldshipout}%
+          \fi\fi\fi\fi\fi\fi
+          \ifx\AtBegShi@found\relax
+          \else
+            \expandafter\endgroup
+            \expandafter\def\AtBegShi@found{%
+              \edef\AtBegShi@GroupLevel{\number\currentgrouplevel}%
+              \afterassignment\CROP@ship
+              \setbox\AtBeginShipoutBox=%
+            }%
+            \def\CROP@ship{%
+              \ifnum\AtBegShi@GroupLevel=\currentgrouplevel
+              \else
+                \expandafter\aftergroup
+              \fi
+              \CROP@@ship
+            }%
+            \def\CROP@shiplist{%
+              \lineskip\z@
+              \lineskiplimit\z@
+              \baselineskip\z@
+              \CROP@kernel
+              \box\AtBeginShipoutBox
+            }%
+            \def\CROP@@ship{%
+              \ifvoid\AtBeginShipoutBox
+              \else
+                \setbox\AtBeginShipoutBox=\vbox{%
+                  \CROP@shiplist
+                }%
+                \expandafter\CROP@shipout
+                \expandafter\box
+                \expandafter\AtBeginShipoutBox
+              \fi
+            }%
+            \AtBegShi@Info{Package `crop' patched}%
+            \begingroup
+          \fi
+        \fi
+      \fi
+    \fi
+  \endgroup
+  \let\AtBegShi@PatchCrop\relax
+}
+\@ifpackageloaded{crop}{%
+  \AtBegShi@PatchCrop
+}{%
+  \AtBeginDocument{\AtBegShi@PatchCrop}%
+}
+\def\AtBegShi@PatchEveryshi{%
+  \begingroup
+    \long\def\AtBegShi@Everyshi@shipout{%
+      \afterassignment\@EveryShipout@Test
+      \global\setbox\@cclv= %
+    }%
+    \long\def\AtBegShi@Everyshi@Test{%
+      \ifvoid\@cclv\relax
+        \aftergroup\@EveryShipout@Output
+      \else
+        \@EveryShipout@Output
+      \fi
+    }%
+    \ifx\AtBegShi@Everyshi@Test\@EveryShipout@Test
+      \let\AtBegShi@found\relax
+      \ifx\shipout\AtBegShi@Everyshi@shipout
+        \def\AtBegShi@found{\shipout}%
+      \else\ifx\AtBegShi@OrgShipout\AtBegShi@Everyshi@shipout
+        \def\AtBegShi@found{\AtBegShi@OrgShipout}%
+      \else\ifx\CROP@shipout\AtBegShi@Everyshi@shipout
+        \def\AtBegShi@found{\CROP@shipout}%
+      \else\ifx\GPTorg@shipout\AtBegShi@Everyshi@shipout
+        \def\AtBegShi@found{\GPTorg@shipout}%
+      \else\ifx\THBorg@shipout\AtBegShi@Everyshi@shipout
+        \def\AtBegShi@found{\THBorg@shipout}%
+      \else\ifx\mem@oldshipout\AtBegShi@Everyshi@shipout
+        \def\AtBegShi@found{\mem@oldshipout}%
+      \else
+        \expandafter\ifx\csname @EveryShipout@Org@Shipout\endcsname
+                        \relax
+           \ifx\@EveryShipout@Shipout\AtBegShi@Everyshi@shipout
+             \def\AtBegShi@found{\@EveryShipout@Shipout}%
+           \fi
+        \fi
+      \fi\fi\fi\fi\fi\fi
+      \ifx\AtBegShi@found\relax
+      \else
+        \expandafter\endgroup
+        \expandafter\def\AtBegShi@found{%
+          \edef\AtBegShi@GroupLevel{\number\currentgrouplevel}%
+          \afterassignment\@EveryShipout@Test
+          \setbox\AtBeginShipoutBox=%
+        }%
+        \def\@EveryShipout@Test{%
+          \ifnum\AtBegShi@GroupLevel=\currentgrouplevel
+          \else
+            \expandafter\aftergroup
+          \fi
+          \AtBegShi@Everyshi@Output
+        }%
+        \def\AtBegShi@Everyshi@Output{%
+          \ifvoid\AtBeginShipoutBox
+          \else
+            \global\setbox\@cclv\box\AtBeginShipoutBox
+            \expandafter\@EveryShipout@Output
+          \fi
+        }%
+        \AtBegShi@Info{Package `everyshi' patched}%
+        \begingroup
+      \fi
+    \fi
+  \endgroup
+  \let\AtBegShi@PatchEveryshi\relax
+}
+\@ifpackageloaded{everyshi}{%
+  \AtBegShi@PatchEveryshi
+}{%
+  \AtBeginDocument{\AtBegShi@PatchEveryshi}%
+}
+\def\AtBegShi@PatchMemoir{%
+  \begingroup
+    \def\AtBegShi@Memoir@shipout{%
+      \afterassignment\mem@shipi
+      \setbox\@cclv=%
+    }%
+    \def\AtBegShi@Memoir@shipi{%
+      \ifvoid\@cclv
+        \expandafter\aftergroup
+      \fi
+      \mem@shipii
+    }%
+    \def\AtBegShi@Memoir@shipiiA{%
+      \mem@oldshipout\vbox{%
+        \trimmarks
+        \unvbox\@cclv
+      }%
+    }%
+    \def\AtBegShi@Memoir@shipiiB{%
+      \ifvoid\@cclv
+        \mem@oldshipout\box\@cclv
+      \else
+        \mem@oldshipout\vbox{%
+          \trimmarks
+          \unvbox\@cclv
+        }%
+      \fi
+    }%
+    \ifx\AtBegShi@Memoir@shipi\mem@shipi
+      \ifcase\ifx\AtBegShi@Memoir@shipiiA\mem@shipii
+               \z@
+             \else
+               \ifx\AtBegShi@Memoir@shipiiB\mem@shipii
+                 \z@
+               \else
+                 \@ne
+               \fi
+             \fi
+        \let\AtBegShi@found\relax
+        \ifx\shipout\AtBegShi@Memoir@shipout
+          \def\AtBegShi@found{\shipout}%
+        \else\ifx\AtBegShi@OrgShipout\AtBegShi@Memoir@shipout
+          \def\AtBegShi@found{\AtBegShi@OrgShipout}%
+        \else\ifx\CROP@shipout\AtBegShi@Memoir@shipout
+          \def\AtBegShi@found{\CROP@shipout}%
+        \else\ifx\GPTorg@shipout\AtBegShi@Memoir@shipout
+          \def\AtBegShi@found{\GPTorg@shipout}%
+        \else\ifx\THBorg@shipout\AtBegShi@Memoir@shipout
+          \def\AtBegShi@found{\THBorg@shipout}%
+        \else\ifx\@EveryShipout@Org@Shipout\AtBegShi@Memoir@shipout
+          \def\AtBegShi@found{\@EveryShipout@Org@Shipout}%
+        \fi\fi\fi\fi\fi\fi
+        \ifx\AtBegShi@found\relax
+        \else
+          \expandafter\endgroup
+          \expandafter\def\AtBegShi@found{%
+            \edef\AtBegShi@GroupLevel{\number\currentgrouplevel}%
+            \afterassignment\mem@shipi
+            \setbox\AtBeginShipoutBox=%
+          }%
+          \def\mem@shipi{%
+            \ifnum\AtBegShi@GroupLevel=\currentgrouplevel
+            \else
+              \expandafter\aftergroup
+            \fi
+            \mem@shipii
+          }%
+          \def\mem@shipii{%
+            \ifvoid\AtBeginShipoutBox
+            \else
+              \setbox\AtBeginShipoutBox=\vbox{%
+                \trimmarks
+                \ifvbox\AtBeginShipoutBox
+                  \unvbox\AtBeginShipoutBox
+                \else
+                  \box\AtBeginShipoutBox
+                \fi
+              }%
+              \expandafter\mem@oldshipout
+              \expandafter\box
+              \expandafter\AtBeginShipoutBox
+            \fi
+          }%
+          \AtBegShi@Info{Class `memoir' patched}%
+          \begingroup
+        \fi
+      \fi
+    \fi
+  \endgroup
+  \let\AtBegShi@PatchMemoir\relax
+}
+\@ifclassloaded{memoir}{%
+  \AtBegShi@PatchMemoir
+}{%
+  \AtBeginDocument{\AtBegShi@PatchMemoir}%
+}
+\AtBegShi@End
+\endinput
+%%
+%% End of file `atbegshi.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/atenddvi.sty b/Master/texmf-dist/tex/latex/oberdiek/atenddvi.sty
index 7473f84b469..3bc3af30c1e 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/atenddvi.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/atenddvi.sty
@@ -28,36 +28,35 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{atenddvi}%
-  [2007/03/20 v1.0 At end DVI hook (HO)]%
+  [2007/04/17 v1.1 At end DVI hook (HO)]%
 \RequirePackage{zref-abspage,zref-lastpage}[2007/03/19]
-\RequirePackage{everyshi}
+\RequirePackage{atbegshi}
 \let\AtEndDvi@Hook\@empty
 \newcommand*{\AtEndDvi}{%
   \g@addto@macro\AtEndDvi@Hook
 }
-\def\AtEndDvi@EveryShipout{%
+\def\AtEndDvi@AtBeginShipout{%
   \begingroup
-    \set@typeset@protect
     \ifnum\value{abspage}=1 %
       \zref@refused{LastPage}%
     \fi
     \ifnum\zref@extractdefault{LastPage}{abspage}{0}=\value{abspage}%
       \xdef\AtEndDvi@LastPage{\number\value{abspage}}%
-      \global\setbox\@cclv=\vbox{%
+      \global\setbox\AtBeginShipoutBox=\vbox{%
         \hbox{%
-          \box\@cclv
-          \setbox\@cclv=\hbox{%
+          \box\AtBeginShipoutBox
+          \setbox\AtBeginShipoutBox=\hbox{%
             \begingroup
               \AtEndDvi@Hook
             \endgroup
           }%
-          \wd\@cclv=\z@
-          \ht\@cclv=\z@
-          \dp\@cclv=\z@
-          \box\@cclv
+          \wd\AtBeginShipoutBox=\z@
+          \ht\AtBeginShipoutBox=\z@
+          \dp\AtBeginShipoutBox=\z@
+          \box\AtBeginShipoutBox
         }%
       }%
-      \global\let\AtEndDvi@EveryShipout\@empty
+      \global\let\AtEndDvi@AtBeginShipout\@empty
       \global\let\AtEndDvi\@gobble
       \let\on@line\@empty
       \PackageInfo{atenddvi}{Last page = \AtEndDvi@LastPage}%
@@ -65,7 +64,7 @@
   \endgroup
 }
 \def\AtEndDvi@AtBeginDocument{%
-  \EveryShipout{\AtEndDvi@EveryShipout}%
+  \AtBeginShipout{\AtEndDvi@AtBeginShipout}%
   \if@filesw
     \immediate\write\@mainaux{%
       \string\providecommand\string\AtEndDvi@Check{}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty b/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty
index a80260d5c1d..9e4a56f9f6f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/pdflscape.sty
@@ -29,7 +29,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdflscape}%
-  [2007/04/11 v0.7 Landscape pages in PDF (HO)]
+  [2007/04/17 v0.8 Landscape pages in PDF (HO)]
 \let\PLS@driver\@empty
 \DeclareOption{pdftex}{%
   \PassOptionsToPackage\CurrentOption{lscape}%
@@ -156,42 +156,42 @@
 \fi
 \def\PLS@temp{dvips}
 \ifx\PLS@temp\PLS@driver
-  \RequirePackage{everyshi}%
-  \EveryShipout{\PLS@EveryShi}%
-  \let\PLS@EveryShi\@empty
+  \RequirePackage{atbegshi}%
+  \AtBeginShipout{\PLS@AtBeginShipout}%
+  \let\PLS@AtBeginShipout\@empty
   \def\PLS@AddRotate#1{%
     \ifnum#1=0 %
     \else
-      \def\PLS@EveryShi{%
-        \global\setbox\@cclv\vbox{%
+      \def\PLS@AtBeginShipout{%
+        \global\setbox\AtBeginShipoutBox\vbox{%
           \Gin@PS@raw{%
             [{ThisPage}\string<\string</Rotate #1\string>\string>%
             /PUT pdfmark%
           }%
-          \box\@cclv
+          \box\AtBeginShipoutBox
         }%
       }%
     \fi
   }%
-  \def\PLS@RemoveRotate{\let\PLS@EveryShi\@empty}%
+  \def\PLS@RemoveRotate{\let\PLS@AtBeginShipout\@empty}%
 \fi
 \def\PLS@temp{dvipdfm}
 \ifx\PLS@temp\PLS@driver
-  \RequirePackage{everyshi}%
-  \EveryShipout{\PLS@EveryShi}%
-  \let\PLS@EveryShi\@empty
+  \RequirePackage{atbegshi}%
+  \AtBeginShipout{\PLS@AtBeginShipout}%
+  \let\PLS@AtBeginShipout\@empty
   \def\PLS@AddRotate#1{%
     \ifnum#1=0 %
     \else
-      \def\PLS@EveryShi{%
-        \global\setbox\@cclv\vbox{%
+      \def\PLS@AtBeginShipout{%
+        \global\setbox\AtBeginShipoutBox\vbox{%
           \special{pdf: put @thispage <</Rotate #1>>}%
-          \box\@cclv
+          \box\AtBeginShipoutBox
         }%
       }%
     \fi
   }%
-  \def\PLS@RemoveRotate{\let\PLS@EveryShi\@empty}%
+  \def\PLS@RemoveRotate{\let\PLS@AtBeginShipout\@empty}%
 \fi
 \g@addto@macro{\landscape}{\PLS@Rotate{90}}
 \g@addto@macro{\endlandscape}{\PLS@Rotate{0}}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
index 8ec86213194..d86b541d0d3 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
@@ -33,16 +33,16 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2007/04/06 v1.6 Module abspage for zref (HO)]%
+  [2007/04/06 v1.7 Module abspage for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{everyshi}%
+\RequirePackage{atbegshi}%
 \begingroup
   \let\@addtoreset\@gobbletwo
   \newcounter{abspage}%
 \endgroup
 \setcounter{abspage}{0}%
-\EveryShipout{%
+\AtBeginShipout{%
   \stepcounter{abspage}%
 }%
 \zref@newprop*{abspage}[0]{\the\c@abspage}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
index 6facd5e2abd..0cd0c2ac6c2 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2007/04/06 v1.6 Module base for zref (HO)]%
+  [2007/04/06 v1.7 Module base for zref (HO)]%
 \def\ZREF@name{zref}
 \def\ZREF@ErrorNoLine#1#2{%
   \begingroup
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
index 551bc4f8462..c141a79bcda 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2007/04/06 v1.6 Module counter for zref (HO)]%
+  [2007/04/06 v1.7 Module counter for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newprop{counter}{}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
index 364f7cb4955..2d6282f550d 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2007/04/06 v1.6 Module dotfill for zref (HO)]%
+  [2007/04/06 v1.7 Module dotfill for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{zref-savepos}[2007/04/06]
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
index 54f37baeb5c..9580fe298d5 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2007/04/06 v1.6 Module hyperref for zref (HO)]%
+  [2007/04/06 v1.7 Module hyperref for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newprop{anchor}[]{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
index 2d099988544..fe999f21099 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2007/04/06 v1.6 Module lastpage for zref (HO)]%
+  [2007/04/06 v1.7 Module lastpage for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \AtBeginDocument{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
index a54b8018eb3..45bdda717ba 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2007/04/06 v1.6 Module perpage for zref (HO)]%
+  [2007/04/06 v1.7 Module perpage for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{zref-abspage}[2007/04/06]
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
index 321e8d1a581..a39572890b0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2007/04/06 v1.6 Module savepos for zref (HO)]%
+  [2007/04/06 v1.7 Module savepos for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
index 7cac0bae107..0410aaf8a75 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2007/04/06 v1.6 Module titleref for zref (HO)]%
+  [2007/04/06 v1.7 Module titleref for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{keyval}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
index 3d596fe4d01..45866ac965c 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2007/04/06 v1.6 Module totpages for zref (HO)]%
+  [2007/04/06 v1.7 Module totpages for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{zref-abspage}[2007/04/06]
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
index e9b74041244..842f2bb01ce 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2007/04/06 v1.6 Module user for zref (HO)]%
+  [2007/04/06 v1.7 Module user for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \newcommand*\zlabel{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
index bc4f28be953..ae23f31f5f3 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2007/04/06 v1.6 Module xr for zref (HO)]%
+  [2007/04/06 v1.7 Module xr for zref (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{keyval}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
index 457360b8f18..224dc97250f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
@@ -33,7 +33,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref}
-  [2007/04/06 v1.6 New reference scheme for LaTeX2e (HO)]%
+  [2007/04/06 v1.7 New reference scheme for LaTeX2e (HO)]%
 \RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \def\ZREF@temp#1{%