etoolbox (3feb18)

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

4 files changed, 21 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
index 1cf9b679bc9..29b9590a0a6 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 f815a4d3aaa..75dfadf95dc 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.5},
-  date={2017/11/22}}
+  revision={v2.5a},
+  date={2018/02/03}}
 
 \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--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/}
+Copyright \textcopyright\ 2007--2011 Philipp Lehman, 2015--2018 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}
@@ -1297,6 +1297,10 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.5a}{2018-02-03}
+\item Internal performance improvements in list processors
+\end{release}
+
 \begin{release}{2.5}{2017-11-22}
 \item Added \cmd{csgundef}\see{aut:def:def}
 \item Added \cmd{gundef}\see{aut:def:def}
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
index 526a58264cf..50b5be7a0bd 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}
-  [2017/11/22 v2.5 etoolbox debug messages (JAW)]
+  [2018/02/03 v2.5a 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 d410e402b72..5f92f1d4fc8 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-2017 Joseph Wright
+%           (c) 2015-2018 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}
-  [2017/11/22 v2.5 e-TeX tools for LaTeX (JAW)]
+  [2018/02/03 v2.5a e-TeX tools for LaTeX (JAW)]
 
 \begingroup
 \@ifundefined{eTeXversion}
@@ -1502,16 +1502,23 @@
     \long\def\noexpand#1####1{%
       \expandafter\noexpand
       \csname etb@lst@\expandafter\@gobble\string#1\endcsname
-      \space####1\noexpand#2&}%
-    \long\csdef{etb@lst@\expandafter\@gobble\string#1}####1\noexpand#2####2&{%
+      \space####1\noexpand#2\noexpand\etb@lst@q@end\noexpand#2&}%
+    \long\csdef{etb@lst@\expandafter\@gobble\string#1}%
+      ####1\noexpand#2####2\noexpand#2{%
       \noexpand\etb@listitem\noexpand\do{####1}%
-      \noexpand\ifblank{####2}
+      \noexpand\ifx\noexpand\etb@lst@q@end####2\noexpand\@empty
+        \noexpand\expandafter\noexpand\@firstoftwo
+      \noexpand\else
+        \noexpand\expandafter\noexpand\@secondoftwo
+      \noexpand\fi
         {\noexpand\listbreak}
         {\expandafter\noexpand
          \csname etb@lst@\expandafter\@gobble\string#1\endcsname
-	 \space####2}&}}%
+	 \space####2\noexpand#2}}}%
   \@tempa}
 
+\def\etb@lst@q@end{\etb@lst@q@end}
+
 \def\etb@defparser@arg#1#2{%
   \begingroup
   \edef\@tempa{\endgroup