diff --git a/tabularray/tabularray.sty b/tabularray/tabularray.sty index 79c5443..10e632f 100644 --- a/tabularray/tabularray.sty +++ b/tabularray/tabularray.sty @@ -906,7 +906,7 @@ \exp_args:NcV \NewDocumentCommand { __tblr_table_cmd_ \l__tblr_tmpa_tl :w } \l__tblr_tmpb_tl { #4 } %% we can not use \cs_if_exist:NTF here (see issue #328) - \__zutil_cs_if_defined:NTF #1 + \zutil_cs_if_defined:NTF #1 { \cs_set_eq:cN { __tblr_table_cmd_ \l__tblr_tmpa_tl _saved:w } #1 } @@ -927,7 +927,7 @@ } \cs_new:Npn \__tblr_if_table_command:NTF #1 - { \__zutil_cs_if_defined:cTF { __tblr_table_cmd_ \cs_to_str:N #1 :w } } + { \zutil_cs_if_defined:cTF { __tblr_table_cmd_ \cs_to_str:N #1 :w } } \cs_new_protected:Npn \__tblr_enable_table_commands: { diff --git a/zutil/testfiles/zutil-l3extras.lvt b/zutil/testfiles/zutil-l3extras.lvt index 3ba7d5e..5043835 100644 --- a/zutil/testfiles/zutil-l3extras.lvt +++ b/zutil/testfiles/zutil-l3extras.lvt @@ -9,16 +9,16 @@ \START -\TEST{\__zutil_cs_if_defined:NTF}{ - \__zutil_cs_if_defined:NTF \zutil_set:n \TRUE \ERROR - \__zutil_cs_if_defined:NTF \scan_stop: \TRUE \ERROR - \__zutil_cs_if_defined:NTF \tex_undefined:D \ERROR \TRUE +\TEST{\zutil_cs_if_defined:NTF}{ + \zutil_cs_if_defined:NTF \zutil_set:n \TRUE \ERROR + \zutil_cs_if_defined:NTF \scan_stop: \TRUE \ERROR + \zutil_cs_if_defined:NTF \tex_undefined:D \ERROR \TRUE } -\TEST{\__zutil_cs_if_defined:cTF}{ - \__zutil_cs_if_defined:cTF { zutil_set:n } \TRUE \ERROR - \__zutil_cs_if_defined:cTF { scan_stop: } \TRUE \ERROR - \__zutil_cs_if_defined:cTF { tex_undefined:D } \ERROR \TRUE +\TEST{\zutil_cs_if_defined:cTF}{ + \zutil_cs_if_defined:cTF { zutil_set:n } \TRUE \ERROR + \zutil_cs_if_defined:cTF { scan_stop: } \TRUE \ERROR + \zutil_cs_if_defined:cTF { tex_undefined:D } \ERROR \TRUE } \OMIT diff --git a/zutil/testfiles/zutil-l3extras.tlg b/zutil/testfiles/zutil-l3extras.tlg index 30bc59f..b755a76 100644 --- a/zutil/testfiles/zutil-l3extras.tlg +++ b/zutil/testfiles/zutil-l3extras.tlg @@ -1,14 +1,14 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. ============================================================ -TEST: \__zutil_cs_if_defined:NTF +TEST: \zutil_cs_if_defined:NTF ============================================================ TRUE TRUE TRUE ============================================================ ============================================================ -TEST: \__zutil_cs_if_defined:cTF +TEST: \zutil_cs_if_defined:cTF ============================================================ TRUE TRUE diff --git a/zutil/zutil-debug.code.tex b/zutil/zutil-debug.code.tex index 28c99b5..9467e1d 100644 --- a/zutil/zutil-debug.code.tex +++ b/zutil/zutil-debug.code.tex @@ -308,12 +308,12 @@ \cs_new:Npn \__zutil_debug_use:N #1 { - \__zutil_cs_if_defined:NTF #1 + \zutil_cs_if_defined:NTF #1 { \cs_replacement_spec:N #1 } { \tl_to_str:n { undefined } } } \cs_new:Npn \__zutil_debug_use:c #1 { - \__zutil_cs_if_defined:cTF {#1} + \zutil_cs_if_defined:cTF {#1} { \cs_replacement_spec:c {#1} } { \tl_to_str:n { undefined } } } diff --git a/zutil/zutil-l3extras.code.tex b/zutil/zutil-l3extras.code.tex index 9dcfebd..7d865b5 100644 --- a/zutil/zutil-l3extras.code.tex +++ b/zutil/zutil-l3extras.code.tex @@ -6,7 +6,7 @@ %% % Treat \relax as defined, thus different from \cs_if_exist:NTF. -\prg_set_conditional:Npnn \__zutil_cs_if_defined:N #1 { p, T, F, TF } +\prg_set_conditional:Npnn \zutil_cs_if_defined:N #1 { p, T, F, TF } { \if_cs_exist:N #1 \prg_return_true: @@ -14,7 +14,7 @@ \prg_return_false: \fi: } -\prg_set_conditional:Npnn \__zutil_cs_if_defined:c #1 { p, T, F, TF } +\prg_set_conditional:Npnn \zutil_cs_if_defined:c #1 { p, T, F, TF } { \if_cs_exist:w #1 \cs_end: \prg_return_true: