diff options
author | Karl Berry <karl@freefriends.org> | 2015-08-03 22:03:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-08-03 22:03:15 +0000 |
commit | 1537e6d91a27ed0dda1f54c21031f800f1179a71 (patch) | |
tree | 4f2e5bab9cab2010b7dfb306f249ce19c338cc63 /Master | |
parent | c5c45d581249ea2b3fed630fa60e82ec968f6697 (diff) |
etoolbox (3aug15)
git-svn-id: svn://tug.org/texlive/trunk@38031 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/etoolbox/README.md (renamed from Master/texmf-dist/doc/latex/etoolbox/README) | 0 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf | bin | 221014 -> 221364 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/etoolbox/etoolbox.def | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty | 17 |
5 files changed, 19 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/latex/etoolbox/README b/Master/texmf-dist/doc/latex/etoolbox/README.md index 48de76e1356..48de76e1356 100644 --- a/Master/texmf-dist/doc/latex/etoolbox/README +++ b/Master/texmf-dist/doc/latex/etoolbox/README.md diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf Binary files differindex baaadb7d6fc..458b22ba0a1 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 3d101b3aec3..4c7a4abb6d8 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.2}, - date={2015/04/04}} + revision={v2.2a}, + date={2015/08/02}} \hypersetup{% pdftitle={The etoolbox Package}, @@ -1269,6 +1269,10 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{2.2a}{2015-08-02} +\item Fixed robustness bug in \cmd{ifblank}/\cmd{notblank} +\end{release} + \begin{release}{2.2}{2015-05-04} \item Added \cmd{csmeaning}\see{aut:def:def} \end{release} 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>} |