zref (9oct20)

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

1 files changed, 42 insertions, 33 deletions

diff --git a/Master/texmf-dist/source/latex/zref/zref.dtx b/Master/texmf-dist/source/latex/zref/zref.dtx
index ea33ef2e88e..a74626aa7dd 100644
--- a/Master/texmf-dist/source/latex/zref/zref.dtx
+++ b/Master/texmf-dist/source/latex/zref/zref.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 %
 % File: zref.dtx
-% Version: 2020-05-28 v2.31
+% Version: 2020-07-03 v2.32
 % Info: A new reference scheme for LaTeX
 %
 % Copyright (C)
@@ -112,7 +112,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: zref 2020-05-28 v2.31 A new reference scheme for LaTeX (HO)}
+\Msg{* Package: zref 2020-07-03 v2.32 A new reference scheme for LaTeX (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -124,7 +124,7 @@
 This is a generated file.
 
 Project: zref
-Version: 2020-05-28 v2.31
+Version: 2020-07-03 v2.32
 
 Copyright (C)
   2006-2012 Heiko Oberdiek
@@ -230,7 +230,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{zref.drv}%
-  [2020-05-28 v2.31 A new reference scheme for LaTeX (HO)]%
+  [2020-07-03 v2.32 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-05-28 v2.31}
+% \date{2020-07-03 v2.32}
 % \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-05-28 v2.31 A new reference scheme for LaTeX (HO)]%
+  [2020-07-03 v2.32 A new reference scheme for LaTeX (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Load basic module}
@@ -1750,12 +1750,13 @@ the height difference of the two baselines is
 %<*base>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2020-05-28 v2.31 Module base for zref (HO)]%
+  [2020-07-03 v2.32 Module base for zref (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Utilities}
 %
 %    \begin{macrocode}
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
 \RequirePackage{ltxcmds}[2010/12/02]
 \RequirePackage{infwarerr}[2010/04/08]
 \RequirePackage{kvsetkeys}[2010/03/01]
@@ -3057,7 +3058,7 @@ the height difference of the two baselines is
 %<*user>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2020-05-28 v2.31 Module user for zref (HO)]%
+  [2020-07-03 v2.32 Module user for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3148,7 +3149,7 @@ the height difference of the two baselines is
 %<*abspage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2020-05-28 v2.31 Module abspage for zref (HO)]%
+  [2020-07-03 v2.32 Module abspage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3196,7 +3197,7 @@ the height difference of the two baselines is
 %<*counter>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2020-05-28 v2.31 Module counter for zref (HO)]%
+  [2020-07-03 v2.32 Module counter for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3241,7 +3242,7 @@ the height difference of the two baselines is
 %<*lastpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2020-05-28 v2.31 Module lastpage for zref (HO)]%
+  [2020-07-03 v2.32 Module lastpage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \RequirePackage{zref-abspage}[2019/11/29]
 \RequirePackage{atveryend}[2009/12/07]
@@ -3313,7 +3314,7 @@ the height difference of the two baselines is
 %<*thepage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-thepage}%
-  [2020-05-28 v2.31 Module thepage for zref (HO)]%
+  [2020-07-03 v2.32 Module thepage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3388,7 +3389,7 @@ the height difference of the two baselines is
 %<*nextpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-nextpage}%
-  [2020-05-28 v2.31 Module nextpage for zref (HO)]%
+  [2020-07-03 v2.32 Module nextpage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3492,7 +3493,7 @@ the height difference of the two baselines is
 %<*totpages>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2020-05-28 v2.31 Module totpages for zref (HO)]%
+  [2020-07-03 v2.32 Module totpages for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3534,7 +3535,7 @@ the height difference of the two baselines is
 %<*pagelayout>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-pagelayout}%
-  [2020-05-28 v2.31 Module pagelayout for zref (HO)]%
+  [2020-07-03 v2.32 Module pagelayout for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3619,13 +3620,17 @@ the height difference of the two baselines is
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\zref@newprop*{outputboxwd}[0pt]{\AtBeginShipoutBoxWidth}
-%    \end{macrocode}
-%    \begin{macrocode}
-\zref@newprop*{outputboxht}[0pt]{\AtBeginShipoutBoxHeight}
-%    \end{macrocode}
-%    \begin{macrocode}
-\zref@newprop*{outputboxdp}[0pt]{\AtBeginShipoutBoxDepth}
+\IfFormatAtLeastTF{2020/10/01}
+ {
+   \zref@newprop*{outputboxwd}[0pt]{\ShipoutBoxWidth}
+   \zref@newprop*{outputboxht}[0pt]{\ShipoutBoxHeight}
+   \zref@newprop*{outputboxdp}[0pt]{\ShipoutBoxDepth}
+ }
+ {
+   \zref@newprop*{outputboxwd}[0pt]{\AtBeginShipoutBoxWidth}
+   \zref@newprop*{outputboxht}[0pt]{\AtBeginShipoutBoxHeight}
+   \zref@newprop*{outputboxdp}[0pt]{\AtBeginShipoutBoxDepth}
+ }
 %    \end{macrocode}
 %    \begin{macrocode}
 \zref@addprops{thepage}{outputboxwd,outputboxht,outputboxdp}
@@ -3762,7 +3767,7 @@ the height difference of the two baselines is
 %<*pageattr>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-pageattr}%
-  [2020-05-28 v2.31 Module pageattr for zref (HO)]%
+  [2020-07-03 v2.32 Module pageattr for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -3994,7 +3999,7 @@ the height difference of the two baselines is
 %<*marks>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-marks}%
-  [2020-05-28 v2.31 Module marks for zref (HO)]%
+  [2020-07-03 v2.32 Module marks for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -4100,7 +4105,7 @@ the height difference of the two baselines is
 %<*runs>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-runs}%
-  [2020-05-28 v2.31 Module runs for zref (HO)]%
+  [2020-07-03 v2.32 Module runs for zref (HO)]%
 %    \end{macrocode}
 %
 %    \begin{macro}{\zruns}
@@ -4132,7 +4137,7 @@ the height difference of the two baselines is
 %<*perpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2020-05-28 v2.31 Module perpage for zref (HO)]%
+  [2020-07-03 v2.32 Module perpage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -4314,7 +4319,7 @@ the height difference of the two baselines is
 %<*titleref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2020-05-28 v2.31 Module titleref for zref (HO)]%
+  [2020-07-03 v2.32 Module titleref for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -4727,7 +4732,7 @@ the height difference of the two baselines is
 %<*xr>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2020-05-28 v2.31 Module xr for zref (HO)]%
+  [2020-07-03 v2.32 Module xr for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -5263,7 +5268,7 @@ the height difference of the two baselines is
 %<*hyperref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2020-05-28 v2.31 Module hyperref for zref (HO)]%
+  [2020-07-03 v2.32 Module hyperref for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -5293,7 +5298,7 @@ the height difference of the two baselines is
 %<*savepos>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2020-05-28 v2.31 Module savepos for zref (HO)]%
+  [2020-07-03 v2.32 Module savepos for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -5466,7 +5471,7 @@ the height difference of the two baselines is
 %<*abspos>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspos}%
-  [2020-05-28 v2.31 Module abspos for zref (HO)]%
+  [2020-07-03 v2.32 Module abspos for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -6120,7 +6125,7 @@ the height difference of the two baselines is
 %<*dotfill>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2020-05-28 v2.31 Module dotfill for zref (HO)]%
+  [2020-07-03 v2.32 Module dotfill for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -6220,7 +6225,7 @@ the height difference of the two baselines is
 %<*env>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-env}%
-  [2020-05-28 v2.31 Module env for zref (HO)]%
+  [2020-07-03 v2.32 Module env for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -6749,6 +6754,10 @@ the height difference of the two baselines is
 %   \item Adapted module zref-counter to use \cs{@currentcounter} in the next
 %   \LaTeX version (issue 5)
 %   \end{Version}
+%   \begin{Version}{2020-07-03 v2.32}
+%   \item Changed in zref-pagelayout the names of the shipout box dimensions
+%    to adapt to the new hook management.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex