summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/zref-vario/zref-vario.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/zref-vario/zref-vario.dtx')
-rw-r--r--macros/latex/contrib/zref-vario/zref-vario.dtx18
1 files changed, 10 insertions, 8 deletions
diff --git a/macros/latex/contrib/zref-vario/zref-vario.dtx b/macros/latex/contrib/zref-vario/zref-vario.dtx
index 2c0aa78192..c9db0a0f8a 100644
--- a/macros/latex/contrib/zref-vario/zref-vario.dtx
+++ b/macros/latex/contrib/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