4 files changed, 42 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
index 44334ab8937..e6f74dc9ec0 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 eced621952e..296b5d6e403 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.5d},
-  date={2018/02/10}}
+  revision={v2.5e},
+  date={2018/02/11}}
 
 \hypersetup{%
   pdftitle={The etoolbox Package},
@@ -1297,6 +1297,10 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.5e}{2018-02-11}
+\item More work on empty list separator in \cmd{DeclareListParser}
+\end{release}
+
 \begin{release}{2.5d}{2018-02-10}
 \item Allow for empty list separator in \cmd{DeclareListParser}
 \end{release}
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
index fc23738b13c..422457fe1a2 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}
-  [2018/02/10 v2.5d etoolbox debug messages (JAW)]
+  [2018/02/11 v2.5e 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 97d12663e8b..3b561d27977 100644
--- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
+++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
@@ -12,7 +12,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etoolbox}
-  [2018/02/10 v2.5d e-TeX tools for LaTeX (JAW)]
+  [2018/02/11 v2.5e e-TeX tools for LaTeX (JAW)]
 
 \begingroup
 \@ifundefined{eTeXversion}
@@ -1497,14 +1497,19 @@
   \@ifdefinable#2{#1{#2}{#3}}}
 
 \def\etb@defparser@do#1#2{%
+  \ifblank{#2}{\long\def#1##1{%
+    \etb@lst@@notoken@do##1\etb@lst@q@end&}}
+    {\etb@defparser@do@aux{#1}{#2}}}
+
+\def\etb@defparser@do@aux#1#2{%
   \begingroup
   \edef\@tempa{\endgroup
     \long\def\noexpand#1####1{%
       \expandafter\noexpand
       \csname etb@lst@\expandafter\@gobble\string#1\endcsname
-      \noexpand\@nil####1\unexpanded{#2}\noexpand\etb@lst@q@end\unexpanded{#2}&}%
+      \noexpand\@nil####1\noexpand#2\noexpand\etb@lst@q@end\noexpand#2&}%
     \long\csdef{etb@lst@\expandafter\@gobble\string#1}%
-      ####1\unexpanded{#2}{%
+      ####1\noexpand#2{%
       \noexpand\expandafter\noexpand\ifx\noexpand\expandafter
       \noexpand\etb@lst@q@end\noexpand\@gobble####1\noexpand\@empty
         \noexpand\expandafter\noexpand\@firstoftwo
@@ -1518,16 +1523,31 @@
 	 \noexpand\@nil}}}%
   \@tempa}
 
+\long\def\etb@lst@@notoken@do#1{%
+  \ifx\etb@lst@q@end#1\@empty
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+    {\listbreak}
+    {\do{#1}%
+    \etb@lst@@notoken@do}}
+
 \def\etb@lst@q@end{\etb@lst@q@end}
 
 \def\etb@defparser@arg#1#2{%
+  \ifblank{#2}{\long\def#1##1##2{%
+    \etb@lst@@notoken@arg{##1}##2\etb@lst@q@end&}}
+    {\etb@defparser@arg@aux{#1}{#2}}}
+
+\def\etb@defparser@arg@aux#1#2{%
   \begingroup
   \edef\@tempa{\endgroup
     \long\def\noexpand#1####1####2{%
       \expandafter\noexpand
       \csname etb@lst@\expandafter\@gobble\string#1\endcsname
-      {####1}\noexpand\@nil####2\unexpanded{#2}\noexpand\etb@lst@q@end\unexpanded{#2}&}%
-    \long\csdef{etb@lst@\expandafter\@gobble\string#1}####1####2\unexpanded{#2}{%
+      {####1}\noexpand\@nil####2\noexpand#2\noexpand\etb@lst@q@end\noexpand#2&}%
+    \long\csdef{etb@lst@\expandafter\@gobble\string#1}####1####2\noexpand#2{%
       \noexpand\expandafter\noexpand\ifx\noexpand\expandafter
       \noexpand\etb@lst@q@end\noexpand\@gobble####2\noexpand\@empty
         \noexpand\expandafter\noexpand\@firstoftwo
@@ -1541,6 +1561,16 @@
 	        {####1}\noexpand\@nil}}}%
   \@tempa}
 
+\long\def\etb@lst@@notoken@arg#1#2{%
+  \ifx\etb@lst@q@end#2\@empty
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+    {\listbreak}
+    {#1{#2}%
+    \etb@lst@@notoken@arg{#1}}}
+
 \long\def\etb@listitem#1#2{%
   \expandafter\ifblank\expandafter{\@gobble#2}
     {}