From 510f3c5fc310ec11b7537d0772cf595e786689b7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 24 Apr 2022 20:11:55 +0000 Subject: zref-vario (24apr22) git-svn-id: svn://tug.org/texlive/trunk@63124 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/zref-vario/zref-vario.dtx | 18 ++++++++++-------- .../texmf-dist/source/latex/zref-vario/zref-vario.ins | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx b/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx index 2c0aa781926..c9db0a0f8a2 100644 --- a/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx +++ b/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx @@ -24,7 +24,7 @@ % zref-vario.ins, % zref-vario.tex, % zref-vario-code.tex, -% and the files listed in MANIFEST.md. +% and the files generated from them. % % The released version of this package is available from CTAN. % @@ -128,19 +128,21 @@ % % Identify the package. % \begin{macrocode} -\ProvidesExplPackage {zref-vario} {2022-02-11} {0.1.3-alpha} +\ProvidesExplPackage {zref-vario} {2022-04-24} {0.1.4} {Extended LaTeX page cross-references with varioref and zref-clever} % \end{macrocode} % % -% Required packages. +% Required packages. The loading of \pkg{varioref} is delayed until +% \texttt{begindocument/before} since it has potential load order issues +% (e.g.\ with \pkg{hyperref}) so, ideally, it should be explicitly loaded by +% the user (and the manual recommends it). But we do it, if it hasn't been +% done. % % \begin{macrocode} +\RequirePackage { zref-clever } [ 2022-01-28 ] % v0.2.0-alpha \AddToHook { begindocument/before } - { - \RequirePackage { varioref } - \RequirePackage { zref-clever } [ 2022-01-28 ] % v0.2.0-alpha - } + { \RequirePackage { varioref } } % \end{macrocode} % % @@ -613,7 +615,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_vref_pagenum:Nn #1#2 { - \exp_args:NNNo \exp_args:NNo \def #1 + \exp_args:NNNo \exp_args:NNo \cs_set_nopar:Npn #1 { \zref@extractdefault {#2} { page } { ?? } } } \cs_new_protected:Npn \@@_vrefpagenum:Nn #1#2 diff --git a/Master/texmf-dist/source/latex/zref-vario/zref-vario.ins b/Master/texmf-dist/source/latex/zref-vario/zref-vario.ins index c04eb45c3e9..f0e767208ba 100644 --- a/Master/texmf-dist/source/latex/zref-vario/zref-vario.ins +++ b/Master/texmf-dist/source/latex/zref-vario/zref-vario.ins @@ -24,7 +24,7 @@ % zref-vario.ins, % zref-vario.tex, % zref-vario-code.tex, -% and the files listed in MANIFEST.md. +% and the files generated from them. % % The released version of this package is available from CTAN. % @@ -70,7 +70,7 @@ This work consists of the files zref-vario.dtx, zref-vario.ins, zref-vario.tex, zref-vario-code.tex, - and the files listed in MANIFEST.md. + and the files generated from them. The released version of this package is available from CTAN. -- cgit v1.2.3