diff options
Diffstat (limited to 'Master')
35 files changed, 836 insertions, 710 deletions
diff --git a/Master/texmf-dist/doc/latex/zref-check/CHANGELOG.md b/Master/texmf-dist/doc/latex/zref-check/CHANGELOG.md index 75b91e2d0a8..11b857b0a3c 100644 --- a/Master/texmf-dist/doc/latex/zref-check/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/zref-check/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.3.4...HEAD) +## [Unreleased](https://github.com/gusbrs/zref-check/compare/v0.3.5...HEAD) + +## [v0.3.5](https://github.com/gusbrs/zref-check/compare/v0.3.4...v0.3.5) (2023-11-14) + +### Changed +- Don't use `expl3` public scratch temporary variables. +- Prefer `e-type` expansion. +- Require 2023-11-01 LaTeX kernel. ## [v0.3.4](https://github.com/gusbrs/zref-check/compare/v0.3.3...v0.3.4) (2023-08-13) diff --git a/Master/texmf-dist/doc/latex/zref-check/README.md b/Master/texmf-dist/doc/latex/zref-check/README.md index 2b5febb76cf..21a20eba689 100644 --- a/Master/texmf-dist/doc/latex/zref-check/README.md +++ b/Master/texmf-dist/doc/latex/zref-check/README.md @@ -2,8 +2,8 @@ **Flexible LaTeX cross-references with contextual checks based on zref** -Author: Gustavo Barros -Maintainer: Gustavo Barros +Author: gusbrs +Maintainer: gusbrs `zref-check` provides an user interface for making LaTeX cross-references flexibly, while allowing to have them checked for consistency with the diff --git a/Master/texmf-dist/doc/latex/zref-check/zref-check-code.pdf b/Master/texmf-dist/doc/latex/zref-check/zref-check-code.pdf Binary files differindex 73d1816b1d9..e664b6c2b8e 100644 --- a/Master/texmf-dist/doc/latex/zref-check/zref-check-code.pdf +++ b/Master/texmf-dist/doc/latex/zref-check/zref-check-code.pdf diff --git a/Master/texmf-dist/doc/latex/zref-check/zref-check-code.tex b/Master/texmf-dist/doc/latex/zref-check/zref-check-code.tex index 02cb8b5c824..fdf39a34879 100644 --- a/Master/texmf-dist/doc/latex/zref-check/zref-check-code.tex +++ b/Master/texmf-dist/doc/latex/zref-check/zref-check-code.tex @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-check". % -% Copyright (C) 2021-2023 Gustavo Barros +% Copyright (C) 2021-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-check.dtx, % zref-check.ins, @@ -63,16 +62,18 @@ \GetFileInfo{zref-check.sty} \title{% - The \pkg{zref-check} package implementation% - \thanks{This file describes \fileversion, released \filedate.}% + The \pkg{zref-check} package% + \texorpdfstring{\\{}\medskip{}}{ - }% + Code documentation% + \texorpdfstring{\medskip{}}{}% } \author{% - Gustavo Barros% - \thanks{\url{https://github.com/gusbrs/zref-check}}% -} + \texorpdfstring{\texttt{gusbrs}\\[0.8em] + \url{https://github.com/gusbrs/zref-check}\\ + \url{https://www.ctan.org/pkg/zref-check}}{gusbrs}} -\date{\filedate} +\date{Version \fileversion\ -- \filedate} \maketitle diff --git a/Master/texmf-dist/doc/latex/zref-check/zref-check-doc.pdf b/Master/texmf-dist/doc/latex/zref-check/zref-check-doc.pdf Binary files differindex d6ba5308cb6..95c0c5994b4 100644 --- a/Master/texmf-dist/doc/latex/zref-check/zref-check-doc.pdf +++ b/Master/texmf-dist/doc/latex/zref-check/zref-check-doc.pdf diff --git a/Master/texmf-dist/doc/latex/zref-check/zref-check-doc.tex b/Master/texmf-dist/doc/latex/zref-check/zref-check-doc.tex index 9d0205c5715..4be8af4625c 100644 --- a/Master/texmf-dist/doc/latex/zref-check/zref-check-doc.tex +++ b/Master/texmf-dist/doc/latex/zref-check/zref-check-doc.tex @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-check". % -% Copyright (C) 2021-2022 Gustavo Barros +% Copyright (C) 2021-2022 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-check.dtx, % zref-check.ins, @@ -59,15 +58,17 @@ \title{% The \pkg{zref-check} package% - \thanks{This file describes \fileversion, released \filedate.}% + \texorpdfstring{\\{}\medskip{}}{ - }% + User manual% + \texorpdfstring{\medskip{}}{}% } \author{% - Gustavo Barros% - \thanks{\url{https://github.com/gusbrs/zref-check}}% -} + \texorpdfstring{\texttt{gusbrs}\\[0.8em] + \url{https://github.com/gusbrs/zref-check}\\ + \url{https://www.ctan.org/pkg/zref-check}}{gusbrs}} -\date{\filedate} +\date{Version \fileversion\ -- \filedate} \maketitle diff --git a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md index a48047cdeb1..c770811b3fc 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/zref-clever/CHANGELOG.md @@ -1,6 +1,13 @@ # Changelog -## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.4.2...HEAD) +## [Unreleased](https://github.com/gusbrs/zref-clever/compare/v0.4.3...HEAD) + +## [v0.4.3](https://github.com/gusbrs/zref-clever/compare/v0.4.2...v0.4.3) (2023-11-14) + +### Changed +- Don't use `expl3` public scratch temporary variables. +- Prefer `e-type` expansion. +- Require 2023-11-01 LaTeX kernel. ## [v0.4.2](https://github.com/gusbrs/zref-clever/compare/v0.4.1...v0.4.2) (2023-08-14) diff --git a/Master/texmf-dist/doc/latex/zref-clever/README.md b/Master/texmf-dist/doc/latex/zref-clever/README.md index 0d7a610d5bc..340408664be 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/README.md +++ b/Master/texmf-dist/doc/latex/zref-clever/README.md @@ -2,8 +2,8 @@ **Clever LaTeX cross-references based on zref** -Author: Gustavo Barros -Maintainer: Gustavo Barros +Author: gusbrs +Maintainer: gusbrs `zref-clever` provides a user interface for making LaTeX cross-references which automates some of their typical features, thus easing their input in the diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf Binary files differindex 0ff0e7173a4..41da795ac74 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf +++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.pdf diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.tex b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.tex index ec9210dd67c..5e5b84dd11f 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.tex +++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-code.tex @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-clever". % -% Copyright (C) 2021-2023 Gustavo Barros +% Copyright (C) 2021-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-clever.dtx, % zref-clever.ins, diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf Binary files differindex 248321f0824..c0ea22459a7 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf +++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.pdf diff --git a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex index 69584c2fb65..ca2baa37093 100644 --- a/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex +++ b/Master/texmf-dist/doc/latex/zref-clever/zref-clever-doc.tex @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-clever". % -% Copyright (C) 2021-2023 Gustavo Barros +% Copyright (C) 2021-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-clever.dtx, % zref-clever.ins, @@ -156,29 +155,24 @@ \lstnewenvironment{zchowto}[1][]{% \renewcommand{\lstlistingname}{How-to}% \renewcommand*\theHlstlisting{ht.\thelstlisting}% + \zcsetup{countertype={lstlisting=zchowto}}% \lstset{#1}% + \stepcounter{zchowto}% \setcounter{lstlisting}{\value{zchowto}}% }{} \newcounter{zcworkaround} \lstnewenvironment{zcworkaround}[1][]{% \renewcommand{\lstlistingname}{Work-around}% \renewcommand*\theHlstlisting{wa.\thelstlisting}% + \zcsetup{countertype={lstlisting=zcworkaround}}% \lstset{#1}% + \stepcounter{zcworkaround}% \setcounter{lstlisting}{\value{zcworkaround}}% }{} \lstnewenvironment{zcexample}[1][]{% \renewcommand{\lstlistingname}{Example}% \lstset{#1}% }{} -\ExplSyntaxOn -\makeatletter -\lst@AddToHook { PreInit } - { - \cs_if_exist:cT { c@ \lstenv@name } - { \exp_args:Nx \refstepcounter { \lstenv@name } } - } -\makeatother -\ExplSyntaxOff \zcRefTypeSetup{zchowto}{ Name-sg = {How-to}, @@ -199,18 +193,17 @@ \title{% The \pkg{zref-clever} package% - \thanks{This file describes \fileversion, released \filedate.}% \texorpdfstring{\\{}\medskip{}}{ - }% User manual% \texorpdfstring{\medskip{}}{}% } \author{% - Gustavo Barros% - \thanks{\url{https://github.com/gusbrs/zref-clever}}% -} + \texorpdfstring{\texttt{gusbrs}\\[0.8em] + \url{https://github.com/gusbrs/zref-clever}\\ + \url{https://www.ctan.org/pkg/zref-clever}}{gusbrs}} -\date{\filedate} +\date{Version \fileversion\ -- \filedate} \maketitle @@ -2646,6 +2639,7 @@ were generously provided by (in chronological order): % 2023-02-18: https://github.com/gusbrs/zref-clever/pull/14 % 2023-02-18: https://github.com/gusbrs/zref-clever/pull/15 % 2023-05-11: https://github.com/T-F-S/tcolorbox/issues/230 + % 2023-11-09: https://github.com/gusbrs/zref-clever/issues/20 and Lars Madsen. % 2023-07-24: https://chat.stackexchange.com/transcript/message/64039717#64039717 % and following discussion. diff --git a/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md b/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md index ac681c2740c..fd935e7a8c9 100644 --- a/Master/texmf-dist/doc/latex/zref-vario/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/zref-vario/README.md b/Master/texmf-dist/doc/latex/zref-vario/README.md index a76d0b945c3..51817bfb40f 100644 --- a/Master/texmf-dist/doc/latex/zref-vario/README.md +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf b/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf Binary files differindex a27a2114874..27e2ec44e40 100644 --- a/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf +++ b/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.pdf diff --git a/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.tex b/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.tex index d1774f8f21d..050f6fc92cb 100644 --- a/Master/texmf-dist/doc/latex/zref-vario/zref-vario-code.tex +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/zref-vario/zref-vario-doc.pdf b/Master/texmf-dist/doc/latex/zref-vario/zref-vario-doc.pdf Binary files differindex df0b0813a29..28e134ebe31 100644 --- a/Master/texmf-dist/doc/latex/zref-vario/zref-vario-doc.pdf +++ b/Master/texmf-dist/doc/latex/zref-vario/zref-vario-doc.pdf diff --git a/Master/texmf-dist/doc/latex/zref-vario/zref-vario-doc.tex b/Master/texmf-dist/doc/latex/zref-vario/zref-vario-doc.tex index 0adfee69b29..d6187077b78 100644 --- a/Master/texmf-dist/doc/latex/zref-vario/zref-vario-doc.tex +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/source/latex/zref-check/zref-check.dtx b/Master/texmf-dist/source/latex/zref-check/zref-check.dtx index c3a05b9990a..438c89d2af5 100644 --- a/Master/texmf-dist/source/latex/zref-check/zref-check.dtx +++ b/Master/texmf-dist/source/latex/zref-check/zref-check.dtx @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-check". % -% Copyright (C) 2021-2023 Gustavo Barros +% Copyright (C) 2021-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-check.dtx, % zref-check.ins, @@ -70,9 +69,11 @@ % % For the \texttt{chapter} and \texttt{section} checks, \pkg{zref-check} uses % the new hook system in \pkg{ltcmdhooks}, which was released with the -% 2021/06/01 \LaTeX{} kernel. +% 2021/06/01 \LaTeX{} kernel. And, since we followed the move to +% \texttt{e}-type expansion, to play safe we require the 2023-11-01 kernel or +% newer. % \begin{macrocode} -\def\zrefcheck@required@kernel{2021-06-01} +\def\zrefcheck@required@kernel{2023-11-01} \NeedsTeXFormat{LaTeX2e}[\zrefcheck@required@kernel] \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{\zrefcheck@required@kernel} @@ -87,7 +88,7 @@ % % Identify the package. % \begin{macrocode} -\ProvidesExplPackage {zref-check} {2023-08-13} {0.3.4} +\ProvidesExplPackage {zref-check} {2023-11-14} {0.3.5} {Flexible cross-references with contextual checks based on zref} % \end{macrocode} % @@ -168,16 +169,38 @@ % % \section{Plumbing} % +% \subsection{Auxiliary} +% +% \begin{macro} +% { +% \l_@@_tmpa_tl , +% \l_@@_tmpb_tl , +% \g_@@_tmpa_tl , +% \l_@@_tmpa_int , +% \l_@@_tmpa_bool , +% \g_@@_tmpa_ior , +% } +% Temporary scratch variables. +% \begin{macrocode} +\tl_new:N \l_@@_tmpa_tl +\tl_new:N \l_@@_tmpb_tl +\tl_new:N \g_@@_tmpa_tl +\int_new:N \l_@@_tmpa_int +\bool_new:N \l_@@_tmpa_bool +\ior_new:N \g_@@_tmpa_ior +% \end{macrocode} +% \end{macro} +% % \subsection{Messages} % -% \begin{macro}{\@@_message:nnnn, \@@_message:nnnx} +% \begin{macro}{\@@_message:nnnn, \@@_message:nnne} % \begin{macrocode} \cs_new_protected:Npn \@@_message:nnnn #1#2#3#4 { \use:c { msg_ \l_@@_msglevel_tl :nnnnn } { zref-check } {#1} {#2} {#3} {#4} } -\cs_generate_variant:Nn \@@_message:nnnn { nnnx } +\cs_generate_variant:Nn \@@_message:nnnn { nnne } % \end{macrocode} % \end{macro} % @@ -594,37 +617,38 @@ % \end{variable} % % \begin{macrocode} -\tl_gset:Nn \g_tmpa_tl { \c_sys_jobname_str .aux } -\file_if_exist:nT { \g_tmpa_tl } +\tl_gset:Nn \g_@@_tmpa_tl { \c_sys_jobname_str .aux } +\file_if_exist:nT { \g_@@_tmpa_tl } { % \end{macrocode} % Retrieve the information from the \file{.aux} file, and store it in a % property list, so that the sequence can be retrieved in key-value fashion. % \begin{macrocode} - \ior_open:Nn \g_tmpa_ior { \g_tmpa_tl } + \ior_open:Nn \g_@@_tmpa_ior { \g_@@_tmpa_tl } \group_begin: - \int_zero:N \l_tmpa_int - \tl_clear:N \l_tmpa_tl - \tl_clear:N \l_tmpb_tl - \bool_set_false:N \l_tmpa_bool - \ior_map_variable:NNn \g_tmpa_ior \l_tmpa_tl + \int_zero:N \l_@@_tmpa_int + \tl_clear:N \l_@@_tmpa_tl + \tl_clear:N \l_@@_tmpb_tl + \bool_set_false:N \l_@@_tmpa_bool + \ior_map_variable:NNn \g_@@_tmpa_ior \l_@@_tmpa_tl { - \tl_map_variable:NNn \l_tmpa_tl \l_tmpb_tl + \tl_map_variable:NNn \l_@@_tmpa_tl \l_@@_tmpb_tl { - \tl_if_eq:NnTF \l_tmpb_tl { \zref@newlabel } + \tl_if_eq:NnTF \l_@@_tmpb_tl { \zref@newlabel } { % \end{macrocode} % Found a \cs{zref@label}, signal it. % \begin{macrocode} - \bool_set_true:N \l_tmpa_bool + \bool_set_true:N \l_@@_tmpa_bool } { - \bool_if:NTF \l_tmpa_bool + \bool_if:NTF \l_@@_tmpa_bool { - \bool_set_false:N \l_tmpa_bool - \int_incr:N \l_tmpa_int - \prop_gput:Nxx \g_@@_auxfile_lblseq_prop - { \l_tmpb_tl } { \int_use:N \l_tmpa_int } + \bool_set_false:N \l_@@_tmpa_bool + \int_incr:N \l_@@_tmpa_int + \prop_gput:Nee \g_@@_auxfile_lblseq_prop + { \l_@@_tmpb_tl } + { \int_use:N \l_@@_tmpa_int } } { % \end{macrocode} @@ -632,7 +656,8 @@ % the loop and discard the rest of the line, to ensure no babel calls to % \cs{catcode} in the \file{.aux} file get expanded. This also breaks the % loop and discards the rest of the \cs{zref@newlabel} lines after we got the -% label we wanted, since we reset \cs{l_tmpa_bool} in the \texttt{T} branch. +% label we wanted, since we reset \cs{l_@@_tmpa_bool} in the \texttt{T} +% branch. % \begin{macrocode} \tl_map_break: } @@ -640,7 +665,7 @@ } } \group_end: - \ior_close:N \g_tmpa_ior + \ior_close:N \g_@@_tmpa_ior } % \end{macrocode} % @@ -778,7 +803,7 @@ { \zref@ifrefcontainsprop {#1} {#2} { - \tl_set:Nx #3 + \tl_set:Ne #3 { \zref@extractdefault {#1} {#2} { \c_empty_tl } } } { @@ -924,7 +949,7 @@ % Names of the labels for this zcheck call. % \begin{macrocode} \int_gincr:N \g_@@_id_int - \tl_set:Nx \l_@@_checkbeg_tl + \tl_set:Ne \l_@@_checkbeg_tl { \@@_check_lblfmt:n { \g_@@_id_int } } % \end{macrocode} % Set checkbeg label. @@ -950,7 +975,7 @@ ! \l_@@_link_star_bool } { - \exp_args:Nx \zrefcheck_get_astl:nnn + \exp_args:Ne \zrefcheck_get_astl:nnn { \l_@@_link_label_tl } { anchor } { \l_@@_link_anchor_tl } \hyperlink { \l_@@_link_anchor_tl } {#4} @@ -974,7 +999,7 @@ % \end{macrocode} % Run the checks. % \begin{macrocode} - \@@_run_checks:nnx { \l_@@_zcheck_checks_seq } + \@@_run_checks:nne { \l_@@_zcheck_checks_seq } { \l_@@_zcheck_labels_seq } { \l_@@_checkbeg_tl } \group_end: } @@ -1187,7 +1212,7 @@ } \group_end: } -\cs_generate_variant:Nn \@@_run_checks:nnn { nnx } +\cs_generate_variant:Nn \@@_run_checks:nnn { nne } % \end{macrocode} % \end{macro} % @@ -1331,7 +1356,7 @@ \l_@@_onpage_bool } { - \@@_message:nnnx { double-check } {#1} {#2} + \@@_message:nnne { double-check } {#1} {#2} { \zref@extractdefault {#3} {page} {'unknown'} } } } @@ -1339,7 +1364,7 @@ \bool_if:NTF \l_@@_empty_label_bool { \@@_message:nnnn { empty-label } {#1} { } { } } { - \@@_message:nnnx { check-failed } {#1} {#2} + \@@_message:nnne { check-failed } {#1} {#2} { \zref@extractdefault {#3} {page} {'unknown'} } } } @@ -1929,7 +1954,7 @@ \cs_new_protected:Npn \zrefcheck_zcref_beg_label: { \int_gincr:N \g_@@_id_int - \tl_set:Nx \l_@@_checkbeg_tl + \tl_set:Ne \l_@@_checkbeg_tl { \@@_check_lblfmt:n { \g_@@_id_int } } \zref@labelbylist { \l_@@_checkbeg_tl } { zrefcheck-check } } @@ -1944,7 +1969,7 @@ } \cs_new_protected:Npn \zrefcheck_zcref_run_checks_on_labels:n #1 { - \@@_run_checks:nnx + \@@_run_checks:nne { \l_@@_zcheck_checks_seq } {#1} { \l_@@_checkbeg_tl } } % \end{macrocode} @@ -1964,7 +1989,7 @@ \cs_new_protected:Npn \zrefcheck_zrefvario_label: { \int_gincr:N \g_@@_id_int - \tl_set:Nx \l_@@_checkbeg_tl + \tl_set:Ne \l_@@_checkbeg_tl { \@@_check_lblfmt:n { \g_@@_id_int } } \zref@labelbylist { \l_@@_checkbeg_tl } { zrefcheck-zrefvario } } diff --git a/Master/texmf-dist/source/latex/zref-check/zref-check.ins b/Master/texmf-dist/source/latex/zref-check/zref-check.ins index e0511ea791d..2207ce484cb 100644 --- a/Master/texmf-dist/source/latex/zref-check/zref-check.ins +++ b/Master/texmf-dist/source/latex/zref-check/zref-check.ins @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-check". % -% Copyright (C) 2021-2023 Gustavo Barros +% Copyright (C) 2021-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-check.dtx, % zref-check.ins, @@ -50,7 +49,7 @@ This file was generated from file(s) of the LaTeX package "zref-check". -Copyright (C) 2021-2023 Gustavo Barros +Copyright (C) 2021-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-check.dtx, zref-check.ins, diff --git a/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx b/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx index f14fb7601d0..1a6e2ea44f3 100644 --- a/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx +++ b/Master/texmf-dist/source/latex/zref-clever/zref-clever.dtx @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-clever". % -% Copyright (C) 2021-2023 Gustavo Barros +% Copyright (C) 2021-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-clever.dtx, % zref-clever.ins, @@ -94,18 +93,17 @@ % % \title{^^A % The \pkg{zref-clever} 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-clever}}^^A -% } +% \texorpdfstring{\texttt{gusbrs}\\[0.8em] +% \url{https://github.com/gusbrs/zref-clever}\\ +% \url{https://www.ctan.org/pkg/zref-clever}}{gusbrs}} % -% \date{\filedate} +% \date{Version \fileversion\ -- \filedate} % % \maketitle % @@ -143,15 +141,16 @@ % \url{https://github.com/latex3/latex2e/pull/699}). Second, the support for % \cs{@currentcounter} has been improved, including \cs{footnote} and % \pkg{amsmath} (by \contributor{Frank Mittelbach} and \contributor{Ulrike -% Fischer} at \url{https://github.com/latex3/latex2e/issues/687}). Finally, -% and critically, the new \texttt{label} hook introduced in the 2023-06-01 +% Fischer} at \url{https://github.com/latex3/latex2e/issues/687}). +% Critically, the new \texttt{label} hook introduced in the 2023-06-01 % release, alongside the corresponding new hooks with arguments, just % simplifies and improves label setting so much, by allowing \cs{zlabel} to be % set with \cs{label}, that it is definitely a must for \pkg{zref-clever}, so -% we require that too. Hence we make the cut at this latter kernel release. +% we require that too. Finally, since we followed the move to \texttt{e}-type +% expansion, to play safe we require the 2023-11-01 kernel or newer. % % \begin{macrocode} -\def\zrefclever@required@kernel{2023-06-01} +\def\zrefclever@required@kernel{2023-11-01} \NeedsTeXFormat{LaTeX2e}[\zrefclever@required@kernel] \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{\zrefclever@required@kernel} @@ -167,7 +166,7 @@ % % Identify the package. % \begin{macrocode} -\ProvidesExplPackage {zref-clever} {2023-08-14} {0.4.2} +\ProvidesExplPackage {zref-clever} {2023-11-14} {0.4.3} {Clever LaTeX cross-references based on zref} % \end{macrocode} % @@ -537,6 +536,27 @@ % \end{macro} % % +% \begin{macro} +% { +% \l_@@_tmpa_tl , +% \l_@@_tmpb_tl , +% \l_@@_tmpa_seq , +% \g_@@_tmpa_seq , +% \l_@@_tmpa_bool , +% \l_@@_tmpa_int , +% } +% Temporary scratch variables. +% \begin{macrocode} +\tl_new:N \l_@@_tmpa_tl +\tl_new:N \l_@@_tmpb_tl +\seq_new:N \l_@@_tmpa_seq +\seq_new:N \g_@@_tmpa_seq +\bool_new:N \l_@@_tmpa_bool +\int_new:N \l_@@_tmpa_int +% \end{macrocode} +% \end{macro} +% +% % \subsection{Messages} % % @@ -1635,7 +1655,7 @@ { \prg_return_false: } } \prg_generate_conditional_variant:Nnn - \@@_language_if_declared:n { x } { T , F , TF } + \@@_language_if_declared:n { e } { T , F , TF } % \end{macrocode} % \end{macro} % @@ -1710,7 +1730,7 @@ \@@_language_if_declared:nTF {#2} { \tl_new:c { \@@_language_varname:n {#1} } - \tl_gset:cx { \@@_language_varname:n {#1} } + \tl_gset:ce { \@@_language_varname:n {#1} } { \tl_use:c { \@@_language_varname:n {#2} } } } { \msg_warning:nnn { zref-clever } { unknown-language-alias } {#2} } @@ -1790,7 +1810,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_process_language_settings: { - \@@_language_if_declared:xTF + \@@_language_if_declared:eTF { \l_@@_ref_language_tl } { % \end{macrocode} @@ -1812,7 +1832,7 @@ { \tl_if_empty:NF \l_@@_ref_decl_case_tl { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { language-no-decl-ref } { \l_@@_ref_language_tl } { \l_@@_ref_decl_case_tl } @@ -1829,7 +1849,7 @@ \seq_if_in:NVF \l_@@_lang_declension_seq \l_@@_ref_decl_case_tl { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { unknown-decl-case } { \l_@@_ref_decl_case_tl } { \l_@@_ref_language_tl } @@ -1854,7 +1874,7 @@ { \tl_if_empty:NF \l_@@_ref_gender_tl { - \msg_warning:nnxxx { zref-clever } + \msg_warning:nneee { zref-clever } { language-no-gender } { \l_@@_ref_language_tl } { g } @@ -1868,7 +1888,7 @@ \seq_if_in:NVF \l_@@_lang_gender_seq \l_@@_ref_gender_tl { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { gender-not-declared } { \l_@@_ref_language_tl } { \l_@@_ref_gender_tl } @@ -1894,14 +1914,14 @@ % \begin{macrocode} \tl_if_empty:NF \l_@@_ref_decl_case_tl { - \msg_warning:nnxx { zref-clever } { unknown-language-decl } + \msg_warning:nnee { zref-clever } { unknown-language-decl } { \l_@@_ref_decl_case_tl } { \l_@@_ref_language_tl } \tl_clear:N \l_@@_ref_decl_case_tl } \tl_if_empty:NF \l_@@_ref_gender_tl { - \msg_warning:nnxxx { zref-clever } + \msg_warning:nneee { zref-clever } { language-no-gender } { \l_@@_ref_language_tl } { g } @@ -1989,18 +2009,18 @@ \@bsphack \@@_language_if_declared:nT {#1} { - \seq_if_in:NxF + \seq_if_in:NeF \g_@@_loaded_langfiles_seq { \tl_use:c { \@@_language_varname:n {#1} } } { - \exp_args:Nx \file_get:nnNTF + \exp_args:Ne \file_get:nnNTF { zref-clever- \tl_use:c { \@@_language_varname:n {#1} } .lang } { \ExplSyntaxOn } - \l_tmpa_tl + \l_@@_tmpa_tl { \tl_set:Nn \l_@@_setup_language_tl {#1} \tl_clear:N \l_@@_setup_type_tl @@ -2024,10 +2044,10 @@ } \l_@@_lang_gender_seq { \seq_clear:N \l_@@_lang_gender_seq } - \keys_set:nV { zref-clever/langfile } \l_tmpa_tl - \seq_gput_right:Nx \g_@@_loaded_langfiles_seq + \keys_set:nV { zref-clever/langfile } \l_@@_tmpa_tl + \seq_gput_right:Ne \g_@@_loaded_langfiles_seq { \tl_use:c { \@@_language_varname:n {#1} } } - \msg_info:nnx { zref-clever } { langfile-loaded } + \msg_info:nne { zref-clever } { langfile-loaded } { \tl_use:c { \@@_language_varname:n {#1} } } } { @@ -2037,7 +2057,7 @@ % There is no point in trying to load it multiple times, if it was not found % the first time, it won't be the next. % \begin{macrocode} - \seq_gput_right:Nx \g_@@_loaded_langfiles_seq + \seq_gput_right:Ne \g_@@_loaded_langfiles_seq { \tl_use:c { \@@_language_varname:n {#1} } } } } @@ -2045,7 +2065,7 @@ \@esphack \group_end: } -\cs_generate_variant:Nn \@@_provide_langfile:n { x } +\cs_generate_variant:Nn \@@_provide_langfile:n { e } % \end{macrocode} % \end{macro} % @@ -2071,14 +2091,14 @@ { \seq_if_empty:NTF \l_@@_lang_declension_seq { - \msg_info:nnxx { zref-clever } { language-no-decl-setup } + \msg_info:nnee { zref-clever } { language-no-decl-setup } { \l_@@_setup_language_tl } {#1} } { \seq_if_in:NnTF \l_@@_lang_declension_seq {#1} { \tl_set:Nn \l_@@_lang_decl_case_tl {#1} } { - \msg_info:nnxx { zref-clever } { unknown-decl-case } + \msg_info:nnee { zref-clever } { unknown-decl-case } {#1} { \l_@@_setup_language_tl } \seq_get_left:NN \l_@@_lang_declension_seq \l_@@_lang_decl_case_tl @@ -2092,7 +2112,7 @@ { \seq_if_empty:NTF \l_@@_lang_gender_seq { - \msg_info:nnxxx { zref-clever } { language-no-gender } + \msg_info:nneee { zref-clever } { language-no-gender } { \l_@@_setup_language_tl } { gender } {#1} } { @@ -2102,13 +2122,13 @@ { option-only-type-specific } { gender } } { - \seq_clear:N \l_tmpa_seq + \seq_clear:N \l_@@_tmpa_seq \clist_map_inline:nn {#1} { \seq_if_in:NnTF \l_@@_lang_gender_seq {##1} - { \seq_put_right:Nn \l_tmpa_seq {##1} } + { \seq_put_right:Nn \l_@@_tmpa_seq {##1} } { - \msg_info:nnxx { zref-clever } + \msg_info:nnee { zref-clever } { gender-not-declared } { \l_@@_setup_language_tl } {##1} } @@ -2138,7 +2158,7 @@ { gender } { seq } } - \l_tmpa_seq + \l_@@_tmpa_seq } } } @@ -2461,14 +2481,14 @@ { \l_@@_setup_language_tl } {#1} { seq } } { - \seq_gclear:N \g_tmpa_seq + \seq_gclear:N \g_@@_tmpa_seq \@@_opt_seq_gset_clist_split:Nn - \g_tmpa_seq {##1} + \g_@@_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } { \int_compare_p:nNn - { \seq_count:N \g_tmpa_seq } = { 4 } + { \seq_count:N \g_@@_tmpa_seq } = { 4 } } { \@@_opt_seq_gset_eq:cN @@ -2477,12 +2497,12 @@ { \l_@@_setup_language_tl } {#1} { seq } } - \g_tmpa_seq + \g_@@_tmpa_seq } { - \msg_info:nnxx { zref-clever } + \msg_info:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \g_tmpa_seq } + {#1} { \seq_count:N \g_@@_tmpa_seq } } } } @@ -2494,14 +2514,14 @@ { \l_@@_setup_type_tl } {#1} { seq } } { - \seq_gclear:N \g_tmpa_seq + \seq_gclear:N \g_@@_tmpa_seq \@@_opt_seq_gset_clist_split:Nn - \g_tmpa_seq {##1} + \g_@@_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } { \int_compare_p:nNn - { \seq_count:N \g_tmpa_seq } = { 4 } + { \seq_count:N \g_@@_tmpa_seq } = { 4 } } { \@@_opt_seq_gset_eq:cN @@ -2511,12 +2531,12 @@ { \l_@@_setup_type_tl } {#1} { seq } } - \g_tmpa_seq + \g_@@_tmpa_seq } { - \msg_info:nnxx { zref-clever } + \msg_info:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \g_tmpa_seq } + {#1} { \seq_count:N \g_@@_tmpa_seq } } } } @@ -2999,8 +3019,8 @@ \bool_if:NTF \l_@@_typeset_range_bool { \group_begin: - \bool_set_false:N \l_tmpa_bool - \exp_args:Nxx \tl_if_eq:nnT + \bool_set_false:N \l_@@_tmpa_bool + \exp_args:Nee \tl_if_eq:nnT { \@@_extract_unexp:nnn {#1} { externaldocument } { } @@ -3012,7 +3032,7 @@ { \tl_if_eq:NnTF \l_@@_ref_property_tl { page } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \@@_extract_unexp:nnn {#1} { zc@pgfmt } { } @@ -3021,10 +3041,10 @@ \@@_extract_unexp:nnn {#2} { zc@pgfmt } { } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l_@@_tmpa_bool } } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \@@_extract_unexp:nnn {#1} { zc@counter } { } @@ -3034,7 +3054,7 @@ {#2} { zc@counter } { } } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \@@_extract_unexp:nnn {#1} { zc@enclval } { } @@ -3043,27 +3063,27 @@ \@@_extract_unexp:nnn {#2} { zc@enclval } { } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l_@@_tmpa_bool } } } } - \bool_if:NTF \l_tmpa_bool + \bool_if:NTF \l_@@_tmpa_bool { - \@@_extract_default:Nnvn \l_tmpb_tl + \@@_extract_default:Nnvn \l_@@_tmpb_tl {#2} { l_@@_endrangeprop_tl } { } } { \zref@ifrefcontainsprop {#2} { \l_@@_ref_property_tl } { - \@@_extract_default:Nnvn \l_tmpb_tl + \@@_extract_default:Nnvn \l_@@_tmpb_tl {#2} { l_@@_ref_property_tl } { } } - { \tl_set:Nn \l_tmpb_tl { zc@missingproperty } } + { \tl_set:Nn \l_@@_tmpb_tl { zc@missingproperty } } } \exp_args:NNNV \group_end: - \tl_set:Nn #3 \l_tmpb_tl + \tl_set:Nn #3 \l_@@_tmpb_tl } { \@@_extract_default:Nnvn #3 @@ -3096,32 +3116,35 @@ { \group_begin: \UseHook { zref-clever/endrange-setup } - \tl_set:Nx \l_tmpa_tl + \tl_set:Ne \l_@@_tmpa_tl { \@@_extract:nnn {#1} { \l_@@_ref_property_tl } { } } - \tl_set:Nx \l_tmpb_tl + \tl_set:Ne \l_@@_tmpb_tl { \@@_extract:nnn {#2} { \l_@@_ref_property_tl } { } } - \bool_set_false:N \l_tmpa_bool - \bool_until_do:Nn \l_tmpa_bool + \bool_set_false:N \l_@@_tmpa_bool + \bool_until_do:Nn \l_@@_tmpa_bool { - \exp_args:Nxx \tl_if_eq:nnTF - { \tl_head:V \l_tmpa_tl } { \tl_head:V \l_tmpb_tl } + \exp_args:Nee \tl_if_eq:nnTF + { \tl_head:V \l_@@_tmpa_tl } + { \tl_head:V \l_@@_tmpb_tl } { - \tl_set:Nx \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } - \tl_set:Nx \l_tmpb_tl { \tl_tail:V \l_tmpb_tl } - \tl_if_empty:NT \l_tmpb_tl - { \bool_set_true:N \l_tmpa_bool } + \tl_set:Ne \l_@@_tmpa_tl + { \tl_tail:V \l_@@_tmpa_tl } + \tl_set:Ne \l_@@_tmpb_tl + { \tl_tail:V \l_@@_tmpb_tl } + \tl_if_empty:NT \l_@@_tmpb_tl + { \bool_set_true:N \l_@@_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l_@@_tmpa_bool } } \exp_args:NNNV \group_end: - \tl_set:Nn #3 \l_tmpb_tl + \tl_set:Nn #3 \l_@@_tmpb_tl } { \tl_set:Nn #3 { zc@missingproperty } } } @@ -3153,38 +3176,41 @@ { \group_begin: \UseHook { zref-clever/endrange-setup } - \tl_set:Nx \l_tmpa_tl + \tl_set:Ne \l_@@_tmpa_tl { \@@_extract:nnn {#1} { \l_@@_ref_property_tl } { } } - \tl_set:Nx \l_tmpb_tl + \tl_set:Ne \l_@@_tmpb_tl { \@@_extract:nnn {#2} { \l_@@_ref_property_tl } { } } - \bool_set_false:N \l_tmpa_bool - \@@_is_integer_rgx:VTF \l_tmpa_tl + \bool_set_false:N \l_@@_tmpa_bool + \@@_is_integer_rgx:VTF \l_@@_tmpa_tl { - \@@_is_integer_rgx:VF \l_tmpb_tl - { \bool_set_true:N \l_tmpa_bool } + \@@_is_integer_rgx:VF \l_@@_tmpb_tl + { \bool_set_true:N \l_@@_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } - \bool_until_do:Nn \l_tmpa_bool + { \bool_set_true:N \l_@@_tmpa_bool } + \bool_until_do:Nn \l_@@_tmpa_bool { - \exp_args:Nxx \tl_if_eq:nnTF - { \tl_head:V \l_tmpa_tl } { \tl_head:V \l_tmpb_tl } + \exp_args:Nee \tl_if_eq:nnTF + { \tl_head:V \l_@@_tmpa_tl } + { \tl_head:V \l_@@_tmpb_tl } { - \tl_set:Nx \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } - \tl_set:Nx \l_tmpb_tl { \tl_tail:V \l_tmpb_tl } - \tl_if_empty:NT \l_tmpb_tl - { \bool_set_true:N \l_tmpa_bool } + \tl_set:Ne \l_@@_tmpa_tl + { \tl_tail:V \l_@@_tmpa_tl } + \tl_set:Ne \l_@@_tmpb_tl + { \tl_tail:V \l_@@_tmpb_tl } + \tl_if_empty:NT \l_@@_tmpb_tl + { \bool_set_true:N \l_@@_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l_@@_tmpa_bool } } \exp_args:NNNV \group_end: - \tl_set:Nn #3 \l_tmpb_tl + \tl_set:Nn #3 \l_@@_tmpb_tl } { \tl_set:Nn #3 { zc@missingproperty } } } @@ -3199,42 +3225,48 @@ { \group_begin: \UseHook { zref-clever/endrange-setup } - \tl_set:Nx \l_tmpa_tl + \tl_set:Ne \l_@@_tmpa_tl { \@@_extract:nnn {#1} { \l_@@_ref_property_tl } { } } - \tl_set:Nx \l_tmpb_tl + \tl_set:Ne \l_@@_tmpb_tl { \@@_extract:nnn {#2} { \l_@@_ref_property_tl } { } } - \bool_set_false:N \l_tmpa_bool - \@@_is_integer_rgx:VTF \l_tmpa_tl + \bool_set_false:N \l_@@_tmpa_bool + \@@_is_integer_rgx:VTF \l_@@_tmpa_tl { - \@@_is_integer_rgx:VF \l_tmpb_tl - { \bool_set_true:N \l_tmpa_bool } + \@@_is_integer_rgx:VF \l_@@_tmpb_tl + { \bool_set_true:N \l_@@_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } - \bool_until_do:Nn \l_tmpa_bool + { \bool_set_true:N \l_@@_tmpa_bool } + \bool_until_do:Nn \l_@@_tmpa_bool { - \exp_args:Nxx \tl_if_eq:nnTF - { \tl_head:V \l_tmpa_tl } { \tl_head:V \l_tmpb_tl } + \exp_args:Nee \tl_if_eq:nnTF + { \tl_head:V \l_@@_tmpa_tl } + { \tl_head:V \l_@@_tmpb_tl } { \bool_lazy_or:nnTF - { \int_compare_p:nNn { \l_tmpb_tl } > { 99 } } - { \int_compare_p:nNn { \tl_head:V \l_tmpb_tl } = { 0 } } + { \int_compare_p:nNn { \l_@@_tmpb_tl } > { 99 } } { - \tl_set:Nx \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } - \tl_set:Nx \l_tmpb_tl { \tl_tail:V \l_tmpb_tl } + \int_compare_p:nNn + { \tl_head:V \l_@@_tmpb_tl } = { 0 } + } + { + \tl_set:Ne \l_@@_tmpa_tl + { \tl_tail:V \l_@@_tmpa_tl } + \tl_set:Ne \l_@@_tmpb_tl + { \tl_tail:V \l_@@_tmpb_tl } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l_@@_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l_@@_tmpa_bool } } \exp_args:NNNV \group_end: - \tl_set:Nn #3 \l_tmpb_tl + \tl_set:Nn #3 \l_@@_tmpb_tl } { \tl_set:Nn #3 { zc@missingproperty } } } @@ -3485,7 +3517,7 @@ { unknown-language-opt } {#1} } } - \@@_provide_langfile:x + \@@_provide_langfile:e { \l_@@_ref_language_tl } } } , @@ -3674,7 +3706,7 @@ titleref .code:n = { % NOTE Option deprecated in 2022-04-22 for 0.3.0. - \msg_warning:nnxx { zref-clever }{ option-deprecated } { titleref } + \msg_warning:nnee { zref-clever }{ option-deprecated } { titleref } { \iow_char:N\\usepackage\iow_char:N\{zref-titleref\iow_char:N\} } } , } @@ -3689,7 +3721,7 @@ vario .code:n = { % NOTE Option deprecated in 2022-04-22 for 0.3.0. - \msg_warning:nnxx { zref-clever }{ option-deprecated } { vario } + \msg_warning:nnee { zref-clever }{ option-deprecated } { vario } { \iow_char:N\\usepackage\iow_char:N\{zref-vario\iow_char:N\} } } , } @@ -4121,21 +4153,24 @@ { \@@_opt_varname_general:nn {#1} { seq } } } { - \seq_clear:N \l_tmpa_seq + \seq_clear:N \l_@@_tmpa_seq \@@_opt_seq_set_clist_split:Nn - \l_tmpa_seq {##1} + \l_@@_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } - { \int_compare_p:nNn { \seq_count:N \l_tmpa_seq } = { 4 } } + { + \int_compare_p:nNn + { \seq_count:N \l_@@_tmpa_seq } = { 4 } + } { \@@_opt_seq_set_eq:cN { \@@_opt_varname_general:nn {#1} { seq } } - \l_tmpa_seq + \l_@@_tmpa_seq } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \l_tmpa_seq } + {#1} { \seq_count:N \l_@@_tmpa_seq } } } } , @@ -4229,7 +4264,7 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_zcsetup:n #1 { \keys_set:nn { zref-clever/zcsetup } {#1} } -\cs_generate_variant:Nn \@@_zcsetup:n { x } +\cs_generate_variant:Nn \@@_zcsetup:n { e } % \end{macrocode} % \end{macro} % @@ -4459,24 +4494,27 @@ } } { - \seq_clear:N \l_tmpa_seq + \seq_clear:N \l_@@_tmpa_seq \@@_opt_seq_set_clist_split:Nn - \l_tmpa_seq {##1} + \l_@@_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } - { \int_compare_p:nNn { \seq_count:N \l_tmpa_seq } = { 4 } } + { + \int_compare_p:nNn + { \seq_count:N \l_@@_tmpa_seq } = { 4 } + } { \@@_opt_seq_set_eq:cN { \@@_opt_varname_type:enn { \l_@@_setup_type_tl } {#1} { seq } } - \l_tmpa_seq + \l_@@_tmpa_seq } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \l_tmpa_seq } + {#1} { \seq_count:N \l_@@_tmpa_seq } } } } , @@ -4596,14 +4634,14 @@ { \seq_if_empty:NTF \l_@@_lang_declension_seq { - \msg_warning:nnxx { zref-clever } { language-no-decl-setup } + \msg_warning:nnee { zref-clever } { language-no-decl-setup } { \l_@@_setup_language_tl } {#1} } { \seq_if_in:NnTF \l_@@_lang_declension_seq {#1} { \tl_set:Nn \l_@@_lang_decl_case_tl {#1} } { - \msg_warning:nnxx { zref-clever } { unknown-decl-case } + \msg_warning:nnee { zref-clever } { unknown-decl-case } {#1} { \l_@@_setup_language_tl } \seq_get_left:NN \l_@@_lang_declension_seq \l_@@_lang_decl_case_tl @@ -4617,7 +4655,7 @@ { \seq_if_empty:NTF \l_@@_lang_gender_seq { - \msg_warning:nnxxx { zref-clever } { language-no-gender } + \msg_warning:nneee { zref-clever } { language-no-gender } { \l_@@_setup_language_tl } { gender } {#1} } { @@ -4627,13 +4665,13 @@ { option-only-type-specific } { gender } } { - \seq_clear:N \l_tmpa_seq + \seq_clear:N \l_@@_tmpa_seq \clist_map_inline:nn {#1} { \seq_if_in:NnTF \l_@@_lang_gender_seq {##1} - { \seq_put_right:Nn \l_tmpa_seq {##1} } + { \seq_put_right:Nn \l_@@_tmpa_seq {##1} } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { gender-not-declared } { \l_@@_setup_language_tl } {##1} } @@ -4646,7 +4684,7 @@ { gender } { seq } } - \l_tmpa_seq + \l_@@_tmpa_seq } } } , @@ -4988,14 +5026,14 @@ { \tl_if_empty:NTF \l_@@_setup_type_tl { - \seq_gclear:N \g_tmpa_seq + \seq_gclear:N \g_@@_tmpa_seq \@@_opt_seq_gset_clist_split:Nn - \g_tmpa_seq {##1} + \g_@@_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } { \int_compare_p:nNn - { \seq_count:N \g_tmpa_seq } = { 4 } + { \seq_count:N \g_@@_tmpa_seq } = { 4 } } { \@@_opt_seq_gset_eq:cN @@ -5004,23 +5042,23 @@ { \l_@@_setup_language_tl } {#1} { seq } } - \g_tmpa_seq + \g_@@_tmpa_seq } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \g_tmpa_seq } + {#1} { \seq_count:N \g_@@_tmpa_seq } } } { - \seq_gclear:N \g_tmpa_seq + \seq_gclear:N \g_@@_tmpa_seq \@@_opt_seq_gset_clist_split:Nn - \g_tmpa_seq {##1} + \g_@@_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } { \int_compare_p:nNn - { \seq_count:N \g_tmpa_seq } = { 4 } + { \seq_count:N \g_@@_tmpa_seq } = { 4 } } { \@@_opt_seq_gset_eq:cN @@ -5029,12 +5067,12 @@ { \l_@@_setup_language_tl } { \l_@@_setup_type_tl } {#1} { seq } } - \g_tmpa_seq + \g_@@_tmpa_seq } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \g_tmpa_seq } + {#1} { \seq_count:N \g_@@_tmpa_seq } } } } , @@ -5137,10 +5175,10 @@ % Ensure language file for reference language is loaded, if available. We % cannot rely on \cs{keys_set:nn} for the task, since if the \opt{lang} option % is set for \texttt{current}, the actual language may have changed outside -% our control. \cs{@@_provide_langfile:x} does nothing if the language file +% our control. \cs{@@_provide_langfile:e} does nothing if the language file % is already loaded. % \begin{macrocode} - \@@_provide_langfile:x { \l_@@_ref_language_tl } + \@@_provide_langfile:e { \l_@@_ref_language_tl } % \end{macrocode} % Process language settings. % \begin{macrocode} @@ -5172,11 +5210,11 @@ % \begin{macrocode} \tl_if_empty:NF \l_@@_zcref_note_tl { - \@@_get_rf_opt_tl:nxxN { notesep } + \@@_get_rf_opt_tl:neeN { notesep } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } - \l_tmpa_tl - \l_tmpa_tl + \l_@@_tmpa_tl + \l_@@_tmpa_tl \l_@@_zcref_note_tl } % \end{macrocode} @@ -5533,9 +5571,9 @@ = { \tl_head:N \l_@@_label_enclval_b_tl } { - \tl_set:Nx \l_@@_label_enclval_a_tl + \tl_set:Ne \l_@@_label_enclval_a_tl { \tl_tail:N \l_@@_label_enclval_a_tl } - \tl_set:Nx \l_@@_label_enclval_b_tl + \tl_set:Ne \l_@@_label_enclval_b_tl { \tl_tail:N \l_@@_label_enclval_b_tl } } { @@ -5943,15 +5981,15 @@ \bool_set_false:N \l_@@_type_first_refbounds_set_bool % Get type block options (not type-specific). - \@@_get_rf_opt_tl:nxxN { tpairsep } + \@@_get_rf_opt_tl:neeN { tpairsep } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_tpairsep_tl - \@@_get_rf_opt_tl:nxxN { tlistsep } + \@@_get_rf_opt_tl:neeN { tlistsep } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_tlistsep_tl - \@@_get_rf_opt_tl:nxxN { tlastsep } + \@@_get_rf_opt_tl:neeN { tlastsep } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_tlastsep_tl @@ -6022,7 +6060,7 @@ { \tl_if_eq:NnT \l_@@_label_type_a_tl { zc@missingtype } { - \msg_warning:nnx { zref-clever } { missing-type } + \msg_warning:nne { zref-clever } { missing-type } { \l_@@_label_a_tl } } \zref@ifrefcontainsprop @@ -6030,7 +6068,7 @@ { \l_@@_ref_property_tl } { } { - \msg_warning:nnxx { zref-clever } { missing-property } + \msg_warning:nnee { zref-clever } { missing-property } { \l_@@_ref_property_tl } { \l_@@_label_a_tl } } @@ -6040,91 +6078,91 @@ % options, once per type. \int_compare:nNnT { \l_@@_label_count_int } = { 0 } { - \@@_get_rf_opt_tl:nxxN { namesep } + \@@_get_rf_opt_tl:neeN { namesep } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_namesep_tl - \@@_get_rf_opt_tl:nxxN { pairsep } + \@@_get_rf_opt_tl:neeN { pairsep } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_pairsep_tl - \@@_get_rf_opt_tl:nxxN { listsep } + \@@_get_rf_opt_tl:neeN { listsep } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_listsep_tl - \@@_get_rf_opt_tl:nxxN { lastsep } + \@@_get_rf_opt_tl:neeN { lastsep } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_lastsep_tl - \@@_get_rf_opt_tl:nxxN { rangesep } + \@@_get_rf_opt_tl:neeN { rangesep } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_rangesep_tl - \@@_get_rf_opt_tl:nxxN { namefont } + \@@_get_rf_opt_tl:neeN { namefont } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_namefont_tl - \@@_get_rf_opt_tl:nxxN { reffont } + \@@_get_rf_opt_tl:neeN { reffont } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_reffont_tl - \@@_get_rf_opt_tl:nxxN { endrangefunc } + \@@_get_rf_opt_tl:neeN { endrangefunc } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_endrangefunc_tl - \@@_get_rf_opt_tl:nxxN { endrangeprop } + \@@_get_rf_opt_tl:neeN { endrangeprop } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_endrangeprop_tl - \@@_get_rf_opt_bool:nnxxN { cap } { false } + \@@_get_rf_opt_bool:nneeN { cap } { false } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_cap_bool - \@@_get_rf_opt_bool:nnxxN { abbrev } { false } + \@@_get_rf_opt_bool:nneeN { abbrev } { false } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_abbrev_bool - \@@_get_rf_opt_bool:nnxxN { rangetopair } { true } + \@@_get_rf_opt_bool:nneeN { rangetopair } { true } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_rangetopair_bool - \@@_get_rf_opt_seq:nxxN { refbounds-first } + \@@_get_rf_opt_seq:neeN { refbounds-first } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_first_seq - \@@_get_rf_opt_seq:nxxN { refbounds-first-sg } + \@@_get_rf_opt_seq:neeN { refbounds-first-sg } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_first_sg_seq - \@@_get_rf_opt_seq:nxxN { refbounds-first-pb } + \@@_get_rf_opt_seq:neeN { refbounds-first-pb } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_first_pb_seq - \@@_get_rf_opt_seq:nxxN { refbounds-first-rb } + \@@_get_rf_opt_seq:neeN { refbounds-first-rb } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_first_rb_seq - \@@_get_rf_opt_seq:nxxN { refbounds-mid } + \@@_get_rf_opt_seq:neeN { refbounds-mid } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_mid_seq - \@@_get_rf_opt_seq:nxxN { refbounds-mid-rb } + \@@_get_rf_opt_seq:neeN { refbounds-mid-rb } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_mid_rb_seq - \@@_get_rf_opt_seq:nxxN { refbounds-mid-re } + \@@_get_rf_opt_seq:neeN { refbounds-mid-re } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_mid_re_seq - \@@_get_rf_opt_seq:nxxN { refbounds-last } + \@@_get_rf_opt_seq:neeN { refbounds-last } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_last_seq - \@@_get_rf_opt_seq:nxxN { refbounds-last-pe } + \@@_get_rf_opt_seq:neeN { refbounds-last-pe } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_last_pe_seq - \@@_get_rf_opt_seq:nxxN { refbounds-last-re } + \@@_get_rf_opt_seq:neeN { refbounds-last-re } { \l_@@_label_type_a_tl } { \l_@@_ref_language_tl } \l_@@_refbounds_last_re_seq @@ -6188,7 +6226,7 @@ \bool_set_true:N \l_@@_type_first_refbounds_set_bool } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_pairsep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6211,7 +6249,7 @@ { \int_compare:nNnTF { \l_@@_ref_count_int } < { 2 } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_pairsep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6219,7 +6257,7 @@ } } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_lastsep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6237,7 +6275,7 @@ % We know `range_beg_is_first_bool' is false, since this is % the second element in the range, but the third or more in % the type list. - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_pairsep_tl \@@_get_ref:VN @@ -6250,7 +6288,7 @@ \l_@@_type_first_refbounds_set_bool } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_listsep_tl \@@_get_ref:VN @@ -6289,7 +6327,7 @@ \int_compare:nNnTF { \l_@@_ref_count_int } < { 2 } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_pairsep_tl \@@_get_ref:VN @@ -6298,7 +6336,7 @@ } } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_lastsep_tl \@@_get_ref:VN @@ -6320,7 +6358,7 @@ \l_@@_refbounds_first_pb_seq \bool_set_true:N \l_@@_type_first_refbounds_set_bool - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_pairsep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6328,14 +6366,14 @@ } } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_listsep_tl \@@_get_ref:VN \l_@@_range_beg_label_tl \l_@@_refbounds_mid_seq } - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_lastsep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6359,7 +6397,7 @@ \int_compare:nNnTF { \l_@@_ref_count_int } < { 2 } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_pairsep_tl \@@_get_ref:VN @@ -6373,7 +6411,7 @@ \l_@@_type_first_refbounds_set_bool } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_lastsep_tl \@@_get_ref:VN @@ -6390,7 +6428,7 @@ \l_@@_range_beg_label_tl \l_@@_label_a_tl \l_@@_range_end_ref_tl - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_rangesep_tl \@@_get_ref_endrange:VVN @@ -6400,7 +6438,7 @@ } } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_rangesep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6422,7 +6460,7 @@ \zref@ifrefundefined { \l_@@_type_first_label_tl } { } { - \msg_warning:nnx { zref-clever } { single-element-range } + \msg_warning:nne { zref-clever } { single-element-range } { \l_@@_type_first_label_type_tl } } } @@ -6442,7 +6480,7 @@ % Test: `zc-typeset01.lvt': "Last of type: option range to pair" \bool_if:NTF \l_@@_next_maybe_range_bool { - \tl_set:Nx \l_@@_typeset_queue_curr_tl + \tl_set:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_pairsep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6465,7 +6503,7 @@ \l_@@_type_first_label_tl \l_@@_label_a_tl \l_@@_range_end_ref_tl - \tl_set:Nx \l_@@_typeset_queue_curr_tl + \tl_set:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_rangesep_tl \@@_get_ref_endrange:VVN @@ -6475,7 +6513,7 @@ } } { - \tl_set:Nx \l_@@_typeset_queue_curr_tl + \tl_set:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_rangesep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6504,14 +6542,14 @@ \bool_if:nTF { \l_@@_typeset_ref_bool && \l_@@_typeset_name_bool } { - \tl_put_left:Nx \l_@@_typeset_queue_curr_tl + \tl_put_left:Ne \l_@@_typeset_queue_curr_tl { \@@_get_ref_first: } } { \bool_if:NTF \l_@@_typeset_ref_bool { % Test: `zc-typeset01.lvt': "Last of type: option typeset ref" - \tl_put_left:Nx \l_@@_typeset_queue_curr_tl + \tl_put_left:Ne \l_@@_typeset_queue_curr_tl { \@@_get_ref:VN \l_@@_type_first_label_tl \l_@@_type_first_refbounds_seq @@ -6521,7 +6559,7 @@ \bool_if:NTF \l_@@_typeset_name_bool { % Test: `zc-typeset01.lvt': "Last of type: option typeset name" - \tl_set:Nx \l_@@_typeset_queue_curr_tl + \tl_set:Ne \l_@@_typeset_queue_curr_tl { \bool_if:NTF \l_@@_name_in_link_bool { @@ -6554,7 +6592,7 @@ % typeset either "ref" or "name". Still, leave here a % sensible fallback, equal to the behavior of "both". % Test: `zc-typeset01.lvt': "Last of type: option typeset none" - \tl_put_left:Nx \l_@@_typeset_queue_curr_tl + \tl_put_left:Ne \l_@@_typeset_queue_curr_tl { \@@_get_ref_first: } } } @@ -6705,7 +6743,7 @@ { 0 } { \int_incr:N \l_@@_ref_count_int - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_listsep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6728,7 +6766,7 @@ } { \int_incr:N \l_@@_ref_count_int - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_listsep_tl \@@_get_ref:VN @@ -6740,7 +6778,7 @@ { \l_@@_range_same_count_int } = { 1 } { \int_incr:N \l_@@_ref_count_int - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_listsep_tl \@@_get_ref:VN @@ -6774,7 +6812,7 @@ } { \int_incr:N \l_@@_ref_count_int - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_listsep_tl \@@_get_ref:VN @@ -6796,7 +6834,7 @@ } { \int_incr:N \l_@@_ref_count_int - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_listsep_tl \@@_get_ref:VN @@ -6805,7 +6843,7 @@ } } \int_incr:N \l_@@_ref_count_int - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_listsep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -6825,7 +6863,7 @@ } { \int_incr:N \l_@@_ref_count_int - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_listsep_tl \@@_get_ref:VN @@ -6846,7 +6884,7 @@ \l_@@_range_beg_label_tl \l_@@_label_a_tl \l_@@_range_end_ref_tl - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_rangesep_tl \@@_get_ref_endrange:VVN @@ -6856,7 +6894,7 @@ } } { - \tl_put_right:Nx \l_@@_typeset_queue_curr_tl + \tl_put_right:Ne \l_@@_typeset_queue_curr_tl { \exp_not:V \l_@@_rangesep_tl \@@_get_ref:VN \l_@@_label_a_tl @@ -7214,7 +7252,7 @@ { \tl_if_empty:NF \l_@@_typeset_queue_curr_tl { - \msg_warning:nnx { zref-clever } + \msg_warning:nne { zref-clever } { nudge-plural-when-sg } { \l_@@_type_first_label_type_tl } } @@ -7230,7 +7268,7 @@ } } { - \msg_warning:nnx { zref-clever } + \msg_warning:nne { zref-clever } { nudge-comptosing } { \l_@@_type_first_label_type_tl } } @@ -7239,7 +7277,7 @@ { \l_@@_nudge_gender_bool } { ! \tl_if_empty_p:N \l_@@_ref_gender_tl } { - \@@_get_rf_opt_seq:nxxN { gender } + \@@_get_rf_opt_seq:neeN { gender } { \l_@@_type_first_label_type_tl } { \l_@@_ref_language_tl } \l_@@_type_name_gender_seq @@ -7249,14 +7287,14 @@ { \seq_if_empty:NTF \l_@@_type_name_gender_seq { - \msg_warning:nnxxx { zref-clever } + \msg_warning:nneee { zref-clever } { nudge-gender-not-declared-for-type } { \l_@@_ref_gender_tl } { \l_@@_type_first_label_type_tl } { \l_@@_ref_language_tl } } { - \msg_warning:nnxxxx { zref-clever } + \msg_warning:nneeee { zref-clever } { nudge-gender-mismatch } { \l_@@_type_first_label_type_tl } { \l_@@_ref_gender_tl } @@ -7299,7 +7337,7 @@ { \tl_clear:N \l_@@_type_name_tl \bool_set_true:N \l_@@_type_name_missing_bool - \msg_warning:nnxx { zref-clever } { missing-name } + \msg_warning:nnee { zref-clever } { missing-name } { \l_@@_name_format_tl } { \l_@@_type_first_label_type_tl } } @@ -7359,7 +7397,7 @@ \tl_clear:N \l_@@_type_name_tl \bool_set_true:N \l_@@_type_name_missing_bool - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { missing-name } { \l_@@_name_format_tl } { \l_@@_type_first_label_type_tl } @@ -7459,13 +7497,13 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_labels_in_sequence:nn #1#2 { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \@@_extract_unexp:nnn {#1} { externaldocument } { } } { \@@_extract_unexp:nnn {#2} { externaldocument } { } } { \tl_if_eq:NnTF \l_@@_ref_property_tl { page } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \@@_extract_unexp:nnn {#1} { zc@pgfmt } { } } { \@@_extract_unexp:nnn {#2} { zc@pgfmt } { } } { @@ -7487,11 +7525,11 @@ } } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \@@_extract_unexp:nnn {#1} { zc@counter } { } } { \@@_extract_unexp:nnn {#2} { zc@counter } { } } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \@@_extract_unexp:nnn {#1} { zc@enclval } { } } { \@@_extract_unexp:nnn {#2} { zc@enclval } { } } { @@ -7514,7 +7552,7 @@ % and we should not even consider this is still a range. If they are equal, % though, of course it is a range, and it is the same. % \begin{macrocode} - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \@@_extract_unexp:nvn {#1} { l_@@_ref_property_tl } { } @@ -7586,7 +7624,7 @@ } } } -\cs_generate_variant:Nn \@@_get_rf_opt_tl:nnnN { nxxN } +\cs_generate_variant:Nn \@@_get_rf_opt_tl:nnnN { neeN } % \end{macrocode} % \end{macro} % @@ -7629,7 +7667,7 @@ } } } -\cs_generate_variant:Nn \@@_get_rf_opt_seq:nnnN { nxxN } +\cs_generate_variant:Nn \@@_get_rf_opt_seq:nnnN { neeN } % \end{macrocode} % \end{macro} % @@ -7672,7 +7710,7 @@ } } } -\cs_generate_variant:Nn \@@_get_rf_opt_bool:nnnnN { nnxxN } +\cs_generate_variant:Nn \@@_get_rf_opt_bool:nnnnN { nneeN } % \end{macrocode} % \end{macro} % @@ -7820,10 +7858,10 @@ % The \cls{memoir} document class has quite a number of cross-referencing % related features, mostly dealing with captions, subfloats, and notes. It % used to be the case that a good number of them where implemented in ways -% which make difficult the use of \pkg{zref}, particularly \cs{zlabel}, short -% of redefining the whole stuff ourselves. Problematic cases included: i) -% side captions; ii) bilingual captions; iii) subcaption references; and iv) -% footnotes, verbfootnotes, sidefootnotes, and pagenotes. +% which made difficult the use of \pkg{zref}, particularly \cs{zlabel}. +% Problematic cases included: i) side captions; ii) bilingual captions; iii) +% subcaption references; and iv) footnotes, verbfootnotes, sidefootnotes, and +% pagenotes. % % However, since then, the situation has much improved, given two main % upstream changes: i) the kernel's new \texttt{label} hook with argument, @@ -7919,7 +7957,7 @@ \bool_new:N \l_@@_amsmath_subequations_bool \AddToHook { env / subequations / begin } { - \@@_zcsetup:x + \@@_zcsetup:e { counterresetby = { @@ -8012,7 +8050,7 @@ \@bsphack \seq_map_inline:Nn #1 { - \exp_args:Nx \tl_if_eq:nnTF + \exp_args:Ne \tl_if_eq:nnTF { \@@_extract_unexp:nnn {##1} { zc@type } { } } { equation } { @@ -8020,7 +8058,7 @@ { \string \MT@newlabel {##1} } } { - \exp_args:Nx \tl_if_eq:nnT + \exp_args:Ne \tl_if_eq:nnT { \@@_extract_unexp:nnn {##1} { zc@type } { } } { parentequation } { @@ -8063,7 +8101,7 @@ \bool_new:N \l_@@_breqn_dgroup_bool \AddToHook { env / dgroup / begin } { - \@@_zcsetup:x + \@@_zcsetup:e { counterresetby = { @@ -8161,26 +8199,26 @@ { \@@_if_package_loaded:nT { enumitem } { - \int_set:Nn \l_tmpa_int { 5 } + \int_set:Nn \l_@@_tmpa_int { 5 } \bool_while_do:nn { \cs_if_exist_p:c - { c@ enum \int_to_roman:n { \l_tmpa_int } } + { c@ enum \int_to_roman:n { \l_@@_tmpa_int } } } { - \@@_zcsetup:x + \@@_zcsetup:e { counterresetby = { - enum \int_to_roman:n { \l_tmpa_int } = - enum \int_to_roman:n { \l_tmpa_int - 1 } + enum \int_to_roman:n { \l_@@_tmpa_int } = + enum \int_to_roman:n { \l_@@_tmpa_int - 1 } } , countertype = - { enum \int_to_roman:n { \l_tmpa_int } = item } , + { enum \int_to_roman:n { \l_@@_tmpa_int } = item } , } - \int_incr:N \l_tmpa_int + \int_incr:N \l_@@_tmpa_int } - \int_compare:nNnT { \l_tmpa_int } > { 5 } + \int_compare:nNnT { \l_@@_tmpa_int } > { 5 } { \msg_info:nnn { zref-clever } { compat-package } { enumitem } } } } diff --git a/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins b/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins index 668d25788fe..cb81bd0cbff 100644 --- a/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins +++ b/Master/texmf-dist/source/latex/zref-clever/zref-clever.ins @@ -4,7 +4,7 @@ % % This file is part of the LaTeX package "zref-clever". % -% Copyright (C) 2021-2023 Gustavo Barros +% Copyright (C) 2021-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-clever.dtx, % zref-clever.ins, @@ -50,7 +49,7 @@ This file was generated from file(s) of the LaTeX package "zref-clever". -Copyright (C) 2021-2023 Gustavo Barros +Copyright (C) 2021-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-clever.dtx, zref-clever.ins, 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 0be32b12bf8..9e125cce761 100644 --- a/Master/texmf-dist/source/latex/zref-vario/zref-vario.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/source/latex/zref-vario/zref-vario.ins b/Master/texmf-dist/source/latex/zref-vario/zref-vario.ins index 211c1ff0b21..cb37ba5c3fe 100644 --- a/Master/texmf-dist/source/latex/zref-vario/zref-vario.ins +++ b/Master/texmf-dist/source/latex/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, diff --git a/Master/texmf-dist/tex/latex/zref-check/zref-check.sty b/Master/texmf-dist/tex/latex/zref-check/zref-check.sty index 277887b7938..e2238e88cee 100644 --- a/Master/texmf-dist/tex/latex/zref-check/zref-check.sty +++ b/Master/texmf-dist/tex/latex/zref-check/zref-check.sty @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "zref-check". %% -%% Copyright (C) 2021-2023 Gustavo Barros +%% Copyright (C) 2021-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 @@ -21,8 +21,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-check.dtx, %% zref-check.ins, @@ -42,7 +41,7 @@ %% %% ----------------------------------------------------------------------- %% -\def\zrefcheck@required@kernel{2021-06-01} +\def\zrefcheck@required@kernel{2023-11-01} \NeedsTeXFormat{LaTeX2e}[\zrefcheck@required@kernel] \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{\zrefcheck@required@kernel} @@ -53,7 +52,7 @@ 'zref-check' requires a LaTeX kernel \zrefcheck@required@kernel\space or newer.% }% }% -\ProvidesExplPackage {zref-check} {2023-08-13} {0.3.4} +\ProvidesExplPackage {zref-check} {2023-11-14} {0.3.5} {Flexible cross-references with contextual checks based on zref} \RequirePackage { zref-user } \RequirePackage { zref-abspage } @@ -89,12 +88,18 @@ page , % for messages abspage , } +\tl_new:N \l__zrefcheck_tmpa_tl +\tl_new:N \l__zrefcheck_tmpb_tl +\tl_new:N \g__zrefcheck_tmpa_tl +\int_new:N \l__zrefcheck_tmpa_int +\bool_new:N \l__zrefcheck_tmpa_bool +\ior_new:N \g__zrefcheck_tmpa_ior \cs_new_protected:Npn \__zrefcheck_message:nnnn #1#2#3#4 { \use:c { msg_ \l__zrefcheck_msglevel_tl :nnnnn } { zref-check } {#1} {#2} {#3} {#4} } -\cs_generate_variant:Nn \__zrefcheck_message:nnnn { nnnx } +\cs_generate_variant:Nn \__zrefcheck_message:nnnn { nnne } \msg_new:nnn { zref-check } { check-failed } { Check~failed~\msg_line_context:.~ @@ -302,30 +307,31 @@ \NewDocumentCommand \zrefchecksetup { m } { \keys_set:nn { zref-check } {#1} } \prop_new:N \g__zrefcheck_auxfile_lblseq_prop -\tl_gset:Nn \g_tmpa_tl { \c_sys_jobname_str .aux } -\file_if_exist:nT { \g_tmpa_tl } +\tl_gset:Nn \g__zrefcheck_tmpa_tl { \c_sys_jobname_str .aux } +\file_if_exist:nT { \g__zrefcheck_tmpa_tl } { - \ior_open:Nn \g_tmpa_ior { \g_tmpa_tl } + \ior_open:Nn \g__zrefcheck_tmpa_ior { \g__zrefcheck_tmpa_tl } \group_begin: - \int_zero:N \l_tmpa_int - \tl_clear:N \l_tmpa_tl - \tl_clear:N \l_tmpb_tl - \bool_set_false:N \l_tmpa_bool - \ior_map_variable:NNn \g_tmpa_ior \l_tmpa_tl + \int_zero:N \l__zrefcheck_tmpa_int + \tl_clear:N \l__zrefcheck_tmpa_tl + \tl_clear:N \l__zrefcheck_tmpb_tl + \bool_set_false:N \l__zrefcheck_tmpa_bool + \ior_map_variable:NNn \g__zrefcheck_tmpa_ior \l__zrefcheck_tmpa_tl { - \tl_map_variable:NNn \l_tmpa_tl \l_tmpb_tl + \tl_map_variable:NNn \l__zrefcheck_tmpa_tl \l__zrefcheck_tmpb_tl { - \tl_if_eq:NnTF \l_tmpb_tl { \zref@newlabel } + \tl_if_eq:NnTF \l__zrefcheck_tmpb_tl { \zref@newlabel } { - \bool_set_true:N \l_tmpa_bool + \bool_set_true:N \l__zrefcheck_tmpa_bool } { - \bool_if:NTF \l_tmpa_bool + \bool_if:NTF \l__zrefcheck_tmpa_bool { - \bool_set_false:N \l_tmpa_bool - \int_incr:N \l_tmpa_int - \prop_gput:Nxx \g__zrefcheck_auxfile_lblseq_prop - { \l_tmpb_tl } { \int_use:N \l_tmpa_int } + \bool_set_false:N \l__zrefcheck_tmpa_bool + \int_incr:N \l__zrefcheck_tmpa_int + \prop_gput:Nee \g__zrefcheck_auxfile_lblseq_prop + { \l__zrefcheck_tmpb_tl } + { \int_use:N \l__zrefcheck_tmpa_int } } { \tl_map_break: @@ -334,7 +340,7 @@ } } \group_end: - \ior_close:N \g_tmpa_ior + \ior_close:N \g__zrefcheck_tmpa_ior } \begingroup \let \@addtoreset \ltx@gobbletwo @@ -363,7 +369,7 @@ { \zref@ifrefcontainsprop {#1} {#2} { - \tl_set:Nx #3 + \tl_set:Ne #3 { \zref@extractdefault {#1} {#2} { \c_empty_tl } } } { @@ -407,7 +413,7 @@ \keys_set:nn { zref-check / zcheck } {#3} \seq_set_split:Nnn \l__zrefcheck_zcheck_labels_seq { , } {#1} \int_gincr:N \g__zrefcheck_id_int - \tl_set:Nx \l__zrefcheck_checkbeg_tl + \tl_set:Ne \l__zrefcheck_checkbeg_tl { \__zrefcheck_check_lblfmt:n { \g__zrefcheck_id_int } } \zref@labelbylist { \l__zrefcheck_checkbeg_tl } { zrefcheck-check } \seq_get:NN \l__zrefcheck_zcheck_labels_seq \l__zrefcheck_link_label_tl @@ -421,7 +427,7 @@ ! \l__zrefcheck_link_star_bool } { - \exp_args:Nx \zrefcheck_get_astl:nnn + \exp_args:Ne \zrefcheck_get_astl:nnn { \l__zrefcheck_link_label_tl } { anchor } { \l__zrefcheck_link_anchor_tl } \hyperlink { \l__zrefcheck_link_anchor_tl } {#4} @@ -436,7 +442,7 @@ } \seq_map_inline:Nn \l__zrefcheck_zcheck_labels_seq { \tl_if_empty:nF {##1} { \zref@refused {##1} } } - \__zrefcheck_run_checks:nnx { \l__zrefcheck_zcheck_checks_seq } + \__zrefcheck_run_checks:nne { \l__zrefcheck_zcheck_checks_seq } { \l__zrefcheck_zcheck_labels_seq } { \l__zrefcheck_checkbeg_tl } \group_end: } @@ -535,7 +541,7 @@ } \group_end: } -\cs_generate_variant:Nn \__zrefcheck_run_checks:nnn { nnx } +\cs_generate_variant:Nn \__zrefcheck_run_checks:nnn { nne } \bool_new:N \l__zrefcheck_passedcheck_bool \bool_new:N \l__zrefcheck_onpage_bool \bool_new:N \l__zrefcheck_empty_label_bool @@ -642,7 +648,7 @@ \l__zrefcheck_onpage_bool } { - \__zrefcheck_message:nnnx { double-check } {#1} {#2} + \__zrefcheck_message:nnne { double-check } {#1} {#2} { \zref@extractdefault {#3} {page} {'unknown'} } } } @@ -650,7 +656,7 @@ \bool_if:NTF \l__zrefcheck_empty_label_bool { \__zrefcheck_message:nnnn { empty-label } {#1} { } { } } { - \__zrefcheck_message:nnnx { check-failed } {#1} {#2} + \__zrefcheck_message:nnne { check-failed } {#1} {#2} { \zref@extractdefault {#3} {page} {'unknown'} } } } @@ -1085,7 +1091,7 @@ \cs_new_protected:Npn \zrefcheck_zcref_beg_label: { \int_gincr:N \g__zrefcheck_id_int - \tl_set:Nx \l__zrefcheck_checkbeg_tl + \tl_set:Ne \l__zrefcheck_checkbeg_tl { \__zrefcheck_check_lblfmt:n { \g__zrefcheck_id_int } } \zref@labelbylist { \l__zrefcheck_checkbeg_tl } { zrefcheck-check } } @@ -1100,13 +1106,13 @@ } \cs_new_protected:Npn \zrefcheck_zcref_run_checks_on_labels:n #1 { - \__zrefcheck_run_checks:nnx + \__zrefcheck_run_checks:nne { \l__zrefcheck_zcheck_checks_seq } {#1} { \l__zrefcheck_checkbeg_tl } } \cs_new_protected:Npn \zrefcheck_zrefvario_label: { \int_gincr:N \g__zrefcheck_id_int - \tl_set:Nx \l__zrefcheck_checkbeg_tl + \tl_set:Ne \l__zrefcheck_checkbeg_tl { \__zrefcheck_check_lblfmt:n { \g__zrefcheck_id_int } } \zref@labelbylist { \l__zrefcheck_checkbeg_tl } { zrefcheck-zrefvario } } diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-dutch.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-dutch.lang index 9450f15d3f8..3a119ee8bec 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-dutch.lang +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-dutch.lang @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "zref-clever". %% -%% Copyright (C) 2021-2023 Gustavo Barros +%% Copyright (C) 2021-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 @@ -21,8 +21,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-clever.dtx, %% zref-clever.ins, diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-english.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-english.lang index bc1b922448a..f2c27039bb3 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-english.lang +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-english.lang @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "zref-clever". %% -%% Copyright (C) 2021-2023 Gustavo Barros +%% Copyright (C) 2021-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 @@ -21,8 +21,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-clever.dtx, %% zref-clever.ins, diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-french.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-french.lang index 78c49a248e1..5b2bc08099e 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-french.lang +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-french.lang @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "zref-clever". %% -%% Copyright (C) 2021-2023 Gustavo Barros +%% Copyright (C) 2021-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 @@ -21,8 +21,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-clever.dtx, %% zref-clever.ins, diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang index b123a2c504e..e4f9581208b 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-german.lang @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "zref-clever". %% -%% Copyright (C) 2021-2023 Gustavo Barros +%% Copyright (C) 2021-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 @@ -21,8 +21,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-clever.dtx, %% zref-clever.ins, diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-italian.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-italian.lang index d6f26294028..41bbf07feb3 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-italian.lang +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-italian.lang @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "zref-clever". %% -%% Copyright (C) 2021-2023 Gustavo Barros +%% Copyright (C) 2021-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 @@ -21,8 +21,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-clever.dtx, %% zref-clever.ins, diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-portuguese.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-portuguese.lang index c1499a3b926..dcc8724befb 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-portuguese.lang +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-portuguese.lang @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "zref-clever". %% -%% Copyright (C) 2021-2023 Gustavo Barros +%% Copyright (C) 2021-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 @@ -21,8 +21,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-clever.dtx, %% zref-clever.ins, diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-spanish.lang b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-spanish.lang index 3a8d8d067c2..0c2d6462480 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever-spanish.lang +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever-spanish.lang @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "zref-clever". %% -%% Copyright (C) 2021-2023 Gustavo Barros +%% Copyright (C) 2021-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 @@ -21,8 +21,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-clever.dtx, %% zref-clever.ins, diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty index 765e152f69e..c0cc00db188 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty @@ -8,7 +8,7 @@ %% %% This file was generated from file(s) of the LaTeX package "zref-clever". %% -%% Copyright (C) 2021-2023 Gustavo Barros +%% Copyright (C) 2021-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 @@ -21,8 +21,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-clever.dtx, %% zref-clever.ins, @@ -42,7 +41,7 @@ %% %% ----------------------------------------------------------------------- %% -\def\zrefclever@required@kernel{2023-06-01} +\def\zrefclever@required@kernel{2023-11-01} \NeedsTeXFormat{LaTeX2e}[\zrefclever@required@kernel] \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{\zrefclever@required@kernel} @@ -53,7 +52,7 @@ 'zref-clever' requires a LaTeX kernel \zrefclever@required@kernel\space or newer.% }% }% -\ProvidesExplPackage {zref-clever} {2023-08-14} {0.4.2} +\ProvidesExplPackage {zref-clever} {2023-11-14} {0.4.3} {Clever LaTeX cross-references based on zref} \RequirePackage { zref-base } \RequirePackage { zref-user } @@ -161,6 +160,12 @@ { \IfPackageLoadedTF {#1} { \prg_return_true: } { \prg_return_false: } } \prg_new_conditional:Npnn \__zrefclever_if_class_loaded:n #1 { T , F , TF } { \IfClassLoadedTF {#1} { \prg_return_true: } { \prg_return_false: } } +\tl_new:N \l__zrefclever_tmpa_tl +\tl_new:N \l__zrefclever_tmpb_tl +\seq_new:N \l__zrefclever_tmpa_seq +\seq_new:N \g__zrefclever_tmpa_seq +\bool_new:N \l__zrefclever_tmpa_bool +\int_new:N \l__zrefclever_tmpa_int \msg_new:nnn { zref-clever } { option-not-type-specific } { Option~'#1'~is~not~type-specific~\msg_line_context:.~ @@ -770,7 +775,7 @@ { \prg_return_false: } } \prg_generate_conditional_variant:Nnn - \__zrefclever_language_if_declared:n { x } { T , F , TF } + \__zrefclever_language_if_declared:n { e } { T , F , TF } \prg_set_eq_conditional:NNn \zrefclever_language_if_declared:n \__zrefclever_language_if_declared:n { TF } \NewDocumentCommand \zcDeclareLanguage { O { } m } @@ -797,7 +802,7 @@ \__zrefclever_language_if_declared:nTF {#2} { \tl_new:c { \__zrefclever_language_varname:n {#1} } - \tl_gset:cx { \__zrefclever_language_varname:n {#1} } + \tl_gset:ce { \__zrefclever_language_varname:n {#1} } { \tl_use:c { \__zrefclever_language_varname:n {#2} } } } { \msg_warning:nnn { zref-clever } { unknown-language-alias } {#2} } @@ -854,7 +859,7 @@ } \cs_new_protected:Npn \__zrefclever_process_language_settings: { - \__zrefclever_language_if_declared:xTF + \__zrefclever_language_if_declared:eTF { \l__zrefclever_ref_language_tl } { \__zrefclever_opt_seq_get:cNF @@ -868,7 +873,7 @@ { \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { language-no-decl-ref } { \l__zrefclever_ref_language_tl } { \l__zrefclever_ref_decl_case_tl } @@ -885,7 +890,7 @@ \seq_if_in:NVF \l__zrefclever_lang_declension_seq \l__zrefclever_ref_decl_case_tl { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { unknown-decl-case } { \l__zrefclever_ref_decl_case_tl } { \l__zrefclever_ref_language_tl } @@ -905,7 +910,7 @@ { \tl_if_empty:NF \l__zrefclever_ref_gender_tl { - \msg_warning:nnxxx { zref-clever } + \msg_warning:nneee { zref-clever } { language-no-gender } { \l__zrefclever_ref_language_tl } { g } @@ -919,7 +924,7 @@ \seq_if_in:NVF \l__zrefclever_lang_gender_seq \l__zrefclever_ref_gender_tl { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { gender-not-declared } { \l__zrefclever_ref_language_tl } { \l__zrefclever_ref_gender_tl } @@ -937,14 +942,14 @@ { \tl_if_empty:NF \l__zrefclever_ref_decl_case_tl { - \msg_warning:nnxx { zref-clever } { unknown-language-decl } + \msg_warning:nnee { zref-clever } { unknown-language-decl } { \l__zrefclever_ref_decl_case_tl } { \l__zrefclever_ref_language_tl } \tl_clear:N \l__zrefclever_ref_decl_case_tl } \tl_if_empty:NF \l__zrefclever_ref_gender_tl { - \msg_warning:nnxxx { zref-clever } + \msg_warning:nneee { zref-clever } { language-no-gender } { \l__zrefclever_ref_language_tl } { g } @@ -960,18 +965,18 @@ \@bsphack \__zrefclever_language_if_declared:nT {#1} { - \seq_if_in:NxF + \seq_if_in:NeF \g__zrefclever_loaded_langfiles_seq { \tl_use:c { \__zrefclever_language_varname:n {#1} } } { - \exp_args:Nx \file_get:nnNTF + \exp_args:Ne \file_get:nnNTF { zref-clever- \tl_use:c { \__zrefclever_language_varname:n {#1} } .lang } { \ExplSyntaxOn } - \l_tmpa_tl + \l__zrefclever_tmpa_tl { \tl_set:Nn \l__zrefclever_setup_language_tl {#1} \tl_clear:N \l__zrefclever_setup_type_tl @@ -995,14 +1000,14 @@ } \l__zrefclever_lang_gender_seq { \seq_clear:N \l__zrefclever_lang_gender_seq } - \keys_set:nV { zref-clever/langfile } \l_tmpa_tl - \seq_gput_right:Nx \g__zrefclever_loaded_langfiles_seq + \keys_set:nV { zref-clever/langfile } \l__zrefclever_tmpa_tl + \seq_gput_right:Ne \g__zrefclever_loaded_langfiles_seq { \tl_use:c { \__zrefclever_language_varname:n {#1} } } - \msg_info:nnx { zref-clever } { langfile-loaded } + \msg_info:nne { zref-clever } { langfile-loaded } { \tl_use:c { \__zrefclever_language_varname:n {#1} } } } { - \seq_gput_right:Nx \g__zrefclever_loaded_langfiles_seq + \seq_gput_right:Ne \g__zrefclever_loaded_langfiles_seq { \tl_use:c { \__zrefclever_language_varname:n {#1} } } } } @@ -1010,7 +1015,7 @@ \@esphack \group_end: } -\cs_generate_variant:Nn \__zrefclever_provide_langfile:n { x } +\cs_generate_variant:Nn \__zrefclever_provide_langfile:n { e } \keys_define:nn { zref-clever/langfile } { type .code:n = @@ -1024,14 +1029,14 @@ { \seq_if_empty:NTF \l__zrefclever_lang_declension_seq { - \msg_info:nnxx { zref-clever } { language-no-decl-setup } + \msg_info:nnee { zref-clever } { language-no-decl-setup } { \l__zrefclever_setup_language_tl } {#1} } { \seq_if_in:NnTF \l__zrefclever_lang_declension_seq {#1} { \tl_set:Nn \l__zrefclever_lang_decl_case_tl {#1} } { - \msg_info:nnxx { zref-clever } { unknown-decl-case } + \msg_info:nnee { zref-clever } { unknown-decl-case } {#1} { \l__zrefclever_setup_language_tl } \seq_get_left:NN \l__zrefclever_lang_declension_seq \l__zrefclever_lang_decl_case_tl @@ -1045,7 +1050,7 @@ { \seq_if_empty:NTF \l__zrefclever_lang_gender_seq { - \msg_info:nnxxx { zref-clever } { language-no-gender } + \msg_info:nneee { zref-clever } { language-no-gender } { \l__zrefclever_setup_language_tl } { gender } {#1} } { @@ -1055,13 +1060,13 @@ { option-only-type-specific } { gender } } { - \seq_clear:N \l_tmpa_seq + \seq_clear:N \l__zrefclever_tmpa_seq \clist_map_inline:nn {#1} { \seq_if_in:NnTF \l__zrefclever_lang_gender_seq {##1} - { \seq_put_right:Nn \l_tmpa_seq {##1} } + { \seq_put_right:Nn \l__zrefclever_tmpa_seq {##1} } { - \msg_info:nnxx { zref-clever } + \msg_info:nnee { zref-clever } { gender-not-declared } { \l__zrefclever_setup_language_tl } {##1} } @@ -1091,7 +1096,7 @@ { gender } { seq } } - \l_tmpa_seq + \l__zrefclever_tmpa_seq } } } @@ -1414,14 +1419,14 @@ { \l__zrefclever_setup_language_tl } {#1} { seq } } { - \seq_gclear:N \g_tmpa_seq + \seq_gclear:N \g__zrefclever_tmpa_seq \__zrefclever_opt_seq_gset_clist_split:Nn - \g_tmpa_seq {##1} + \g__zrefclever_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } { \int_compare_p:nNn - { \seq_count:N \g_tmpa_seq } = { 4 } + { \seq_count:N \g__zrefclever_tmpa_seq } = { 4 } } { \__zrefclever_opt_seq_gset_eq:cN @@ -1430,12 +1435,12 @@ { \l__zrefclever_setup_language_tl } {#1} { seq } } - \g_tmpa_seq + \g__zrefclever_tmpa_seq } { - \msg_info:nnxx { zref-clever } + \msg_info:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \g_tmpa_seq } + {#1} { \seq_count:N \g__zrefclever_tmpa_seq } } } } @@ -1447,14 +1452,14 @@ { \l__zrefclever_setup_type_tl } {#1} { seq } } { - \seq_gclear:N \g_tmpa_seq + \seq_gclear:N \g__zrefclever_tmpa_seq \__zrefclever_opt_seq_gset_clist_split:Nn - \g_tmpa_seq {##1} + \g__zrefclever_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } { \int_compare_p:nNn - { \seq_count:N \g_tmpa_seq } = { 4 } + { \seq_count:N \g__zrefclever_tmpa_seq } = { 4 } } { \__zrefclever_opt_seq_gset_eq:cN @@ -1464,12 +1469,12 @@ { \l__zrefclever_setup_type_tl } {#1} { seq } } - \g_tmpa_seq + \g__zrefclever_tmpa_seq } { - \msg_info:nnxx { zref-clever } + \msg_info:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \g_tmpa_seq } + {#1} { \seq_count:N \g__zrefclever_tmpa_seq } } } } @@ -1803,8 +1808,8 @@ \bool_if:NTF \l__zrefclever_typeset_range_bool { \group_begin: - \bool_set_false:N \l_tmpa_bool - \exp_args:Nxx \tl_if_eq:nnT + \bool_set_false:N \l__zrefclever_tmpa_bool + \exp_args:Nee \tl_if_eq:nnT { \__zrefclever_extract_unexp:nnn {#1} { externaldocument } { } @@ -1816,7 +1821,7 @@ { \tl_if_eq:NnTF \l__zrefclever_ref_property_tl { page } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \__zrefclever_extract_unexp:nnn {#1} { zc@pgfmt } { } @@ -1825,10 +1830,10 @@ \__zrefclever_extract_unexp:nnn {#2} { zc@pgfmt } { } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l__zrefclever_tmpa_bool } } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \__zrefclever_extract_unexp:nnn {#1} { zc@counter } { } @@ -1838,7 +1843,7 @@ {#2} { zc@counter } { } } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \__zrefclever_extract_unexp:nnn {#1} { zc@enclval } { } @@ -1847,27 +1852,27 @@ \__zrefclever_extract_unexp:nnn {#2} { zc@enclval } { } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l__zrefclever_tmpa_bool } } } } - \bool_if:NTF \l_tmpa_bool + \bool_if:NTF \l__zrefclever_tmpa_bool { - \__zrefclever_extract_default:Nnvn \l_tmpb_tl + \__zrefclever_extract_default:Nnvn \l__zrefclever_tmpb_tl {#2} { l__zrefclever_endrangeprop_tl } { } } { \zref@ifrefcontainsprop {#2} { \l__zrefclever_ref_property_tl } { - \__zrefclever_extract_default:Nnvn \l_tmpb_tl + \__zrefclever_extract_default:Nnvn \l__zrefclever_tmpb_tl {#2} { l__zrefclever_ref_property_tl } { } } - { \tl_set:Nn \l_tmpb_tl { zc@missingproperty } } + { \tl_set:Nn \l__zrefclever_tmpb_tl { zc@missingproperty } } } \exp_args:NNNV \group_end: - \tl_set:Nn #3 \l_tmpb_tl + \tl_set:Nn #3 \l__zrefclever_tmpb_tl } { \__zrefclever_extract_default:Nnvn #3 @@ -1891,32 +1896,35 @@ { \group_begin: \UseHook { zref-clever/endrange-setup } - \tl_set:Nx \l_tmpa_tl + \tl_set:Ne \l__zrefclever_tmpa_tl { \__zrefclever_extract:nnn {#1} { \l__zrefclever_ref_property_tl } { } } - \tl_set:Nx \l_tmpb_tl + \tl_set:Ne \l__zrefclever_tmpb_tl { \__zrefclever_extract:nnn {#2} { \l__zrefclever_ref_property_tl } { } } - \bool_set_false:N \l_tmpa_bool - \bool_until_do:Nn \l_tmpa_bool + \bool_set_false:N \l__zrefclever_tmpa_bool + \bool_until_do:Nn \l__zrefclever_tmpa_bool { - \exp_args:Nxx \tl_if_eq:nnTF - { \tl_head:V \l_tmpa_tl } { \tl_head:V \l_tmpb_tl } + \exp_args:Nee \tl_if_eq:nnTF + { \tl_head:V \l__zrefclever_tmpa_tl } + { \tl_head:V \l__zrefclever_tmpb_tl } { - \tl_set:Nx \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } - \tl_set:Nx \l_tmpb_tl { \tl_tail:V \l_tmpb_tl } - \tl_if_empty:NT \l_tmpb_tl - { \bool_set_true:N \l_tmpa_bool } + \tl_set:Ne \l__zrefclever_tmpa_tl + { \tl_tail:V \l__zrefclever_tmpa_tl } + \tl_set:Ne \l__zrefclever_tmpb_tl + { \tl_tail:V \l__zrefclever_tmpb_tl } + \tl_if_empty:NT \l__zrefclever_tmpb_tl + { \bool_set_true:N \l__zrefclever_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l__zrefclever_tmpa_bool } } \exp_args:NNNV \group_end: - \tl_set:Nn #3 \l_tmpb_tl + \tl_set:Nn #3 \l__zrefclever_tmpb_tl } { \tl_set:Nn #3 { zc@missingproperty } } } @@ -1936,38 +1944,41 @@ { \group_begin: \UseHook { zref-clever/endrange-setup } - \tl_set:Nx \l_tmpa_tl + \tl_set:Ne \l__zrefclever_tmpa_tl { \__zrefclever_extract:nnn {#1} { \l__zrefclever_ref_property_tl } { } } - \tl_set:Nx \l_tmpb_tl + \tl_set:Ne \l__zrefclever_tmpb_tl { \__zrefclever_extract:nnn {#2} { \l__zrefclever_ref_property_tl } { } } - \bool_set_false:N \l_tmpa_bool - \__zrefclever_is_integer_rgx:VTF \l_tmpa_tl + \bool_set_false:N \l__zrefclever_tmpa_bool + \__zrefclever_is_integer_rgx:VTF \l__zrefclever_tmpa_tl { - \__zrefclever_is_integer_rgx:VF \l_tmpb_tl - { \bool_set_true:N \l_tmpa_bool } + \__zrefclever_is_integer_rgx:VF \l__zrefclever_tmpb_tl + { \bool_set_true:N \l__zrefclever_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } - \bool_until_do:Nn \l_tmpa_bool + { \bool_set_true:N \l__zrefclever_tmpa_bool } + \bool_until_do:Nn \l__zrefclever_tmpa_bool { - \exp_args:Nxx \tl_if_eq:nnTF - { \tl_head:V \l_tmpa_tl } { \tl_head:V \l_tmpb_tl } + \exp_args:Nee \tl_if_eq:nnTF + { \tl_head:V \l__zrefclever_tmpa_tl } + { \tl_head:V \l__zrefclever_tmpb_tl } { - \tl_set:Nx \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } - \tl_set:Nx \l_tmpb_tl { \tl_tail:V \l_tmpb_tl } - \tl_if_empty:NT \l_tmpb_tl - { \bool_set_true:N \l_tmpa_bool } + \tl_set:Ne \l__zrefclever_tmpa_tl + { \tl_tail:V \l__zrefclever_tmpa_tl } + \tl_set:Ne \l__zrefclever_tmpb_tl + { \tl_tail:V \l__zrefclever_tmpb_tl } + \tl_if_empty:NT \l__zrefclever_tmpb_tl + { \bool_set_true:N \l__zrefclever_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l__zrefclever_tmpa_bool } } \exp_args:NNNV \group_end: - \tl_set:Nn #3 \l_tmpb_tl + \tl_set:Nn #3 \l__zrefclever_tmpb_tl } { \tl_set:Nn #3 { zc@missingproperty } } } @@ -1978,42 +1989,48 @@ { \group_begin: \UseHook { zref-clever/endrange-setup } - \tl_set:Nx \l_tmpa_tl + \tl_set:Ne \l__zrefclever_tmpa_tl { \__zrefclever_extract:nnn {#1} { \l__zrefclever_ref_property_tl } { } } - \tl_set:Nx \l_tmpb_tl + \tl_set:Ne \l__zrefclever_tmpb_tl { \__zrefclever_extract:nnn {#2} { \l__zrefclever_ref_property_tl } { } } - \bool_set_false:N \l_tmpa_bool - \__zrefclever_is_integer_rgx:VTF \l_tmpa_tl + \bool_set_false:N \l__zrefclever_tmpa_bool + \__zrefclever_is_integer_rgx:VTF \l__zrefclever_tmpa_tl { - \__zrefclever_is_integer_rgx:VF \l_tmpb_tl - { \bool_set_true:N \l_tmpa_bool } + \__zrefclever_is_integer_rgx:VF \l__zrefclever_tmpb_tl + { \bool_set_true:N \l__zrefclever_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } - \bool_until_do:Nn \l_tmpa_bool + { \bool_set_true:N \l__zrefclever_tmpa_bool } + \bool_until_do:Nn \l__zrefclever_tmpa_bool { - \exp_args:Nxx \tl_if_eq:nnTF - { \tl_head:V \l_tmpa_tl } { \tl_head:V \l_tmpb_tl } + \exp_args:Nee \tl_if_eq:nnTF + { \tl_head:V \l__zrefclever_tmpa_tl } + { \tl_head:V \l__zrefclever_tmpb_tl } { \bool_lazy_or:nnTF - { \int_compare_p:nNn { \l_tmpb_tl } > { 99 } } - { \int_compare_p:nNn { \tl_head:V \l_tmpb_tl } = { 0 } } + { \int_compare_p:nNn { \l__zrefclever_tmpb_tl } > { 99 } } { - \tl_set:Nx \l_tmpa_tl { \tl_tail:V \l_tmpa_tl } - \tl_set:Nx \l_tmpb_tl { \tl_tail:V \l_tmpb_tl } + \int_compare_p:nNn + { \tl_head:V \l__zrefclever_tmpb_tl } = { 0 } + } + { + \tl_set:Ne \l__zrefclever_tmpa_tl + { \tl_tail:V \l__zrefclever_tmpa_tl } + \tl_set:Ne \l__zrefclever_tmpb_tl + { \tl_tail:V \l__zrefclever_tmpb_tl } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l__zrefclever_tmpa_bool } } - { \bool_set_true:N \l_tmpa_bool } + { \bool_set_true:N \l__zrefclever_tmpa_bool } } \exp_args:NNNV \group_end: - \tl_set:Nn #3 \l_tmpb_tl + \tl_set:Nn #3 \l__zrefclever_tmpb_tl } { \tl_set:Nn #3 { zc@missingproperty } } } @@ -2161,7 +2178,7 @@ { unknown-language-opt } {#1} } } - \__zrefclever_provide_langfile:x + \__zrefclever_provide_langfile:e { \l__zrefclever_ref_language_tl } } } , @@ -2297,7 +2314,7 @@ titleref .code:n = { % NOTE Option deprecated in 2022-04-22 for 0.3.0. - \msg_warning:nnxx { zref-clever }{ option-deprecated } { titleref } + \msg_warning:nnee { zref-clever }{ option-deprecated } { titleref } { \iow_char:N\\usepackage\iow_char:N\{zref-titleref\iow_char:N\} } } , } @@ -2306,7 +2323,7 @@ vario .code:n = { % NOTE Option deprecated in 2022-04-22 for 0.3.0. - \msg_warning:nnxx { zref-clever }{ option-deprecated } { vario } + \msg_warning:nnee { zref-clever }{ option-deprecated } { vario } { \iow_char:N\\usepackage\iow_char:N\{zref-vario\iow_char:N\} } } , } @@ -2576,21 +2593,24 @@ { \__zrefclever_opt_varname_general:nn {#1} { seq } } } { - \seq_clear:N \l_tmpa_seq + \seq_clear:N \l__zrefclever_tmpa_seq \__zrefclever_opt_seq_set_clist_split:Nn - \l_tmpa_seq {##1} + \l__zrefclever_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } - { \int_compare_p:nNn { \seq_count:N \l_tmpa_seq } = { 4 } } + { + \int_compare_p:nNn + { \seq_count:N \l__zrefclever_tmpa_seq } = { 4 } + } { \__zrefclever_opt_seq_set_eq:cN { \__zrefclever_opt_varname_general:nn {#1} { seq } } - \l_tmpa_seq + \l__zrefclever_tmpa_seq } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \l_tmpa_seq } + {#1} { \seq_count:N \l__zrefclever_tmpa_seq } } } } , @@ -2638,7 +2658,7 @@ { \__zrefclever_zcsetup:n {#1} } \cs_new_protected:Npn \__zrefclever_zcsetup:n #1 { \keys_set:nn { zref-clever/zcsetup } {#1} } -\cs_generate_variant:Nn \__zrefclever_zcsetup:n { x } +\cs_generate_variant:Nn \__zrefclever_zcsetup:n { e } \NewDocumentCommand \zcRefTypeSetup { m m } { \tl_set:Nn \l__zrefclever_setup_type_tl {#1} @@ -2840,24 +2860,27 @@ } } { - \seq_clear:N \l_tmpa_seq + \seq_clear:N \l__zrefclever_tmpa_seq \__zrefclever_opt_seq_set_clist_split:Nn - \l_tmpa_seq {##1} + \l__zrefclever_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } - { \int_compare_p:nNn { \seq_count:N \l_tmpa_seq } = { 4 } } + { + \int_compare_p:nNn + { \seq_count:N \l__zrefclever_tmpa_seq } = { 4 } + } { \__zrefclever_opt_seq_set_eq:cN { \__zrefclever_opt_varname_type:enn { \l__zrefclever_setup_type_tl } {#1} { seq } } - \l_tmpa_seq + \l__zrefclever_tmpa_seq } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \l_tmpa_seq } + {#1} { \seq_count:N \l__zrefclever_tmpa_seq } } } } , @@ -2947,14 +2970,14 @@ { \seq_if_empty:NTF \l__zrefclever_lang_declension_seq { - \msg_warning:nnxx { zref-clever } { language-no-decl-setup } + \msg_warning:nnee { zref-clever } { language-no-decl-setup } { \l__zrefclever_setup_language_tl } {#1} } { \seq_if_in:NnTF \l__zrefclever_lang_declension_seq {#1} { \tl_set:Nn \l__zrefclever_lang_decl_case_tl {#1} } { - \msg_warning:nnxx { zref-clever } { unknown-decl-case } + \msg_warning:nnee { zref-clever } { unknown-decl-case } {#1} { \l__zrefclever_setup_language_tl } \seq_get_left:NN \l__zrefclever_lang_declension_seq \l__zrefclever_lang_decl_case_tl @@ -2968,7 +2991,7 @@ { \seq_if_empty:NTF \l__zrefclever_lang_gender_seq { - \msg_warning:nnxxx { zref-clever } { language-no-gender } + \msg_warning:nneee { zref-clever } { language-no-gender } { \l__zrefclever_setup_language_tl } { gender } {#1} } { @@ -2978,13 +3001,13 @@ { option-only-type-specific } { gender } } { - \seq_clear:N \l_tmpa_seq + \seq_clear:N \l__zrefclever_tmpa_seq \clist_map_inline:nn {#1} { \seq_if_in:NnTF \l__zrefclever_lang_gender_seq {##1} - { \seq_put_right:Nn \l_tmpa_seq {##1} } + { \seq_put_right:Nn \l__zrefclever_tmpa_seq {##1} } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { gender-not-declared } { \l__zrefclever_setup_language_tl } {##1} } @@ -2997,7 +3020,7 @@ { gender } { seq } } - \l_tmpa_seq + \l__zrefclever_tmpa_seq } } } , @@ -3339,14 +3362,14 @@ { \tl_if_empty:NTF \l__zrefclever_setup_type_tl { - \seq_gclear:N \g_tmpa_seq + \seq_gclear:N \g__zrefclever_tmpa_seq \__zrefclever_opt_seq_gset_clist_split:Nn - \g_tmpa_seq {##1} + \g__zrefclever_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } { \int_compare_p:nNn - { \seq_count:N \g_tmpa_seq } = { 4 } + { \seq_count:N \g__zrefclever_tmpa_seq } = { 4 } } { \__zrefclever_opt_seq_gset_eq:cN @@ -3355,23 +3378,23 @@ { \l__zrefclever_setup_language_tl } {#1} { seq } } - \g_tmpa_seq + \g__zrefclever_tmpa_seq } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \g_tmpa_seq } + {#1} { \seq_count:N \g__zrefclever_tmpa_seq } } } { - \seq_gclear:N \g_tmpa_seq + \seq_gclear:N \g__zrefclever_tmpa_seq \__zrefclever_opt_seq_gset_clist_split:Nn - \g_tmpa_seq {##1} + \g__zrefclever_tmpa_seq {##1} \bool_lazy_or:nnTF { \tl_if_empty_p:n {##1} } { \int_compare_p:nNn - { \seq_count:N \g_tmpa_seq } = { 4 } + { \seq_count:N \g__zrefclever_tmpa_seq } = { 4 } } { \__zrefclever_opt_seq_gset_eq:cN @@ -3380,12 +3403,12 @@ { \l__zrefclever_setup_language_tl } { \l__zrefclever_setup_type_tl } {#1} { seq } } - \g_tmpa_seq + \g__zrefclever_tmpa_seq } { - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { refbounds-must-be-four } - {#1} { \seq_count:N \g_tmpa_seq } + {#1} { \seq_count:N \g__zrefclever_tmpa_seq } } } } , @@ -3452,7 +3475,7 @@ \keys_set:nn { zref-clever/reference } {#3} \seq_set_from_clist:Nn \l__zrefclever_zcref_labels_seq {#1} \bool_set:Nn \l__zrefclever_link_star_bool {#2} - \__zrefclever_provide_langfile:x { \l__zrefclever_ref_language_tl } + \__zrefclever_provide_langfile:e { \l__zrefclever_ref_language_tl } \__zrefclever_process_language_settings: \bool_lazy_and:nnT { \l__zrefclever_zrefcheck_available_bool } @@ -3468,11 +3491,11 @@ \group_end: \tl_if_empty:NF \l__zrefclever_zcref_note_tl { - \__zrefclever_get_rf_opt_tl:nxxN { notesep } + \__zrefclever_get_rf_opt_tl:neeN { notesep } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } - \l_tmpa_tl - \l_tmpa_tl + \l__zrefclever_tmpa_tl + \l__zrefclever_tmpa_tl \l__zrefclever_zcref_note_tl } \bool_lazy_and:nnT @@ -3687,9 +3710,9 @@ = { \tl_head:N \l__zrefclever_label_enclval_b_tl } { - \tl_set:Nx \l__zrefclever_label_enclval_a_tl + \tl_set:Ne \l__zrefclever_label_enclval_a_tl { \tl_tail:N \l__zrefclever_label_enclval_a_tl } - \tl_set:Nx \l__zrefclever_label_enclval_b_tl + \tl_set:Ne \l__zrefclever_label_enclval_b_tl { \tl_tail:N \l__zrefclever_label_enclval_b_tl } } { @@ -3839,15 +3862,15 @@ \bool_set_false:N \l__zrefclever_type_first_refbounds_set_bool % Get type block options (not type-specific). - \__zrefclever_get_rf_opt_tl:nxxN { tpairsep } + \__zrefclever_get_rf_opt_tl:neeN { tpairsep } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_tpairsep_tl - \__zrefclever_get_rf_opt_tl:nxxN { tlistsep } + \__zrefclever_get_rf_opt_tl:neeN { tlistsep } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_tlistsep_tl - \__zrefclever_get_rf_opt_tl:nxxN { tlastsep } + \__zrefclever_get_rf_opt_tl:neeN { tlastsep } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_tlastsep_tl @@ -3918,7 +3941,7 @@ { \tl_if_eq:NnT \l__zrefclever_label_type_a_tl { zc@missingtype } { - \msg_warning:nnx { zref-clever } { missing-type } + \msg_warning:nne { zref-clever } { missing-type } { \l__zrefclever_label_a_tl } } \zref@ifrefcontainsprop @@ -3926,7 +3949,7 @@ { \l__zrefclever_ref_property_tl } { } { - \msg_warning:nnxx { zref-clever } { missing-property } + \msg_warning:nnee { zref-clever } { missing-property } { \l__zrefclever_ref_property_tl } { \l__zrefclever_label_a_tl } } @@ -3936,91 +3959,91 @@ % options, once per type. \int_compare:nNnT { \l__zrefclever_label_count_int } = { 0 } { - \__zrefclever_get_rf_opt_tl:nxxN { namesep } + \__zrefclever_get_rf_opt_tl:neeN { namesep } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_namesep_tl - \__zrefclever_get_rf_opt_tl:nxxN { pairsep } + \__zrefclever_get_rf_opt_tl:neeN { pairsep } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_pairsep_tl - \__zrefclever_get_rf_opt_tl:nxxN { listsep } + \__zrefclever_get_rf_opt_tl:neeN { listsep } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_listsep_tl - \__zrefclever_get_rf_opt_tl:nxxN { lastsep } + \__zrefclever_get_rf_opt_tl:neeN { lastsep } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_lastsep_tl - \__zrefclever_get_rf_opt_tl:nxxN { rangesep } + \__zrefclever_get_rf_opt_tl:neeN { rangesep } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_rangesep_tl - \__zrefclever_get_rf_opt_tl:nxxN { namefont } + \__zrefclever_get_rf_opt_tl:neeN { namefont } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_namefont_tl - \__zrefclever_get_rf_opt_tl:nxxN { reffont } + \__zrefclever_get_rf_opt_tl:neeN { reffont } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_reffont_tl - \__zrefclever_get_rf_opt_tl:nxxN { endrangefunc } + \__zrefclever_get_rf_opt_tl:neeN { endrangefunc } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_endrangefunc_tl - \__zrefclever_get_rf_opt_tl:nxxN { endrangeprop } + \__zrefclever_get_rf_opt_tl:neeN { endrangeprop } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_endrangeprop_tl - \__zrefclever_get_rf_opt_bool:nnxxN { cap } { false } + \__zrefclever_get_rf_opt_bool:nneeN { cap } { false } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_cap_bool - \__zrefclever_get_rf_opt_bool:nnxxN { abbrev } { false } + \__zrefclever_get_rf_opt_bool:nneeN { abbrev } { false } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_abbrev_bool - \__zrefclever_get_rf_opt_bool:nnxxN { rangetopair } { true } + \__zrefclever_get_rf_opt_bool:nneeN { rangetopair } { true } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_rangetopair_bool - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-first } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-first } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_first_seq - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-first-sg } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-first-sg } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_first_sg_seq - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-first-pb } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-first-pb } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_first_pb_seq - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-first-rb } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-first-rb } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_first_rb_seq - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-mid } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-mid } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_mid_seq - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-mid-rb } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-mid-rb } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_mid_rb_seq - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-mid-re } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-mid-re } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_mid_re_seq - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-last } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-last } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_last_seq - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-last-pe } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-last-pe } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_last_pe_seq - \__zrefclever_get_rf_opt_seq:nxxN { refbounds-last-re } + \__zrefclever_get_rf_opt_seq:neeN { refbounds-last-re } { \l__zrefclever_label_type_a_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_refbounds_last_re_seq @@ -4064,7 +4087,7 @@ \bool_set_true:N \l__zrefclever_type_first_refbounds_set_bool } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_pairsep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4087,7 +4110,7 @@ { \int_compare:nNnTF { \l__zrefclever_ref_count_int } < { 2 } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_pairsep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4095,7 +4118,7 @@ } } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_lastsep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4113,7 +4136,7 @@ % We know `range_beg_is_first_bool' is false, since this is % the second element in the range, but the third or more in % the type list. - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_pairsep_tl \__zrefclever_get_ref:VN @@ -4126,7 +4149,7 @@ \l__zrefclever_type_first_refbounds_set_bool } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_listsep_tl \__zrefclever_get_ref:VN @@ -4165,7 +4188,7 @@ \int_compare:nNnTF { \l__zrefclever_ref_count_int } < { 2 } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_pairsep_tl \__zrefclever_get_ref:VN @@ -4174,7 +4197,7 @@ } } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_lastsep_tl \__zrefclever_get_ref:VN @@ -4196,7 +4219,7 @@ \l__zrefclever_refbounds_first_pb_seq \bool_set_true:N \l__zrefclever_type_first_refbounds_set_bool - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_pairsep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4204,14 +4227,14 @@ } } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_listsep_tl \__zrefclever_get_ref:VN \l__zrefclever_range_beg_label_tl \l__zrefclever_refbounds_mid_seq } - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_lastsep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4235,7 +4258,7 @@ \int_compare:nNnTF { \l__zrefclever_ref_count_int } < { 2 } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_pairsep_tl \__zrefclever_get_ref:VN @@ -4249,7 +4272,7 @@ \l__zrefclever_type_first_refbounds_set_bool } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_lastsep_tl \__zrefclever_get_ref:VN @@ -4266,7 +4289,7 @@ \l__zrefclever_range_beg_label_tl \l__zrefclever_label_a_tl \l__zrefclever_range_end_ref_tl - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_rangesep_tl \__zrefclever_get_ref_endrange:VVN @@ -4276,7 +4299,7 @@ } } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_rangesep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4298,7 +4321,7 @@ \zref@ifrefundefined { \l__zrefclever_type_first_label_tl } { } { - \msg_warning:nnx { zref-clever } { single-element-range } + \msg_warning:nne { zref-clever } { single-element-range } { \l__zrefclever_type_first_label_type_tl } } } @@ -4318,7 +4341,7 @@ % Test: `zc-typeset01.lvt': "Last of type: option range to pair" \bool_if:NTF \l__zrefclever_next_maybe_range_bool { - \tl_set:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_set:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_pairsep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4341,7 +4364,7 @@ \l__zrefclever_type_first_label_tl \l__zrefclever_label_a_tl \l__zrefclever_range_end_ref_tl - \tl_set:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_set:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_rangesep_tl \__zrefclever_get_ref_endrange:VVN @@ -4351,7 +4374,7 @@ } } { - \tl_set:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_set:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_rangesep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4380,14 +4403,14 @@ \bool_if:nTF { \l__zrefclever_typeset_ref_bool && \l__zrefclever_typeset_name_bool } { - \tl_put_left:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_left:Ne \l__zrefclever_typeset_queue_curr_tl { \__zrefclever_get_ref_first: } } { \bool_if:NTF \l__zrefclever_typeset_ref_bool { % Test: `zc-typeset01.lvt': "Last of type: option typeset ref" - \tl_put_left:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_left:Ne \l__zrefclever_typeset_queue_curr_tl { \__zrefclever_get_ref:VN \l__zrefclever_type_first_label_tl \l__zrefclever_type_first_refbounds_seq @@ -4397,7 +4420,7 @@ \bool_if:NTF \l__zrefclever_typeset_name_bool { % Test: `zc-typeset01.lvt': "Last of type: option typeset name" - \tl_set:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_set:Ne \l__zrefclever_typeset_queue_curr_tl { \bool_if:NTF \l__zrefclever_name_in_link_bool { @@ -4430,7 +4453,7 @@ % typeset either "ref" or "name". Still, leave here a % sensible fallback, equal to the behavior of "both". % Test: `zc-typeset01.lvt': "Last of type: option typeset none" - \tl_put_left:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_left:Ne \l__zrefclever_typeset_queue_curr_tl { \__zrefclever_get_ref_first: } } } @@ -4574,7 +4597,7 @@ { 0 } { \int_incr:N \l__zrefclever_ref_count_int - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_listsep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4597,7 +4620,7 @@ } { \int_incr:N \l__zrefclever_ref_count_int - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_listsep_tl \__zrefclever_get_ref:VN @@ -4609,7 +4632,7 @@ { \l__zrefclever_range_same_count_int } = { 1 } { \int_incr:N \l__zrefclever_ref_count_int - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_listsep_tl \__zrefclever_get_ref:VN @@ -4643,7 +4666,7 @@ } { \int_incr:N \l__zrefclever_ref_count_int - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_listsep_tl \__zrefclever_get_ref:VN @@ -4665,7 +4688,7 @@ } { \int_incr:N \l__zrefclever_ref_count_int - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_listsep_tl \__zrefclever_get_ref:VN @@ -4674,7 +4697,7 @@ } } \int_incr:N \l__zrefclever_ref_count_int - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_listsep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4694,7 +4717,7 @@ } { \int_incr:N \l__zrefclever_ref_count_int - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_listsep_tl \__zrefclever_get_ref:VN @@ -4715,7 +4738,7 @@ \l__zrefclever_range_beg_label_tl \l__zrefclever_label_a_tl \l__zrefclever_range_end_ref_tl - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_rangesep_tl \__zrefclever_get_ref_endrange:VVN @@ -4725,7 +4748,7 @@ } } { - \tl_put_right:Nx \l__zrefclever_typeset_queue_curr_tl + \tl_put_right:Ne \l__zrefclever_typeset_queue_curr_tl { \exp_not:V \l__zrefclever_rangesep_tl \__zrefclever_get_ref:VN \l__zrefclever_label_a_tl @@ -4992,7 +5015,7 @@ { \tl_if_empty:NF \l__zrefclever_typeset_queue_curr_tl { - \msg_warning:nnx { zref-clever } + \msg_warning:nne { zref-clever } { nudge-plural-when-sg } { \l__zrefclever_type_first_label_type_tl } } @@ -5008,7 +5031,7 @@ } } { - \msg_warning:nnx { zref-clever } + \msg_warning:nne { zref-clever } { nudge-comptosing } { \l__zrefclever_type_first_label_type_tl } } @@ -5017,7 +5040,7 @@ { \l__zrefclever_nudge_gender_bool } { ! \tl_if_empty_p:N \l__zrefclever_ref_gender_tl } { - \__zrefclever_get_rf_opt_seq:nxxN { gender } + \__zrefclever_get_rf_opt_seq:neeN { gender } { \l__zrefclever_type_first_label_type_tl } { \l__zrefclever_ref_language_tl } \l__zrefclever_type_name_gender_seq @@ -5027,14 +5050,14 @@ { \seq_if_empty:NTF \l__zrefclever_type_name_gender_seq { - \msg_warning:nnxxx { zref-clever } + \msg_warning:nneee { zref-clever } { nudge-gender-not-declared-for-type } { \l__zrefclever_ref_gender_tl } { \l__zrefclever_type_first_label_type_tl } { \l__zrefclever_ref_language_tl } } { - \msg_warning:nnxxxx { zref-clever } + \msg_warning:nneeee { zref-clever } { nudge-gender-mismatch } { \l__zrefclever_type_first_label_type_tl } { \l__zrefclever_ref_gender_tl } @@ -5077,7 +5100,7 @@ { \tl_clear:N \l__zrefclever_type_name_tl \bool_set_true:N \l__zrefclever_type_name_missing_bool - \msg_warning:nnxx { zref-clever } { missing-name } + \msg_warning:nnee { zref-clever } { missing-name } { \l__zrefclever_name_format_tl } { \l__zrefclever_type_first_label_type_tl } } @@ -5137,7 +5160,7 @@ \tl_clear:N \l__zrefclever_type_name_tl \bool_set_true:N \l__zrefclever_type_name_missing_bool - \msg_warning:nnxx { zref-clever } + \msg_warning:nnee { zref-clever } { missing-name } { \l__zrefclever_name_format_tl } { \l__zrefclever_type_first_label_type_tl } @@ -5196,13 +5219,13 @@ \cs_generate_variant:Nn \__zrefclever_extract_url_unexp:n { V } \cs_new_protected:Npn \__zrefclever_labels_in_sequence:nn #1#2 { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \__zrefclever_extract_unexp:nnn {#1} { externaldocument } { } } { \__zrefclever_extract_unexp:nnn {#2} { externaldocument } { } } { \tl_if_eq:NnTF \l__zrefclever_ref_property_tl { page } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \__zrefclever_extract_unexp:nnn {#1} { zc@pgfmt } { } } { \__zrefclever_extract_unexp:nnn {#2} { zc@pgfmt } { } } { @@ -5224,11 +5247,11 @@ } } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \__zrefclever_extract_unexp:nnn {#1} { zc@counter } { } } { \__zrefclever_extract_unexp:nnn {#2} { zc@counter } { } } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \__zrefclever_extract_unexp:nnn {#1} { zc@enclval } { } } { \__zrefclever_extract_unexp:nnn {#2} { zc@enclval } { } } { @@ -5243,7 +5266,7 @@ = { \__zrefclever_extract:nnn {#2} { zc@cntval } { -1 } } { - \exp_args:Nxx \tl_if_eq:nnT + \exp_args:Nee \tl_if_eq:nnT { \__zrefclever_extract_unexp:nvn {#1} { l__zrefclever_ref_property_tl } { } @@ -5297,7 +5320,7 @@ } } } -\cs_generate_variant:Nn \__zrefclever_get_rf_opt_tl:nnnN { nxxN } +\cs_generate_variant:Nn \__zrefclever_get_rf_opt_tl:nnnN { neeN } \cs_new_protected:Npn \__zrefclever_get_rf_opt_seq:nnnN #1#2#3#4 { % First attempt: general options. @@ -5330,7 +5353,7 @@ } } } -\cs_generate_variant:Nn \__zrefclever_get_rf_opt_seq:nnnN { nxxN } +\cs_generate_variant:Nn \__zrefclever_get_rf_opt_seq:nnnN { neeN } \cs_new_protected:Npn \__zrefclever_get_rf_opt_bool:nnnnN #1#2#3#4#5 { % First attempt: general options. @@ -5363,7 +5386,7 @@ } } } -\cs_generate_variant:Nn \__zrefclever_get_rf_opt_bool:nnnnN { nnxxN } +\cs_generate_variant:Nn \__zrefclever_get_rf_opt_bool:nnnnN { nneeN } \__zrefclever_compat_module:nn { appendix } { \AddToHook { cmd / appendix / before } @@ -5483,7 +5506,7 @@ \bool_new:N \l__zrefclever_amsmath_subequations_bool \AddToHook { env / subequations / begin } { - \__zrefclever_zcsetup:x + \__zrefclever_zcsetup:e { counterresetby = { @@ -5538,7 +5561,7 @@ \@bsphack \seq_map_inline:Nn #1 { - \exp_args:Nx \tl_if_eq:nnTF + \exp_args:Ne \tl_if_eq:nnTF { \__zrefclever_extract_unexp:nnn {##1} { zc@type } { } } { equation } { @@ -5546,7 +5569,7 @@ { \string \MT@newlabel {##1} } } { - \exp_args:Nx \tl_if_eq:nnT + \exp_args:Ne \tl_if_eq:nnT { \__zrefclever_extract_unexp:nnn {##1} { zc@type } { } } { parentequation } { @@ -5568,7 +5591,7 @@ \bool_new:N \l__zrefclever_breqn_dgroup_bool \AddToHook { env / dgroup / begin } { - \__zrefclever_zcsetup:x + \__zrefclever_zcsetup:e { counterresetby = { @@ -5623,26 +5646,26 @@ { \__zrefclever_if_package_loaded:nT { enumitem } { - \int_set:Nn \l_tmpa_int { 5 } + \int_set:Nn \l__zrefclever_tmpa_int { 5 } \bool_while_do:nn { \cs_if_exist_p:c - { c@ enum \int_to_roman:n { \l_tmpa_int } } + { c@ enum \int_to_roman:n { \l__zrefclever_tmpa_int } } } { - \__zrefclever_zcsetup:x + \__zrefclever_zcsetup:e { counterresetby = { - enum \int_to_roman:n { \l_tmpa_int } = - enum \int_to_roman:n { \l_tmpa_int - 1 } + enum \int_to_roman:n { \l__zrefclever_tmpa_int } = + enum \int_to_roman:n { \l__zrefclever_tmpa_int - 1 } } , countertype = - { enum \int_to_roman:n { \l_tmpa_int } = item } , + { enum \int_to_roman:n { \l__zrefclever_tmpa_int } = item } , } - \int_incr:N \l_tmpa_int + \int_incr:N \l__zrefclever_tmpa_int } - \int_compare:nNnT { \l_tmpa_int } > { 5 } + \int_compare:nNnT { \l__zrefclever_tmpa_int } > { 5 } { \msg_info:nnn { zref-clever } { compat-package } { enumitem } } } } diff --git a/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty b/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty index 3ecd5db6772..8ed5f71edbf 100644 --- a/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty +++ b/Master/texmf-dist/tex/latex/zref-vario/zref-vario.sty @@ -8,7 +8,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 @@ -21,8 +21,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, @@ -42,11 +41,23 @@ %% %% ----------------------------------------------------------------------- %% -\NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage {zref-vario} {2023-08-15} {0.1.9} +\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.% + }% + }% +\ProvidesExplPackage {zref-vario} {2023-11-14} {0.1.10} {Extended LaTeX page cross-references with varioref and zref-clever} \RequirePackage { zref-clever } [ 2022-01-28 ] % v0.2.0-alpha \RequirePackage { varioref } +\tl_new:N \l__zrefvario_tmpa_tl +\tl_new:N \l__zrefvario_tmpb_tl \NewDocumentCommand \zvsetup { m } { \keys_set:nn { zref-vario/setup } {#1} } \tl_new:N \l__zrefvario_pageprop_tl @@ -118,7 +129,7 @@ { \__zrefvario_ref_opt_name_lang_tl:nn { zv_unknown_language } {#2} } } } -\cs_generate_variant:Nn \__zrefvario_ref_opt_tl_get:nnN { xnN } +\cs_generate_variant:Nn \__zrefvario_ref_opt_tl_get:nnN { enN } \cs_new_protected:Npn \__zrefvario_ref_opt_cs_get:nnnN #1#2#3#4 { \cs_if_exist:cTF @@ -143,7 +154,7 @@ } } } -\cs_generate_variant:Nn \__zrefvario_ref_opt_cs_get:nnnN { xnnN } +\cs_generate_variant:Nn \__zrefvario_ref_opt_cs_get:nnnN { ennN } \tl_new:N \l__zrefvario_reftextcurrent_tl \tl_set:Nn \l__zrefvario_reftextcurrent_tl { \reftextcurrent } \tl_new:N \l__zrefvario_vref_reftextcurrent_tl @@ -182,7 +193,7 @@ { \tl_set:Nn \l__zrefvario_setup_language_tl {#1} \keys_set:nn { zref-vario/langsetup } {#2} - \seq_gput_right:Nx \g__zrefvario_setup_languages_seq + \seq_gput_right:Ne \g__zrefvario_setup_languages_seq { \__zrefvario_base_lang:n {#1} } } { \msg_warning:nnn { zref-vario } { unknown-language-setup } {#1} } @@ -358,49 +369,49 @@ { reftextfaceafter = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextfaceafter } { \l__zrefvario_ref_language_tl } \zref@default } , reftextfacebefore = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextfacebefore } { \l__zrefvario_ref_language_tl } \zref@default } , reftextafter = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextafter } { \l__zrefvario_ref_language_tl } \zref@default } , reftextbefore = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextbefore } { \l__zrefvario_ref_language_tl } \zref@default } , reftextcurrent = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextcurrent } { \l__zrefvario_ref_language_tl } \zref@default } , reftextfaraway = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextfaraway } { \l__zrefvario_ref_language_tl } \zref@default } , reftextpagerange = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextpagerange } { \l__zrefvario_ref_language_tl } \zref@default } , reftextlabelrange = { - \msg_warning:nnxx { zref-vario } { missing-string } + \msg_warning:nnee { zref-vario } { missing-string } { reftextlabelrange } { \l__zrefvario_ref_language_tl } \zref@default } , @@ -413,10 +424,10 @@ { \AddToHook { begindocument } { - \seq_if_in:NxF \g__zrefvario_setup_languages_seq + \seq_if_in:NeF \g__zrefvario_setup_languages_seq { \__zrefvario_base_lang:e { \l__zrefvario_ref_language_tl } } { - \msg_warning:nnx { zref-vario } { language-not-setup } + \msg_warning:nne { zref-vario } { language-not-setup } { \l__zrefvario_ref_language_tl } } } @@ -476,47 +487,47 @@ \cs_set_eq:NN \vref@pagenum \__zrefvario_vref_pagenum:Nn \cs_set_eq:NN \vrefpagenum \__zrefvario_vrefpagenum:Nn \cs_set_eq:NN \vref@label \__zrefvario_vref_label:n - \__zrefvario_ref_opt_tl_get:xnN + \__zrefvario_ref_opt_tl_get:enN { \l__zrefvario_ref_language_tl } { reftextfaceafter } \reftextfaceafter - \__zrefvario_ref_opt_tl_get:xnN + \__zrefvario_ref_opt_tl_get:enN { \l__zrefvario_ref_language_tl } { reftextfacebefore } \reftextfacebefore - \__zrefvario_ref_opt_tl_get:xnN + \__zrefvario_ref_opt_tl_get:enN { \l__zrefvario_ref_language_tl } { reftextafter } \reftextafter - \__zrefvario_ref_opt_tl_get:xnN + \__zrefvario_ref_opt_tl_get:enN { \l__zrefvario_ref_language_tl } { reftextbefore } \reftextbefore - \__zrefvario_ref_opt_tl_get:xnN + \__zrefvario_ref_opt_tl_get:enN { \l__zrefvario_ref_language_tl } { reftextcurrent } \reftextcurrent - \__zrefvario_ref_opt_cs_get:xnnN + \__zrefvario_ref_opt_cs_get:ennN { \l__zrefvario_ref_language_tl } { reftextfaraway } { n } \reftextfaraway - \__zrefvario_ref_opt_cs_get:xnnN + \__zrefvario_ref_opt_cs_get:ennN { \l__zrefvario_ref_language_tl } { reftextpagerange } { nn } \reftextpagerange - \__zrefvario_ref_opt_cs_get:xnnN + \__zrefvario_ref_opt_cs_get:ennN { \l__zrefvario_ref_language_tl } { reftextlabelrange } { nn } \reftextlabelrange - \__zrefvario_ref_opt_cs_get:xnnN + \__zrefvario_ref_opt_cs_get:ennN { \l__zrefvario_ref_language_tl } { vrefformat } { nn } \vrefformat - \__zrefvario_ref_opt_cs_get:xnnN + \__zrefvario_ref_opt_cs_get:ennN { \l__zrefvario_ref_language_tl } { vrefrangeformat } { nnn } \vrefrangeformat - \__zrefvario_ref_opt_cs_get:xnnN + \__zrefvario_ref_opt_cs_get:ennN { \l__zrefvario_ref_language_tl } { fullrefformat } { n } \fullrefformat @@ -561,9 +572,9 @@ { \l__zrefvario_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__zrefvario_tmpa_tl { \the\c@vrcnt @vr } + \vrefpagenum \l__zrefvario_tmpb_tl {#1} + \tl_if_eq:NNT \l__zrefvario_tmpa_tl \l__zrefvario_tmpb_tl { \zrefcheck_zrefvario_run_check_on_label:Vn \l__zrefvario_vcheck_tl {#1} @@ -622,12 +633,12 @@ { \l__zrefvario_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__zrefvario_tmpa_tl {#1} + \vrefpagenum \l__zrefvario_tmpb_tl {#2} + \tl_if_eq:NNT \l__zrefvario_tmpa_tl \l__zrefvario_tmpb_tl { - \vref@pagenum \l_tmpa_tl { \the\c@vrcnt @vr } - \tl_if_eq:NNT \l_tmpa_tl \l_tmpb_tl + \vref@pagenum \l__zrefvario_tmpa_tl { \the\c@vrcnt @vr } + \tl_if_eq:NNT \l__zrefvario_tmpa_tl \l__zrefvario_tmpb_tl { \zrefcheck_zrefvario_run_check_on_label:Vn \l__zrefvario_vcheck_tl {#1} diff --git a/Master/tlpkg/bin/c2lx b/Master/tlpkg/bin/c2lx index c91f99f587c..3dcb982fe58 100755 --- a/Master/tlpkg/bin/c2lx +++ b/Master/tlpkg/bin/c2lx @@ -38,12 +38,15 @@ elif test "x$1" = xjxu; then shift; label=jxu pkgs="beaulivre colorist einfart lebhart mindflow minimalist simplivre" pkgs="$pkgs create-theorem crefthe projlib q-and-a" +elif test "x$1" = xminim-all; then + shift; label=minim + pkgs="minim-hatching minim-math minim-mp minim-pdf minim-xmp minim" elif test "x$1" = xqyi; then shift; label=qyi pkgs="easybook spbmark" -elif test "x$1" = xminim-all; then - shift; label=minim - pkgs="minim-hatching minim-math minim-mp minim-pdf minim-xmp minim" +elif test "x$1" = xzref-all; then + shift; label=zref + pkgs="zref-check zref-clever zref-vario" else echo "$0: unknown latex or group type: $1" >&2 echo "$0: must be one of: e dev 3 deng jxu qyi minim-all" >&2 |