From 59daa75215ad3bfaf65959f943d5f7ac26f20d25 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 9 Oct 2020 20:22:13 +0000 Subject: zref (9oct20) git-svn-id: svn://tug.org/texlive/trunk@56611 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/zref/zref-abspage.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-abspos.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-base.sty | 5 +++-- Master/texmf-dist/tex/latex/zref/zref-counter.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-dotfill.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-env.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-hyperref.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-lastpage.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-marks.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-nextpage.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-pageattr.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty | 18 +++++++++++++----- Master/texmf-dist/tex/latex/zref/zref-perpage.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-runs.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-savepos.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-thepage.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-titleref.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-totpages.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-user.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref-xr.sty | 4 ++-- Master/texmf-dist/tex/latex/zref/zref.sty | 4 ++-- 21 files changed, 54 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/zref/zref-abspage.sty b/Master/texmf-dist/tex/latex/zref/zref-abspage.sty index f910da622bd..45d44427562 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-abspage.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-abspos.sty b/Master/texmf-dist/tex/latex/zref/zref-abspos.sty index 532d9b3b12a..fab5020f4d3 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-abspos.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-abspos.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-base.sty b/Master/texmf-dist/tex/latex/zref/zref-base.sty index 583ba3e80a6..489ff7429c4 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-base.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-base.sty @@ -9,7 +9,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 @@ -48,7 +48,8 @@ %% \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)]% +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \RequirePackage{ltxcmds}[2010/12/02] \RequirePackage{infwarerr}[2010/04/08] \RequirePackage{kvsetkeys}[2010/03/01] diff --git a/Master/texmf-dist/tex/latex/zref/zref-counter.sty b/Master/texmf-dist/tex/latex/zref/zref-counter.sty index 574399f5fd0..88667b5f433 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-counter.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty b/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty index 21b391a9c54..a9c33ba7f87 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-env.sty b/Master/texmf-dist/tex/latex/zref/zref-env.sty index 1b63749930c..1b5702a6ab4 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-env.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-env.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty b/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty index dd769801ea0..11c54cb1953 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty b/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty index db955216a43..a3783e7b41b 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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] diff --git a/Master/texmf-dist/tex/latex/zref/zref-marks.sty b/Master/texmf-dist/tex/latex/zref/zref-marks.sty index 3627093a69c..6f09a1ad2bf 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-marks.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-marks.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty b/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty index 1abea5da291..2e0a1b9b487 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty b/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty index 67248f0e578..ef8b1752290 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty b/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty index 6976e179c77..f17b1070442 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 @@ -121,9 +121,17 @@ \ZREF@temp\trimtop % memoir.cls \ZREF@temp\uppermargin % memoir.cls \ZREF@temp\headmargin % memoir.cls -\zref@newprop*{outputboxwd}[0pt]{\AtBeginShipoutBoxWidth} -\zref@newprop*{outputboxht}[0pt]{\AtBeginShipoutBoxHeight} -\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} + } \zref@addprops{thepage}{outputboxwd,outputboxht,outputboxdp} \ltx@newif\ifZREF@pl@list \ZREF@IfDefinable\zlistpagelayout\def{% diff --git a/Master/texmf-dist/tex/latex/zref/zref-perpage.sty b/Master/texmf-dist/tex/latex/zref/zref-perpage.sty index f88ccbf3357..904bbb522fe 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-perpage.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-runs.sty b/Master/texmf-dist/tex/latex/zref/zref-runs.sty index de0e19dcc36..ebfed278f23 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-runs.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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)]% \providecommand*{\zruns}{0}% \AtBeginDocument{% \edef\zruns{\number\numexpr\zruns+1}% diff --git a/Master/texmf-dist/tex/latex/zref/zref-savepos.sty b/Master/texmf-dist/tex/latex/zref/zref-savepos.sty index 7fbf74c7811..afdddaa2138 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-savepos.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-thepage.sty b/Master/texmf-dist/tex/latex/zref/zref-thepage.sty index 56840a43d1c..93f67608eac 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-thepage.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-titleref.sty b/Master/texmf-dist/tex/latex/zref/zref-titleref.sty index 86ab840f3a2..f9313352561 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-titleref.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-totpages.sty b/Master/texmf-dist/tex/latex/zref/zref-totpages.sty index e96311b3b44..254efa3858a 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-totpages.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-user.sty b/Master/texmf-dist/tex/latex/zref/zref-user.sty index 0aa807154b8..e31a79f8ab0 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-user.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-user.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref-xr.sty b/Master/texmf-dist/tex/latex/zref/zref-xr.sty index 3f1c2066300..45a1afdc94f 100644 --- a/Master/texmf-dist/tex/latex/zref/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/zref/zref-xr.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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 diff --git a/Master/texmf-dist/tex/latex/zref/zref.sty b/Master/texmf-dist/tex/latex/zref/zref.sty index 88ef82b0a5f..0a6b1f43a05 100644 --- a/Master/texmf-dist/tex/latex/zref/zref.sty +++ b/Master/texmf-dist/tex/latex/zref/zref.sty @@ -9,7 +9,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 @@ -48,7 +48,7 @@ %% \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)]% \RequirePackage{zref-base}[2019/11/29] \@ifundefined{ZREF@base@ok}{\endinput}{} \def\ZREF@temp#1{% -- cgit v1.2.3