1 files changed, 13 insertions, 6 deletions
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