From 44cc8f42f6e31b2244589be3cc435df903faf11b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 23 Mar 2021 22:29:23 +0000 Subject: regexpatch (23mar21) git-svn-id: svn://tug.org/texlive/trunk@58668 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty b/Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty index 4e37eaa93b3..048b17cf2d5 100644 --- a/Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty +++ b/Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty @@ -25,7 +25,7 @@ %% The released version of this bundle is available from CTAN. %% \RequirePackage{expl3} -\GetIdInfo$Id: regexpatch.dtx 0.2e 2020-10-06 12:00:00Z Enrico $ +\GetIdInfo$Id: regexpatch.dtx 0.2f 2021-03-21 12:00:00Z Enrico $ {Extending etoolbox patching commands} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -57,7 +57,7 @@ \bool_set_false:N \l_xpatch_protect_bool \bool_set_false:N \l_xpatch_optional_bool \tl_set:Nf \l_xpatch_name_tl { \cs_to_str:N #1 } - \tl_set:Nf \l_xpatch_repl_tl { \token_get_replacement_spec:N #1 } + \tl_set:Nf \l_xpatch_repl_tl { \cs_replacement_spec:N #1 } \tl_clear:N \l_xpatch_type_tl \regex_match:nVT % \DeclareRobustCommand {^\\protect\ \\\u{l_xpatch_name_tl}\ \ } @@ -102,7 +102,7 @@ \bool_if:NT \l_xpatch_protect_bool { \tl_set:Nf \l_xpatch_repl_tl - { \exp_after:wN \token_get_replacement_spec:N + { \exp_after:wN \cs_replacement_spec:N \cs:w \l_xpatch_name_tl \cs_end: } \regex_match:nVT % \DeclareRobustCommand with opt arg {^\\@protected@testopt\ \\\u{l_xpatch_name_tl}\ \\\\} @@ -150,11 +150,11 @@ \cs_generate_variant:Nn \xpatch_main_four:NNnnnn {Nc} \cs_new_protected:Npn \xpatch_get_all:N #1 { - \tl_set:Nf \l_xpatch_prefix_tl { \token_get_prefix_spec:N #1 } + \tl_set:Nf \l_xpatch_prefix_tl { \cs_prefix_spec:N #1 } \tl_set_rescan:Nnx \l_xpatch_prefix_tl { } \l_xpatch_prefix_tl - \tl_set:Nf \l_xpatch_arg_tl { \token_get_arg_spec:N #1 } + \tl_set:Nf \l_xpatch_arg_tl { \cs_argument_spec:N #1 } \tl_set_rescan:Nnx \l_xpatch_arg_tl { } \l_xpatch_arg_tl - \tl_set:Nf \l_xpatch_replacement_tl { \token_get_replacement_spec:N #1 } + \tl_set:Nf \l_xpatch_replacement_tl { \cs_replacement_spec:N #1 } \tl_set_rescan:Nnx \l_xpatch_replacement_tl { } \l_xpatch_replacement_tl } \cs_new_protected:Npn \xpatch_rebuild:N #1 @@ -851,7 +851,7 @@ \bool_if:NTF \l_xpatch_optional_bool { \tl_set:Nx \l_xpatch_name_tl { \tl_tail:V \l_xpatch_name_tl } - \tl_set:Nx \l_xpatch_prefix_tl { \token_get_prefix_spec:N #1 } + \tl_set:Nx \l_xpatch_prefix_tl { \cs_prefix_spec:N #1 } \tl_clear:N \l_xpatch_prefix_tl \tl_set_rescan:Nnx \l_xpatch_prefix_tl { } \l_xpatch_prefix_tl \tl_set_eq:Nc \l_xpatch_replacement_tl { \l_xpatch_name_tl } -- cgit v1.2.3