summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-23 22:32:36 +0000
committerKarl Berry <karl@freefriends.org>2021-03-23 22:32:36 +0000
commit8a5ebcfbf355fb5fac49a90435bac8578f30effb (patch)
treec0d48eff87c4c91967e3194a49ba0c98005d0187
parenta48065f8ab93b8dcf2d983c9f5d4a0e0cf7c7c50 (diff)
regexpatch (23mar21) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58674 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/regexpatch/README9
-rw-r--r--Master/texmf-dist/doc/latex/regexpatch/regexpatch.pdfbin536001 -> 536404 bytes
-rw-r--r--Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx17
-rw-r--r--Master/texmf-dist/source/latex/regexpatch/regexpatch.ins2
-rw-r--r--Master/texmf-dist/tex/latex/regexpatch/regexpatch.sty14
5 files changed, 21 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/regexpatch/README b/Master/texmf-dist/doc/latex/regexpatch/README
index f0198a44321..5fb79da552e 100644
--- a/Master/texmf-dist/doc/latex/regexpatch/README
+++ b/Master/texmf-dist/doc/latex/regexpatch/README
@@ -1,12 +1,11 @@
The regexpatch package generalizes the macro patching commands
provided by P. Lehmann's `etoolbox'. The difference between this
package and its sibling `xpatch' is that this package sports a very
-powerful `\regexpatchcmd' based on the `l3regex' module of LaTeX3
-experimental packages.
+powerful `\regexpatchcmd' based on the `l3regex' module of expl3.
-This version fixes a silly typo introduced in version 0.2c
+This version replaces deprecated
-This is version 0.2e of the package (a maintainance release)
+This is version 0.2f of the package (a maintainance release)
Copyright 2012-2020 Enrico Gregorio
@@ -40,5 +39,5 @@ o move "regexpatch.sty" to locations where LaTeX will find
it (the FAQ on CTAN in /help/uktug-FAQ gives more
information about this magic place
-2020/10/06
+2021/03/21
Enrico Gregorio
diff --git a/Master/texmf-dist/doc/latex/regexpatch/regexpatch.pdf b/Master/texmf-dist/doc/latex/regexpatch/regexpatch.pdf
index 798e1940b92..30d2c9d8052 100644
--- a/Master/texmf-dist/doc/latex/regexpatch/regexpatch.pdf
+++ b/Master/texmf-dist/doc/latex/regexpatch/regexpatch.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx b/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx
index deaadd12559..36384e967ab 100644
--- a/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx
+++ b/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx
@@ -25,7 +25,7 @@
\newcommand{\sv}{[\texttt{*}]}
%</driver>
%<*driver|package>
-\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}
%</driver|package>
%<*driver>
@@ -55,6 +55,7 @@
%
% \maketitle
%
+% \changes{v0.2f}{2021/03/21}{Replaced deprecated commands}
% \changes{v0.2e}{2020/10/06}{Replaced deprecated commands}
% \changes{v0.2d}{2018/05/02}{Fixed silly typo}
% \changes{v0.2c}{2018/03/31}{Removed loading of \texttt{l3regex}}
@@ -759,7 +760,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<control word>
{^\\protect\ \\\u{l_xpatch_name_tl}\ \ }
@@ -804,7 +805,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<any cs> with opt arg
{^\\@protected@testopt\ \\\u{l_xpatch_name_tl}\ \\\\}
@@ -872,11 +873,11 @@
% \begin{macrocode}
\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
}
% \end{macrocode}
@@ -1652,13 +1653,13 @@
% Gather the prefix (it is |\protected| when |#1| has been defined
% with |\newrobustcmd|).
% \begin{macrocode}
- \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
% \end{macrocode}
% Get the replacement text in tokenized form: the control sequences
% have spaces in their names, so we can't rely on
-% |\token_get_replacement_spec:N| because the spaces would be lost.
+% |\cs_replacement_spec:N| because the spaces would be lost.
% \begin{macrocode}
\tl_set_eq:Nc \l_xpatch_replacement_tl { \l_xpatch_name_tl }
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/regexpatch/regexpatch.ins b/Master/texmf-dist/source/latex/regexpatch/regexpatch.ins
index ba88d86942c..8a6d5336603 100644
--- a/Master/texmf-dist/source/latex/regexpatch/regexpatch.ins
+++ b/Master/texmf-dist/source/latex/regexpatch/regexpatch.ins
@@ -1,6 +1,6 @@
\iffalse meta-comment
-File regexpatch.ins Copyright (C) 2012-2020 Enrico Gregorio
+File regexpatch.ins Copyright (C) 2012-2021 Enrico Gregorio
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
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<control word>
{^\\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<any cs> 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 }