1 files changed, 16 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
index 903dbbe175e..8e8ef707587 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.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,12 +41,15 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-nextpage}%
-  [2010/04/23 v2.15 Module nextpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/04/23]
-\RequirePackage{zref-thepage}[2010/04/23]
-\RequirePackage{zref-lastpage}[2010/04/23]
+  [2010/05/01 v2.17 Module nextpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+  \expandafter\endinput
+\fi
+\RequirePackage{zref-abspage}[2010/05/01]
+\RequirePackage{zref-thepage}[2010/05/01]
+\RequirePackage{zref-lastpage}[2010/05/01]
 \RequirePackage{uniquecounter}[2009/12/18]
 \UniqueCounterNew{znextpage}
 
@@ -63,9 +67,9 @@
 \def\ZREF@np@call@unknown#1{#1}
 \def\ZREF@np@call@nonext#1{#1}
 \def\ZREF@np@call@next#1{#1}
-\newcommand*{\znextpage}{%
-  \UniqueCounterCall{znextpage}{\ZREF@nextpage}%
-}
+\ZREF@IfDefinable\znextpage\def{%
+  {\UniqueCounterCall{znextpage}{\ZREF@nextpage}}%
+}%
 \newcommand*{\znonextpagename}{}
 \newcommand*{\zunknownnextpagename}{\Z@D@page}
 \def\ZREF@nextpage#1{%