xpatch (26mar20)

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

5 files changed, 16 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/xpatch/README b/Master/texmf-dist/doc/latex/xpatch/README
index e228ead5ccf..41c2870bf4d 100644
--- a/Master/texmf-dist/doc/latex/xpatch/README
+++ b/Master/texmf-dist/doc/latex/xpatch/README
@@ -1,14 +1,18 @@
 The xpatch package generalizes the macro patching commands provided by
 P. Lehmann's `etoolbox'.
 
-This is version 0.3 of the package
+This is version 0.3a of the package
+
+Changes from version 0.3
+o Changed deprecated function \token_get_replacement_spec:N
+  to \cs_replacement_spec:N
 
 Changes from version 0.2
 o Added \xpatch...format, \xpreto...format and \xappto...format  macros 
   for patching internal biblatex macros defined \Declare...Format
   (under kind request by Audrey Boruvka)
 
- Copyright 2012 Enrico Gregorio
+ 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
diff --git a/Master/texmf-dist/doc/latex/xpatch/xpatch.pdf b/Master/texmf-dist/doc/latex/xpatch/xpatch.pdf
index f84680cc4f4..be1e39fe492 100644
--- a/Master/texmf-dist/doc/latex/xpatch/xpatch.pdf
+++ b/Master/texmf-dist/doc/latex/xpatch/xpatch.pdf
diff --git a/Master/texmf-dist/source/latex/xpatch/xpatch.dtx b/Master/texmf-dist/source/latex/xpatch/xpatch.dtx
index f901c32048b..2fe484e6670 100644
--- a/Master/texmf-dist/source/latex/xpatch/xpatch.dtx
+++ b/Master/texmf-dist/source/latex/xpatch/xpatch.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: xpatch.dtx (C) Copyright 2012 Enrico Gregorio
+%% File: xpatch.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
@@ -24,7 +24,7 @@
 \usepackage{bookmark}
 %</driver>
 %<*driver|package>
-\GetIdInfo$Id: xpatch.dtx 0.3 2012-10-02 12:00:00Z Enrico $
+\GetIdInfo$Id: xpatch.dtx 0.3a 2020-03-25 12:00:00Z Enrico $
           {Extending etoolbox patching commands}
 %</driver|package>
 %<*driver>
@@ -36,6 +36,7 @@
 % \changes{v0.2}{2012/01/13}{Added \texttt{\char`\\x...bibdriver} macros; fixed a bug for
 %  control symbols defined with \texttt{\char`\\newcommand} and an optional argument.}
 % \changes{v0.3}{2012/10/01}{Added a bunch of biblatex related commands}
+% \changes{v0.3a}{2020/03/25}{Changed deprecated function}
 %
 % \title{^^A
 %   The \textsf{xpatch} package\\ Extending \textsf{etoolbox} patching
@@ -543,7 +544,7 @@
 % \pkg{l3regex} stabilizes.}
 %    \begin{macrocode}
    \tl_set:Nx \l__xpatch_repl_tl
-     { \c__xpatch_bizarre_tl \token_get_replacement_spec:N #2 }
+     { \c__xpatch_bizarre_tl \cs_replacement_spec:N #2 }
 %    \end{macrocode}
 % We look whether the token list contains the bizarre list followed by
 % |\protect| and the same name (with two spaces) which happens if |#2|
@@ -635,7 +636,7 @@
      {
       \tl_set:Nx \l__xpatch_repl_tl
         { \c__xpatch_bizarre_tl 
-          \exp_after:wN \token_get_replacement_spec:N 
+          \exp_after:wN \cs_replacement_spec:N 
             \cs:w \l__xpatch_name_tl \cs_end: }
       \tl_if_in:NxT \l__xpatch_repl_tl
         {
diff --git a/Master/texmf-dist/source/latex/xpatch/xpatch.ins b/Master/texmf-dist/source/latex/xpatch/xpatch.ins
index 28ca5db6769..dc0ad457d6b 100644
--- a/Master/texmf-dist/source/latex/xpatch/xpatch.ins
+++ b/Master/texmf-dist/source/latex/xpatch/xpatch.ins
@@ -1,6 +1,6 @@
 \iffalse meta-comment
 
-File xpatch.ins Copyright (C) 2012 Enrico Gregorio
+File xpatch.ins Copyright (C) 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
diff --git a/Master/texmf-dist/tex/latex/xpatch/xpatch.sty b/Master/texmf-dist/tex/latex/xpatch/xpatch.sty
index 818e802ef43..bec5455292f 100644
--- a/Master/texmf-dist/tex/latex/xpatch/xpatch.sty
+++ b/Master/texmf-dist/tex/latex/xpatch/xpatch.sty
@@ -9,7 +9,7 @@
 %% Do not distribute this file without also distributing the
 %% source files specified above.
 %% 
-%% File: xpatch.dtx (C) Copyright 2012 Enrico Gregorio
+%% File: xpatch.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
@@ -24,7 +24,7 @@
 %% The released version of this bundle is available from CTAN.
 %%
 \RequirePackage{expl3}
-\GetIdInfo$Id: xpatch.dtx 0.3 2012-10-02 12:00:00Z Enrico $
+\GetIdInfo$Id: xpatch.dtx 0.3a 2020-03-25 12:00:00Z Enrico $
           {Extending etoolbox patching commands}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -53,7 +53,7 @@
     \bool_set_false:N \l__xpatch_protect_bool
    \tl_set:Nx \l__xpatch_name_tl { \cs_to_str:N #2  }
    \tl_set:Nx \l__xpatch_repl_tl
-     { \c__xpatch_bizarre_tl \token_get_replacement_spec:N #2 }
+     { \c__xpatch_bizarre_tl \cs_replacement_spec:N #2 }
    \tl_if_in:NxT \l__xpatch_repl_tl
      {
       \c__xpatch_bizarre_tl
@@ -107,7 +107,7 @@
      {
       \tl_set:Nx \l__xpatch_repl_tl
         { \c__xpatch_bizarre_tl
-          \exp_after:wN \token_get_replacement_spec:N
+          \exp_after:wN \cs_replacement_spec:N
             \cs:w \l__xpatch_name_tl \cs_end: }
       \tl_if_in:NxT \l__xpatch_repl_tl
         {