diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/etoolbox')
| -rw-r--r-- | Master/texmf-dist/tex/latex/etoolbox/etoolbox.def | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def index c8188214d72..6448fe2669f 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} - [2015/03/19 v2.1d etoolbox debug messages (JAW)] + [2015/08/02 v2.2a 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 154a030aaef..35549423a15 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} - [2015/05/04 v2.2 e-TeX tools for LaTeX (JAW)] + [2015/08/02 v2.2a e-TeX tools for LaTeX (JAW)] \begingroup \@ifundefined{eTeXversion} @@ -476,12 +476,19 @@ % {<string>}{<true>}{<false>} -\newcommand{\ifblank}[1]{% from url.sty - \etb@ifblank@i#1&&\@secondoftwo\@firstoftwo:} -\long\def\etb@ifblank@i#1#2#4#5:{#4} +\newcommand{\ifblank}[1]{% from expl3 + \expandafter\ifx\expandafter\relax\detokenize\expandafter{\@gobble#1?}\relax + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} \newcommand{\notblank}[1]{% - \etb@ifblank@i#1&&\@firstoftwo\@secondoftwo:} + \expandafter\ifx\expandafter\relax\detokenize\expandafter{\@gobble#1?}\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi} % {<numexpr>}{<comp>}{<numexpr>}{<true>}{<false>} |