oberdiek update (3may10)

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

1 files changed, 28 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
index 980090e83ea..4971af69c66 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
@@ -28,9 +28,10 @@
 %% This work consists of the main source file zref.dtx
 %% and the derived files
 %%    zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%%    zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%%    zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%%    zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%%    zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%%    zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%%    zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%%    zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
 %%    zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
 %%    zref-totpages.sty, zref-user.sty, zref-xr.sty,
 %%    zref-example.tex, zref-example-lastpage.tex,
@@ -40,10 +41,13 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2010/04/23 v2.15 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/04/23]
+  [2010/05/01 v2.17 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+  \expandafter\endinput
+\fi
+\RequirePackage{zref-abspage}[2010/05/01]
 \zref@newprop*{pagevalue}[0]{\number\c@page}
 \zref@newlist{perpage}
 \zref@addprop{perpage}{abspage,page,pagevalue}
@@ -56,8 +60,10 @@
   \fi
   \ZREF@org@stepcounter{#1}%
 }
-\newcommand*{\zmakeperpage}{%
-  \@ifnextchar[\ZREF@makeperpage@opt{\ZREF@@makeperpage[\z@]}%
+\ZREF@IfDefinable\zmakeperpage\def{%
+  {%
+    \@ifnextchar[\ZREF@makeperpage@opt{\ZREF@@makeperpage[\ltx@zero]}%
+  }%
 }
 \def\ZREF@makeperpage@opt[#1]{%
   \begingroup
@@ -80,18 +86,22 @@
   }%
 }
 \def\ZREF@@perpage@step#1#2{%
-  \global\advance\c@zref@unique\@ne
+  \global\advance\c@zref@unique\ltx@one
   \begingroup
-    \expandafter\zref@labelbylist\expandafter{\thezref@unique}{perpage}%
+    \expandafter
+    \zref@labelbylist\expandafter{\thezref@unique}{perpage}%
     \zref@ifrefundefined\thezref@unique{%
       \global\c@zpage=\c@page
       \global\let\thezpage\thepage
-      \expandafter\xdef\csname ZREF@abspage@#1\endcsname{\number\c@abspage}%
+      \expandafter\xdef\csname ZREF@abspage@#1\endcsname{%
+        \number\c@abspage
+      }%
     }{%
       \global\c@zpage=\zref@extract\thezref@unique{pagevalue}\relax
       \xdef\thezpage{\noexpand\zref@extract{\thezref@unique}{page}}%
       \expandafter\xdef\csname ZREF@abspage@#1\endcsname{%
-        \zref@extractdefault\thezref@unique{abspage}{\number\c@abspage}%
+        \zref@extractdefault\thezref@unique
+            {abspage}{\number\c@abspage}%
       }%
     }%
     \expandafter\ifx\csname ZREF@abspage@#1\expandafter\endcsname
@@ -104,8 +114,11 @@
     \fi
   \endgroup
 }
-\newcommand*{\zunmakeperpage}[1]{%
-  \global\expandafter\let\csname ZREF@perpage@#1\endcsname\@undefined
+\ZREF@IfDefinable\zunmakeperpage\def{%
+  #1{%
+    \global\expandafter
+    \let\csname ZREF@perpage@#1\endcsname\@undefined
+  }%
 }
 \endinput
 %%