From 219ddedcea6254dad0d23d0735255ed970000552 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 1 Apr 2018 22:31:14 +0000 Subject: regexpatch (31mar18) git-svn-id: svn://tug.org/texlive/trunk@47233 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/regexpatch/regexpatch.dtx | 74 +++++++++++----------- .../source/latex/regexpatch/regexpatch.ins | 2 +- 2 files changed, 39 insertions(+), 37 deletions(-) (limited to 'Master/texmf-dist/source/latex/regexpatch') diff --git a/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx b/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx index 01f7fa57eaa..5582196a454 100644 --- a/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx +++ b/Master/texmf-dist/source/latex/regexpatch/regexpatch.dtx @@ -1,4 +1,4 @@ -% \iffalse meta-comment + % \iffalse meta-comment % %% File: regexpatch.dtx (C) Copyright 2012-2016 Enrico Gregorio %% @@ -11,7 +11,7 @@ %% %% This file is part of the "regexpatch bundle" (The Work in LPPL) %% and all files in that bundle must be distributed together. -%% +%% %% The released version of this bundle is available from CTAN. %% % @@ -25,7 +25,7 @@ \newcommand{\sv}{[\texttt{*}]} % %<*driver|package> -\GetIdInfo$Id: regexpatch.dtx 0.2b 2016-05-15 12:00:00Z Enrico $ +\GetIdInfo$Id: regexpatch.dtx 0.2c 2018-03-31 12:00:00Z Enrico $ {Extending etoolbox patching commands} % %<*driver> @@ -55,11 +55,12 @@ % % \maketitle % +% \changes{v0.2c}{2018/03/31}{Removed loading of \texttt{l3regex}} % \changes{v0.2b}{2016/05/15}{Fix for removed function} % \changes{v0.2a}{2015/05/20}{Fixed silly mistake} % \changes{v0.2}{2013/03/28}{Polished code and documentation} % \changes{v0.2}{2013/03/28}{Additional biblatex related macros} -% \changes{v0.1c}{2013/03/25}{Replaced obsolete command +% \changes{v0.1c}{2013/03/25}{Replaced obsolete command % \texttt{\protect\string\protect\prg_case_str:onn}} % \changes{v0.1c}{2013/03/25}{Replaced \texttt{\protect\string\protect\msg_term:x} % with \texttt{\protect\string\protect\msg_term:n}} @@ -212,7 +213,7 @@ % % % \section{Important notices} -% +% % If the command to be patched contains `|@|-commands' in its % replacement text, \emph{always} ensure that the patching code is % enclosed between |\makeatletter| and |\makeatother|; this is @@ -297,7 +298,7 @@ %\end{verbatim} % that would become an astonishing %\begin{verbatim} -% \expandafter\patchcmd\csname\expandafter\string\csname +% \expandafter\patchcmd\csname\expandafter\string\csname % abx@macro@\detokenize{foo.bar}\endcsname\endcsname % {and}{und}{}{} %\end{verbatim} @@ -501,7 +502,7 @@ % It's important to remember that patching commands that have |@| in % their name must \emph{always} be performed between |\makeatletter| % and |\makeatother|. -% +% % \section{Examples} % % From \texttt{http://tex.stackexchange.com/a/42894}: the series @@ -666,7 +667,7 @@ } \tex_endinput:D } -\RequirePackage{xparse,l3regex} +\RequirePackage{xparse} % \end{macrocode} % % \subsection{Variables} @@ -1191,11 +1192,11 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn { abx@macro@ \tl_to_str:n {#2} } {#3}{#4}{#5}{#6} } { - \xpatch_main:Ncnnnn \xpatch_patchcmd_once:Nnnnn + \xpatch_main)four:Ncnnnn \xpatch_patchcmd_once:Nnnnn { abx@macro@ \tl_to_str:n {#2} } {#3}{#4}{#5}{#6} } } @@ -1207,7 +1208,7 @@ { abx@macro@ \tl_to_str:n {#2} } {#3}{#4}{#5}{#6} } { - \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_once:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_once:Nnnnn { abx@macro@ \tl_to_str:n {#2} } {#3}{#4}{#5}{#6} } } @@ -1241,6 +1242,7 @@ { \exp_args:Nc \xpatch_regexpatchcmd_once:Nnnnn {blx@bbx@#2} {#3}{#4}{#5}{#6} } } % \end{macrocode} +% \changes{v0.2c}{2018/03/31}{Fixed wrong function name in \texttt{\protect\string\protect\xpatchbibmacro}} % \changes{v0.2a}{2015/05/20}{Fixed silly mistake} % Other \pkg{biblatex} related macros, added by request of the % maintainers. @@ -1263,7 +1265,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn { abx@ffd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1275,7 +1277,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn { abx@ffd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1287,7 +1289,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn { abx@ffd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1299,7 +1301,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn { abx@ffd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1325,7 +1327,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn { abx@nfd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1337,7 +1339,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn { abx@nfd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1349,7 +1351,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn { abx@nfd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1361,7 +1363,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn { abx@nfd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1387,7 +1389,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn { abx@lfd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1399,7 +1401,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn { abx@lfd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1411,7 +1413,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn { abx@lfd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1423,7 +1425,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn { abx@lfd@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1449,7 +1451,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn { abx@fid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1461,7 +1463,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn { abx@fid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1473,7 +1475,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn { abx@fid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1485,7 +1487,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn { abx@fid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1511,7 +1513,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn { abx@nid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1523,7 +1525,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn { abx@nid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1535,7 +1537,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn { abx@nid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1547,7 +1549,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn { abx@nid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1573,7 +1575,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_pretocmd_all:Nnnn { abx@lid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1585,7 +1587,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn + \xpatch_main_three:Ncnnn \xpatch_apptocmd_all:Nnnn { abx@lid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6} } { @@ -1597,7 +1599,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_patchcmd_all:Nnnnn { abx@lid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1609,7 +1611,7 @@ { \IfBooleanTF{#1} { - \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn + \xpatch_main_four:Ncnnnn \xpatch_regexpatchcmd_all:Nnnnn { abx@lid@ \tl_to_str:n {#2} @ \tl_to_str:n {#3} } {#4}{#5}{#6}{#7} } { @@ -1678,7 +1680,7 @@ { \group_begin: \bool_set_true:N \l_xpatch_tracing_bool - \xpatch_message:n + \xpatch_message:n { Macro~`\token_to_str:N #1'~ has~no~optional~argument~ or~it~has~been~defined~with~`xparse'~and~operating~ diff --git a/Master/texmf-dist/source/latex/regexpatch/regexpatch.ins b/Master/texmf-dist/source/latex/regexpatch/regexpatch.ins index ef0e52ac236..93fd3aeb50d 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-2013 Enrico Gregorio +File regexpatch.ins Copyright (C) 2012-2018 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 -- cgit v1.2.3