regexpatch (6oct20)

git-svn-id: svn://tug.org/texlive/trunk@56576 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 11 insertions, 10 deletions

diff --git a/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx b/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx
index e7d5dabf6b2..deaadd12559 100644
--- a/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx
+++ b/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx
@@ -1,6 +1,6 @@
  % \iffalse meta-comment
 %
-%% File: regexpatch.dtx (C) Copyright 2012-2016 Enrico Gregorio
+%% File: regexpatch.dtx (C) Copyright 2012-2020 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
@@ -25,7 +25,7 @@
 \newcommand{\sv}{[\texttt{*}]}
 %</driver>
 %<*driver|package>
-\GetIdInfo$Id: regexpatch.dtx 0.2d 2018-05-02 12:00:00Z Enrico $
+\GetIdInfo$Id: regexpatch.dtx 0.2e 2020-10-06 12:00:00Z Enrico $
           {Extending etoolbox patching commands}
 %</driver|package>
 %<*driver>
@@ -55,6 +55,7 @@
 %
 % \maketitle
 %
+% \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}}
 % \changes{v0.2b}{2016/05/15}{Fix for removed function}
@@ -701,7 +702,7 @@
 % A variant for checking a regex match so that we can give the second
 % argument as a token list.
 %    \begin{macrocode}
-\cs_generate_variant:Nn \regex_match:nnT {nV}
+\prg_generate_conditional_variant:Nnn \regex_match:nn {nV} { T,F,TF }
 %    \end{macrocode}
 %
 % \subsection{Functions}
@@ -757,8 +758,8 @@
   {
    \bool_set_false:N \l_xpatch_protect_bool
    \bool_set_false:N \l_xpatch_optional_bool
-   \tl_set:Nx \l_xpatch_name_tl { \cs_to_str:N #1  }
-   \tl_set:Nx \l_xpatch_repl_tl { \token_get_replacement_spec:N #1 }
+   \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_clear:N \l_xpatch_type_tl
    \regex_match:nVT % \DeclareRobustCommand<control word>
      {^\\protect\ \\\u{l_xpatch_name_tl}\ \ }
@@ -802,7 +803,7 @@
      }
    \bool_if:NT \l_xpatch_protect_bool
      {
-      \tl_set:Nx \l_xpatch_repl_tl
+      \tl_set:Nf \l_xpatch_repl_tl
         { \exp_after:wN \token_get_replacement_spec:N
             \cs:w \l_xpatch_name_tl \cs_end: }
       \regex_match:nVT % \DeclareRobustCommand<any cs> with opt arg
@@ -842,9 +843,9 @@
       \exp_after:wN #1 \cs:w \l_xpatch_name_tl \cs_end: {#3}{#4}{#5}{#6}
      }
      {
-      \msg_term:n
+      \iow_term:x
         {
-         xpatch~message \\
+         xpatch~message: ^^J
         `\token_to_str:N #2'~is~undefined;~
         I'll~ignore~the~request.
         }
@@ -1054,7 +1055,7 @@
   {
    \bool_if:NT \l_xpatch_tracing_bool
      {
-      \msg_term:n { xpatch~message \\ #1 }
+      \iow_term:x { xpatch~message ^^J ~ #1 }
      }
   }
 \cs_new:Npn \xpatch_message_cstype:N #1
@@ -1651,7 +1652,7 @@
 % Gather the prefix (it is |\protected| when |#1| has been defined
 % with |\newrobustcmd|).
 %    \begin{macrocode}
-    \tl_set:Nf \l_xpatch_prefix_tl { \token_get_prefix_spec:N #1 }
+    \tl_set:Nx \l_xpatch_prefix_tl { \token_get_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}