1 files changed, 17 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
index ebbffcb5136..600dc10fbf0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.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,9 +41,12 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2010/04/23 v2.15 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+  [2010/05/01 v2.17 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+  \expandafter\endinput
+\fi
 \newcommand*\zlabel{%
   \ifx\label\ltx@gobble
     \expandafter\ltx@gobble
@@ -50,7 +54,7 @@
     \expandafter\zref@wrapper@babel\expandafter\zref@label
   \fi
 }%
-\newcommand*{\zref}[2][default]{%
+\newcommand*{\zref}[2][default]{% robust because of optional argument
   \zref@propexists{#1}{%
     \zref@wrapper@babel\ZREF@zref{#2}{#1}%
   }%
@@ -59,10 +63,12 @@
   \zref@refused{#1}%
   \zref@extract{#1}%
 }%
-\newcommand*\zpageref{%
-  \zref[page]%
-}%
-\newcommand*{\zrefused}{\zref@refused}%
+\ZREF@IfDefinable\zpageref\def{%
+  {\zref[page]}%
+}
+\ZREF@IfDefinable\zrefused\def{%
+  {\zref@refused}%
+}
 \endinput
 %%
 %% End of file `zref-user.sty'.