etoolbox (3jan17)

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

4 files changed, 27 insertions, 22 deletions

diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
index 3f76945663c..fe58f53ed17 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
+++ b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
index 2f8c2ed4ef3..f1072a21cc8 100644
--- a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
+++ b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
@@ -12,8 +12,8 @@
   url={http://www.ctan.org/pkg/etoolbox/},
   author={Philipp Lehman, Joseph Wright},
   email={joseph.wright@morningstar2.co.uk},
-  revision={v2.3},
-  date={2016/12/26}}
+  revision={v2.4},
+  date={2017/01/02}}
 
 \hypersetup{%
   pdftitle={The etoolbox Package},
@@ -35,7 +35,7 @@ The \sty{etoolbox} package is a toolbox of programming tools geared primarily to
 
 \subsection{License}
 
-Copyright \textcopyright\ 2007--2011 Philipp Lehman, 2015,2016 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or later.\fnurl{http://www.latex-project.org/lppl/}
+Copyright \textcopyright\ 2007--2011 Philipp Lehman, 2015--2017 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or later.\fnurl{http://www.latex-project.org/lppl/}
 
 \section{User Commands}
 \label{use}
@@ -1183,21 +1183,21 @@ Similar to \cmd{listeadd} except that it takes a control sequence name as its fi
 
 Similar to \cmd{listcseadd} except that the assignment is global.
 
-\cmditem{listdel}{listmacro}{item}
+\cmditem{listremove}{listmacro}{item}
 
 This command removes an \prm{item} from a \prm{listmacro}. A blank \prm{item} is ignored.
 
-\cmditem{listgdel}{listmacro}{item}
+\cmditem{listgremove}{listmacro}{item}
 
-Similar to \cmd{listdel} except that the assignment is global.
+Similar to \cmd{listremove} except that the assignment is global.
 
-\cmditem{listcsdel}{listcsname}{item}
+\cmditem{listcsremove}{listcsname}{item}
 
-Similar to \cmd{listdel} except that it takes a control sequence name as its first argument.
+Similar to \cmd{listremove} except that it takes a control sequence name as its first argument.
 
-\cmditem{listcsgdel}{listcsname}{item}
+\cmditem{listcsgremove}{listcsname}{item}
 
-Similar to \cmd{listcsdel} except that the assignment is global.
+Similar to \cmd{listcsremove} except that the assignment is global.
 
 \cmditem{dolistloop}{listmacro}
 
@@ -1289,6 +1289,11 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.4}{2017-01-02}
+\item Renamed \cmd{listdel} to \cmd{listremove} (name clash)\see{aut:lst:int}
+\item Renamed \cmd{listgdel} to \cmd{listgremove} (name clash)\see{aut:lst:int}
+\end{release}
+
 \begin{release}{2.3}{2016-12-26}
 \item Added \cmd{listdel}\see{aut:lst:int}
 \item Added \cmd{listgdel}\see{aut:lst:int}
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
index e99a704cfde..b00ea3a615e 100644
--- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
+++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
@@ -1,5 +1,5 @@
 \ProvidesFile{etoolbox.def}
-  [2016/12/26 v2.3 etoolbox debug messages (JAW)]
+  [2017/01/02 v2.4 etoolbox debug messages (JAW)]
 
 \begingroup
 \makeatletter
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
index d2bfb6b12ad..0b73840df25 100644
--- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
+++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
@@ -1,5 +1,5 @@
 % Copyright (c) 2007-2011 Philipp Lehman.
-%           (c) 2015,2016 Joseph Wright
+%           (c) 2015-2017 Joseph Wright
 %
 % Permission is granted to copy, distribute and/or modify this
 % software under the terms of the LaTeX Project Public License
@@ -12,7 +12,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoolbox}
-  [2016/12/26 v2.3 e-TeX tools for LaTeX (JAW)]
+  [2017/01/02 v2.4 e-TeX tools for LaTeX (JAW)]
 
 \begingroup
 \@ifundefined{eTeXversion}
@@ -1572,12 +1572,12 @@
 
 % {<listmacro>}{<string>}
 
-\newrobustcmd{\listdel}[2]{%
-  \etb@listdel{#1}{#2}\def}
-\newrobustcmd{\listgdel}[2]{%
-  \etb@listdel{#1}{#2}\gdef}
+\newrobustcmd{\listremove}[2]{%
+  \etb@listremove{#1}{#2}\def}
+\newrobustcmd{\listgremove}[2]{%
+  \etb@listremove{#1}{#2}\gdef}
 
-\protected\long\def\etb@listdel#1#2#3{%
+\protected\long\def\etb@listremove#1#2#3{%
   \ifblank{#2}
     {}
     {\ifinlist{#2}{#1}{%
@@ -1589,10 +1589,10 @@
 
 % {<listcsname>}{<string>}
 
-\newrobustcmd{\listcsdel}[1]{%
-  \expandafter\listdel\csname#1\endcsname}
-\newrobustcmd{\listcsgdel}[1]{%
-  \expandafter\listgdel\csname#1\endcsname}
+\newrobustcmd{\listcsremove}[1]{%
+  \expandafter\listremove\csname#1\endcsname}
+\newrobustcmd{\listcsgremove}[1]{%
+  \expandafter\listgremove\csname#1\endcsname}
 
 % {<string>}{<listmacro>}{<true>}{<false>}