From c337b14500c3e98d579f6e3138a2a7a59b1459a1 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 16 Mar 2015 20:47:50 +0000
Subject: etoolbox (16mar15)

git-svn-id: svn://tug.org/texlive/trunk@36537 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty')

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}
 
-- 
cgit v1.2.3

