summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/zref-vario
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-08 21:52:17 +0000
committerKarl Berry <karl@freefriends.org>2022-02-08 21:52:17 +0000
commit52f867b578332875678567cd90f15d2a9e9420b7 (patch)
tree6445cb17b9a37ecc4d4a9b008e8393c4f84ba727 /Master/texmf-dist/source/latex/zref-vario
parent35e83165817085cc1bdbbf9d5b7ba8e05a1bb8da (diff)
zref-vario (8feb22)
git-svn-id: svn://tug.org/texlive/trunk@61951 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/zref-vario')
-rw-r--r--Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx97
1 files changed, 95 insertions, 2 deletions
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 9d5992f8f3c..17c01eed424 100644
--- a/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx
+++ b/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx
@@ -128,7 +128,7 @@
%
% Identify the package.
% \begin{macrocode}
-\ProvidesExplPackage {zref-vario} {2022-02-01} {0.1.1-alpha}
+\ProvidesExplPackage {zref-vario} {2022-02-08} {0.1.2-alpha}
{Extended LaTeX page cross-references with varioref and zref-clever}
% \end{macrocode}
%
@@ -574,7 +574,7 @@
\seq_if_in:NxF \g_@@_setup_languages_seq
{ \@@_base_lang:e { \l_@@_ref_language_tl } }
{
- \msg_warning:nnx { zref-vario } { language-not-setup }
+ \msg_warning:nnx { zref-vario } { language-not-setup }
{ \l_@@_ref_language_tl }
}
}
@@ -731,6 +731,19 @@
\@@_varioref_setup:
\@@_vpageref:VVn \l_@@_reftextcurrent_tl
\l_@@_reftextother_tl {#1}
+ \bool_lazy_and:nnT
+ { \g_@@_zrefcheck_available_bool }
+ { \l_@@_with_vcheck_bool }
+ {
+ \zrefcheck_zrefvario_label:
+ \vref@pagenum \l_tmpa_tl { \the\c@vrcnt @vr }
+ \vrefpagenum \l_tmpb_tl {#1}
+ \tl_if_eq:NNT \l_tmpa_tl \l_tmpb_tl
+ {
+ \zrefcheck_zrefvario_run_check_on_label:Vn
+ \l_@@_vcheck_tl {#1}
+ }
+ }
\group_end:
}
\cs_new_protected:Npn \@@_vpageref:nnn #1#2#3
@@ -787,6 +800,25 @@
{ \keys_set:nn { zref-vario/ref } { nohyperref } }
\@@_varioref_setup:
\@@_vpagerefrange:Vnn \l_@@_reftextcurrent_tl {#1} {#2}
+ \bool_lazy_and:nnT
+ { \g_@@_zrefcheck_available_bool }
+ { \l_@@_with_vcheck_bool }
+ {
+ \zrefcheck_zrefvario_label:
+ \vrefpagenum \l_tmpa_tl {#1}
+ \vrefpagenum \l_tmpb_tl {#2}
+ \tl_if_eq:NNT \l_tmpa_tl \l_tmpb_tl
+ {
+ \vref@pagenum \l_tmpa_tl { \the\c@vrcnt @vr }
+ \tl_if_eq:NNT \l_tmpa_tl \l_tmpb_tl
+ {
+ \zrefcheck_zrefvario_run_check_on_label:Vn
+ \l_@@_vcheck_tl {#1}
+ \zrefcheck_zrefvario_run_check_on_label:Vn
+ \l_@@_vcheck_tl {#2}
+ }
+ }
+ }
\group_end:
}
\cs_new_protected:Npn \@@_vpagerefrange:nnn #1#2#3
@@ -818,6 +850,67 @@
%
%
%
+% \section{\pkg{zref-check} integration}
+%
+% Integration with \pkg{zref-check}. \opt{vcheck}, differently from
+% \opt{check}, receives only two values \texttt{above} and \texttt{below},
+% since these are the only two checks which make sense for \pkg{zref-vario}.
+% This means that it also does not take \cs{zcheck}'s options, but these can
+% always be passed to \opt{check}. Besides this, \opt{vcheck}'s check should
+% only be done when label(s) and reference are in the same page, that is, when
+% \opt{vcurrent} is used. Furthermore, since \pkg{varioref} handles the case
+% where the reference crosses page boundaries, we only set one label for the
+% purpose, and this is done at the end of the reference, because that's the
+% point \pkg{varioref} itself uses to check if label and reference are in the
+% same page.
+%
+% \begin{macrocode}
+\bool_new:N \g_@@_zrefcheck_available_bool
+\bool_new:N \l_@@_with_vcheck_bool
+\tl_new:N \l_@@_vcheck_tl
+\AddToHook { begindocument/before }
+ {
+ \IfPackageLoadedTF { zref-check }
+ {
+ \IfPackageAtLeastTF { zref-check } { 2022-02-08 }
+ {
+ \bool_gset_true:N \g_@@_zrefcheck_available_bool
+ \keys_define:nn { zref-vario/current }
+ {
+ vcheck .choices:nn =
+ { above , below }
+ {
+ \bool_set_true:N \l_@@_with_vcheck_bool
+ \tl_set:NV \l_@@_vcheck_tl \l_keys_choice_tl
+ } ,
+ }
+ }
+ {
+ \bool_gset_false:N \g_@@_zrefcheck_available_bool
+ \keys_define:nn { zref-vario/current }
+ {
+ vcheck .code:n =
+ { \msg_warning:nn { zref-vario } { zref-check-unavailable } } ,
+ }
+ }
+ }
+ {
+ \bool_gset_false:N \g_@@_zrefcheck_available_bool
+ \keys_define:nn { zref-vario/current }
+ {
+ vcheck .code:n =
+ { \msg_warning:nn { zref-vario } { zref-check-unavailable } } ,
+ }
+ }
+ }
+\msg_new:nnn { zref-vario } { zref-check-unavailable }
+ {
+ Option~'vcheck'~is~only~available~when~'zref-check'~is~loaded~
+ and~newer~than~'2022-02-08~v0.2.4'.
+ }
+% \end{macrocode}
+%
+%
% \section{Languages}
%
%