diff options
author | Norbert Preining <norbert@preining.info> | 2023-11-15 03:01:12 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-11-15 03:01:12 +0000 |
commit | f5460c92605f1b3b17448b27ce53375157c3e4b1 (patch) | |
tree | c02171bfdb42a95c39a65edd35f227ae61c8de72 /macros/latex/contrib/zref-vario | |
parent | e20928a0f9f4a7faa8bb21915e761e11e34f04ff (diff) |
CTAN sync 202311150301
Diffstat (limited to 'macros/latex/contrib/zref-vario')
-rw-r--r-- | macros/latex/contrib/zref-vario/CHANGELOG.md | 9 | ||||
-rw-r--r-- | macros/latex/contrib/zref-vario/README.md | 4 | ||||
-rw-r--r-- | macros/latex/contrib/zref-vario/zref-vario-code.pdf | bin | 649524 -> 594590 bytes | |||
-rw-r--r-- | macros/latex/contrib/zref-vario/zref-vario-code.tex | 5 | ||||
-rw-r--r-- | macros/latex/contrib/zref-vario/zref-vario-doc.pdf | bin | 149693 -> 148094 bytes | |||
-rw-r--r-- | macros/latex/contrib/zref-vario/zref-vario-doc.tex | 14 | ||||
-rw-r--r-- | macros/latex/contrib/zref-vario/zref-vario.dtx | 108 | ||||
-rw-r--r-- | macros/latex/contrib/zref-vario/zref-vario.ins | 10 |
8 files changed, 86 insertions, 64 deletions
diff --git a/macros/latex/contrib/zref-vario/CHANGELOG.md b/macros/latex/contrib/zref-vario/CHANGELOG.md index ac681c2740..fd935e7a8c 100644 --- a/macros/latex/contrib/zref-vario/CHANGELOG.md +++ b/macros/latex/contrib/zref-vario/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/zref-vario/compare/v0.1.9...HEAD) +## [Unreleased](https://github.com/gusbrs/zref-vario/compare/v0.1.10...HEAD) + +## [v0.1.10](https://github.com/gusbrs/zref-vario/compare/v0.1.9...v0.1.10) (2023-11-14) + +### Changed +- Don't use `expl3` public scratch temporary variables. +- Prefer `e-type` expansion. +- Require 2023-11-01 LaTeX kernel. ## [v0.1.9](https://github.com/gusbrs/zref-vario/compare/v0.1.8...v0.1.9) (2023-08-15) diff --git a/macros/latex/contrib/zref-vario/README.md b/macros/latex/contrib/zref-vario/README.md index a76d0b945c..51817bfb40 100644 --- a/macros/latex/contrib/zref-vario/README.md +++ b/macros/latex/contrib/zref-vario/README.md @@ -2,8 +2,8 @@ **Extended LaTeX page cross-references with varioref and zref-clever** -Author: Gustavo Barros -Maintainer: Gustavo Barros +Author: gusbrs +Maintainer: gusbrs `zref-vario` offers a compatibility layer for `varioref` to be used alongside `zref-clever`. It provides "`\z...`" counterparts to `varioref`'s main diff --git a/macros/latex/contrib/zref-vario/zref-vario-code.pdf b/macros/latex/contrib/zref-vario/zref-vario-code.pdf Binary files differindex a27a211487..27e2ec44e4 100644 --- a/macros/latex/contrib/zref-vario/zref-vario-code.pdf +++ b/macros/latex/contrib/zref-vario/zref-vario-code.pdf diff --git a/macros/latex/contrib/zref-vario/zref-vario-code.tex b/macros/latex/contrib/zref-vario/zref-vario-code.tex index d1774f8f21..050f6fc92c 100644 --- a/macros/latex/contrib/zref-vario/zref-vario-code.tex +++ b/macros/latex/contrib/zref-vario/zref-vario-code.tex @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-vario". % -% Copyright (C) 2022-2023 Gustavo Barros +% Copyright (C) 2022-2023 gusbrs % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -17,8 +17,7 @@ % version 2005/12/01 or later. % % -% This work is "maintained" (as per LPPL maintenance status) by -% Gustavo Barros. +% This work is "maintained" (as per LPPL maintenance status) by gusbrs. % % This work consists of the files zref-vario.dtx, % zref-vario.ins, diff --git a/macros/latex/contrib/zref-vario/zref-vario-doc.pdf b/macros/latex/contrib/zref-vario/zref-vario-doc.pdf Binary files differindex df0b0813a2..28e134ebe3 100644 --- a/macros/latex/contrib/zref-vario/zref-vario-doc.pdf +++ b/macros/latex/contrib/zref-vario/zref-vario-doc.pdf diff --git a/macros/latex/contrib/zref-vario/zref-vario-doc.tex b/macros/latex/contrib/zref-vario/zref-vario-doc.tex index 0adfee69b2..d6187077b7 100644 --- a/macros/latex/contrib/zref-vario/zref-vario-doc.tex +++ b/macros/latex/contrib/zref-vario/zref-vario-doc.tex @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-vario". % -% Copyright (C) 2022-2023 Gustavo Barros +% Copyright (C) 2022-2023 gusbrs % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -17,8 +17,7 @@ % version 2005/12/01 or later. % % -% This work is "maintained" (as per LPPL maintenance status) by -% Gustavo Barros. +% This work is "maintained" (as per LPPL maintenance status) by gusbrs. % % This work consists of the files zref-vario.dtx, % zref-vario.ins, @@ -94,18 +93,17 @@ \title{% The \pkg{zref-vario} package% - \thanks{This file describes \fileversion, released \filedate.}% \texorpdfstring{\\{}\medskip{}}{ - }% User manual% \texorpdfstring{\medskip{}}{}% } \author{% - Gustavo Barros% - \thanks{\url{https://github.com/gusbrs/zref-vario}}% -} + \texorpdfstring{\texttt{gusbrs}\\[0.8em] + \url{https://github.com/gusbrs/zref-vario}\\ + \url{https://www.ctan.org/pkg/zref-vario}}{gusbrs}} -\date{\filedate} +\date{Version \fileversion\ -- \filedate} \maketitle diff --git a/macros/latex/contrib/zref-vario/zref-vario.dtx b/macros/latex/contrib/zref-vario/zref-vario.dtx index 0be32b12bf..9e125cce76 100644 --- a/macros/latex/contrib/zref-vario/zref-vario.dtx +++ b/macros/latex/contrib/zref-vario/zref-vario.dtx @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-vario". % -% Copyright (C) 2022-2023 Gustavo Barros +% Copyright (C) 2022-2023 gusbrs % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -17,8 +17,7 @@ % version 2005/12/01 or later. % % -% This work is "maintained" (as per LPPL maintenance status) by -% Gustavo Barros. +% This work is "maintained" (as per LPPL maintenance status) by gusbrs. % % This work consists of the files zref-vario.dtx, % zref-vario.ins, @@ -89,18 +88,17 @@ % % \title{^^A % The \pkg{zref-vario} package^^A -% \thanks{This file describes \fileversion, released \filedate.}^^A % \texorpdfstring{\\{}\medskip{}}{ - }^^A % Code documentation^^A % \texorpdfstring{\medskip{}}{}^^A % } % % \author{^^A -% Gustavo Barros^^A -% \thanks{\url{https://github.com/gusbrs/zref-vario}}^^A -% } +% \texorpdfstring{\texttt{gusbrs}\\[0.8em] +% \url{https://github.com/gusbrs/zref-vario}\\ +% \url{https://www.ctan.org/pkg/zref-vario}}{gusbrs}} % -% \date{\filedate} +% \date{Version \fileversion\ -- \filedate} % % \maketitle % @@ -127,19 +125,28 @@ % % % \begin{macrocode} -\NeedsTeXFormat{LaTeX2e} +\def\zrefvario@required@kernel{2023-11-01} +\NeedsTeXFormat{LaTeX2e}[\zrefvario@required@kernel] +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} +\IfFormatAtLeastTF{\zrefvario@required@kernel} + {} + {% + \PackageError{zref-vario}{LaTeX kernel too old} + {% + 'zref-vario' requires a LaTeX kernel \zrefvario@required@kernel\space or newer.% + }% + }% % \end{macrocode} % % % Identify the package. % \begin{macrocode} -\ProvidesExplPackage {zref-vario} {2023-08-15} {0.1.9} +\ProvidesExplPackage {zref-vario} {2023-11-14} {0.1.10} {Extended LaTeX page cross-references with varioref and zref-clever} % \end{macrocode} % % -% Required packages. Note that \pkg{zref-clever} \texttt{v0.2.0-alpha}, from -% 2022-01-28, requires a kernel 2021-11-15 or newer. +% Required packages. % % \begin{macrocode} \RequirePackage { zref-clever } [ 2022-01-28 ] % v0.2.0-alpha @@ -151,6 +158,19 @@ % in ways that break \pkg{zref-vario}. % % +% \begin{macro} +% { +% \l_@@_tmpa_tl , +% \l_@@_tmpb_tl , +% } +% Temporary scratch variables. +% \begin{macrocode} +\tl_new:N \l_@@_tmpa_tl +\tl_new:N \l_@@_tmpb_tl +% \end{macrocode} +% \end{macro} +% +% % \section{Options} % % \subsection*{\cs{zvsetup}} @@ -301,7 +321,7 @@ { \@@_ref_opt_name_lang_tl:nn { zv_unknown_language } {#2} } } } -\cs_generate_variant:Nn \@@_ref_opt_tl_get:nnN { xnN } +\cs_generate_variant:Nn \@@_ref_opt_tl_get:nnN { enN } \cs_new_protected:Npn \@@_ref_opt_cs_get:nnnN #1#2#3#4 { \cs_if_exist:cTF @@ -326,7 +346,7 @@ } } } -\cs_generate_variant:Nn \@@_ref_opt_cs_get:nnnN { xnnN } +\cs_generate_variant:Nn \@@_ref_opt_cs_get:nnnN { ennN } % \end{macrocode} % \end{macro} % @@ -393,7 +413,7 @@ { \tl_set:Nn \l_@@_setup_language_tl {#1} \keys_set:nn { zref-vario/langsetup } {#2} - \seq_gput_right:Nx \g_@@_setup_languages_seq + \seq_gput_right:Ne \g_@@_setup_languages_seq { \@@_base_lang:n {#1} } } { \msg_warning:nnn { zref-vario } { unknown-language-setup } {#1} } @@ -593,49 +613,49 @@ { reftextfaceafter = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextfaceafter } { \l_@@_ref_language_tl } \zref@default } , reftextfacebefore = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextfacebefore } { \l_@@_ref_language_tl } \zref@default } , reftextafter = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextafter } { \l_@@_ref_language_tl } \zref@default } , reftextbefore = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextbefore } { \l_@@_ref_language_tl } \zref@default } , reftextcurrent = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextcurrent } { \l_@@_ref_language_tl } \zref@default } , reftextfaraway = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextfaraway } { \l_@@_ref_language_tl } \zref@default } , reftextpagerange = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextpagerange } { \l_@@_ref_language_tl } \zref@default } , reftextlabelrange = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextlabelrange } { \l_@@_ref_language_tl } \zref@default } , @@ -654,10 +674,10 @@ { \AddToHook { begindocument } { - \seq_if_in:NxF \g_@@_setup_languages_seq + \seq_if_in:NeF \g_@@_setup_languages_seq { \@@_base_lang:e { \l_@@_ref_language_tl } } { - \msg_warning:nnx { zref-vario } { language-not-setup } + \msg_warning:nne { zref-vario } { language-not-setup } { \l_@@_ref_language_tl } } } @@ -787,47 +807,47 @@ \cs_set_eq:NN \vref@pagenum \@@_vref_pagenum:Nn \cs_set_eq:NN \vrefpagenum \@@_vrefpagenum:Nn \cs_set_eq:NN \vref@label \@@_vref_label:n - \@@_ref_opt_tl_get:xnN + \@@_ref_opt_tl_get:enN { \l_@@_ref_language_tl } { reftextfaceafter } \reftextfaceafter - \@@_ref_opt_tl_get:xnN + \@@_ref_opt_tl_get:enN { \l_@@_ref_language_tl } { reftextfacebefore } \reftextfacebefore - \@@_ref_opt_tl_get:xnN + \@@_ref_opt_tl_get:enN { \l_@@_ref_language_tl } { reftextafter } \reftextafter - \@@_ref_opt_tl_get:xnN + \@@_ref_opt_tl_get:enN { \l_@@_ref_language_tl } { reftextbefore } \reftextbefore - \@@_ref_opt_tl_get:xnN + \@@_ref_opt_tl_get:enN { \l_@@_ref_language_tl } { reftextcurrent } \reftextcurrent - \@@_ref_opt_cs_get:xnnN + \@@_ref_opt_cs_get:ennN { \l_@@_ref_language_tl } { reftextfaraway } { n } \reftextfaraway - \@@_ref_opt_cs_get:xnnN + \@@_ref_opt_cs_get:ennN { \l_@@_ref_language_tl } { reftextpagerange } { nn } \reftextpagerange - \@@_ref_opt_cs_get:xnnN + \@@_ref_opt_cs_get:ennN { \l_@@_ref_language_tl } { reftextlabelrange } { nn } \reftextlabelrange - \@@_ref_opt_cs_get:xnnN + \@@_ref_opt_cs_get:ennN { \l_@@_ref_language_tl } { vrefformat } { nn } \vrefformat - \@@_ref_opt_cs_get:xnnN + \@@_ref_opt_cs_get:ennN { \l_@@_ref_language_tl } { vrefrangeformat } { nnn } \vrefrangeformat - \@@_ref_opt_cs_get:xnnN + \@@_ref_opt_cs_get:ennN { \l_@@_ref_language_tl } { fullrefformat } { n } \fullrefformat @@ -899,9 +919,9 @@ { \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 + \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} @@ -978,12 +998,12 @@ { \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 + \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 + \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} diff --git a/macros/latex/contrib/zref-vario/zref-vario.ins b/macros/latex/contrib/zref-vario/zref-vario.ins index 211c1ff0b2..cb37ba5c3f 100644 --- a/macros/latex/contrib/zref-vario/zref-vario.ins +++ b/macros/latex/contrib/zref-vario/zref-vario.ins @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-vario". % -% Copyright (C) 2022-2023 Gustavo Barros +% Copyright (C) 2022-2023 gusbrs % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -17,8 +17,7 @@ % version 2005/12/01 or later. % % -% This work is "maintained" (as per LPPL maintenance status) by -% Gustavo Barros. +% This work is "maintained" (as per LPPL maintenance status) by gusbrs. % % This work consists of the files zref-vario.dtx, % zref-vario.ins, @@ -50,7 +49,7 @@ This file was generated from file(s) of the LaTeX package "zref-vario". -Copyright (C) 2022-2023 Gustavo Barros +Copyright (C) 2022-2023 gusbrs It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -63,8 +62,7 @@ and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. -This work is "maintained" (as per LPPL maintenance status) by - Gustavo Barros. +This work is "maintained" (as per LPPL maintenance status) by gusbrs. This work consists of the files zref-vario.dtx, zref-vario.ins, |