diff options
Diffstat (limited to 'macros/latex/contrib/l3kernel/l3cctab.dtx')
| -rw-r--r-- | macros/latex/contrib/l3kernel/l3cctab.dtx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx index fc9cdd9e92..4192ec029a 100644 --- a/macros/latex/contrib/l3kernel/l3cctab.dtx +++ b/macros/latex/contrib/l3kernel/l3cctab.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-08-29} +% \date{Released 2023-10-10} % % \maketitle % @@ -543,7 +543,7 @@ { \seq_gpop:NNF \g_@@_unused_seq \l_@@_internal_a_tl { \@@_begin_aux: } - \exp_args:Nx \@@_chk_group_begin:n + \@@_chk_group_begin:e { \@@_nesting_number:N \l_@@_internal_a_tl } \seq_gpush:NV \g_@@_stack_seq \l_@@_internal_a_tl \exp_args:NV \@@_gset:n \l_@@_internal_a_tl @@ -566,7 +566,7 @@ \seq_gpop:NNTF \g_@@_stack_seq \l_@@_internal_a_tl { \seq_gpush:NV \g_@@_unused_seq \l_@@_internal_a_tl - \exp_args:Nx \@@_chk_group_end:n + \exp_args:Ne \@@_chk_group_end:n { \@@_nesting_number:N \l_@@_internal_a_tl } \@@_select:N \l_@@_internal_a_tl } @@ -575,7 +575,8 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_chk_group_begin:n,\@@_chk_group_end:n} +% \begin{macro} +% {\@@_chk_group_begin:n,\@@_chk_group_begin:e, \@@_chk_group_end:n} % Catcode tables are not allowed to be intermixed with groups, so here % we check that they are properly nested regarding \TeX{} groups. % \cs{@@_chk_group_begin:n} stores the current group level in a stack, @@ -636,10 +637,11 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_chk_group_begin:n #1 { - \seq_gpush:Nx \g_@@_group_seq + \seq_gpush:Ne \g_@@_group_seq { \int_use:N \tex_currentgrouplevel:D } \cs_set_eq:cN { @@_group_ #1 _chk: } \prg_do_nothing: } +\cs_generate_variant:Nn \@@_chk_group_begin:n { e } \cs_new_protected:Npn \@@_chk_group_end:n #1 { \seq_gpop:NN \g_@@_group_seq \l_@@_internal_b_tl @@ -650,7 +652,7 @@ } { \cs_if_exist_p:c { @@_group_ #1 _chk: } } { - \msg_error:nnx { cctab } { group-mismatch } + \msg_error:nne { cctab } { group-mismatch } { \int_sign:n { \tex_currentgrouplevel:D - \l_@@_internal_b_tl } @@ -675,10 +677,10 @@ \exp_after:wN \exp_after:wN \exp_after:wN \@@_nesting_number:w \exp_after:wN \token_to_str:N #1 } - \use:x + \use:e { \cs_new:Npn \exp_not:N \@@_nesting_number:w - ##1 \tl_to_str:n { g_@@_ } ##2 \tl_to_str:n { _cctab } {##2} + #1 \tl_to_str:n { g_@@_ } #2 \tl_to_str:n { _cctab } {#2} } } % \end{macrocode} @@ -754,13 +756,13 @@ \@@_chk_if_valid_aux:NTF #1 { \prg_return_true: } { - \msg_error:nnx { cctab } { invalid-cctab } + \msg_error:nne { cctab } { invalid-cctab } { \token_to_str:N #1 } \prg_return_false: } } { - \msg_error:nnx { kernel } { command-not-defined } + \msg_error:nne { kernel } { command-not-defined } { \token_to_str:N #1 } \prg_return_false: } |