diff options
author | Karl Berry <karl@freefriends.org> | 2015-03-16 20:47:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-03-16 20:47:50 +0000 |
commit | c337b14500c3e98d579f6e3138a2a7a59b1459a1 (patch) | |
tree | 11aa6c4ec5776a7e600afa7d0a888eaa68686dae /Master/texmf-dist/tex/latex/etoolbox | |
parent | 88e80bc72bd0448dfa0b3b1b65c7c5d41b7a043b (diff) |
etoolbox (16mar15)
git-svn-id: svn://tug.org/texlive/trunk@36537 c570f23f-e606-0410-a88d-b1316a301751
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 | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def index 53c58cf7c57..c42900e4885 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/10 v2.1b etoolbox debug messages (JAW)] + [2015/03/15 v2.1c 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 ccedf988880..1b70cf2dd47 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/03/10 v2.1b e-TeX tools for LaTeX (JAW)] + [2015/03/15 v2.1c e-TeX tools for LaTeX (JAW)] \begingroup \@ifundefined{eTeXversion} @@ -1159,6 +1159,7 @@ \edef\noexpand\etb@resrvda{\noexpand\etb@resrvda\meaning#1&}}% \etb@resrvda \makeatletter + \endlinechar\m@ne \scantokens\expandafter{\etb@resrvda}% \expandafter\endgroup\ifx#1\etb@resrvda \expandafter\@firstoftwo @@ -1175,7 +1176,7 @@ \endgroup\noexpand\noexpand\noexpand\ifblank{####2}}% \edef\noexpand\etb@resrvda{\noexpand\etb@resrvda \expandafter\strip@prefix\meaning#1\detokenize{#2}&}% - \noexpand\etb@resrvda} + \noexpand\etb@resrvda}% \etb@resrvda\@secondoftwo\@firstoftwo} % {<string>}{<true}{<false>} @@ -1214,7 +1215,7 @@ {The command is special and cannot be handled by \string\robustify.}% \@tempswafalse}} - {\protected\edef#1{\expandonce\etb@resrvda}} + {\protected\edef#1{\expandonce\etb@resrvda}}% \if@tempswa \ifcsdef{\string#1 } {} @@ -1305,12 +1306,14 @@ \etb@patchcmd@scantoks\etb@resrvda \let#2\etb@resrvda \undef\etb@resrvda - \@firstoftwo} + \@firstoftwo}% {\@secondoftwo}} \def\etb@patchcmd@scantoks#1{% \edef\etb@resrvda{\endgroup + \endlinechar\m@ne \unexpanded{\makeatletter\scantokens}{#1}% + \endlinechar\the\endlinechar\relax \catcode\number`\@=\the\catcode`\@\relax}% \etb@resrvda} |