summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/etoolbox
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-02-03 22:55:30 +0000
committerKarl Berry <karl@freefriends.org>2018-02-03 22:55:30 +0000
commit7c2a9723071dea43c607f1d4f854523c75ef012a (patch)
treede75b977d0cb5a8d2dec85cc2a2bb65061755663 /Master/texmf-dist/tex/latex/etoolbox
parentb2bd23ad17f82aad5776427229b915e7c8e5bb35 (diff)
etoolbox (3feb18)
git-svn-id: svn://tug.org/texlive/trunk@46533 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/etoolbox')
-rw-r--r--Master/texmf-dist/tex/latex/etoolbox/etoolbox.def2
-rw-r--r--Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty19
2 files changed, 14 insertions, 7 deletions
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