texlive[46602] Master/texmf-dist: etoolbox (11feb18)

[commits+karl at tug.org]

Revision: 46602
          http://tug.org/svn/texlive?view=revision&revision=46602
Author:   karl
Date:     2018-02-11 23:50:58 +0100 (Sun, 11 Feb 2018)
Log Message:
-----------
etoolbox (11feb18)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
    trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
    trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
    trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty

Modified: trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex	2018-02-11 22:50:35 UTC (rev 46601)
+++ trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex	2018-02-11 22:50:58 UTC (rev 46602)
@@ -12,8 +12,8 @@
   url={http://www.ctan.org/pkg/etoolbox/},
   author={Philipp Lehman, Joseph Wright},
   email={joseph.wright at 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 @@
 
 \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}

Modified: trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def	2018-02-11 22:50:35 UTC (rev 46601)
+++ trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def	2018-02-11 22:50:58 UTC (rev 46602)
@@ -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

Modified: trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty	2018-02-11 22:50:35 UTC (rev 46601)
+++ trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty	2018-02-11 22:50:58 UTC (rev 46602)
@@ -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 at defparser@do#1#2{%
+  \ifblank{#2}{\long\def#1##1{%
+    \etb at lst@@notoken at do##1\etb at lst@q at end&}}
+    {\etb at defparser@do at aux{#1}{#2}}}
+
+\def\etb at defparser@do at aux#1#2{%
   \begingroup
   \edef\@tempa{\endgroup
     \long\def\noexpand#1####1{%
       \expandafter\noexpand
       \csname etb at lst@\expandafter\@gobble\string#1\endcsname
-      \noexpand\@nil####1\unexpanded{#2}\noexpand\etb at lst@q at end\unexpanded{#2}&}%
+      \noexpand\@nil####1\noexpand#2\noexpand\etb at lst@q at end\noexpand#2&}%
     \long\csdef{etb at lst@\expandafter\@gobble\string#1}%
-      ####1\unexpanded{#2}{%
+      ####1\noexpand#2{%
       \noexpand\expandafter\noexpand\ifx\noexpand\expandafter
       \noexpand\etb at lst@q at end\noexpand\@gobble####1\noexpand\@empty
         \noexpand\expandafter\noexpand\@firstoftwo
@@ -1518,16 +1523,31 @@
 	 \noexpand\@nil}}}%
   \@tempa}
 
+\long\def\etb at lst@@notoken at do#1{%
+  \ifx\etb at lst@q at end#1\@empty
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+    {\listbreak}
+    {\do{#1}%
+    \etb at lst@@notoken at do}}
+
 \def\etb at lst@q at end{\etb at lst@q at end}
 
 \def\etb at defparser@arg#1#2{%
+  \ifblank{#2}{\long\def#1##1##2{%
+    \etb at lst@@notoken at arg{##1}##2\etb at lst@q at end&}}
+    {\etb at defparser@arg at aux{#1}{#2}}}
+
+\def\etb at defparser@arg at aux#1#2{%
   \begingroup
   \edef\@tempa{\endgroup
     \long\def\noexpand#1####1####2{%
       \expandafter\noexpand
       \csname etb at lst@\expandafter\@gobble\string#1\endcsname
-      {####1}\noexpand\@nil####2\unexpanded{#2}\noexpand\etb at lst@q at end\unexpanded{#2}&}%
-    \long\csdef{etb at lst@\expandafter\@gobble\string#1}####1####2\unexpanded{#2}{%
+      {####1}\noexpand\@nil####2\noexpand#2\noexpand\etb at lst@q at end\noexpand#2&}%
+    \long\csdef{etb at lst@\expandafter\@gobble\string#1}####1####2\noexpand#2{%
       \noexpand\expandafter\noexpand\ifx\noexpand\expandafter
       \noexpand\etb at lst@q at end\noexpand\@gobble####2\noexpand\@empty
         \noexpand\expandafter\noexpand\@firstoftwo
@@ -1541,6 +1561,16 @@
 	        {####1}\noexpand\@nil}}}%
   \@tempa}
 
+\long\def\etb at lst@@notoken at arg#1#2{%
+  \ifx\etb at lst@q at end#2\@empty
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+    {\listbreak}
+    {#1{#2}%
+    \etb at lst@@notoken at arg{#1}}}
+
 \long\def\etb at listitem#1#2{%
   \expandafter\ifblank\expandafter{\@gobble#2}
     {}