zref (4mar20)

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

21 files changed, 193 insertions, 148 deletions

diff --git a/Master/texmf-dist/tex/latex/zref/zref-abspage.sty b/Master/texmf-dist/tex/latex/zref/zref-abspage.sty
index 7560d9855de..0be0c2bdc32 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-abspage.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-abspage.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2019/11/29 v2.28 Module abspage for zref (HO)]%
+  [2020-03-03 v2.29 Module abspage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -65,6 +65,7 @@
 }%
 \zref@newprop*{abspage}[0]{\the\c@abspage}%
 \zref@addprop\ZREF@mainlist{abspage}%
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-abspage.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-abspos.sty b/Master/texmf-dist/tex/latex/zref/zref-abspos.sty
index 32a93db99e0..76e88805e62 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-abspos.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-abspos.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspos}%
-  [2019/11/29 v2.28 Module abspos for zref (HO)]%
+  [2020-03-03 v2.29 Module abspos for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -61,7 +61,6 @@
 \fi
 \RequirePackage{zref-pagelayout}[2019/11/29]
 \zref@addprop{savepos}{abspage}
-\RequirePackage{ifpdf}[2010/09/13]
 \newcommand*{\zref@absposx}[3]{%
   \number
     \expandafter\zref@absposnumx\expandafter{%
@@ -170,6 +169,9 @@
     pdfpagewidth%
   }%
 }
+\ifluatex
+\def\ZREF@abspos@media@width{pdfpagewidth}%
+\fi
 \edef\ZREF@abspos@media@height{%
   \ltx@ifundefined{pdfpageheight}{%
     \ltx@ifundefined{mediaheight}{%
@@ -193,6 +195,18 @@
     \noexpand\fi
   }%
 }
+\ifluatex
+\edef\ZREF@abspos@media@height{%
+   \noexpand\ifcase\pageheight
+      \ltx@ifundefined{stockheight}{%
+        paperheight%
+      }{%
+        stockheight%
+      }%
+    \noexpand\else
+      pdfpageheight%
+    \noexpand\fi}%
+\fi
 \def\ZREF@abspos@media@x@left#1{%
   0%
 }
@@ -232,10 +246,12 @@
 }
 \let\ZREF@temp\ltx@two
 \ltx@IfUndefined{pdfhorigin}{}{%
-  \ifpdf
     \let\ZREF@temp\ltx@zero
-  \fi
 }
+\ifluatex
+  \let\ZREF@temp\ltx@zero
+\fi
+
 \ifx\ZREF@temp\ltx@two
   \ifnum\mag=1000 %
     \let\ZREF@temp\ltx@one
@@ -256,10 +272,11 @@
 \fi
 \let\ZREF@temp\ltx@two
 \ltx@IfUndefined{pdfvorigin}{}{%
-  \ifpdf
     \let\ZREF@temp\ltx@zero
-  \fi
 }
+\ifluatex
+    \let\ZREF@temp\ltx@zero
+\fi
 \ifx\ZREF@temp\ltx@two
   \ifnum\mag=1000 %
     \let\ZREF@temp\ltx@one
@@ -359,6 +376,7 @@
 \let\ZREF@abspos@stock@y@top\ZREF@abspos@paper@y@top
 \let\ZREF@abspos@stock@y@bottom\ZREF@abspos@paper@y@bottom
 \let\ZREF@abspos@stock@y@center\ZREF@abspos@paper@y@center
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-abspos.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-base.sty b/Master/texmf-dist/tex/latex/zref/zref-base.sty
index 955d733637a..c3846ac804f 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-base.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2019/11/29 v2.28 Module base for zref (HO)]%
+  [2020-03-03 v2.29 Module base for zref (HO)]%
 \RequirePackage{ltxcmds}[2010/12/02]
 \RequirePackage{infwarerr}[2010/04/08]
 \RequirePackage{kvsetkeys}[2010/03/01]
@@ -784,6 +784,7 @@
   \global\let\ZREF@NewPropPageValue\relax
 }
 \let\ZREF@base@ok=Y
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-base.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-counter.sty b/Master/texmf-dist/tex/latex/zref/zref-counter.sty
index d70578f5bdb..38bdf747e3e 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-counter.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-counter.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2019/11/29 v2.28 Module counter for zref (HO)]%
+  [2020-03-03 v2.29 Module counter for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -64,6 +64,7 @@
     }%
   }%
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-counter.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty b/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty
index eecf8517253..aacd3760d6b 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-dotfill.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2019/11/29 v2.28 Module dotfill for zref (HO)]%
+  [2020-03-03 v2.29 Module dotfill for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -99,6 +99,7 @@
 \def\ZREF@dotfill{%
   \cleaders\hb@xt@\dimen@{\hss\ZREF@df@dot\hss}\hfill
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-dotfill.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-env.sty b/Master/texmf-dist/tex/latex/zref/zref-env.sty
index bbdbb7a7ae3..f8b67bd312b 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-env.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-env.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-env}%
-  [2019/11/29 v2.28 Module env for zref (HO)]%
+  [2020-03-03 v2.29 Module env for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -64,6 +64,7 @@
   \fi
 }
 \def\ZREF@ENV@line#1line #2\ltx@empty#3\@nil{#2}%
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-env.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty b/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty
index f5281974aa6..503fcdbe644 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-hyperref.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2019/11/29 v2.28 Module hyperref for zref (HO)]%
+  [2020-03-03 v2.29 Module hyperref for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -56,6 +56,7 @@
 \fi
 \ZREF@NewPropAnchor
 \zref@addprop\ZREF@mainlist{anchor}%
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-hyperref.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty b/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty
index dfd3b7ce5b8..f252bd27152 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-lastpage.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2019/11/29 v2.28 Module lastpage for zref (HO)]%
+  [2020-03-03 v2.29 Module lastpage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \RequirePackage{zref-abspage}[2019/11/29]
 \RequirePackage{atveryend}[2009/12/07]
@@ -87,6 +87,7 @@
   \zref@refused{#1}%
   \zref@iflastpage{#1}%
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-lastpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-marks.sty b/Master/texmf-dist/tex/latex/zref/zref-marks.sty
index 4d430f1bde7..1600b732d35 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-marks.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-marks.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-marks}%
-  [2019/11/29 v2.28 Module marks for zref (HO)]%
+  [2020-03-03 v2.29 Module marks for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -137,6 +137,7 @@
     }%
   }%
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-marks.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty b/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty
index 28fc5904518..d3498998262 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-nextpage.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-nextpage}%
-  [2019/11/29 v2.28 Module nextpage for zref (HO)]%
+  [2020-03-03 v2.29 Module nextpage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -135,6 +135,7 @@
     }%
   \x
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-nextpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty b/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty
index ed1d57fad35..663183271db 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-pageattr.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,64 +48,53 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-pageattr}%
-  [2019/11/29 v2.28 Module pageattr for zref (HO)]%
+  [2020-03-03 v2.29 Module pageattr for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
   \expandafter\endinput
 \fi
 \RequirePackage{iftex}[2019/11/07]%
+\let\ZREF@temp=N%
 \ifluatex
-  \ifnum\luatexversion<39 %
-  \else
-    \begingroup
-      \escapechar=-1 %
-      \def\ZREF@temp#1{%
-        \ltx@IfUndefined{\string#1}{%
-          \let#1\ltx@undefined
-          \directlua{%
-            if tex.enableprimitives then %
-              tex.enableprimitives('', {'\string#1'})%
-            end%
-          }%
-          \ltx@ifundefined{\string#1}{%
-          }{%
-            \global#1=#1%
-            \@PackageInfoNoLine{zref-pageattr}{%
-              \string#1 enabled%
-            }%
-          }%
-        }{}%
-      }%
-      \ZREF@temp\pdfpageattr
-      \ZREF@temp\pdfpagesattr
-    \endgroup
-  \fi
+\expandafter\@firstoftwo
+\else
+\expandafter\@secondoftwo
 \fi
-\let\ZREF@temp=N%
-\ltx@IfUndefined{pdfpageattr}{%
+{%luatex
+ \RequirePackage{zref-thepage}[2019/11/29]
+ \RequirePackage{zref-lastpage}[2019/11/29]%
+ \zref@newprop*{pdfpageattr}[]{\zref@hex{\the\pdfvariable pageattr}}%
+ \zref@addprop{thepage}{pdfpageattr}%
+ \zref@newprop*{pdfpagesattr}[]{\zref@hex{\the\pdfvariable pagesattr}}%
+ \zref@addprop{LastPage}{pdfpagesattr}%
+ \let\ZREF@temp=Y%
+}
+{%other
+ \ltx@IfUndefined{pdfpageattr}{%
   \@PackageInfoNoLine{zref-pageattr}{%
     \string\pdfpageattr\space is not available%
   }%
   \def\zref@pdfpageattr#1{}%
   \def\zref@pdfpageattr@used#1{}%
-}{%
+ }{%
   \RequirePackage{zref-thepage}[2019/11/29]%
   \zref@newprop*{pdfpageattr}[]{\zref@hex{\the\pdfpageattr}}%
   \zref@addprop{thepage}{pdfpageattr}%
   \let\ZREF@temp=Y%
-}
-\ltx@IfUndefined{pdfpagesattr}{%
+ }
+ \ltx@IfUndefined{pdfpagesattr}{%
   \@PackageInfoNoLine{zref-pageattr}{%
     \string\pdfpagesattr\space is not available%
   }%
   \def\zref@pdfpagesattr{}%
   \def\zref@pdfpagesattr@used{}%
-}{%
+ }{%
   \RequirePackage{zref-lastpage}[2019/11/29]%
   \zref@newprop*{pdfpagesattr}[]{\zref@hex{\the\pdfpagesattr}}%
   \zref@addprop{LastPage}{pdfpagesattr}%
   \let\ZREF@temp=Y%
+ }%
 }%
 \ifx\ZREF@temp N%
   \expandafter\endinput
@@ -143,12 +132,23 @@
     \AtVeryEndDocument{\ZREF@pa@AtVeryEnd}%
   \fi
 }
-\ltx@IfUndefined{pdfpageattr}{%
+\let\ZREF@temp=Y%
+\ltx@IfUndefined{pdfpageattr}{}{\let\ZREF@temp=N}
+\ifluatex \let\ZREF@temp=N \fi
+\ifx\ZREF@temp Y
+ \expandafter\@firstoftwo
+\else
+ \expandafter\@secondoftwo
+\fi
+ {%
   \def\ZREF@pa@AtVeryEnd{}%
-}{%
+ }
+ {%
   \def\ZREF@pa@AtVeryEnd{%
     \begingroup
-      \toks@{List of \ltx@backslashchar pdfpageattr:\MessageBreak}%
+      \toks@{List of \ltx@backslashchar
+             \ifluatex pdfvariable\else pdf\fi
+             pdfpageattr:\MessageBreak}%
       \count@=1 %
       \ZREF@pa@ListPage
       \edef\x{\endgroup
@@ -158,11 +158,12 @@
       }%
     \x
   }%
-\def\zref@pageattr#1{%
+\def\zref@pdfpageattr#1{%
   \zref@unhex{%
     \zref@extract{thepage\ZREF@number{#1}}{pdfpageattr}%
   }%
 }
+\let\zref@pageattr\zref@pdfpageattr
 \ZREF@Robust\def\zref@pageattr@used#1{%
   \zref@refused{thepage\ZREF@number{#1}}%
 }
@@ -186,8 +187,13 @@
     \ZREF@pa@ListPage
   }%
 }
-\ltx@IfUndefined{pdfpagesattr}{%
-}{%
+\let\ZREF@temp=Y%
+\ltx@IfUndefined{pdfpagesattr}{}{\let\ZREF@temp=N}
+\ifluatex \let\ZREF@temp=N \fi
+\ifx\ZREF@temp N
+ \expandafter\@firstofone
+\fi
+ {%
   \def\zref@pdfpagesattr{%
     \zref@unhex{%
       \zref@extract{LastPage}{pdfpagesattr}%
@@ -198,7 +204,9 @@
   }%
   \ltx@LocalAppendToMacro\ZREF@pa@AtVeryEnd{%
     \@PackageInfoNoLine{zref-pageattr}{%
-      \ltx@backslashchar pdfpagesattr:\MessageBreak
+      \ltx@backslashchar
+      \ifluatex pdfvariable\else pdf\fi
+      pagesattr:\MessageBreak
       <<\zref@pdfpagesattr>>%
       \MessageBreak
     }%
@@ -207,6 +215,7 @@
 \AfterLastShipout{%
   \ZREF@pa@AfterLastShipout
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-pageattr.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty b/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty
index 2897232474a..7bffd086a1f 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-pagelayout.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-pagelayout}%
-  [2019/11/29 v2.28 Module pagelayout for zref (HO)]%
+  [2020-03-03 v2.29 Module pagelayout for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -57,35 +57,6 @@
 \RequirePackage{zref-thepage}[2019/11/29]
 \RequirePackage{iftex}[2019/11/07]%
 \RequirePackage{atveryend}[2010/03/24]
-\ifluatex
-  \ifnum\luatexversion<39 %
-  \else
-    \begingroup
-      \escapechar=-1 %
-      \def\ZREF@temp#1{%
-        \ltx@IfUndefined{\string#1}{%
-          \let#1\ltx@undefined
-          \directlua{%
-            if tex.enableprimitives then %
-              tex.enableprimitives('', {'\string#1'})%
-            end%
-          }%
-          \ltx@ifundefined{\string#1}{%
-          }{%
-            \global#1=#1%
-            \@PackageInfoNoLine{zref-pagelayout}{%
-              \string#1 enabled%
-            }%
-          }%
-        }{}%
-      }%
-      \ZREF@temp\pdfpagewidth
-      \ZREF@temp\pdfpageheight
-      \ZREF@temp\pdfhorigin
-      \ZREF@temp\pdfvorigin
-    \endgroup
-  \fi
-\fi
 \def\ZREF@temp#1{%
   \begingroup
     \escapechar=-1 %
@@ -107,10 +78,29 @@
 \ZREF@temp\stockheight % memoir.cls, crop.sty
 \ZREF@temp\mediawidth % VTeX
 \ZREF@temp\mediaheight % VTeX
+\ifluatex
+\zref@newprop*{pdfvorigin}%
+                             [\number\pdfvariable vorigin]% hash-ok
+                             {\number\pdfvariable vorigin}%
+\zref@addprop{thepage}{pdfvorigin}
+\zref@newprop*{pdfhorigin}%
+                             [\number\pdfvariable horigin]% hash-ok
+                             {\number\pdfvariable horigin}%
+\zref@addprop{thepage}{pdfhorigin}
+\zref@newprop*{pdfpageheight}%
+                             [\number\pageheight]% hash-ok
+                             {\number\pageheight}%
+\zref@addprop{thepage}{pdfpageheight}
+\zref@newprop*{pdfpagewidth}%
+                             [\number\pagewidth]% hash-ok
+                             {\number\pagewidth}%
+\zref@addprop{thepage}{pdfpagewidth}
+\else
 \ZREF@temp\pdfpagewidth
 \ZREF@temp\pdfpageheight
 \ZREF@temp\pdfhorigin
 \ZREF@temp\pdfvorigin
+\fi
 \ZREF@temp\hoffset
 \ZREF@temp\voffset
 \ZREF@temp\topmargin
@@ -228,6 +218,7 @@
 \AfterLastShipout{%
   \ZREF@pl@AfterLastShipout
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-pagelayout.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-perpage.sty b/Master/texmf-dist/tex/latex/zref/zref-perpage.sty
index 9e23b596e9d..42c5f629da4 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-perpage.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-perpage.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2019/11/29 v2.28 Module perpage for zref (HO)]%
+  [2020-03-03 v2.29 Module perpage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -138,6 +138,7 @@
     \let\csname ZREF@perpage@#1\endcsname\@undefined
   }%
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-perpage.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-runs.sty b/Master/texmf-dist/tex/latex/zref/zref-runs.sty
index 60b892dc0b9..e9119cf4380 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-runs.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-runs.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-runs}%
-  [2019/11/29 v2.28 Module runs for zref (HO)]%
+  [2020-03-03 v2.29 Module runs for zref (HO)]%
 \providecommand*{\zruns}{0}%
 \AtBeginDocument{%
   \edef\zruns{\number\numexpr\zruns+1}%
@@ -62,6 +62,7 @@
     \fi
   \endgroup
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-runs.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-savepos.sty b/Master/texmf-dist/tex/latex/zref/zref-savepos.sty
index 0d8915775a4..f069a1f65b7 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-savepos.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-savepos.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,17 +48,13 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2019/11/29 v2.28 Module savepos for zref (HO)]%
+  [2020-03-03 v2.29 Module savepos for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
   \expandafter\endinput
 \fi
-\ifx\pdfsavepos\@undefined
-  \let\pdfsavepos          \savepos
-  \let\pdflastxpos         \lastxpos
-  \let\pdflastypos         \lastypos
-\fi
+\ifx\directlua\@undefined
 \ltx@IfUndefined{pdfsavepos}{%
   \PackageError\ZREF@name{%
     \string\pdfsavepos\space is not supported.\MessageBreak
@@ -66,7 +62,7 @@
   }\ZREF@UpdatePdfTeX
   \endinput
 }{}%
-\RequirePackage{ifpdf}
+\fi
 \ifpdf
 \else
   \ltx@IfUndefined{pdftexversion}{%
@@ -82,14 +78,27 @@
   }%
 \fi
 \zref@newlist{savepos}
-\zref@newprop*{posx}[0]{\the\pdflastxpos}
-\zref@newprop*{posy}[0]{\the\pdflastypos}
+\ifx\directlua\@undefined
+  \zref@newprop*{posx}[0]{\the\pdflastxpos}
+  \zref@newprop*{posy}[0]{\the\pdflastypos}
+\else
+  \zref@newprop*{posx}[0]{\the\lastxpos}
+  \zref@newprop*{posy}[0]{\the\lastypos}
+\fi
 \zref@addprops{savepos}{posx,posy}
-\def\zref@savepos{%
-  \if@filesw
-    \pdfsavepos
-  \fi
-}
+\ifx\directlua\@undefined
+  \def\zref@savepos{%
+    \if@filesw
+      \pdfsavepos
+    \fi
+  }
+\else
+  \def\zref@savepos{%
+    \if@filesw
+      \savepos
+    \fi
+  }
+\fi
 \def\ZREF@zsavepos#1#2#3{%
   \@bsphack
   \if@filesw
@@ -127,6 +136,7 @@
   \zref@extract{#1}{posy}%
 }%
 \let\ZREF@savepos@ok=Y
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-savepos.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-thepage.sty b/Master/texmf-dist/tex/latex/zref/zref-thepage.sty
index 82578aa4daf..409f4bb5dfa 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-thepage.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-thepage.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-thepage}%
-  [2019/11/29 v2.28 Module thepage for zref (HO)]%
+  [2020-03-03 v2.29 Module thepage for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -84,6 +84,7 @@
     \zref@thepage{#1}%
   }%
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-thepage.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-titleref.sty b/Master/texmf-dist/tex/latex/zref/zref-titleref.sty
index a5963522002..c3c6f646a58 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-titleref.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-titleref.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2019/11/29 v2.28 Module titleref for zref (HO)]%
+  [2020-03-03 v2.29 Module titleref for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -288,6 +288,7 @@
     \fi
   }{}%
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-titleref.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-totpages.sty b/Master/texmf-dist/tex/latex/zref/zref-totpages.sty
index 9a66c3fa7ed..c8c31ee161c 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-totpages.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-totpages.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2019/11/29 v2.28 Module totpages for zref (HO)]%
+  [2020-03-03 v2.29 Module totpages for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -62,6 +62,7 @@
 \AtBeginDocument{%
   \zref@refused{LastPage}%
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-totpages.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-user.sty b/Master/texmf-dist/tex/latex/zref/zref-user.sty
index 481a9c7e083..3c6bf7e505f 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-user.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-user.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2019/11/29 v2.28 Module user for zref (HO)]%
+  [2020-03-03 v2.29 Module user for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -82,6 +82,7 @@
 \ZREF@IfDefinable\zrefused\def{%
   {\zref@refused}%
 }
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-user.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref-xr.sty b/Master/texmf-dist/tex/latex/zref/zref-xr.sty
index 8f5fe9b608d..5b07f5beed3 100644
--- a/Master/texmf-dist/tex/latex/zref/zref-xr.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref-xr.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2019/11/29 v2.28 Module xr for zref (HO)]%
+  [2020-03-03 v2.29 Module xr for zref (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \ifx\ZREF@base@ok Y%
 \else
@@ -447,6 +447,7 @@
   }{%
   }%
 }%
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref-xr.sty'.
diff --git a/Master/texmf-dist/tex/latex/zref/zref.sty b/Master/texmf-dist/tex/latex/zref/zref.sty
index 3b0df5131db..9035ef9000c 100644
--- a/Master/texmf-dist/tex/latex/zref/zref.sty
+++ b/Master/texmf-dist/tex/latex/zref/zref.sty
@@ -9,11 +9,11 @@
 %% This is a generated file.
 %% 
 %% Project: zref
-%% Version: 2019/11/29 v2.28
+%% Version: 2020-03-03 v2.29
 %% 
 %% Copyright (C)
 %%   2006-2012 Heiko Oberdiek
-%%   2016-2019 Oberdiek Package Support Group
+%%   2016-2020 Oberdiek Package Support Group
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -48,7 +48,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref}
-  [2019/11/29 v2.28 A new reference scheme for LaTeX (HO)]%
+  [2020-03-03 v2.29 A new reference scheme for LaTeX (HO)]%
 \RequirePackage{zref-base}[2019/11/29]
 \@ifundefined{ZREF@base@ok}{\endinput}{}
 \def\ZREF@temp#1{%
@@ -76,6 +76,7 @@
 \ZREF@temp{user}
 \ZREF@temp{xr}
 \ProcessOptions\relax
+%% \section{Installation}
 \endinput
 %%
 %% End of file `zref.sty'.