1 files changed, 14 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
index 316e64c4492..913adbaffb9 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.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-marks}%
-  [2010/04/23 v2.15 Module marks for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+  [2010/05/01 v2.17 Module marks for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+  \expandafter\endinput
+\fi
 \RequirePackage{kvsetkeys}[2009/07/30]
 \newcommand*{\zref@marks@register}[3][]{%
   \edef\ZREF@TempName{#1}%
@@ -69,16 +73,16 @@
       \ifx\kv@value\relax
         \def\kv@value{top,first,bot}%
       \fi
-      \edef\ZREF@temp{\expandafter\@car\kv@key X\@nil}%
+      \edef\ZREF@temp{\expandafter\ltx@car\kv@key X\@nil}%
       \ifx\ZREF@temp\ZREF@STAR
-        \edef\kv@key{\expandafter\@cdr\kv@key\@nil}%
+        \edef\kv@key{\expandafter\ltx@cdr\kv@key\@nil}%
         \zref@newlist\kv@key
       \fi
       \expandafter\comma@parse\expandafter{\kv@value}{%
         \ifcase0\ifx\comma@entry\ZREF@NAME@top 1\else
                 \ifx\comma@entry\ZREF@NAME@first 1\else
                 \ifx\comma@entry\ZREF@NAME@bot 1\fi\fi\fi\ltx@space
-          \PackageWarning\ZREF@name{%
+          \PackageWarning{zref-marks}{%
             Use `top', `first' or `bot' for the list values%
             \MessageBreak
             in the third argument of \string\zref@marks@register.%
@@ -119,7 +123,7 @@
       \x
     \fi
   }{%
-    \PackageWarning\ZREF@name{%
+    \PackageWarning{zref-marks}{%
       \string\zref@marks@register\ltx@space does not generate the%
       \MessageBreak
       new property `#1\ZREF@TempName', because\MessageBreak