etoolbox (1dec16)

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

4 files changed, 21 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
index 458b22ba0a1..95ae840d655 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 4c7a4abb6d8..69809b26286 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.2a},
-  date={2015/08/02}}
+  revision={v2.2b},
+  date={2016/12/01}}
 
 \hypersetup{%
   pdftitle={The etoolbox Package},
@@ -1263,12 +1263,21 @@ Expands to \prm{true} if \prm{string} is a Roman numeral, and to \prm{false} oth
 
 \end{ltxsyntax}
 
+\section{Reporting issues}
+
+The development code for \sty{etoolbox} is hosted on GitHub: \url{https://github.com/josephwright/etoolbox}. This is the best place to log any issues with the package.
+
 \section{Revision History}
 
 This revision history is a list of changes relevant to users of this package. Changes of a more technical nature which do not affect the user interface or the behavior of the package are not included in the list. If an entry in the revision history states that a feature has been \emph{improved} or \emph{extended}, this indicates a syntactically backwards compatible modification, such as the addition of an optional argument to an existing command. Entries stating that a feature has been \emph{modified} demand attention. They indicate a modification which may require changes to existing documents in some, hopefully rare, cases. The numbers on the right indicate the relevant section of this manual.
 
 \begin{changelog}
 
+\begin{release}{2.2b}{2016-12-01}
+\item Fixed \cmd{ifdefltxprotect} for some types of \latex robust commands
+\item Remove redundant macro after \cmd{robustify} processing
+\end{release}
+
 \begin{release}{2.2a}{2015-08-02}
 \item Fixed robustness bug in \cmd{ifblank}/\cmd{notblank}
 \end{release}
diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
index 6448fe2669f..75a01547a59 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/08/02 v2.2a etoolbox debug messages (JAW)]
+  [2016/12/01 v2.2b 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 35549423a15..da8327b8338 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/08/02 v2.2a e-TeX tools for LaTeX (JAW)]
+  [2016/12/01 v2.2b e-TeX tools for LaTeX (JAW)]
 
 \begingroup
 \@ifundefined{eTeXversion}
@@ -238,7 +238,14 @@
 
 \newrobustcmd{\ifdefltxprotect}[1]{%
   \begingroup
+  \edef\etb@resrvda{\string#1}%
+  \def\etb@resrvdb{#1}%
+  \edef\etb@resrvdb{\expandafter\strip@prefix\meaning\etb@resrvdb}%
   \edef\etb@resrvda{%
+    \ifx\etb@resrvda\etb@resrvdb
+      \noexpand\x@protect
+      \noexpand#1%
+    \fi
     \noexpand\protect\expandafter\noexpand
     \csname\expandafter\@gobble\string#1 \endcsname}%
   \expandafter\endgroup\ifx#1\etb@resrvda
@@ -1233,9 +1240,7 @@
               \@tempswafalse}}
           {\protected\edef#1{\expandonce\etb@resrvda}}%
         \if@tempswa
-          \ifcsdef{\string#1 }
-            {}
-            {\csundef{\expandafter\@gobble\string#1 }}%
+          \csundef{\expandafter\@gobble\string#1 }%
         \fi
         \undef\etb@resrvda}
        {\etb@error{\string#1 not a macro}\@eha}}}