withargs (4nov19)

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

4 files changed, 21 insertions, 5 deletions

diff --git a/Master/texmf-dist/doc/latex/withargs/README b/Master/texmf-dist/doc/latex/withargs/README
index 45cee67f258..9a5c837e9ac 100644
--- a/Master/texmf-dist/doc/latex/withargs/README
+++ b/Master/texmf-dist/doc/latex/withargs/README
@@ -1,6 +1,6 @@
-LaTeX Package : withargs 0.2.0
+LaTeX Package : withargs 0.3.1
 
-Last Modified : 2016-12-19
+Last Modified : 2019-11-04
 
 Author        : Michiel Helvensteijn  (www.mhelvens.net)
 
diff --git a/Master/texmf-dist/doc/latex/withargs/withargs.pdf b/Master/texmf-dist/doc/latex/withargs/withargs.pdf
index a3ea4e7f6d8..b5d3c6fc052 100644
--- a/Master/texmf-dist/doc/latex/withargs/withargs.pdf
+++ b/Master/texmf-dist/doc/latex/withargs/withargs.pdf
diff --git a/Master/texmf-dist/doc/latex/withargs/withargs.tex b/Master/texmf-dist/doc/latex/withargs/withargs.tex
index a34e0dcda50..bbe63332bdd 100644
--- a/Master/texmf-dist/doc/latex/withargs/withargs.tex
+++ b/Master/texmf-dist/doc/latex/withargs/withargs.tex
@@ -30,6 +30,20 @@
 	withargs:nn,withargs:cn
 }
 
+% Ugly hack, because of the unfortunate deprecation of 'n' to 'c' conversion,
+% plus the fact that kernel errors, even non-fatal ones, cannot be redirected.
+% Will think of a better solution at some point, but not now.
+\ExplSyntaxOn
+\let\__withargs_docs_old_kernel_msg_error:nnnnnn\__kernel_msg_error:nnnnnn
+\def\__kernel_msg_error:nnnnnn#1#2{
+  \str_if_eq:nnTF { #1/#2 } { kernel/deprecated-variant }{
+    \__kernel_msg_warning:nnnnnn{#1}{#2}
+  }{
+    \__withargs_docs_old_kernel_msg_error:nnnnnn{#1}{#2}
+  }
+}
+\ExplSyntaxOff
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Global Changes                                                               %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -46,6 +60,9 @@
 \changes{0.2.0}{2016/12/19}
   {adjusted code to new version of expl3}
 
+\changes{0.3.1}{2019/11/04}
+  {adjusted code to new version of expl3}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{document}                                                               %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/withargs/withargs.sty b/Master/texmf-dist/tex/latex/withargs/withargs.sty
index c7d715687a3..ac86a4964ea 100644
--- a/Master/texmf-dist/tex/latex/withargs/withargs.sty
+++ b/Master/texmf-dist/tex/latex/withargs/withargs.sty
@@ -17,7 +17,7 @@
 %                                                                              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \fi %%%%
 
-% \CheckSum{117}
+% \CheckSum{116}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -46,7 +46,7 @@
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\ProvidesExplPackage{withargs}{2016/12/19}{0.2.0}
+\ProvidesExplPackage{withargs}{2019/11/04}{0.3.1}
   {an inline construct for passing token lists as TeX parameters}
 %    \end{macrocode}
 %
@@ -66,7 +66,6 @@
 %  
 %    \begin{macrocode}
 \RequirePackage{xparse}
-\RequirePackage{l3regex}
 %    \end{macrocode}
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%