etoolbox (16mar15)

git-svn-id: svn://tug.org/texlive/trunk@36537 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 16 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
index 1dd09fd3108..c2f6a5e0291 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 9fa5b9fa77d..5eae4f1e582 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.1b},
-  date={2015/03/10}}
+  revision={v2.1c},
+  date={2015/03/15}}
 
 \hypersetup{%
   pdftitle={The etoolbox Package},
@@ -1265,6 +1265,12 @@ This revision history is a list of changes relevant to users of this package. Ch
 
 \begin{changelog}
 
+\begin{release}{2.1b}{2015-03-15}
+\item Fixed space bug in \cmd{ifpatchable}
+\item Fixed space bug in \cmd{patchcmd}
+\item Fixed space bug in \cmd{robustify}
+\end{release}
+
 \begin{release}{2.1b}{2015-03-10}
 \item Minor documentation fixes
 \end{release}
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}