diff options
author | Norbert Preining <norbert@preining.info> | 2024-03-15 03:06:35 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-03-15 03:06:35 +0000 |
commit | 12679ab7d3c2a210f4123163671b532b8b55d5f9 (patch) | |
tree | 0060d13467186ad977f4e73488ee20dd6c0017ab /macros/latex/contrib/l3kernel | |
parent | 62170822e034fdd3f81de7274835d0d3b0467100 (diff) |
CTAN sync 202403150306
Diffstat (limited to 'macros/latex/contrib/l3kernel')
90 files changed, 634 insertions, 441 deletions
diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md index eed4b5c3e1..9c8c4d506c 100644 --- a/macros/latex/contrib/l3kernel/CHANGELOG.md +++ b/macros/latex/contrib/l3kernel/CHANGELOG.md @@ -7,6 +7,19 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2024-03-14] + +### Added +- Macro interface for `l3sys-query` + +### Changed +- Require that `expl3` is loaded at top level in generic mode +- Ensure that the dimension arguments to `\box_autosize_to_...:Nnn` + are properly formed (issue \#1502) + +### Fixed +- Typeset `TF` of internal conditionals in current color (issue \#730) +- Some functions and variables were defined locally ## [2024-02-20] ### Changed @@ -1687,7 +1700,8 @@ this project uses date-based 'snapshot' version identifiers. - Step functions have been added for dim variables, e.g. `\dim_step_inline:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2024-02-20...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2024-03-14...HEAD +[2024-03-14]: https://github.com/latex3/latex3/compare/2024-02-20...2024-03-14 [2024-02-20]: https://github.com/latex3/latex3/compare/2024-02-18...2024-02-20 [2024-02-18]: https://github.com/latex3/latex3/compare/2024-02-13...2024-02-18 [2024-02-13]: https://github.com/latex3/latex3/compare/2024-01-22...2024-02-13 diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md index 93cd009b56..8ef94a41ac 100644 --- a/macros/latex/contrib/l3kernel/README.md +++ b/macros/latex/contrib/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2024-02-20 +Release 2024-03-14 Overview -------- diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx index 2c3f5f892a..76ef8ec919 100644 --- a/macros/latex/contrib/l3kernel/expl3.dtx +++ b/macros/latex/contrib/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> %</driver|generic|package|2ekernel> -\def\ExplFileDate{2024-02-20}% +\def\ExplFileDate{2024-03-14}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -1695,6 +1695,16 @@ {\ExplFileDate\space L3 programming layer}% % \end{macrocode} % +% \begin{macrocode} +\ifnum\currentgrouplevel=0 % +\else + \errhelp{expl3 cannot be loaded inside a group: + reading the code has been aborted.}% + \errmessage{expl3 Error: Loading attempted inside a group!}% + \expandafter\endinput +\fi +% \end{macrocode} +% % \begin{variable}[int]{\l@expl@tidy@tl} % Save the category code of |@| and then set it to \enquote{letter}. % \begin{macrocode} diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf Binary files differindex 8468634aee..b36343153a 100644 --- a/macros/latex/contrib/l3kernel/expl3.pdf +++ b/macros/latex/contrib/l3kernel/expl3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf Binary files differindex 973d529575..1df60adf1a 100644 --- a/macros/latex/contrib/l3kernel/interface3.pdf +++ b/macros/latex/contrib/l3kernel/interface3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex index 985ab25097..ff8114028e 100644 --- a/macros/latex/contrib/l3kernel/interface3.tex +++ b/macros/latex/contrib/l3kernel/interface3.tex @@ -58,7 +58,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2024-02-20} +\date{Released 2024-03-14} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx index 67bd4b8791..66e999fe62 100644 --- a/macros/latex/contrib/l3kernel/l3basics.dtx +++ b/macros/latex/contrib/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -1047,7 +1047,7 @@ % \texttt{n} arguments may be an unbraced single token % (\emph{i.e.}~an \texttt{N} argument). % \begin{texnote} -% These are equivalent to \LaTeXe{}'s \tn{@gobble}, \tn{@gobbbletwo}, +% These are equivalent to \LaTeXe{}'s \tn{@gobble}, \tn{@gobbletwo}, % \emph{etc.} % \end{texnote} % \end{function} @@ -1387,17 +1387,17 @@ % } % Then some conditionals. % \begin{macrocode} -\tex_let:D \if_true: \tex_iftrue:D -\tex_let:D \if_false: \tex_iffalse:D -\tex_let:D \or: \tex_or:D -\tex_let:D \else: \tex_else:D -\tex_let:D \fi: \tex_fi:D -\tex_let:D \reverse_if:N \tex_unless:D -\tex_let:D \if:w \tex_if:D -\tex_let:D \if_charcode:w \tex_if:D -\tex_let:D \if_catcode:w \tex_ifcat:D -\tex_let:D \if_meaning:w \tex_ifx:D -\tex_let:D \if_bool:N \tex_ifodd:D +\tex_global:D \tex_let:D \if_true: \tex_iftrue:D +\tex_global:D \tex_let:D \if_false: \tex_iffalse:D +\tex_global:D \tex_let:D \or: \tex_or:D +\tex_global:D \tex_let:D \else: \tex_else:D +\tex_global:D \tex_let:D \fi: \tex_fi:D +\tex_global:D \tex_let:D \reverse_if:N \tex_unless:D +\tex_global:D \tex_let:D \if:w \tex_if:D +\tex_global:D \tex_let:D \if_charcode:w \tex_if:D +\tex_global:D \tex_let:D \if_catcode:w \tex_ifcat:D +\tex_global:D \tex_let:D \if_meaning:w \tex_ifx:D +\tex_global:D \tex_let:D \if_bool:N \tex_ifodd:D % \end{macrocode} % \end{macro} % @@ -1410,20 +1410,20 @@ % } % \TeX{} lets us detect some if its modes. % \begin{macrocode} -\tex_let:D \if_mode_math: \tex_ifmmode:D -\tex_let:D \if_mode_horizontal: \tex_ifhmode:D -\tex_let:D \if_mode_vertical: \tex_ifvmode:D -\tex_let:D \if_mode_inner: \tex_ifinner:D +\tex_global:D \tex_let:D \if_mode_math: \tex_ifmmode:D +\tex_global:D \tex_let:D \if_mode_horizontal: \tex_ifhmode:D +\tex_global:D \tex_let:D \if_mode_vertical: \tex_ifvmode:D +\tex_global:D \tex_let:D \if_mode_inner: \tex_ifinner:D % \end{macrocode} % \end{macro} % % \begin{macro}[EXP]{\if_cs_exist:N, \if_cs_exist:w, \cs:w, \cs_end:} % Building csnames and testing if control sequences exist. % \begin{macrocode} -\tex_let:D \if_cs_exist:N \tex_ifdefined:D -\tex_let:D \if_cs_exist:w \tex_ifcsname:D -\tex_let:D \cs:w \tex_csname:D -\tex_let:D \cs_end: \tex_endcsname:D +\tex_global:D \tex_let:D \if_cs_exist:N \tex_ifdefined:D +\tex_global:D \tex_let:D \if_cs_exist:w \tex_ifcsname:D +\tex_global:D \tex_let:D \cs:w \tex_csname:D +\tex_global:D \tex_let:D \cs_end: \tex_endcsname:D % \end{macrocode} % \end{macro} % @@ -1431,28 +1431,28 @@ % The five |\exp_| functions are used in the \pkg{l3expan} module % where they are described. % \begin{macrocode} -\tex_let:D \exp_after:wN \tex_expandafter:D -\tex_let:D \exp_not:N \tex_noexpand:D -\tex_let:D \exp_not:n \tex_unexpanded:D -\tex_let:D \exp:w \tex_romannumeral:D -\tex_chardef:D \exp_end: = 0 ~ +\tex_global:D \tex_let:D \exp_after:wN \tex_expandafter:D +\tex_global:D \tex_let:D \exp_not:N \tex_noexpand:D +\tex_global:D \tex_let:D \exp_not:n \tex_unexpanded:D +\tex_global:D \tex_let:D \exp:w \tex_romannumeral:D +\tex_global:D \tex_chardef:D \exp_end: = 0 ~ % \end{macrocode} % \end{macro} % % \begin{macro}[EXP]{\token_to_meaning:N, \cs_meaning:N} % Examining a control sequence or token. % \begin{macrocode} -\tex_let:D \token_to_meaning:N \tex_meaning:D -\tex_let:D \cs_meaning:N \tex_meaning:D +\tex_global:D \tex_let:D \token_to_meaning:N \tex_meaning:D +\tex_global:D \tex_let:D \cs_meaning:N \tex_meaning:D % \end{macrocode} % \end{macro} % % \begin{macro}[EXP]{\tl_to_str:n, \token_to_str:N, \__kernel_tl_to_str:w} % Making strings. % \begin{macrocode} -\tex_let:D \tl_to_str:n \tex_detokenize:D -\tex_let:D \token_to_str:N \tex_string:D -\tex_let:D \__kernel_tl_to_str:w \tex_detokenize:D +\tex_global:D \tex_let:D \tl_to_str:n \tex_detokenize:D +\tex_global:D \tex_let:D \token_to_str:N \tex_string:D +\tex_global:D \tex_let:D \__kernel_tl_to_str:w \tex_detokenize:D % \end{macrocode} % \end{macro} % @@ -1461,9 +1461,9 @@ % versions that are safe inside alignments. These safe versions are % defined in the \pkg{l3prg} module. % \begin{macrocode} -\tex_let:D \scan_stop: \tex_relax:D -\tex_let:D \group_begin: \tex_begingroup:D -\tex_let:D \group_end: \tex_endgroup:D +\tex_global:D \tex_let:D \scan_stop: \tex_relax:D +\tex_global:D \tex_let:D \group_begin: \tex_begingroup:D +\tex_global:D \tex_let:D \group_end: \tex_endgroup:D % \end{macrocode} % \end{macro} % @@ -1474,24 +1474,24 @@ % \begin{macro}[EXP]{\if_int_compare:w, \@@_to_roman:w} % For integers. % \begin{macrocode} -\tex_let:D \if_int_compare:w \tex_ifnum:D -\tex_let:D \@@_to_roman:w \tex_romannumeral:D +\tex_global:D \tex_let:D \if_int_compare:w \tex_ifnum:D +\tex_global:D \tex_let:D \@@_to_roman:w \tex_romannumeral:D % \end{macrocode} % \end{macro} % % \begin{macro}{\group_insert_after:N} % Adding material after the end of a group. % \begin{macrocode} -\tex_let:D \group_insert_after:N \tex_aftergroup:D +\tex_global:D \tex_let:D \group_insert_after:N \tex_aftergroup:D % \end{macrocode} % \end{macro} % % \begin{macro}[EXP]{\exp_args:Nc, \exp_args:cc} % Discussed in \pkg{l3expan}, but needed much earlier. % \begin{macrocode} -\tex_long:D \tex_def:D \exp_args:Nc #1#2 +\tex_long:D \tex_gdef:D \exp_args:Nc #1#2 { \exp_after:wN #1 \cs:w #2 \cs_end: } -\tex_long:D \tex_def:D \exp_args:cc #1#2 +\tex_long:D \tex_gdef:D \exp_args:cc #1#2 { \cs:w #1 \exp_after:wN \cs_end: \cs:w #2 \cs_end: } % \end{macrocode} % \end{macro} @@ -1505,8 +1505,8 @@ % are used. The \cs{cs_meaning:c} command must check for an undefined % control sequence to avoid defining it mistakenly. % \begin{macrocode} -\tex_def:D \token_to_str:c { \exp_args:Nc \token_to_str:N } -\tex_long:D \tex_def:D \cs_meaning:c #1 +\tex_gdef:D \token_to_str:c { \exp_args:Nc \token_to_str:N } +\tex_long:D \tex_gdef:D \cs_meaning:c #1 { \if_cs_exist:w #1 \cs_end: \exp_after:wN \use_i:nn @@ -1516,7 +1516,7 @@ { \exp_args:Nc \cs_meaning:N {#1} } { \tl_to_str:n {undefined} } } -\tex_let:D \token_to_meaning:c = \cs_meaning:c +\tex_global:D \tex_let:D \token_to_meaning:c = \cs_meaning:c % \end{macrocode} % \end{macro} % @@ -1531,7 +1531,7 @@ % required but it can't be used until the allocation has been set % up properly! % \begin{macrocode} -\tex_chardef:D \c_zero_int = 0 ~ +\tex_global:D \tex_chardef:D \c_zero_int = 0 ~ % \end{macrocode} % \end{variable} % @@ -1542,12 +1542,12 @@ % more registers available than \eTeX{}. % \begin{macrocode} \tex_ifdefined:D \tex_luatexversion:D - \tex_chardef:D \c_max_register_int = 65 535 ~ + \tex_global:D \tex_chardef:D \c_max_register_int = 65 535 ~ \tex_else:D \tex_ifdefined:D \tex_omathchardef:D - \tex_omathchardef:D \c_max_register_int = 65535 ~ + \tex_global:D \tex_omathchardef:D \c_max_register_int = 65535 ~ \tex_else:D - \tex_mathchardef:D \c_max_register_int = 32767 ~ + \tex_global:D \tex_mathchardef:D \c_max_register_int = 32767 ~ \tex_fi:D \tex_fi:D % \end{macrocode} @@ -1556,39 +1556,7 @@ % \subsection{Defining functions} % % We start by providing functions for the typical definition -% functions. First the local ones. -% -% \begin{macro} -% { -% \cs_set_nopar:Npn , \cs_set_nopar:Npe , \cs_set_nopar:Npx , -% \cs_set:Npn , \cs_set:Npe , \cs_set:Npx , -% \cs_set_protected_nopar:Npn , \cs_set_protected_nopar:Npe , \cs_set_protected_nopar:Npx , -% \cs_set_protected:Npn , \cs_set_protected:Npe , \cs_set_protected:Npx -% } -% All assignment functions in \LaTeX3 should be naturally protected; -% after all, the \TeX{} primitives for assignments are and it can be -% a cause of problems if others aren't. -% \begin{macrocode} -\tex_let:D \cs_set_nopar:Npn \tex_def:D -\tex_let:D \cs_set_nopar:Npe \tex_edef:D -\tex_let:D \cs_set_nopar:Npx \tex_edef:D -\tex_protected:D \tex_long:D \tex_def:D \cs_set:Npn - { \tex_long:D \tex_def:D } -\tex_protected:D \tex_long:D \tex_def:D \cs_set:Npe - { \tex_long:D \tex_edef:D } -\tex_let:D \cs_set:Npx \cs_set:Npe -\tex_protected:D \tex_long:D \tex_def:D \cs_set_protected_nopar:Npn - { \tex_protected:D \tex_def:D } -\tex_protected:D \tex_long:D \tex_def:D \cs_set_protected_nopar:Npe - { \tex_protected:D \tex_edef:D } -\tex_let:D \cs_set_protected_nopar:Npx \cs_set_protected_nopar:Npe -\tex_protected:D \tex_long:D \tex_def:D \cs_set_protected:Npn - { \tex_protected:D \tex_long:D \tex_def:D } -\tex_protected:D \tex_long:D \tex_def:D \cs_set_protected:Npe - { \tex_protected:D \tex_long:D \tex_edef:D } -\tex_let:D \cs_set_protected:Npx \cs_set_protected:Npe -% \end{macrocode} -% \end{macro} +% functions. First the global ones. % % \begin{macro} % { @@ -1597,26 +1565,58 @@ % \cs_gset_protected_nopar:Npn , \cs_gset_protected_nopar:Npe , \cs_gset_protected_nopar:Npx , % \cs_gset_protected:Npn , \cs_gset_protected:Npe , \cs_gset_protected:Npx % } -% Global versions of the above functions. +% All assignment functions in \LaTeX3 should be naturally protected; +% after all, the \TeX{} primitives for assignments are and it can be +% a cause of problems if others aren't. % \begin{macrocode} -\tex_let:D \cs_gset_nopar:Npn \tex_gdef:D -\tex_let:D \cs_gset_nopar:Npe \tex_xdef:D -\tex_let:D \cs_gset_nopar:Npx \tex_xdef:D -\cs_set_protected:Npn \cs_gset:Npn +\tex_global:D \tex_let:D \cs_gset_nopar:Npn \tex_gdef:D +\tex_global:D \tex_let:D \cs_gset_nopar:Npe \tex_xdef:D +\tex_global:D \tex_let:D \cs_gset_nopar:Npx \tex_xdef:D +\tex_protected:D \tex_long:D \tex_gdef:D \cs_gset:Npn { \tex_long:D \tex_gdef:D } -\cs_set_protected:Npn \cs_gset:Npe +\tex_protected:D \tex_long:D \tex_gdef:D \cs_gset:Npe { \tex_long:D \tex_xdef:D } -\tex_let:D \cs_gset:Npx \cs_gset:Npe -\cs_set_protected:Npn \cs_gset_protected_nopar:Npn +\tex_global:D \tex_let:D \cs_gset:Npx \cs_gset:Npe +\tex_protected:D \tex_long:D \tex_gdef:D \cs_gset_protected_nopar:Npn { \tex_protected:D \tex_gdef:D } -\cs_set_protected:Npn \cs_gset_protected_nopar:Npe +\tex_protected:D \tex_long:D \tex_gdef:D \cs_gset_protected_nopar:Npe { \tex_protected:D \tex_xdef:D } -\tex_let:D \cs_gset_protected_nopar:Npx \cs_gset_protected_nopar:Npe -\cs_set_protected:Npn \cs_gset_protected:Npn +\tex_global:D \tex_let:D \cs_gset_protected_nopar:Npx \cs_gset_protected_nopar:Npe +\tex_protected:D \tex_long:D \tex_gdef:D \cs_gset_protected:Npn { \tex_protected:D \tex_long:D \tex_gdef:D } -\cs_set_protected:Npn \cs_gset_protected:Npe +\tex_protected:D \tex_long:D \tex_gdef:D \cs_gset_protected:Npe { \tex_protected:D \tex_long:D \tex_xdef:D } -\tex_let:D \cs_gset_protected:Npx \cs_gset_protected:Npe +\tex_global:D \tex_let:D \cs_gset_protected:Npx \cs_gset_protected:Npe +% \end{macrocode} +% \end{macro} +% +% \begin{macro} +% { +% \cs_set_nopar:Npn , \cs_set_nopar:Npe , \cs_set_nopar:Npx , +% \cs_set:Npn , \cs_set:Npe , \cs_set:Npx , +% \cs_set_protected_nopar:Npn , \cs_set_protected_nopar:Npe , \cs_set_protected_nopar:Npx , +% \cs_set_protected:Npn , \cs_set_protected:Npe , \cs_set_protected:Npx +% } +% Local versions of the above functions. +% \begin{macrocode} +\tex_global:D \tex_let:D \cs_set_nopar:Npn \tex_def:D +\tex_global:D \tex_let:D \cs_set_nopar:Npe \tex_edef:D +\tex_global:D \tex_let:D \cs_set_nopar:Npx \tex_edef:D +\cs_gset_protected:Npn \cs_set:Npn + { \tex_long:D \tex_def:D } +\cs_gset_protected:Npn \cs_set:Npe + { \tex_long:D \tex_edef:D } +\tex_global:D \tex_let:D \cs_set:Npx \cs_set:Npe +\cs_gset_protected:Npn \cs_set_protected_nopar:Npn + { \tex_protected:D \tex_def:D } +\cs_gset_protected:Npn \cs_set_protected_nopar:Npe + { \tex_protected:D \tex_edef:D } +\tex_global:D \tex_let:D \cs_set_protected_nopar:Npx \cs_set_protected_nopar:Npe +\cs_gset_protected:Npn \cs_set_protected:Npn + { \tex_protected:D \tex_long:D \tex_def:D } +\cs_gset_protected:Npn \cs_set_protected:Npe + { \tex_protected:D \tex_long:D \tex_edef:D } +\tex_global:D \tex_let:D \cs_set_protected:Npx \cs_set_protected:Npe % \end{macrocode} % \end{macro} % @@ -1631,14 +1631,14 @@ % used in defining conditionals. We don't use |tl| methods because % \pkg{l3basics} is loaded earlier. % \begin{macrocode} -\cs_set_nopar:Npn \l_@@_internal_tl { } +\cs_gset_nopar:Npn \l_@@_internal_tl { } % \end{macrocode} % \end{variable} % % \begin{macro}[EXP]{\use:c} % This macro grabs its argument and returns a csname from it. % \begin{macrocode} -\cs_set:Npn \use:c #1 { \cs:w #1 \cs_end: } +\cs_gset:Npn \use:c #1 { \cs:w #1 \cs_end: } % \end{macrocode} % \end{macro} % @@ -1646,7 +1646,7 @@ % Fully expands its argument and passes it to the input stream. Uses % the reserved \cs{l_@@_internal_tl} which we've set up above. % \begin{macrocode} -\cs_set_protected:Npn \use:x #1 +\cs_gset_protected:Npn \use:x #1 { \cs_set_nopar:Npx \l_@@_internal_tl {#1} \l_@@_internal_tl @@ -1660,7 +1660,7 @@ % % \begin{macro}[EXP]{\use:e} % \begin{macrocode} -\cs_set:Npn \use:e #1 { \tex_expanded:D {#1} } +\cs_gset:Npn \use:e #1 { \tex_expanded:D {#1} } % \end{macrocode} % \end{macro} % @@ -1672,18 +1672,18 @@ % These macros grab their arguments and return them back to the input % (with outer braces removed). % \begin{macrocode} -\cs_set:Npn \use:n #1 {#1} -\cs_set:Npn \use:nn #1#2 {#1#2} -\cs_set:Npn \use:nnn #1#2#3 {#1#2#3} -\cs_set:Npn \use:nnnn #1#2#3#4 {#1#2#3#4} +\cs_gset:Npn \use:n #1 {#1} +\cs_gset:Npn \use:nn #1#2 {#1#2} +\cs_gset:Npn \use:nnn #1#2#3 {#1#2#3} +\cs_gset:Npn \use:nnnn #1#2#3#4 {#1#2#3#4} % \end{macrocode} % \end{macro} % % \begin{macro}[EXP]{\use_i:nn, \use_ii:nn} % The equivalent to \LaTeXe{}'s \tn{@firstoftwo} and \tn{@secondoftwo}. % \begin{macrocode} -\cs_set:Npn \use_i:nn #1#2 {#1} -\cs_set:Npn \use_ii:nn #1#2 {#2} +\cs_gset:Npn \use_i:nn #1#2 {#1} +\cs_gset:Npn \use_ii:nn #1#2 {#2} % \end{macrocode} % \end{macro} % @@ -1705,60 +1705,60 @@ % } % We also need something for picking up arguments from a longer list. % \begin{macrocode} -\cs_set:Npn \use_i:nnn #1#2#3 {#1} -\cs_set:Npn \use_ii:nnn #1#2#3 {#2} -\cs_set:Npn \use_iii:nnn #1#2#3 {#3} -\cs_set:Npn \use_i:nnnn #1#2#3#4 {#1} -\cs_set:Npn \use_ii:nnnn #1#2#3#4 {#2} -\cs_set:Npn \use_iii:nnnn #1#2#3#4 {#3} -\cs_set:Npn \use_iv:nnnn #1#2#3#4 {#4} -\cs_set:Npn \use_i:nnnnn #1#2#3#4#5 {#1} -\cs_set:Npn \use_ii:nnnnn #1#2#3#4#5 {#2} -\cs_set:Npn \use_iii:nnnnn #1#2#3#4#5 {#3} -\cs_set:Npn \use_iv:nnnnn #1#2#3#4#5 {#4} -\cs_set:Npn \use_v:nnnnn #1#2#3#4#5 {#5} -\cs_set:Npn \use_i:nnnnnn #1#2#3#4#5#6 {#1} -\cs_set:Npn \use_ii:nnnnnn #1#2#3#4#5#6 {#2} -\cs_set:Npn \use_iii:nnnnnn #1#2#3#4#5#6 {#3} -\cs_set:Npn \use_iv:nnnnnn #1#2#3#4#5#6 {#4} -\cs_set:Npn \use_v:nnnnnn #1#2#3#4#5#6 {#5} -\cs_set:Npn \use_vi:nnnnnn #1#2#3#4#5#6 {#6} -\cs_set:Npn \use_i:nnnnnnn #1#2#3#4#5#6#7 {#1} -\cs_set:Npn \use_ii:nnnnnnn #1#2#3#4#5#6#7 {#2} -\cs_set:Npn \use_iii:nnnnnnn #1#2#3#4#5#6#7 {#3} -\cs_set:Npn \use_iv:nnnnnnn #1#2#3#4#5#6#7 {#4} -\cs_set:Npn \use_v:nnnnnnn #1#2#3#4#5#6#7 {#5} -\cs_set:Npn \use_vi:nnnnnnn #1#2#3#4#5#6#7 {#6} -\cs_set:Npn \use_vii:nnnnnnn #1#2#3#4#5#6#7 {#7} -\cs_set:Npn \use_i:nnnnnnnn #1#2#3#4#5#6#7#8 {#1} -\cs_set:Npn \use_ii:nnnnnnnn #1#2#3#4#5#6#7#8 {#2} -\cs_set:Npn \use_iii:nnnnnnnn #1#2#3#4#5#6#7#8 {#3} -\cs_set:Npn \use_iv:nnnnnnnn #1#2#3#4#5#6#7#8 {#4} -\cs_set:Npn \use_v:nnnnnnnn #1#2#3#4#5#6#7#8 {#5} -\cs_set:Npn \use_vi:nnnnnnnn #1#2#3#4#5#6#7#8 {#6} -\cs_set:Npn \use_vii:nnnnnnnn #1#2#3#4#5#6#7#8 {#7} -\cs_set:Npn \use_viii:nnnnnnnn #1#2#3#4#5#6#7#8 {#8} -\cs_set:Npn \use_i:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#1} -\cs_set:Npn \use_ii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#2} -\cs_set:Npn \use_iii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#3} -\cs_set:Npn \use_iv:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#4} -\cs_set:Npn \use_v:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#5} -\cs_set:Npn \use_vi:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#6} -\cs_set:Npn \use_vii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#7} -\cs_set:Npn \use_viii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#8} -\cs_set:Npn \use_ix:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#9} +\cs_gset:Npn \use_i:nnn #1#2#3 {#1} +\cs_gset:Npn \use_ii:nnn #1#2#3 {#2} +\cs_gset:Npn \use_iii:nnn #1#2#3 {#3} +\cs_gset:Npn \use_i:nnnn #1#2#3#4 {#1} +\cs_gset:Npn \use_ii:nnnn #1#2#3#4 {#2} +\cs_gset:Npn \use_iii:nnnn #1#2#3#4 {#3} +\cs_gset:Npn \use_iv:nnnn #1#2#3#4 {#4} +\cs_gset:Npn \use_i:nnnnn #1#2#3#4#5 {#1} +\cs_gset:Npn \use_ii:nnnnn #1#2#3#4#5 {#2} +\cs_gset:Npn \use_iii:nnnnn #1#2#3#4#5 {#3} +\cs_gset:Npn \use_iv:nnnnn #1#2#3#4#5 {#4} +\cs_gset:Npn \use_v:nnnnn #1#2#3#4#5 {#5} +\cs_gset:Npn \use_i:nnnnnn #1#2#3#4#5#6 {#1} +\cs_gset:Npn \use_ii:nnnnnn #1#2#3#4#5#6 {#2} +\cs_gset:Npn \use_iii:nnnnnn #1#2#3#4#5#6 {#3} +\cs_gset:Npn \use_iv:nnnnnn #1#2#3#4#5#6 {#4} +\cs_gset:Npn \use_v:nnnnnn #1#2#3#4#5#6 {#5} +\cs_gset:Npn \use_vi:nnnnnn #1#2#3#4#5#6 {#6} +\cs_gset:Npn \use_i:nnnnnnn #1#2#3#4#5#6#7 {#1} +\cs_gset:Npn \use_ii:nnnnnnn #1#2#3#4#5#6#7 {#2} +\cs_gset:Npn \use_iii:nnnnnnn #1#2#3#4#5#6#7 {#3} +\cs_gset:Npn \use_iv:nnnnnnn #1#2#3#4#5#6#7 {#4} +\cs_gset:Npn \use_v:nnnnnnn #1#2#3#4#5#6#7 {#5} +\cs_gset:Npn \use_vi:nnnnnnn #1#2#3#4#5#6#7 {#6} +\cs_gset:Npn \use_vii:nnnnnnn #1#2#3#4#5#6#7 {#7} +\cs_gset:Npn \use_i:nnnnnnnn #1#2#3#4#5#6#7#8 {#1} +\cs_gset:Npn \use_ii:nnnnnnnn #1#2#3#4#5#6#7#8 {#2} +\cs_gset:Npn \use_iii:nnnnnnnn #1#2#3#4#5#6#7#8 {#3} +\cs_gset:Npn \use_iv:nnnnnnnn #1#2#3#4#5#6#7#8 {#4} +\cs_gset:Npn \use_v:nnnnnnnn #1#2#3#4#5#6#7#8 {#5} +\cs_gset:Npn \use_vi:nnnnnnnn #1#2#3#4#5#6#7#8 {#6} +\cs_gset:Npn \use_vii:nnnnnnnn #1#2#3#4#5#6#7#8 {#7} +\cs_gset:Npn \use_viii:nnnnnnnn #1#2#3#4#5#6#7#8 {#8} +\cs_gset:Npn \use_i:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#1} +\cs_gset:Npn \use_ii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#2} +\cs_gset:Npn \use_iii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#3} +\cs_gset:Npn \use_iv:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#4} +\cs_gset:Npn \use_v:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#5} +\cs_gset:Npn \use_vi:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#6} +\cs_gset:Npn \use_vii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#7} +\cs_gset:Npn \use_viii:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#8} +\cs_gset:Npn \use_ix:nnnnnnnnn #1#2#3#4#5#6#7#8#9 {#9} % \end{macrocode} % \end{macro} % % \begin{macro}[EXP]{\use_i_ii:nnn} % \begin{macrocode} -\cs_set:Npn \use_i_ii:nnn #1#2#3 {#1#2} +\cs_gset:Npn \use_i_ii:nnn #1#2#3 {#1#2} % \end{macrocode} % \end{macro} % % \begin{macro}[EXP]{\use_ii_i:nn} % \begin{macrocode} -\cs_set:Npn \use_ii_i:nn #1#2 { #2 #1 } +\cs_gset:Npn \use_ii_i:nn #1#2 { #2 #1 } % \end{macrocode} % \end{macro} % @@ -1772,9 +1772,9 @@ % Functions that gobble everything until they see either \cs{q_nil}, % \cs{q_stop}, or \cs{q_recursion_stop}, respectively. % \begin{macrocode} -\cs_set:Npn \use_none_delimit_by_q_nil:w #1 \q_nil { } -\cs_set:Npn \use_none_delimit_by_q_stop:w #1 \q_stop { } -\cs_set:Npn \use_none_delimit_by_q_recursion_stop:w #1 \q_recursion_stop { } +\cs_gset:Npn \use_none_delimit_by_q_nil:w #1 \q_nil { } +\cs_gset:Npn \use_none_delimit_by_q_stop:w #1 \q_stop { } +\cs_gset:Npn \use_none_delimit_by_q_recursion_stop:w #1 \q_recursion_stop { } % \end{macrocode} % \end{macro} % @@ -1788,9 +1788,9 @@ % when you need to skip the rest of a mapping sequence but want an % easy way to control what should be expanded next. % \begin{macrocode} -\cs_set:Npn \use_i_delimit_by_q_nil:nw #1#2 \q_nil {#1} -\cs_set:Npn \use_i_delimit_by_q_stop:nw #1#2 \q_stop {#1} -\cs_set:Npn \use_i_delimit_by_q_recursion_stop:nw +\cs_gset:Npn \use_i_delimit_by_q_nil:nw #1#2 \q_nil {#1} +\cs_gset:Npn \use_i_delimit_by_q_stop:nw #1#2 \q_stop {#1} +\cs_gset:Npn \use_i_delimit_by_q_recursion_stop:nw #1#2 \q_recursion_stop {#1} % \end{macrocode} % \end{macro} @@ -1817,15 +1817,15 @@ % who will assume that expanding such a function once takes care % of gobbling all the tokens in one go. % \begin{macrocode} -\cs_set:Npn \use_none:n #1 { } -\cs_set:Npn \use_none:nn #1#2 { } -\cs_set:Npn \use_none:nnn #1#2#3 { } -\cs_set:Npn \use_none:nnnn #1#2#3#4 { } -\cs_set:Npn \use_none:nnnnn #1#2#3#4#5 { } -\cs_set:Npn \use_none:nnnnnn #1#2#3#4#5#6 { } -\cs_set:Npn \use_none:nnnnnnn #1#2#3#4#5#6#7 { } -\cs_set:Npn \use_none:nnnnnnnn #1#2#3#4#5#6#7#8 { } -\cs_set:Npn \use_none:nnnnnnnnn #1#2#3#4#5#6#7#8#9 { } +\cs_gset:Npn \use_none:n #1 { } +\cs_gset:Npn \use_none:nn #1#2 { } +\cs_gset:Npn \use_none:nnn #1#2#3 { } +\cs_gset:Npn \use_none:nnnn #1#2#3#4 { } +\cs_gset:Npn \use_none:nnnnn #1#2#3#4#5 { } +\cs_gset:Npn \use_none:nnnnnn #1#2#3#4#5#6 { } +\cs_gset:Npn \use_none:nnnnnnn #1#2#3#4#5#6#7 { } +\cs_gset:Npn \use_none:nnnnnnnn #1#2#3#4#5#6#7#8 { } +\cs_gset:Npn \use_none:nnnnnnnnn #1#2#3#4#5#6#7#8#9 { } % \end{macrocode} % \end{macro} % @@ -1840,20 +1840,20 @@ % up with guards. We can also more easily change the logic in one % place then. This is needed primarily for deprecations. % \begin{macrocode} -\cs_set_protected:Npn \__kernel_if_debug:TF #1#2 {#2} +\cs_gset_protected:Npn \__kernel_if_debug:TF #1#2 {#2} % \end{macrocode} % \end{macro} % % \begin{macro}{\debug_on:n, \debug_off:n} % Stubs. % \begin{macrocode} -\cs_set_protected:Npn \debug_on:n #1 +\cs_gset_protected:Npn \debug_on:n #1 { \sys_load_debug: \cs_if_exist:NT \@@_all_on: { \debug_on:n {#1} } } -\cs_set_protected:Npn \debug_off:n #1 +\cs_gset_protected:Npn \debug_off:n #1 { \sys_load_debug: \cs_if_exist:NT \@@_all_on: @@ -1864,8 +1864,8 @@ % % \begin{macro}{\debug_suspend:, \debug_resume:} % \begin{macrocode} -\cs_set_protected:Npn \debug_suspend: { } -\cs_set_protected:Npn \debug_resume: { } +\cs_gset_protected:Npn \debug_suspend: { } +\cs_gset_protected:Npn \debug_resume: { } % \end{macrocode} % \end{macro} % @@ -1875,9 +1875,9 @@ % only make these into errors if the user requests it. This relies on % two token lists, filled up in \pkg{l3deprecation}. % \begin{macrocode} -\cs_set_nopar:Npn \g_@@_deprecation_on_tl { } -\cs_set_nopar:Npn \g_@@_deprecation_off_tl { } -\cs_set_protected:Npn \__kernel_deprecation_code:nn #1#2 +\cs_gset_nopar:Npn \g_@@_deprecation_on_tl { } +\cs_gset_nopar:Npn \g_@@_deprecation_off_tl { } +\cs_gset_protected:Npn \__kernel_deprecation_code:nn #1#2 { \tl_gput_right:Nn \g_@@_deprecation_on_tl {#1} \tl_gput_right:Nn \g_@@_deprecation_off_tl {#2} @@ -1923,9 +1923,9 @@ % at least two tokens: see how the logical tests are actually implemented % to see this. % \begin{macrocode} -\cs_set:Npn \prg_return_true: +\cs_gset:Npn \prg_return_true: { \exp_after:wN \use_i:nn \exp:w } -\cs_set:Npn \prg_return_false: +\cs_gset:Npn \prg_return_false: { \exp_after:wN \use_ii:nn \exp:w} % \end{macrocode} % An extended state space could be implemented by including a more @@ -1936,7 +1936,7 @@ % \begin{macro}[EXP]{\@@_use_none_delimit_by_q_recursion_stop:w} % Private version of \cs{use_none_delimit_by_q_recursion_stop:w}. % \begin{macrocode} -\cs_set:Npn \@@_use_none_delimit_by_q_recursion_stop:w +\cs_gset:Npn \@@_use_none_delimit_by_q_recursion_stop:w #1 \q_@@_recursion_stop { } % \end{macrocode} % \end{macro} @@ -1962,19 +1962,19 @@ % conditionals. % Note that |e| stands for expandable and |p| for protected. % \begin{macrocode} -\cs_set_protected:Npn \prg_set_conditional:Npnn +\cs_gset_protected:Npn \prg_set_conditional:Npnn { \@@_generate_conditional_parm:NNNpnn \cs_set:Npn e } -\cs_set_protected:Npn \prg_gset_conditional:Npnn +\cs_gset_protected:Npn \prg_gset_conditional:Npnn { \@@_generate_conditional_parm:NNNpnn \cs_gset:Npn e } -\cs_set_protected:Npn \prg_new_conditional:Npnn +\cs_gset_protected:Npn \prg_new_conditional:Npnn { \@@_generate_conditional_parm:NNNpnn \cs_new:Npn e } -\cs_set_protected:Npn \prg_set_protected_conditional:Npnn +\cs_gset_protected:Npn \prg_set_protected_conditional:Npnn { \@@_generate_conditional_parm:NNNpnn \cs_set_protected:Npn p } -\cs_set_protected:Npn \prg_gset_protected_conditional:Npnn +\cs_gset_protected:Npn \prg_gset_protected_conditional:Npnn { \@@_generate_conditional_parm:NNNpnn \cs_gset_protected:Npn p } -\cs_set_protected:Npn \prg_new_protected_conditional:Npnn +\cs_gset_protected:Npn \prg_new_protected_conditional:Npnn { \@@_generate_conditional_parm:NNNpnn \cs_new_protected:Npn p } -\cs_set_protected:Npn \@@_generate_conditional_parm:NNNpnn #1#2#3#4# +\cs_gset_protected:Npn \@@_generate_conditional_parm:NNNpnn #1#2#3#4# { \use:e { @@ -2014,19 +2014,19 @@ % erroneous case where the function name contains no colon is captured % later. % \begin{macrocode} -\cs_set_protected:Npn \prg_set_conditional:Nnn +\cs_gset_protected:Npn \prg_set_conditional:Nnn { \@@_generate_conditional_count:NNNnn \cs_set:Npn e } -\cs_set_protected:Npn \prg_gset_conditional:Nnn +\cs_gset_protected:Npn \prg_gset_conditional:Nnn { \@@_generate_conditional_count:NNNnn \cs_set:Npn e } -\cs_set_protected:Npn \prg_new_conditional:Nnn +\cs_gset_protected:Npn \prg_new_conditional:Nnn { \@@_generate_conditional_count:NNNnn \cs_new:Npn e } -\cs_set_protected:Npn \prg_set_protected_conditional:Nnn +\cs_gset_protected:Npn \prg_set_protected_conditional:Nnn { \@@_generate_conditional_count:NNNnn \cs_set_protected:Npn p } -\cs_set_protected:Npn \prg_gset_protected_conditional:Nnn +\cs_gset_protected:Npn \prg_gset_protected_conditional:Nnn { \@@_generate_conditional_count:NNNnn \cs_gset_protected:Npn p } -\cs_set_protected:Npn \prg_new_protected_conditional:Nnn +\cs_gset_protected:Npn \prg_new_protected_conditional:Nnn { \@@_generate_conditional_count:NNNnn \cs_new_protected:Npn p } -\cs_set_protected:Npn \@@_generate_conditional_count:NNNnn #1#2#3 +\cs_gset_protected:Npn \@@_generate_conditional_count:NNNnn #1#2#3 { \use:e { @@ -2035,7 +2035,7 @@ } #1 #2 } -\cs_set_protected:Npn \@@_generate_conditional_count:nnNNNnn #1#2#3#4#5 +\cs_gset_protected:Npn \@@_generate_conditional_count:nnNNNnn #1#2#3#4#5 { \__kernel_cs_parm_from_arg_count:nnF { \@@_generate_conditional:nnNNNnnn {#1} {#2} #3 #4 #5 } @@ -2076,7 +2076,7 @@ % \cs{use_i:nn} instead of \cs{use_i_ii:nnn} to functions such as % \cs{@@_generate_p_form:wNNnnnnN}. % \begin{macrocode} -\cs_set_protected:Npn \@@_generate_conditional:nnNNNnnn #1#2#3#4#5#6#7#8 +\cs_gset_protected:Npn \@@_generate_conditional:nnNNNnnn #1#2#3#4#5#6#7#8 { \if_meaning:w \c_false_bool #3 \msg_error:nne { kernel } { missing-colon } @@ -2097,10 +2097,10 @@ \exp_not:n { , \q_@@_recursion_tail , \q_@@_recursion_stop } } } -\cs_set:Npn \@@_generate_conditional_test:w +\cs_gset:Npn \@@_generate_conditional_test:w #1 \prg_return_true: \else: \prg_return_false: \fi: \s_@@_mark #2 { #2 {#1} } -\cs_set:Npn \@@_generate_conditional_fast:nw #1#2 \exp_not:n #3 +\cs_gset:Npn \@@_generate_conditional_fast:nw #1#2 \exp_not:n #3 { \exp_not:n { {#1} \use_i:nn } } % \end{macrocode} % Looping through the list of desired forms. First are six arguments @@ -2111,7 +2111,7 @@ % then \cs{use_none:nnnnnnnn} cleans up. Otherwise, the % error message is removed by the variant form. % \begin{macrocode} -\cs_set_protected:Npn \@@_generate_conditional:NNnnnnNw #1#2#3#4#5#6#7#8 , +\cs_gset_protected:Npn \@@_generate_conditional:NNnnnnNw #1#2#3#4#5#6#7#8 , { \if_meaning:w \q_@@_recursion_tail #8 \exp_after:wN \@@_use_none_delimit_by_q_recursion_stop:w @@ -2158,7 +2158,7 @@ % but if those are actually missing, the recovery from the runaway argument % would not insert \cs{fi:} back, messing up nesting of conditionals. % \begin{macrocode} -\cs_set_protected:Npn \@@_generate_p_form:wNNnnnnN +\cs_gset_protected:Npn \@@_generate_p_form:wNNnnnnN #1 \s_@@_stop #2#3#4#5#6#7#8 { \if_meaning:w e #3 @@ -2177,7 +2177,7 @@ { \token_to_str:c { #4 _p: #5 } } } } -\cs_set_protected:Npn \@@_generate_T_form:wNNnnnnN +\cs_gset_protected:Npn \@@_generate_T_form:wNNnnnnN #1 \s_@@_stop #2#3#4#5#6#7#8 { #8 @@ -2185,7 +2185,7 @@ { { #7 \exp_end: \use:n \use_none:n } } { #7 \@@_T_true:w \fi: \use_none:n } } -\cs_set_protected:Npn \@@_generate_F_form:wNNnnnnN +\cs_gset_protected:Npn \@@_generate_F_form:wNNnnnnN #1 \s_@@_stop #2#3#4#5#6#7#8 { #8 @@ -2193,7 +2193,7 @@ { { #7 \exp_end: { } } } { #7 \@@_F_true:w \fi: \use:n } } -\cs_set_protected:Npn \@@_generate_TF_form:wNNnnnnN +\cs_gset_protected:Npn \@@_generate_TF_form:wNNnnnnN #1 \s_@@_stop #2#3#4#5#6#7#8 { #8 @@ -2201,10 +2201,10 @@ { { #7 \exp_end: } } { #7 \@@_TF_true:w \fi: \use_ii:nn } } -\cs_set:Npn \@@_p_true:w \fi: \c_false_bool { \fi: \c_true_bool } -\cs_set:Npn \@@_T_true:w \fi: \use_none:n { \fi: \use:n } -\cs_set:Npn \@@_F_true:w \fi: \use:n { \fi: \use_none:n } -\cs_set:Npn \@@_TF_true:w \fi: \use_ii:nn { \fi: \use_i:nn } +\cs_gset:Npn \@@_p_true:w \fi: \c_false_bool { \fi: \c_true_bool } +\cs_gset:Npn \@@_T_true:w \fi: \use_none:n { \fi: \use:n } +\cs_gset:Npn \@@_F_true:w \fi: \use:n { \fi: \use_none:n } +\cs_gset:Npn \@@_TF_true:w \fi: \use_ii:nn { \fi: \use_i:nn } % \end{macrocode} % \end{macro} % \end{macro} @@ -2223,13 +2223,13 @@ % |,| \cs{q_@@_recursion_stop} % to a first auxiliary. % \begin{macrocode} -\cs_set_protected:Npn \prg_set_eq_conditional:NNn +\cs_gset_protected:Npn \prg_set_eq_conditional:NNn { \@@_set_eq_conditional:NNNn \cs_set_eq:cc } -\cs_set_protected:Npn \prg_gset_eq_conditional:NNn +\cs_gset_protected:Npn \prg_gset_eq_conditional:NNn { \@@_set_eq_conditional:NNNn \cs_gset_eq:cc } -\cs_set_protected:Npn \prg_new_eq_conditional:NNn +\cs_gset_protected:Npn \prg_new_eq_conditional:NNn { \@@_set_eq_conditional:NNNn \cs_new_eq:cc } -\cs_set_protected:Npn \@@_set_eq_conditional:NNNn #1#2#3#4 +\cs_gset_protected:Npn \@@_set_eq_conditional:NNNn #1#2#3#4 { \use:e { @@ -2268,7 +2268,7 @@ % step in the loop, make sure that the conditional form we copy is % defined, and copy it, otherwise abort. % \begin{macrocode} -\cs_set_protected:Npn \@@_set_eq_conditional:nnNnnNNw #1#2#3#4#5#6 +\cs_gset_protected:Npn \@@_set_eq_conditional:nnNnnNNw #1#2#3#4#5#6 { \if_meaning:w \c_false_bool #3 \msg_error:nne { kernel } { missing-colon } @@ -2282,7 +2282,7 @@ \fi: \@@_set_eq_conditional_loop:nnnnNw {#1} {#2} {#4} {#5} } -\cs_set_protected:Npn \@@_set_eq_conditional_loop:nnnnNw #1#2#3#4#5#6 , +\cs_gset_protected:Npn \@@_set_eq_conditional_loop:nnnnNw #1#2#3#4#5#6 , { \if_meaning:w \q_@@_recursion_tail #6 \exp_after:wN \@@_use_none_delimit_by_q_recursion_stop:w @@ -2299,13 +2299,13 @@ #5 {#1} {#2} {#3} {#4} \@@_set_eq_conditional_loop:nnnnNw {#1} {#2} {#3} {#4} #5 } -\cs_set:Npn \@@_set_eq_conditional_p_form:wNnnnn #1 \s_@@_stop #2#3#4#5#6 +\cs_gset:Npn \@@_set_eq_conditional_p_form:wNnnnn #1 \s_@@_stop #2#3#4#5#6 { #2 { #3 _p : #4 } { #5 _p : #6 } } -\cs_set:Npn \@@_set_eq_conditional_TF_form:wNnnnn #1 \s_@@_stop #2#3#4#5#6 +\cs_gset:Npn \@@_set_eq_conditional_TF_form:wNnnnn #1 \s_@@_stop #2#3#4#5#6 { #2 { #3 : #4 TF } { #5 : #6 TF } } -\cs_set:Npn \@@_set_eq_conditional_T_form:wNnnnn #1 \s_@@_stop #2#3#4#5#6 +\cs_gset:Npn \@@_set_eq_conditional_T_form:wNnnnn #1 \s_@@_stop #2#3#4#5#6 { #2 { #3 : #4 T } { #5 : #6 T } } -\cs_set:Npn \@@_set_eq_conditional_F_form:wNnnnn #1 \s_@@_stop #2#3#4#5#6 +\cs_gset:Npn \@@_set_eq_conditional_F_form:wNnnnn #1 \s_@@_stop #2#3#4#5#6 { #2 { #3 : #4 F } { #5 : #6 F } } % \end{macrocode} % \end{macro} @@ -2323,8 +2323,8 @@ % \begin{variable}{\c_true_bool, \c_false_bool} % Here are the canonical boolean values. % \begin{macrocode} -\tex_chardef:D \c_true_bool = 1 ~ -\tex_chardef:D \c_false_bool = 0 ~ +\tex_global:D \tex_chardef:D \c_true_bool = 1 ~ +\tex_global:D \tex_chardef:D \c_false_bool = 0 ~ % \end{macrocode} % \end{variable} % @@ -2392,7 +2392,7 @@ % In all three cases, \cs{cs_to_str:N} takes two expansion steps % to be fully expanded. % \begin{macrocode} -\cs_set:Npn \cs_to_str:N +\cs_gset:Npn \cs_to_str:N { % \end{macrocode} % We implement the expansion scheme using \cs{tex_romannumeral:D} @@ -2405,8 +2405,8 @@ \if:w \token_to_str:N \ \@@_to_str:w \fi: \exp_after:wN \@@_to_str:N \token_to_str:N } -\cs_set:Npn \@@_to_str:N #1 { \c_zero_int } -\cs_set:Npn \@@_to_str:w #1 \@@_to_str:N +\cs_gset:Npn \@@_to_str:N #1 { \c_zero_int } +\cs_gset:Npn \@@_to_str:w #1 \@@_to_str:N { - \int_value:w \fi: \exp_after:wN \c_zero_int } % \end{macrocode} % If speed is a concern we could use \tn{csstring} in \LuaTeX{}. For @@ -2436,19 +2436,19 @@ % auxiliary trims the trailing \cs{s_@@_mark} from the function name if % present (that is, if the original function had no colon). % \begin{macrocode} -\cs_set_protected:Npn \@@_tmp:w #1 +\cs_gset_protected:Npn \@@_tmp:w #1 { - \cs_set:Npn \cs_split_function:N ##1 + \cs_gset:Npn \cs_split_function:N ##1 { \exp_after:wN \exp_after:wN \exp_after:wN \@@_split_function_auxi:w \cs_to_str:N ##1 \s_@@_mark \c_true_bool #1 \s_@@_mark \c_false_bool \s_@@_stop } - \cs_set:Npn \@@_split_function_auxi:w + \cs_gset:Npn \@@_split_function_auxi:w ##1 #1 ##2 \s_@@_mark ##3##4 \s_@@_stop { \@@_split_function_auxii:w ##1 \s_@@_mark \s_@@_stop {##2} ##3 } - \cs_set:Npn \@@_split_function_auxii:w ##1 \s_@@_mark ##2 \s_@@_stop + \cs_gset:Npn \@@_split_function_auxii:w ##1 \s_@@_mark ##2 \s_@@_stop { {##1} } } \exp_after:wN \@@_tmp:w \token_to_str:N : @@ -2476,7 +2476,7 @@ % \cs{else:} in the top level functions will be removed by the optimization, % and this usage of \cs{else:} will be fine). % \begin{macrocode} -\prg_set_conditional:Npnn \cs_if_exist:N #1 { p , T , F , TF } +\prg_gset_conditional:Npnn \cs_if_exist:N #1 { p , T , F , TF } { \if_meaning:w #1 \scan_stop: \use_i:nnnn @@ -2498,7 +2498,7 @@ % \begin{macrocode} \cs_if_exist:NTF \tex_lastnamedcs:D { - \prg_set_conditional:Npnn \cs_if_exist:c #1 { p , T , F , TF } + \prg_gset_conditional:Npnn \cs_if_exist:c #1 { p , T , F , TF } { \if_cs_exist:w #1 \cs_end: \@@_if_exist_c_aux: @@ -2507,11 +2507,11 @@ \prg_return_false: \fi: } - \cs_set:Npn \@@_if_exist_c_aux: + \cs_gset:Npn \@@_if_exist_c_aux: { \fi: \exp_after:wN \if_meaning:w \tex_lastnamedcs:D \scan_stop: \else: } } { - \prg_set_conditional:Npnn \cs_if_exist:c #1 { p , T , F , TF } + \prg_gset_conditional:Npnn \cs_if_exist:c #1 { p , T , F , TF } { \if_cs_exist:w #1 \cs_end: \@@_if_exist_c_aux:w @@ -2523,7 +2523,7 @@ \prg_return_false: \fi: } - \cs_set:Npn \@@_if_exist_c_aux:w \fi: \use_none:n #1 \if_false: + \cs_gset:Npn \@@_if_exist_c_aux:w \fi: \use_none:n #1 \if_false: { \fi: \exp_after:wN \if_meaning:w \cs:w #1 \cs_end: \scan_stop: \else: } } % \end{macrocode} @@ -2533,7 +2533,7 @@ % \begin{macro}[pTF, EXP]{\cs_if_free:N, \cs_if_free:c} % The logical reversal of the above. % \begin{macrocode} -\prg_set_conditional:Npnn \cs_if_free:N #1 { p , T , F , TF } +\prg_gset_conditional:Npnn \cs_if_free:N #1 { p , T , F , TF } { \if_cs_exist:N #1 \else: @@ -2547,7 +2547,7 @@ } \cs_if_exist:NTF \tex_lastnamedcs:D { - \prg_set_conditional:Npnn \cs_if_free:c #1 { p , T , F , TF } + \prg_gset_conditional:Npnn \cs_if_free:c #1 { p , T , F , TF } { \if_cs_exist:w #1 \cs_end: \@@_if_free_c_aux:w @@ -2558,11 +2558,11 @@ \prg_return_false: \fi: } - \cs_set:Npn \@@_if_free_c_aux:w \fi: \if_true: + \cs_gset:Npn \@@_if_free_c_aux:w \fi: \if_true: { \fi: \exp_after:wN \if_meaning:w \tex_lastnamedcs:D \scan_stop: } } { - \prg_set_conditional:Npnn \cs_if_free:c #1 { p , T , F , TF } + \prg_gset_conditional:Npnn \cs_if_free:c #1 { p , T , F , TF } { \if_cs_exist:w #1 \cs_end: \@@_if_free_c_aux:w @@ -2574,7 +2574,7 @@ \prg_return_false: \fi: } - \cs_set:Npn \@@_if_free_c_aux:w \fi: \use_none:n #1 \if_true: + \cs_gset:Npn \@@_if_free_c_aux:w \fi: \use_none:n #1 \if_true: { \fi: \exp_after:wN \if_meaning:w \cs:w #1 \cs_end: \scan_stop: } } % \end{macrocode} @@ -2591,49 +2591,49 @@ % sequence in the hash table if it does not exist. % If available we use the \tn{lastnamedcs} primitive. % \begin{macrocode} -\cs_set:Npn \cs_if_exist_use:NTF #1#2 +\cs_gset:Npn \cs_if_exist_use:NTF #1#2 { \cs_if_exist:NTF #1 { #1 #2 } } -\cs_set:Npn \cs_if_exist_use:NF #1 +\cs_gset:Npn \cs_if_exist_use:NF #1 { \cs_if_exist:NTF #1 #1 } -\cs_set:Npn \cs_if_exist_use:NT #1 #2 +\cs_gset:Npn \cs_if_exist_use:NT #1 #2 { \cs_if_exist:NT #1 { #1 #2 } } -\cs_set:Npn \cs_if_exist_use:N #1 +\cs_gset:Npn \cs_if_exist_use:N #1 { \cs_if_exist:NT #1 #1 } \cs_if_exist:NTF \tex_lastnamedcs:D { - \cs_set:Npn \cs_if_exist_use:cTF #1 + \cs_gset:Npn \cs_if_exist_use:cTF #1 { \if_cs_exist:w #1 \cs_end: \@@_if_exist_use_aux:w \fi: \use_ii:nn } - \cs_set:Npn \@@_if_exist_use_aux:w \fi: \use_ii:nn + \cs_gset:Npn \@@_if_exist_use_aux:w \fi: \use_ii:nn { \fi: \exp_after:wN \@@_if_exist_use_aux:Nnn \tex_lastnamedcs:D } } { - \cs_set:Npn \cs_if_exist_use:cTF #1 + \cs_gset:Npn \cs_if_exist_use:cTF #1 { \if_cs_exist:w #1 \cs_end: \@@_if_exist_use_aux:w \fi: \use_iii:nnn {#1} } - \cs_set:Npn \@@_if_exist_use_aux:w \fi: \use_iii:nnn #1 + \cs_gset:Npn \@@_if_exist_use_aux:w \fi: \use_iii:nnn #1 { \fi: \exp_after:wN \@@_if_exist_use_aux:Nnn \cs:w #1 \cs_end: } } -\cs_set:Npn \@@_if_exist_use_aux:Nnn #1#2 +\cs_gset:Npn \@@_if_exist_use_aux:Nnn #1#2 { \if_meaning:w #1 \scan_stop: \exp_after:wN \use_iii:nnn \fi: \use_i:nn { #1 #2 } } -\cs_set:Npn \cs_if_exist_use:cF #1 +\cs_gset:Npn \cs_if_exist_use:cF #1 { \cs_if_exist_use:cTF {#1} {} } -\cs_set:Npn \cs_if_exist_use:cT #1#2 +\cs_gset:Npn \cs_if_exist_use:cT #1#2 { \cs_if_exist_use:cTF {#1} {#2} {} } -\cs_set:Npn \cs_if_exist_use:c #1 +\cs_gset:Npn \cs_if_exist_use:c #1 { \cs_if_exist_use:cTF {#1} {} {} } % \end{macrocode} % \end{macro} @@ -2659,7 +2659,7 @@ % a reasonable response. Setting the \tn{newlinechar} is needed, to % turn |^^J| into a proper line break in plain \TeX{}. % \begin{macrocode} -\cs_set_protected:Npn \msg_error:nnee #1#2#3#4 +\cs_gset_protected:Npn \msg_error:nnee #1#2#3#4 { \tex_newlinechar:D = `\^^J \scan_stop: \tex_errmessage:D @@ -2672,9 +2672,9 @@ } \tex_end:D } -\cs_set_protected:Npn \msg_error:nne #1#2#3 +\cs_gset_protected:Npn \msg_error:nne #1#2#3 { \msg_error:nnee {#1} {#2} {#3} { } } -\cs_set_protected:Npn \msg_error:nn #1#2 +\cs_gset_protected:Npn \msg_error:nn #1#2 { \msg_error:nnee {#1} {#2} { } { } } % \end{macrocode} % \end{macro} @@ -2682,7 +2682,7 @@ % \begin{macro}[rEXP]{\msg_line_context:} % Another one from \pkg{l3msg} which will be altered later. % \begin{macrocode} -\cs_set:Npn \msg_line_context: +\cs_gset:Npn \msg_line_context: { on~line~ \tex_the:D \tex_inputlineno:D } % \end{macrocode} % \end{macro} @@ -2692,9 +2692,9 @@ % similar one for writing to both the log file and the terminal. % These will be redefined later by \pkg{l3file}. % \begin{macrocode} -\cs_set_protected:Npn \iow_log:e +\cs_gset_protected:Npn \iow_log:e { \tex_immediate:D \tex_write:D -1 } -\cs_set_protected:Npn \iow_term:e +\cs_gset_protected:Npn \iow_term:e { \tex_immediate:D \tex_write:D 16 } % \end{macrocode} % \end{macro} @@ -2708,7 +2708,7 @@ % issued. We have to make sure we don't put the argument into the % conditional processing since it may be an |\if...| type function! % \begin{macrocode} -\cs_set_protected:Npn \__kernel_chk_if_free_cs:N #1 +\cs_gset_protected:Npn \__kernel_chk_if_free_cs:N #1 { \cs_if_free:NF #1 { @@ -2716,7 +2716,7 @@ { \token_to_str:N #1 } { \token_to_meaning:N #1 } } } -\cs_set_protected:Npn \__kernel_chk_if_free_cs:c +\cs_gset_protected:Npn \__kernel_chk_if_free_cs:c { \exp_args:Nc \__kernel_chk_if_free_cs:N } % \end{macrocode} % \end{macro} @@ -2740,7 +2740,7 @@ % \begin{macrocode} \cs_set:Npn \@@_tmp:w #1#2 { - \cs_set_protected:Npn #1 ##1 + \cs_gset_protected:Npn #1 ##1 { \__kernel_chk_if_free_cs:N ##1 #2 ##1 @@ -2838,7 +2838,7 @@ % \begin{macro}[documented-as=\cs_set_protected:Npn] % { % \cs_set_protected:cpn , \cs_set_protected:cpe , \cs_set_protected:cpx , -% \cs_gset_protected:cpn , \cs_gset_protected:cpe , \cs_gset_protected:cpx , +% \cs_gset_protected:cpn , \cs_gset_protected:cpe , \cs_gset_protected:cpx , % \cs_new_protected:cpn , \cs_new_protected:cpe , \cs_new_protected:cpx % } % Variants of the \cs{cs_set_protected:Npn} versions which make a csname @@ -2940,7 +2940,7 @@ % the functions use here are not defined yet, but will be defined % before this function is called. % \begin{macrocode} -\cs_set_protected:Npn \__kernel_cs_parm_from_arg_count:nnF #1#2 +\cs_new_protected:Npn \__kernel_cs_parm_from_arg_count:nnF #1#2 { \exp_args:Ne \@@_parm_from_arg_count_test:nnF { @@ -2961,7 +2961,7 @@ } {#1} } -\cs_set_protected:Npn \@@_parm_from_arg_count_test:nnF #1#2 +\cs_new_protected:Npn \@@_parm_from_arg_count_test:nnF #1#2 { \if_meaning:w \c_false_bool #1 \exp_after:wN \use_ii:nn diff --git a/macros/latex/contrib/l3kernel/l3bitset.dtx b/macros/latex/contrib/l3kernel/l3bitset.dtx index ece9fbfa6c..3100c28463 100644 --- a/macros/latex/contrib/l3kernel/l3bitset.dtx +++ b/macros/latex/contrib/l3kernel/l3bitset.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index 9583f2548d..5ff0c2e68d 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -302,7 +302,7 @@ Type H <return> for immediate help}\def~{\errmessage{% % \begin{variable}{\l_@@_expl_bool} % The status for code syntax: this is on at present. % \begin{macrocode} -\chardef\l_@@_expl_bool = 1\relax +\global\chardef\l_@@_expl_bool = 1\relax % \end{macrocode} %\end{variable} % diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx index df79b10cc7..08463db56d 100644 --- a/macros/latex/contrib/l3kernel/l3box.dtx +++ b/macros/latex/contrib/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -849,7 +849,8 @@ % \begin{syntax} % \cs{box_rotate:Nn} \meta{box} \Arg{angle} % \end{syntax} -% Rotates the \meta{box} by \meta{angle} (in degrees) anti-clockwise about +% Rotates the \meta{box} by \meta{angle} (a \meta{fp expr} in degrees) +% anti-clockwise about % its reference point. The reference point of the updated box is moved % horizontally such that it is at the left side of the smallest rectangle % enclosing the rotated material. The updated \meta{box} is an |hbox|, @@ -866,7 +867,7 @@ % \end{syntax} % Scales the \meta{box} by factors \meta{x-scale} and \meta{y-scale} in % the horizontal and vertical directions, respectively (both scales are -% integer expressions). The updated \meta{box} is an |hbox|, irrespective +% \meta{fp expr}). The updated \meta{box} is an |hbox|, irrespective % of the nature of the \meta{box} before the scaling is applied. Negative % scalings cause the material in the \meta{box} to be reversed in % direction, but the reference point of the \meta{box} is unchanged. @@ -2296,8 +2297,9 @@ { #5 #1 { - \fp_set:Nn \l_@@_scale_x_fp { ( #2 ) / \box_wd:N #1 } - \fp_set:Nn \l_@@_scale_y_fp { ( #3 ) / ( #4 ) } + \fp_set:Nn \l_@@_scale_x_fp { ( \dim_to_fp:n {#2} ) / \box_wd:N #1 } + \fp_set:Nn \l_@@_scale_y_fp + { ( \dim_to_fp:n {#3} ) / ( \dim_to_fp:n {#4} ) } \fp_compare:nNnTF \l_@@_scale_x_fp > \l_@@_scale_y_fp { \fp_set_eq:NN \l_@@_scale_x_fp \l_@@_scale_y_fp } { \fp_set_eq:NN \l_@@_scale_y_fp \l_@@_scale_x_fp } diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx index 311b9cc88b..5cdaa3dc92 100644 --- a/macros/latex/contrib/l3kernel/l3cctab.dtx +++ b/macros/latex/contrib/l3kernel/l3cctab.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx index 9f2eda4560..ad65a4b174 100644 --- a/macros/latex/contrib/l3kernel/l3clist.dtx +++ b/macros/latex/contrib/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx index 8ba7b27aa9..ad41224aa0 100644 --- a/macros/latex/contrib/l3kernel/l3coffins.dtx +++ b/macros/latex/contrib/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -1302,7 +1302,7 @@ % y = s ( x - a ) + b % \] % \begin{macrocode} -\cs_set_protected:Npn \@@_calculate_intersection:nnnnnn #1#2#3#4#5#6 +\cs_new_protected:Npn \@@_calculate_intersection:nnnnnn #1#2#3#4#5#6 { \fp_compare:nNnTF {#1} = {#2} { \bool_set_true:N \l_@@_error_bool } diff --git a/macros/latex/contrib/l3kernel/l3color.dtx b/macros/latex/contrib/l3kernel/l3color.dtx index f3537307b2..514ff326a4 100644 --- a/macros/latex/contrib/l3kernel/l3color.dtx +++ b/macros/latex/contrib/l3kernel/l3color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx index 82c95f7ff8..6654b6d4cd 100644 --- a/macros/latex/contrib/l3kernel/l3debug.dtx +++ b/macros/latex/contrib/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -69,7 +69,7 @@ % % Standard file identification. % \begin{macrocode} -\ProvidesExplFile{l3debug.def}{2024-02-20}{}{L3 Debugging support} +\ProvidesExplFile{l3debug.def}{2024-03-14}{}{L3 Debugging support} % \end{macrocode} % % \begin{variable}{\s_@@_stop} diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index 25dd05fb0c..3906c6786e 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -220,7 +220,7 @@ % up: one for Fall 2022. % \begin{macrocode} %\__kernel_patch_deprecation:nnNNpn { 2022-06-24 } { \cs_parameter_spec:N } -\cs_gset:Npn \cs_argument_spec:N { \cs_parameter_spec:N } +\cs_new:Npn \cs_argument_spec:N { \cs_parameter_spec:N } % \end{macrocode} % \end{macro} % @@ -300,13 +300,13 @@ % too long. % \begin{macrocode} %\__kernel_patch_deprecation:nnNNpn { 2024-01-10 } { \keys_set_exclude_groups:nnn } -\cs_set_protected:Npn \keys_set_filter:nnn { \keys_set_exclude_groups:nnn } +\cs_new_protected:Npn \keys_set_filter:nnn { \keys_set_exclude_groups:nnn } \cs_generate_variant:Nn \keys_set_filter:nnn { nnV , nnv , nno } %\__kernel_patch_deprecation:nnNNpn { 2024-01-10 } { \keys_set_exclude_groups:nnnN } -\cs_set_protected:Npn \keys_set_filter:nnnN { \keys_set_exclude_groups:nnnN } +\cs_new_protected:Npn \keys_set_filter:nnnN { \keys_set_exclude_groups:nnnN } \cs_generate_variant:Nn \keys_set_filter:nnnN { nnV , nnv , nno } %\__kernel_patch_deprecation:nnNNpn { 2024-01-10 } { \keys_set_exclude_groups:nnnnN } -\cs_set_protected:Npn \keys_set_filter:nnnnN { \keys_set_exclude_groups:nnnnN } +\cs_new_protected:Npn \keys_set_filter:nnnnN { \keys_set_exclude_groups:nnnnN } \cs_generate_variant:Nn \keys_set_filter:nnnnN { nnV , nnv , nno } % \end{macrocode} % \end{macro} @@ -370,13 +370,13 @@ % \begin{macro}[EXP, noTF, deprecated]{\bool_case_true:n} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2023-05-03 } { \bool_case:n } -\cs_gset:Npn \bool_case_true:n { \bool_case:n } +\cs_new:Npn \bool_case_true:n { \bool_case:n } \__kernel_patch_deprecation:nnNNpn { 2023-05-03 } { \bool_case:nT } -\cs_gset:Npn \bool_case_true:nT { \bool_case:nT } +\cs_new:Npn \bool_case_true:nT { \bool_case:nT } \__kernel_patch_deprecation:nnNNpn { 2023-05-03 } { \bool_case:nF } -\cs_gset:Npn \bool_case_true:nF { \bool_case:nF } +\cs_new:Npn \bool_case_true:nF { \bool_case:nF } \__kernel_patch_deprecation:nnNNpn { 2023-05-03 } { \bool_case:nTF } -\cs_gset:Npn \bool_case_true:nTF { \bool_case:nTF } +\cs_new:Npn \bool_case_true:nTF { \bool_case:nTF } % \end{macrocode} % \end{macro} % @@ -394,17 +394,17 @@ % } % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_lowercase:n } -\cs_gset:Npn \str_lower_case:n { \str_lowercase:n } +\cs_new:Npn \str_lower_case:n { \str_lowercase:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_lowercase:f } -\cs_gset:Npn \str_lower_case:f { \str_lowercase:f } +\cs_new:Npn \str_lower_case:f { \str_lowercase:f } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_uppercase:n } -\cs_gset:Npn \str_upper_case:n { \str_uppercase:n } +\cs_new:Npn \str_upper_case:n { \str_uppercase:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_uppercase:f } -\cs_gset:Npn \str_upper_case:f { \str_uppercase:f } +\cs_new:Npn \str_upper_case:f { \str_uppercase:f } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_casefold:n } -\cs_gset:Npn \str_fold_case:n { \str_casefold:n } +\cs_new:Npn \str_fold_case:n { \str_casefold:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_casefold:V } -\cs_gset:Npn \str_fold_case:V { \str_casefold:V } +\cs_new:Npn \str_fold_case:V { \str_casefold:V } % \end{macrocode} % \end{macro} % @@ -412,9 +412,9 @@ % {\str_foldcase:n, \str_foldcase:V} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2020-10-17 } { \str_casefold:n } -\cs_gset:Npn \str_foldcase:n { \str_casefold:n } +\cs_new:Npn \str_foldcase:n { \str_casefold:n } \__kernel_patch_deprecation:nnNNpn { 2022-10-17 } { \str_casefold:V } -\cs_gset:Npn \str_foldcase:V { \str_casefold:V } +\cs_new:Npn \str_foldcase:V { \str_casefold:V } % \end{macrocode} % \end{macro} % @@ -425,7 +425,7 @@ % take a value that is big enough to accommodate all of Unicode. % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2020-08-20 } { } -\cs_gset_protected:Npn \str_declare_eight_bit_encoding:nnn #1 +\cs_new_protected:Npn \str_declare_eight_bit_encoding:nnn #1 { \@@_declare_eight_bit_encoding:nnnn {#1} { 1114112 } } % \end{macrocode} % \end{macro} @@ -440,9 +440,9 @@ % \begin{macro}[EXP, deprecated]{ \seq_indexed_map_function:NN} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2020-06-18 } { \seq_map_indexed_inline:Nn } -\cs_gset_protected:Npn \seq_indexed_map_inline:Nn { \seq_map_indexed_inline:Nn } +\cs_new_protected:Npn \seq_indexed_map_inline:Nn { \seq_map_indexed_inline:Nn } \__kernel_patch_deprecation:nnNNpn { 2020-06-18 } { \seq_map_indexed_function:NN } -\cs_gset:Npn \seq_indexed_map_function:NN { \seq_map_indexed_function:NN } +\cs_new:Npn \seq_indexed_map_function:NN { \seq_map_indexed_function:NN } % \end{macrocode} % \end{macro} % \end{macro} @@ -450,16 +450,16 @@ % \begin{macro}[deprecated]{\seq_mapthread_function:NNN} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2023-05-10 } { \seq_map_pairwise_function:NNN } -\cs_gset:Npn \seq_mapthread_function:NNN { \seq_map_pairwise_function:NNN } +\cs_new:Npn \seq_mapthread_function:NNN { \seq_map_pairwise_function:NNN } % \end{macrocode} % \end{macro} % % \begin{macro}[deprecated]{\seq_set_map_x:NNn, \seq_gset_map_x:NNn} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2023-10-26 } { \seq_set_map_e:NNn } -\cs_gset_protected:Npn \seq_set_map_x:NNn { \seq_set_map_e:NNn } +\cs_new_protected:Npn \seq_set_map_x:NNn { \seq_set_map_e:NNn } \__kernel_patch_deprecation:nnNNpn { 2023-10-26 } { \seq_gset_map_e:NNn } -\cs_gset_protected:Npn \seq_gset_map_x:NNn { \seq_gset_map_e:NNn } +\cs_new_protected:Npn \seq_gset_map_x:NNn { \seq_gset_map_e:NNn } % \end{macrocode} % \end{macro} % @@ -472,7 +472,7 @@ % \begin{macro}[deprecated]{\sys_load_deprecation:} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2021-01-11 } { (no~longer~required) } -\cs_gset_protected:Npn \sys_load_deprecation: { } +\cs_new_protected:Npn \sys_load_deprecation: { } % \end{macrocode} % \end{macro} % @@ -486,10 +486,10 @@ % \begin{macro}[EXP, deprecated]{\text_titlecase:nn} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2023-07-08 } { \text_titlecase_first:n } -\cs_gset:Npn \text_titlecase:n #1 +\cs_new:Npn \text_titlecase:n #1 { \text_titlecase_first:n { \text_lowercase:n {#1} } } \__kernel_patch_deprecation:nnNNpn { 2023-07-08 } { \text_titlecase_first:nn } -\cs_gset:Npn \text_titlecase:nn #1#2 +\cs_new:Npn \text_titlecase:nn #1#2 { \text_titlecase_first:nn {#1} { \text_lowercase:n {#2} } } % \end{macrocode} % \end{macro} @@ -509,22 +509,22 @@ % } % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_lowercase:n } -\cs_gset:Npn \tl_lower_case:n #1 +\cs_new:Npn \tl_lower_case:n #1 { \text_lowercase:n {#1} } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_lowercase:nn } -\cs_gset:Npn \tl_lower_case:nn #1#2 +\cs_new:Npn \tl_lower_case:nn #1#2 { \text_lowercase:nn {#1} {#2} } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_uppercase:n } -\cs_gset:Npn \tl_upper_case:n #1 +\cs_new:Npn \tl_upper_case:n #1 { \text_uppercase:n {#1} } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_uppercase:nn } -\cs_gset:Npn \tl_upper_case:nn #1#2 +\cs_new:Npn \tl_upper_case:nn #1#2 { \text_uppercase:nn {#1} {#2} } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:n } -\cs_gset:Npn \tl_mixed_case:n #1 +\cs_new:Npn \tl_mixed_case:n #1 { \text_titlecase_first:n {#1} } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:nn } -\cs_gset:Npn \tl_mixed_case:nn #1#2 +\cs_new:Npn \tl_mixed_case:nn #1#2 { \text_titlecase_first:nn {#1} {#2} } % \end{macrocode} % \end{macro} @@ -532,13 +532,13 @@ % \begin{macro}[noTF, deprecated]{\tl_case:Nn, \tl_case:cn} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:Nn } -\cs_gset:Npn \tl_case:Nn { \token_case_meaning:Nn } +\cs_new:Npn \tl_case:Nn { \token_case_meaning:Nn } \__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:NnT } -\cs_gset:Npn \tl_case:NnT { \token_case_meaning:NnT } +\cs_new:Npn \tl_case:NnT { \token_case_meaning:NnT } \__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:NnF } -\cs_gset:Npn \tl_case:NnF { \token_case_meaning:NnF } +\cs_new:Npn \tl_case:NnF { \token_case_meaning:NnF } \__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:NnTF } -\cs_gset:Npn \tl_case:NnTF { \token_case_meaning:NnTF } +\cs_new:Npn \tl_case:NnTF { \token_case_meaning:NnTF } \cs_generate_variant:Nn \tl_case:Nn { c } \prg_generate_conditional_variant:Nnn \tl_case:Nn { c } { T , F , TF } @@ -570,16 +570,16 @@ % \begin{macro}[EXP, deprecated]{\char_to_utfviii_bytes:n} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2022-10-09 } { [ \codepoint_generate:nn ] } -\cs_gset:Npn \char_to_utfviii_bytes:n { \__kernel_codepoint_to_bytes:n } +\cs_new:Npn \char_to_utfviii_bytes:n { \__kernel_codepoint_to_bytes:n } % \end{macrocode} % \end{macro} % % \begin{macro}[EXP, deprecated]{\char_to_nfd:N, \char_to_nfd:n} % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2022-10-09 } { \codepoint_to_nfd:n } -\cs_gset:Npn \char_to_nfd:N #1 { \codepoint_to_nfd:n {`#1} } +\cs_new:Npn \char_to_nfd:N #1 { \codepoint_to_nfd:n {`#1} } \__kernel_patch_deprecation:nnNNpn { 2022-10-09 } { \codepoint_to_nfd:n } -\cs_gset:Npn \char_to_nfd:n { \codepoint_to_nfd:n } +\cs_new:Npn \char_to_nfd:n { \codepoint_to_nfd:n } % \end{macrocode} % \end{macro} % @@ -592,21 +592,21 @@ % } % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_lowercase:n } -\cs_gset:Npn \char_lower_case:N { \text_lowercase:n } +\cs_new:Npn \char_lower_case:N { \text_lowercase:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_uppercase:n } -\cs_gset:Npn \char_upper_case:N { \text_uppercase:n } +\cs_new:Npn \char_upper_case:N { \text_uppercase:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:n } -\cs_gset:Npn \char_mixed_case:N { \text_titlecase_first:n } +\cs_new:Npn \char_mixed_case:N { \text_titlecase_first:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_casefold:n } -\cs_gset:Npn \char_fold_case:N { \str_casefold:n } +\cs_new:Npn \char_fold_case:N { \str_casefold:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_lowercase:n } -\cs_gset:Npn \char_str_lower_case:N { \str_lowercase:n } +\cs_new:Npn \char_str_lower_case:N { \str_lowercase:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_uppercase:n } -\cs_gset:Npn \char_str_upper_case:N { \str_uppercase:n } +\cs_new:Npn \char_str_upper_case:N { \str_uppercase:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_titlecase:n } -\cs_gset:Npn \char_str_mixed_case:N { \str_titlecase:n } +\cs_new:Npn \char_str_mixed_case:N { \str_titlecase:n } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \str_casefold:n } -\cs_gset:Npn \char_str_fold_case:N { \str_casefold:n } +\cs_new:Npn \char_str_fold_case:N { \str_casefold:n } % \end{macrocode} % \end{macro} % @@ -619,23 +619,23 @@ % } % \begin{macrocode} \__kernel_patch_deprecation:nnNNpn { 2022-10-17 } { \text_lowercase:n } -\cs_gset:Npn \char_lowercase:N { \text_lowercase:n } +\cs_new:Npn \char_lowercase:N { \text_lowercase:n } \__kernel_patch_deprecation:nnNNpn { 2022-10-17 } { \text_uppercase:n } -\cs_gset:Npn \char_uppercase:N { \text_uppercase:n } +\cs_new:Npn \char_uppercase:N { \text_uppercase:n } \__kernel_patch_deprecation:nnNNpn { 2022-10-17 } { \text_titlecase_first:n } -\cs_gset:Npn \char_titlecase:N { \text_titlecase_first:n } +\cs_new:Npn \char_titlecase:N { \text_titlecase_first:n } \__kernel_patch_deprecation:nnNNpn { 2022-10-17 } { \str_casefold:n } -\cs_gset:Npn \char_foldcase:N { \str_casefold:n } +\cs_new:Npn \char_foldcase:N { \str_casefold:n } \__kernel_patch_deprecation:nnNNpn { 2022-10-17 } { \str_lowercase:n } -\cs_gset:Npn \char_str_lowercase:N { \str_lowercase:n } +\cs_new:Npn \char_str_lowercase:N { \str_lowercase:n } \__kernel_patch_deprecation:nnNNpn { 2022-10-17 } { \tl_to_str:e { \text_titlecase_first:n } } -\cs_gset:Npn \char_str_titlecase:N #1 +\cs_new:Npn \char_str_titlecase:N #1 { \tl_to_str:e { \text_titlecase_first:n {#1} } } \__kernel_patch_deprecation:nnNNpn { 2022-10-17 } { \str_uppercase:n } -\cs_gset:Npn \char_str_uppercase:N { \str_uppercase:n } +\cs_new:Npn \char_str_uppercase:N { \str_uppercase:n } \__kernel_patch_deprecation:nnNNpn { 2022-10-17 } { \str_casefold:n } -\cs_gset:Npn \char_str_foldcase:N { \str_casefold:n } +\cs_new:Npn \char_str_foldcase:N { \str_casefold:n } % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx index 695e47a444..a48a24df23 100644 --- a/macros/latex/contrib/l3kernel/l3doc.dtx +++ b/macros/latex/contrib/l3kernel/l3doc.dtx @@ -71,7 +71,7 @@ and all files in that bundle must be distributed together. % This isn't included in the typeset documentation because it's a bit % ugly: %<*class> -\ProvidesExplClass{l3doc}{2024-02-20}{} +\ProvidesExplClass{l3doc}{2024-03-14}{} {L3 Experimental documentation class} %</class> % \fi @@ -84,7 +84,7 @@ and all files in that bundle must be distributed together. % require you to do updates, if the class changes.}} % % \author{\Team} -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % \maketitle % \tableofcontents % @@ -1655,7 +1655,7 @@ and all files in that bundle must be distributed together. % % \begin{macro}{\l@section, \l@subsection} % Customise the table of contents (as we have so many sections). -% Different design and/or structure is called for). +% Different design and/or structure is called for. % \begin{macrocode} \@addtoreset{section}{part} \cs_gset:Npn \l@section #1#2 @@ -2127,11 +2127,9 @@ and all files in that bundle must be distributed together. { \hyperlink { explTF } } { \mbox } { - \color{black} \itshape TF \makebox[0pt][r] { - \cs_if_exist:NT \Codedoc@explTF { \color{red} } \underline { \phantom{\itshape TF} \kern-0.1em } } } @@ -3206,18 +3204,22 @@ and all files in that bundle must be distributed together. \tl_set:Nn \l_@@_tmpa_tl {#1} \tl_replace_all:NnV \l_@@_tmpa_tl { ~ } \c_catcode_other_space_tl - \@@_macroname_prefix:o \l_@@_tmpa_tl - \@@_macroname_suffix:N #2 + \@@_print_macroname_aux:on + \l_@@_tmpa_tl { \bool_if:NT #2 { \@@_typeset_TF: } } } } -\cs_new_protected:Npn \@@_macroname_prefix:n #1 +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@@_print_macroname_aux:nn} +% |#1| is prefix, |#2| is optional |TF| suffix. +% \begin{macrocode} +\cs_new_protected:Npn \@@_print_macroname_aux:nn #1#2 { \@@_if_macro_internal:nTF {#1} - { \@@_typeset_aux:n {#1} } {#1} + { \@@_typeset_aux:n { #1 #2 } } { #1 #2 } } -\cs_generate_variant:Nn \@@_macroname_prefix:n { o } -\cs_new_protected:Npn \@@_macroname_suffix:N #1 - { \bool_if:NTF #1 { \@@_typeset_TF: } { } } +\cs_generate_variant:Nn \@@_print_macroname_aux:nn { o } % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/l3kernel/l3doc.pdf b/macros/latex/contrib/l3kernel/l3doc.pdf Binary files differindex 99b165a539..2f85329fdc 100644 --- a/macros/latex/contrib/l3kernel/l3doc.pdf +++ b/macros/latex/contrib/l3kernel/l3doc.pdf diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx index fe60a6f312..c973d593c5 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.dtx +++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf Binary files differindex b5ea68fdc7..f2e611b2c9 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.pdf +++ b/macros/latex/contrib/l3kernel/l3docstrip.pdf diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx index aaf0d04d29..7e507b7598 100644 --- a/macros/latex/contrib/l3kernel/l3expan.dtx +++ b/macros/latex/contrib/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx index 1159101ca5..3a4d1c06dc 100644 --- a/macros/latex/contrib/l3kernel/l3file.dtx +++ b/macros/latex/contrib/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx index 7604c2c2ba..40614c7348 100644 --- a/macros/latex/contrib/l3kernel/l3flag.dtx +++ b/macros/latex/contrib/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx index cb20934904..6d00047e4d 100644 --- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx index fd75e1bb5a..1f4ea5d34d 100644 --- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx index 76b7a8cdb2..a7401407cd 100644 --- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx index 5b95dc543e..0459331326 100644 --- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx index 571cb9864a..5b5f947c38 100644 --- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx index 51e747a744..bcd16a4b68 100644 --- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-functions.dtx b/macros/latex/contrib/l3kernel/l3fp-functions.dtx index efedd0fffb..b26d8e7f26 100644 --- a/macros/latex/contrib/l3kernel/l3fp-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-functions.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx index a0984d5f36..c95704085c 100644 --- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx index a313f9b0be..53b85a7cc8 100644 --- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx index a2c8eb81db..cdbdf38ee1 100644 --- a/macros/latex/contrib/l3kernel/l3fp-random.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx index a19ce34195..bddb146be7 100644 --- a/macros/latex/contrib/l3kernel/l3fp-round.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-symbolic.dtx b/macros/latex/contrib/l3kernel/l3fp-symbolic.dtx index f2073b5e52..26a084733d 100644 --- a/macros/latex/contrib/l3kernel/l3fp-symbolic.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-symbolic.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx index 70e41d5a4d..e1a3dd89a0 100644 --- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx index 98cf15b281..21cefc166c 100644 --- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx @@ -42,7 +42,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-types.dtx b/macros/latex/contrib/l3kernel/l3fp-types.dtx index 23c7f6ac4e..0d589c9549 100644 --- a/macros/latex/contrib/l3kernel/l3fp-types.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-types.dtx @@ -42,7 +42,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx index 5983dc2f48..11dbcdceef 100644 --- a/macros/latex/contrib/l3kernel/l3fp.dtx +++ b/macros/latex/contrib/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx index 97ebfe2295..1517840431 100644 --- a/macros/latex/contrib/l3kernel/l3fparray.dtx +++ b/macros/latex/contrib/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -58,7 +58,7 @@ % close to that of \pkg{l3intarray}. The size of the array is fixed and % must be given at point of initialisation % -% \begin{function}[added = 2018-05-05]{\fparray_new:Nn} +% \begin{function}[added = 2018-05-05]{\fparray_new:Nn, \fparray_new:cn} % \begin{syntax} % \cs{fparray_new:Nn} \meta{fparray~var} \Arg{size} % \end{syntax} @@ -68,7 +68,7 @@ % assignments are always global. % \end{function} % -% \begin{function}[EXP, added = 2018-05-05]{\fparray_count:N} +% \begin{function}[EXP, added = 2018-05-05]{\fparray_count:N, \fparray_count:c} % \begin{syntax} % \cs{fparray_count:N} \meta{fparray~var} % \end{syntax} @@ -76,7 +76,7 @@ % variable}. This is performed in constant time. % \end{function} % -% \begin{function}[added = 2018-05-05]{\fparray_gset:Nnn} +% \begin{function}[added = 2018-05-05]{\fparray_gset:Nnn, \fparray_gset:cnn} % \begin{syntax} % \cs{fparray_gset:Nnn} \meta{fparray~var} \Arg{position} \Arg{value} % \end{syntax} @@ -87,7 +87,7 @@ % Assignments are always global. % \end{function} % -% \begin{function}[added = 2018-05-05]{\fparray_gzero:N} +% \begin{function}[added = 2018-05-05]{\fparray_gzero:N, \fparray_gzero:c} % \begin{syntax} % \cs{fparray_gzero:N} \meta{fparray~var} % \end{syntax} @@ -96,7 +96,10 @@ % \end{function} % % \begin{function}[EXP, added = 2018-05-05] -% {\fparray_item:Nn, \fparray_item_to_tl:Nn} +% { +% \fparray_item:Nn, \fparray_item:cn +% \fparray_item_to_tl:Nn, \fparray_item_to_tl:cn +% } % \begin{syntax} % \cs{fparray_item:Nn} \meta{fparray~var} \Arg{position} % \end{syntax} diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx index 0eacdb25e7..9fa2a547ff 100644 --- a/macros/latex/contrib/l3kernel/l3int.dtx +++ b/macros/latex/contrib/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -1215,7 +1215,7 @@ } \cs_new:Npn \@@_abs:N #1 { \if_meaning:w - #1 \else: \exp_after:wN #1 \fi: } -\cs_set:Npn \int_max:nn #1#2 +\cs_new:Npn \int_max:nn #1#2 { \int_value:w \exp_after:wN \@@_maxmin:wwN \int_value:w \@@_eval:w #1 \exp_after:wN ; @@ -1223,7 +1223,7 @@ > \exp_stop_f: } -\cs_set:Npn \int_min:nn #1#2 +\cs_new:Npn \int_min:nn #1#2 { \int_value:w \exp_after:wN \@@_maxmin:wwN \int_value:w \@@_eval:w #1 \exp_after:wN ; @@ -1395,10 +1395,10 @@ \cs_if_exist:NTF \tex_omathchardef:D { \cs_new_eq:NN \@@_constdef:Nw \tex_omathchardef:D } { \cs_new_eq:NN \@@_constdef:Nw \tex_chardef:D } - \@@_constdef:Nw \c_@@_max_constdef_int 1114111 ~ + \tex_global:D \@@_constdef:Nw \c_@@_max_constdef_int 1114111 ~ \else: \cs_new_eq:NN \@@_constdef:Nw \tex_mathchardef:D - \tex_mathchardef:D \c_@@_max_constdef_int 32767 ~ + \tex_global:D \@@_constdef:Nw \c_@@_max_constdef_int 32767 ~ \fi: % \end{macrocode} % \end{variable} diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx index 4dd308a5c5..5704a2ab75 100644 --- a/macros/latex/contrib/l3kernel/l3intarray.dtx +++ b/macros/latex/contrib/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx index be8aed20d9..480425d730 100644 --- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx index 9000132775..5ea436176f 100644 --- a/macros/latex/contrib/l3kernel/l3keys.dtx +++ b/macros/latex/contrib/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx index e7970a7e2f..bd56f1ed3a 100644 --- a/macros/latex/contrib/l3kernel/l3legacy.dtx +++ b/macros/latex/contrib/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx index f112b99215..3d177f6345 100644 --- a/macros/latex/contrib/l3kernel/l3luatex.dtx +++ b/macros/latex/contrib/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -267,7 +267,7 @@ \lua_now:n , \lua_now:e } { - \cs_set:Npn #1 ##1 + \cs_gset:Npn #1 ##1 { \msg_expandable_error:nnn { luatex } { luatex-required } { #1 } @@ -276,7 +276,7 @@ \clist_map_inline:nn { \lua_shipout_e:n , \lua_shipout:n, \lua_load_module:n } { - \cs_set_protected:Npn #1 ##1 + \cs_gset_protected:Npn #1 ##1 { \msg_error:nnn { luatex } { luatex-required } { #1 } diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx index 75ba84a6ff..3acae8d111 100644 --- a/macros/latex/contrib/l3kernel/l3msg.dtx +++ b/macros/latex/contrib/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx index 0782a08aa6..3e78d86acf 100644 --- a/macros/latex/contrib/l3kernel/l3names.dtx +++ b/macros/latex/contrib/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf Binary files differindex fead4d5f9f..87f01af5a7 100644 --- a/macros/latex/contrib/l3kernel/l3news.pdf +++ b/macros/latex/contrib/l3kernel/l3news.pdf diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf Binary files differindex a6a77cbf56..5a6d4af9e2 100644 --- a/macros/latex/contrib/l3kernel/l3news01.pdf +++ b/macros/latex/contrib/l3kernel/l3news01.pdf diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf Binary files differindex 8ef3a6499f..8cda69f971 100644 --- a/macros/latex/contrib/l3kernel/l3news02.pdf +++ b/macros/latex/contrib/l3kernel/l3news02.pdf diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf Binary files differindex 9afc8bd99d..f16bb58750 100644 --- a/macros/latex/contrib/l3kernel/l3news03.pdf +++ b/macros/latex/contrib/l3kernel/l3news03.pdf diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf Binary files differindex 0d2a7c3531..52c33e516a 100644 --- a/macros/latex/contrib/l3kernel/l3news04.pdf +++ b/macros/latex/contrib/l3kernel/l3news04.pdf diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf Binary files differindex 0fceb43473..1f6bda9687 100644 --- a/macros/latex/contrib/l3kernel/l3news05.pdf +++ b/macros/latex/contrib/l3kernel/l3news05.pdf diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf Binary files differindex 61ebc770ff..cd65bce3a6 100644 --- a/macros/latex/contrib/l3kernel/l3news06.pdf +++ b/macros/latex/contrib/l3kernel/l3news06.pdf diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf Binary files differindex 3f2d7e51f4..721252a9b0 100644 --- a/macros/latex/contrib/l3kernel/l3news07.pdf +++ b/macros/latex/contrib/l3kernel/l3news07.pdf diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf Binary files differindex 43104af4c3..855db5bdc5 100644 --- a/macros/latex/contrib/l3kernel/l3news08.pdf +++ b/macros/latex/contrib/l3kernel/l3news08.pdf diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf Binary files differindex 429016e9f6..5dc3a3b9ad 100644 --- a/macros/latex/contrib/l3kernel/l3news09.pdf +++ b/macros/latex/contrib/l3kernel/l3news09.pdf diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf Binary files differindex 8a19d48d88..e921d2c81b 100644 --- a/macros/latex/contrib/l3kernel/l3news10.pdf +++ b/macros/latex/contrib/l3kernel/l3news10.pdf diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf Binary files differindex 2fbf1ed30b..a4866d55e7 100644 --- a/macros/latex/contrib/l3kernel/l3news11.pdf +++ b/macros/latex/contrib/l3kernel/l3news11.pdf diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf Binary files differindex 0e0c63f2be..4b6072bca1 100644 --- a/macros/latex/contrib/l3kernel/l3news12.pdf +++ b/macros/latex/contrib/l3kernel/l3news12.pdf diff --git a/macros/latex/contrib/l3kernel/l3pdf.dtx b/macros/latex/contrib/l3kernel/l3pdf.dtx index 0310e7c6ad..7ffd0c1c05 100644 --- a/macros/latex/contrib/l3kernel/l3pdf.dtx +++ b/macros/latex/contrib/l3kernel/l3pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf Binary files differindex 281bc5dc71..9b2e9b407e 100644 --- a/macros/latex/contrib/l3kernel/l3prefixes.pdf +++ b/macros/latex/contrib/l3kernel/l3prefixes.pdf diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx index e596e4cfb7..8bbdd6a587 100644 --- a/macros/latex/contrib/l3kernel/l3prg.dtx +++ b/macros/latex/contrib/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx index dcf14be536..878b9eb758 100644 --- a/macros/latex/contrib/l3kernel/l3prop.dtx +++ b/macros/latex/contrib/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx index c465fa251c..000063bc00 100644 --- a/macros/latex/contrib/l3kernel/l3quark.dtx +++ b/macros/latex/contrib/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -820,43 +820,46 @@ % \begin{macro}{ % \@@_new_conditional_n:Nnnn, % \@@_new_conditional_N:Nnnn, +% \@@_new_conditional_n_aux:NNNn, +% \@@_new_conditional_N_aux:NNNn % } % These macros implement the two possibilities for branching quark -% conditionals, passing -% the right arguments to \cs{@@_new_conditional_aux_do:NNnnn}, -% which defines some auxiliaries and defines the -% main conditionals. +% conditionals. To avoid constructing without defining the +% \cs[no-index]{__\meta{type}_if_quark_\meta{name}:w} helper, +% \texttt{N}-type function accepts a \cs{prg_do_nothing:} as +% a placeholder. % \begin{macrocode} -\cs_new_protected:Npn \@@_new_conditional_n:Nnnn - { \@@_new_conditional_aux_do:NNnnn \use_i:nn } -\cs_new_protected:Npn \@@_new_conditional_N:Nnnn - { \@@_new_conditional_aux_do:NNnnn \use_ii:nn } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{ -% \@@_new_conditional_aux_do:NNnnn, -% \@@_new_conditional_define:NNNNn, -% } -% Similar to the previous macros, but branching conditionals only -% require one auxiliary, so we take a shortcut. In -% \cs{@@_new_conditional_define:NNNNn}, |#4| is \cs{use_i:nn} to -% define the \texttt{n}-type function (which needs an auxiliary) and -% is \cs{use_ii:nn} to define the \texttt{N}-type function. -% \begin{macrocode} -\cs_new_protected:Npn \@@_new_conditional_aux_do:NNnnn #1 #2 #3 #4 +\cs_new_protected:Npn \@@_new_conditional_n:Nnnn #1 #2 #3 + { + \exp_args:Ncc \@@_new_conditional_n_aux:NNNn + { __ #3 _if_quark_ #2 :w } { q__ #3 _ #2 } #1 + } +\cs_new_protected:Npn \@@_new_conditional_N:Nnnn #1 #2 #3 { - \exp_args:Ncc \@@_new_conditional_define:NNNNn - { __ #4 _if_quark_ #3 :w } { q__ #4 _ #3 } #2 #1 + \exp_args:NNc \@@_new_conditional_N_aux:NNNn + \prg_do_nothing: { q__ #3 _ #2 } #1 } -\cs_new_protected:Npn \@@_new_conditional_define:NNNNn #1 #2 #3 #4 #5 +\cs_new_protected:Npn \@@_new_conditional_n_aux:NNNn #1 #2 #3 #4 { - #4 { \cs_gset:Npn #1 ##1 #2 ##2 ? ##3 ?! { ##1 ##2 } } { } - \exp_args:Nno \use:n { \prg_new_conditional:Npnn #3 ##1 {#5} } + \cs_gset:Npn #1 ##1 #2 ##2 ? ##3 ?! { ##1##2 } + \prg_new_conditional:Npnn #3 ##1 {#4} { - #4 { \@@_if_empty_if:o { #1 {} ##1 {} ?! #2 ??! } } - { \if_meaning:w #2 ##1 } - \prg_return_true: \else: \prg_return_false: \fi: + \@@_if_empty_if:o { #1 {} ##1 {} ?! #2 ??! } + \prg_return_true: + \else: + \prg_return_false: + \fi: + } + } +\cs_new_protected:Npn \@@_new_conditional_N_aux:NNNn #1 #2 #3 #4 + { + \prg_new_conditional:Npnn #3 ##1 {#4} + { + \if_meaning:w #2 ##1 + \prg_return_true: + \else: + \prg_return_false: + \fi: } } % \end{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx index 428870c453..395be76907 100644 --- a/macros/latex/contrib/l3kernel/l3regex.dtx +++ b/macros/latex/contrib/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -4155,7 +4155,7 @@ % incorrect). That's clunky, but not too expensive, since it's only % one test. % \begin{macrocode} -\cs_set:Npn \@@_show_class:NnnnN #1#2#3#4#5 +\cs_new:Npn \@@_show_class:NnnnN #1#2#3#4#5 { \group_begin: \tl_build_begin:N \l_@@_build_tl diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx index c200bf21f9..5334e8fd88 100644 --- a/macros/latex/contrib/l3kernel/l3seq.dtx +++ b/macros/latex/contrib/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx index c0dfc22a37..1839c8a2e5 100644 --- a/macros/latex/contrib/l3kernel/l3skip.dtx +++ b/macros/latex/contrib/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx index b96e3f3b2b..818f605e07 100644 --- a/macros/latex/contrib/l3kernel/l3sort.dtx +++ b/macros/latex/contrib/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx index e7b7ecf44d..be850b3109 100644 --- a/macros/latex/contrib/l3kernel/l3str-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx index 827cc994f5..88ad33c74b 100644 --- a/macros/latex/contrib/l3kernel/l3str.dtx +++ b/macros/latex/contrib/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf Binary files differindex 8c34658440..322b032a67 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.pdf +++ b/macros/latex/contrib/l3kernel/l3styleguide.pdf diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex index 81590ff768..a2ffe8d770 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.tex +++ b/macros/latex/contrib/l3kernel/l3styleguide.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2024-02-20} +\date{Released 2024-03-14} \begin{document} diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf Binary files differindex 4e1be073a9..2a701d8ec5 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex index e16dec0704..7e124576c7 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2024-02-20} +\date{Released 2024-03-14} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx index 9a0fb8dcf3..feec1232fd 100644 --- a/macros/latex/contrib/l3kernel/l3sys.dtx +++ b/macros/latex/contrib/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -324,6 +324,58 @@ % Execute \meta{tokens} through shell escape at shipout. % \end{function} % +% \section{System queries} +% +% Some queries can be made about the file system, etc., without needing to +% use unrestricted shell escape. This is carried out using the script +% \texttt{l3sys-query}, which is documented separately. The wrappers here +% use this script, if available, to obtain system information that is +% not directly available within the \TeX{} run. Note that if restricted +% shell escape is disabled, no results can be obtained. +% +% \begin{function}[added = 2024-03-08] +% {\sys_get_query:nN, \sys_get_query:nnN, \sys_get_query:nnnN} +% \begin{syntax} +% \cs{sys_get_query:nN} \Arg{cmd} \Arg{tl var} +% \cs{sys_get_query:nnN} \Arg{cmd} \Arg{spec} \Arg{tl var} +% \cs{sys_get_query:nnnN} \Arg{cmd} \Arg{options} \Arg{spec} \Arg{tl var} +% \end{syntax} +% Sets the \meta{tl var} to the information returned by the +% \texttt{l3sys-query} \meta{cmd}, potentially supplying the \meta{options} +% and \meta{spec} to the query call. The valid \meta{cmd} names are at present +% \begin{itemize} +% \item \texttt{pwd} Returns the present working directory +% \item \texttt{ls} Returns a directory listing, using the \meta{spec} to +% select files and applying the \meta{options} if given +% \end{itemize} +% The \meta{spec} is likely to contain the wildcards |*| or |?|, +% and will automatically be passed to +% the script without shell expansion. In a glob is needed within the +% \meta{options}, this will need to be protected from shell expansion +% using |'| tokens. +% +% The \meta{spec} and \meta{options}, if given, are expanded fully +% before passing to the underlying script. +% +% If more than one line of text is returned by the \meta{cmd}, these will be +% separated by character~13 (|^^M|) tokens of category code~12. In most +% cases, \cs{sys_split_query:nnnN} should be preferred when multi-line +% output is expected. +% \end{function} +% +% \begin{function}[added = 2024-03-08] +% {\sys_split_query:nN, \sys_split_query:nnN, \sys_split_query:nnnN} +% \begin{syntax} +% \cs{sys_split_query:nN} \Arg{cmd} \Arg{seq} +% \cs{sys_split_query:nnN} \Arg{cmd} \Arg{spec} \Arg{seq} +% \cs{sys_split_query:nnnN} \Arg{cmd} \Arg{options} \Arg{spec} \Arg{seq} +% \end{syntax} +% Works as described for \cs{sys_split_query:nnnN}, but sets the \meta{seq} +% to contain one entry for each line returned by \texttt{l3sys-query}. +% This function should therefore be preferred where multi-line return is +% expected, e.g.~for the \texttt{ls} command. +% \end{function} +% % \section{Loading configuration data} % % \begin{function}[added = 2019-09-12]{\sys_load_backend:n} @@ -390,6 +442,12 @@ %<*tex> % \end{macrocode} % +% \begin{macro}{\l_@@_tmp_tl} +% \begin{macrocode} +\tl_new:N \l_@@_tmp_tl +% \end{macrocode} +% \end{macro} +% % \subsubsection{Detecting the engine} % % \begin{macro}{\@@_const:nn} @@ -1083,6 +1141,107 @@ end % \end{macrocode} % \end{macro} % +% \subsection{System queries} +% +% \begin{macro}{\sys_get_query:nN} +% \begin{macro}{\sys_get_query:nnN} +% \begin{macro} +% { +% \sys_get_query:nnnN, +% \@@_get_query_auxi:nnnN, \@@_get_query_auxi:neeN, +% \@@_get_query_auxii:nnnN, \@@_get_query_auxii:neeN +% } +% Calling the query system is quite straight-forward: most of the effort is +% in making the read-back catcode-safe. We also want to trim off the trailing +% |^^M| from the last line. +% \begin{macrocode} +\cs_new_protected:Npn \sys_get_query:nN #1#2 + { \sys_get_query:nnnN {#1} { } { } #2 } +\cs_new_protected:Npn \sys_get_query:nnN #1#2#3 + { \sys_get_query:nnnN {#1} { } {#2} #3 } +\cs_new_protected:Npn \sys_get_query:nnnN #1#2#3#4 + { + \str_clear:N #4 + \@@_get_query_auxi:neeN {#1} {#2} {#3} #4 + } +\cs_new:Npn \@@_get_query_auxi:nnnN #1#2#3#4 + { + \@@_get_query_auxii:neeN {#1} + { \tl_if_blank:nF {#2} { \tl_to_str:n { ~ #2 } } } + { + \tl_if_blank:nF {#3} + { + \c_space_tl + \sys_if_shell_restricted:F ' + \tl_to_str:n {#3} + \sys_if_shell_restricted:F ' + } + } + #4 + } +\cs_generate_variant:Nn \@@_get_query_auxi:nnnN { nee } +\cs_new_protected:Npn \@@_get_query_auxii:nnnN #1#2#3#4 + { + \sys_if_shell:T + { + \sys_get_shell:nnN + { l3sys-query~#1 #2 #3 } + { + \int_step_inline:nnn { 0 } { `a - 1 } + { \char_set_catcode_other:n {##1} } + \int_step_inline:nnn { `Z + 1 } { 127 } + { \char_set_catcode_other:n {##1} } + \tex_endlinechar:D 13 \scan_stop: + } + \l_@@_tmp_tl + \tl_if_empty:NF \l_@@_tmp_tl + { + \exp_after:wN \@@_get_query:Nw \exp_after:wN #4 + \l_@@_tmp_tl \q_stop + } + } + } +\cs_generate_variant:Nn \@@_get_query_auxii:nnnN { nee } +\group_begin: + \tex_lccode:D `\* = 13 \scan_stop: + \tex_lowercase:D + { + \group_end: + \cs_new_protected:Npn \@@_get_query:Nw #1#2 * \q_stop + } + { \tl_set:Nn #1 {#2} } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\sys_split_query:nN} +% \begin{macro}{\sys_split_query:nnN} +% \begin{macro}{\sys_split_query:nnnN} +% A wrapper for convenience. +% \begin{macrocode} +\cs_new_protected:Npn \sys_split_query:nN #1#2 + { \sys_split_query:nnnN {#1} { } { } #2 } +\cs_new_protected:Npn \sys_split_query:nnN #1#2#3 + { \sys_split_query:nnnN {#1} { } {#2} #3 } +\group_begin: + \tex_lccode:D `\* = 13 \scan_stop: + \tex_lowercase:D + { + \group_end: + \cs_new_protected:Npn \sys_split_query:nnnN #1#2#3#4 + { + \seq_clear:N #4 + \sys_get_query:nnnN {#1} {#2} {#3} \l_@@_tmp_tl + \tl_if_empty:NF \l_@@_tmp_tl + { \seq_set_split:NnV #4 * \l_@@_tmp_tl } + } + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % \subsubsection{Held over from \pkg{l3file}} % % \begin{variable}{\g_file_curr_name_str} diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf Binary files differindex a1e571ac5c..93def3980b 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.pdf +++ b/macros/latex/contrib/l3kernel/l3term-glossary.pdf diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex index 600709d762..5db9e83a45 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.tex +++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2024-02-20} +\date{Released 2024-03-14} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx index 8a5677806c..0547db28b1 100644 --- a/macros/latex/contrib/l3kernel/l3text-case.dtx +++ b/macros/latex/contrib/l3kernel/l3text-case.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text-map.dtx b/macros/latex/contrib/l3kernel/l3text-map.dtx index fff01a5255..d364c32199 100644 --- a/macros/latex/contrib/l3kernel/l3text-map.dtx +++ b/macros/latex/contrib/l3kernel/l3text-map.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx index 6de37faa62..8f92c1eae9 100644 --- a/macros/latex/contrib/l3kernel/l3text-purify.dtx +++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx index bdbd7c8d27..5feff565b9 100644 --- a/macros/latex/contrib/l3kernel/l3text.dtx +++ b/macros/latex/contrib/l3kernel/l3text.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -889,12 +889,12 @@ % {\c_@@_chardef_group_end_token, \c_@@_mathchardef_group_end_token} % Markers for implict char handling. % \begin{macrocode} -\tex_chardef:D \c_@@_chardef_space_token = `\ % -\tex_mathchardef:D \c_@@_mathchardef_space_token = `\ % -\tex_chardef:D \c_@@_chardef_group_begin_token = `\{ % `\} -\tex_mathchardef:D \c_@@_mathchardef_group_begin_token = `\{ % `\} `\{ -\tex_chardef:D \c_@@_chardef_group_end_token = `\} % `\{ -\tex_mathchardef:D \c_@@_mathchardef_group_end_token = `\} % +\tex_global:D \tex_chardef:D \c_@@_chardef_space_token = `\ % +\tex_global:D \tex_mathchardef:D \c_@@_mathchardef_space_token = `\ % +\tex_global:D \tex_chardef:D \c_@@_chardef_group_begin_token = `\{ % `\} +\tex_global:D \tex_mathchardef:D \c_@@_mathchardef_group_begin_token = `\{ % `\} `\{ +\tex_global:D \tex_chardef:D \c_@@_chardef_group_end_token = `\} % `\{ +\tex_global:D \tex_mathchardef:D \c_@@_mathchardef_group_end_token = `\} % % \end{macrocode} % \end{variable} % \end{variable} diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx index 776b360434..d965050c76 100644 --- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl-build.dtx b/macros/latex/contrib/l3kernel/l3tl-build.dtx index 1fc841ca78..175b7bc24f 100644 --- a/macros/latex/contrib/l3kernel/l3tl-build.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-build.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx index ed83e3bc81..0938e7cd5e 100644 --- a/macros/latex/contrib/l3kernel/l3tl.dtx +++ b/macros/latex/contrib/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx index b11e4859db..cd538ee6d0 100644 --- a/macros/latex/contrib/l3kernel/l3token.dtx +++ b/macros/latex/contrib/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % @@ -2376,7 +2376,7 @@ end } } { - \tex_chardef:D \c_@@_A_int = `A ~ % + \tex_global:D \tex_chardef:D \c_@@_A_int = `A ~ % \use:e { \prg_new_conditional:Npnn \exp_not:N \token_if_primitive:N #1 diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx index b4a70b24ad..cd552800b0 100644 --- a/macros/latex/contrib/l3kernel/l3unicode.dtx +++ b/macros/latex/contrib/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2024-02-20} +% \date{Released 2024-03-14} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf Binary files differindex 6350700965..c6a6396503 100644 --- a/macros/latex/contrib/l3kernel/source3.pdf +++ b/macros/latex/contrib/l3kernel/source3.pdf diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex index 69761fd7f3..c09d75767b 100644 --- a/macros/latex/contrib/l3kernel/source3.tex +++ b/macros/latex/contrib/l3kernel/source3.tex @@ -57,7 +57,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2024-02-20} +\date{Released 2024-03-14} \pagenumbering{roman} \maketitle |