CTAN sync 202005290302

2 files changed, 57 insertions, 43 deletions

diff --git a/macros/latex/contrib/zref/zref.dtx b/macros/latex/contrib/zref/zref.dtx
index d7a5b0863e..ea33ef2e88 100644
--- a/macros/latex/contrib/zref/zref.dtx
+++ b/macros/latex/contrib/zref/zref.dtx
@@ -1,12 +1,12 @@
 % \iffalse meta-comment
 %
 % File: zref.dtx
-% Version: 2020-03-03 v2.29
+% Version: 2020-05-28 v2.31
 % Info: A new reference scheme for LaTeX
 %
 % Copyright (C)
 %    2006-2012  Heiko Oberdiek
-%    2016-2019  Oberdiek Package Support Group
+%    2016-2020  Oberdiek Package Support Group
 %    https://github.com/ho-tex/zref/issues
 %
 % This work may be distributed and/or modified under the
@@ -112,7 +112,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: zref 2020-03-03 v2.29 A new reference scheme for LaTeX (HO)}
+\Msg{* Package: zref 2020-05-28 v2.31 A new reference scheme for LaTeX (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -124,7 +124,7 @@
 This is a generated file.
 
 Project: zref
-Version: 2020-03-03 v2.29
+Version: 2020-05-28 v2.31
 
 Copyright (C)
   2006-2012 Heiko Oberdiek
@@ -230,7 +230,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{zref.drv}%
-  [2020-03-03 v2.29 A new reference scheme for LaTeX (HO)]%
+  [2020-05-28 v2.31 A new reference scheme for LaTeX (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/11/22]
 \setlength{\emergencystretch}{1em}
@@ -245,7 +245,7 @@ and the derived files
 % \GetFileInfo{zref.drv}
 %
 % \title{The \xpackage{zref} package}
-% \date{2020-03-03 v2.29}
+% \date{2020-05-28 v2.31}
 % \author{Heiko Oberdiek\thanks
 % {Please report any issues at \url{https://github.com/ho-tex/zref/issues}}}
 %
@@ -1663,7 +1663,7 @@ the height difference of the two baselines is
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref}
-  [2020-03-03 v2.29 A new reference scheme for LaTeX (HO)]%
+  [2020-05-28 v2.31 A new reference scheme for LaTeX (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Load basic module}
@@ -1750,7 +1750,7 @@ the height difference of the two baselines is
 %<*base>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2020-03-03 v2.29 Module base for zref (HO)]%
+  [2020-05-28 v2.31 Module base for zref (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Utilities}
@@ -3057,7 +3057,7 @@ the height difference of the two baselines is
 %<*user>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2020-03-03 v2.29 Module user for zref (HO)]%
+  [2020-05-28 v2.31 Module user for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3148,7 +3148,7 @@ the height difference of the two baselines is
 %<*abspage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2020-03-03 v2.29 Module abspage for zref (HO)]%
+  [2020-05-28 v2.31 Module abspage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3196,7 +3196,7 @@ the height difference of the two baselines is
 %<*counter>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2020-03-03 v2.29 Module counter for zref (HO)]%
+  [2020-05-28 v2.31 Module counter for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3207,23 +3207,28 @@ the height difference of the two baselines is
 %    For features such as \xpackage{hyperref}'s \cs{autoref}
 %    we need the name of the counter. The property
 %    \verb|counter| is defined and added to the main property
-%    list.
-%    \begin{macrocode}
-\zref@newprop{counter}{}
-\zref@addprop\ZREF@mainlist{counter}
-%    \end{macrocode}
-%
-%    \cs{refstepcounter} is the central macro where we know
-%    which counter is responsible for the reference.
-%    \begin{macrocode}
-\AtBeginDocument{%
-  \ZREF@patch{refstepcounter}{%
-    \def\refstepcounter#1{%
-      \zref@setcurrent{counter}{#1}%
-      \ZREF@org@refstepcounter{#1}%
+%    list. Starting with \LaTeX\ 2020-10-01 the proper can use
+%    \@currentcounter. In older formats
+%    \cs{refstepcounter} has to be patched but this can fail in some
+%    cases, see issue \#5.
+%    \begin{macrocode}
+\@ifl@t@r\fmtversion{2020-10-01}
+ {
+  \zref@newprop{counter}{\@currentcounter}
+  \zref@addprop\ZREF@mainlist{counter}
+ }
+ {
+  \zref@newprop{counter}{}
+  \zref@addprop\ZREF@mainlist{counter}
+  \AtBeginDocument{%
+    \ZREF@patch{refstepcounter}{%
+      \def\refstepcounter#1{%
+        \zref@setcurrent{counter}{#1}%
+        \ZREF@org@refstepcounter{#1}%
+      }%
     }%
-  }%
-}
+  }
+ }
 %    \end{macrocode}
 %    \begin{macrocode}
 %</counter>
@@ -3236,7 +3241,7 @@ the height difference of the two baselines is
 %<*lastpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2020-03-03 v2.29 Module lastpage for zref (HO)]%
+  [2020-05-28 v2.31 Module lastpage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \RequirePackage{zref-abspage}[2019/11/29]
 \RequirePackage{atveryend}[2009/12/07]
@@ -3308,7 +3313,7 @@ the height difference of the two baselines is
 %<*thepage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-thepage}%
-  [2020-03-03 v2.29 Module thepage for zref (HO)]%
+  [2020-05-28 v2.31 Module thepage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3383,7 +3388,7 @@ the height difference of the two baselines is
 %<*nextpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-nextpage}%
-  [2020-03-03 v2.29 Module nextpage for zref (HO)]%
+  [2020-05-28 v2.31 Module nextpage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3487,7 +3492,7 @@ the height difference of the two baselines is
 %<*totpages>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2020-03-03 v2.29 Module totpages for zref (HO)]%
+  [2020-05-28 v2.31 Module totpages for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3529,7 +3534,7 @@ the height difference of the two baselines is
 %<*pagelayout>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-pagelayout}%
-  [2020-03-03 v2.29 Module pagelayout for zref (HO)]%
+  [2020-05-28 v2.31 Module pagelayout for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3757,7 +3762,7 @@ the height difference of the two baselines is
 %<*pageattr>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-pageattr}%
-  [2020-03-03 v2.29 Module pageattr for zref (HO)]%
+  [2020-05-28 v2.31 Module pageattr for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3989,7 +3994,7 @@ the height difference of the two baselines is
 %<*marks>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-marks}%
-  [2020-03-03 v2.29 Module marks for zref (HO)]%
+  [2020-05-28 v2.31 Module marks for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -4095,7 +4100,7 @@ the height difference of the two baselines is
 %<*runs>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-runs}%
-  [2020-03-03 v2.29 Module runs for zref (HO)]%
+  [2020-05-28 v2.31 Module runs for zref (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macro}{\zruns}
@@ -4127,7 +4132,7 @@ the height difference of the two baselines is
 %<*perpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2020-03-03 v2.29 Module perpage for zref (HO)]%
+  [2020-05-28 v2.31 Module perpage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -4309,7 +4314,7 @@ the height difference of the two baselines is
 %<*titleref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2020-03-03 v2.29 Module titleref for zref (HO)]%
+  [2020-05-28 v2.31 Module titleref for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -4722,7 +4727,7 @@ the height difference of the two baselines is
 %<*xr>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2020-03-03 v2.29 Module xr for zref (HO)]%
+  [2020-05-28 v2.31 Module xr for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -5258,7 +5263,7 @@ the height difference of the two baselines is
 %<*hyperref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2020-03-03 v2.29 Module hyperref for zref (HO)]%
+  [2020-05-28 v2.31 Module hyperref for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -5288,7 +5293,7 @@ the height difference of the two baselines is
 %<*savepos>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2020-03-03 v2.29 Module savepos for zref (HO)]%
+  [2020-05-28 v2.31 Module savepos for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -5461,7 +5466,7 @@ the height difference of the two baselines is
 %<*abspos>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspos}%
-  [2020-03-03 v2.29 Module abspos for zref (HO)]%
+  [2020-05-28 v2.31 Module abspos for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -5479,6 +5484,7 @@ the height difference of the two baselines is
 %    \begin{macrocode}
 \RequirePackage{zref-pagelayout}[2019/11/29]
 \zref@addprop{savepos}{abspage}
+\zref@addprop{savepos}{pagevalue}
 %    \end{macrocode}
 %
 %    \begin{macro}{\zref@absposx}
@@ -6114,7 +6120,7 @@ the height difference of the two baselines is
 %<*dotfill>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2020-03-03 v2.29 Module dotfill for zref (HO)]%
+  [2020-05-28 v2.31 Module dotfill for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -6214,7 +6220,7 @@ the height difference of the two baselines is
 %<*env>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-env}%
-  [2020-03-03 v2.29 Module env for zref (HO)]%
+  [2020-05-28 v2.31 Module env for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -6735,6 +6741,14 @@ the height difference of the two baselines is
 %   \item use luatex command names directly in zref-savepos rather than defining pdftex compatibility names.
 %   \item allow zref-abspos to use \verb|\pdf[vh]origin| in dvi mode.
 %   \end{Version}
+%   \begin{Version}{2020-03-04 v2.30}
+%   \item
+%     add pagevalue property to savepos in the abspos module (issue 1)
+%   \end{Version}
+%   \begin{Version}{2020-05-28 v2.31}
+%   \item Adapted module zref-counter to use \cs{@currentcounter} in the next
+%   \LaTeX version (issue 5)
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/macros/latex/contrib/zref/zref.pdf b/macros/latex/contrib/zref/zref.pdf
index 79542ad086..1a7415cc28 100644
--- a/macros/latex/contrib/zref/zref.pdf
+++ b/macros/latex/contrib/zref/zref.pdf