From a2e36e6098124b767825914adc09449f74ca3e67 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 10 Sep 2019 21:45:07 +0000 Subject: etoolbox (10sep19) git-svn-id: svn://tug.org/texlive/trunk@52073 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf | Bin 224632 -> 224407 bytes Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex | 9 +- Master/texmf-dist/tex/latex/etoolbox/etoolbox.def | 2 +- Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty | 122 +++++++++++++++------- 4 files changed, 91 insertions(+), 42 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf index 40403d833e9..4d69fa3b4fb 100644 Binary files a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf and b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf differ diff --git a/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex b/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex index 4764fd032d0..3d547118387 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.5e}, - date={2018/08/19}} + revision={v2.5g}, + date={2019/09/09}} \hypersetup{% pdftitle={The etoolbox Package}, @@ -1297,6 +1297,11 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{2.5g}{2019-09-09} +\item Update patching of \cmd{begin} and \cmd{end} in advance of \LaTeX{} + kernel changes +\end{release} + \begin{release}{2.5f}{2018-08-18} \item Fix issue with \cmd{ifdefempty}, \cmd{ifcsempty}, \cs{ifdefvoid} and \cmd{ifcsvoid} when applied to macros expanding to space tokens diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def index 4069146dcce..59ebf9e1f49 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} - [2018/08/19 v2.5f etoolbox debug messages (JAW)] + [2019/09/09 v2.5g 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 067d62b92d6..189653133f1 100644 --- a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty +++ b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty @@ -1,5 +1,5 @@ % Copyright (c) 2007-2011 Philipp Lehman. -% (c) 2015-2018 Joseph Wright +% (c) 2015-2019 Joseph Wright % % Permission is granted to copy, distribute and/or modify this % software under the terms of the LaTeX Project Public License @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{etoolbox} - [2018/08/19 v2.5f e-TeX tools for LaTeX (JAW)] + [2019/09/09 v2.5g e-TeX tools for LaTeX (JAW)] \begingroup \@ifundefined{eTeXversion} @@ -268,8 +268,8 @@ {\@secondoftwo} {\ifdefmacro{#1} {\ifdefparam{#1} - {\@secondoftwo} - {\etb@ifdefempty{#1}}} + {\@secondoftwo} + {\etb@ifdefempty{#1}}} {\@secondoftwo}}} \def\etb@ifdefempty#1{% @@ -295,8 +295,8 @@ {\@firstoftwo} {\ifdefmacro{#1} {\ifdefparam{#1} - {\@secondoftwo} - {\etb@ifdefempty{#1}}} + {\@secondoftwo} + {\etb@ifdefempty{#1}}} {\@secondoftwo}}} % {}{}{} @@ -342,14 +342,14 @@ \ifdefmacro{#1} {\ifdefmacro{#2} {\begingroup - \edef\etb@tempa{\expandafter\strip@prefix\meaning#1}% - \edef\etb@tempb{\expandafter\strip@prefix\meaning#2}% - \ifx\etb@tempa\etb@tempb - \aftergroup\@firstoftwo - \else - \aftergroup\@secondoftwo - \fi - \endgroup} + \edef\etb@tempa{\expandafter\strip@prefix\meaning#1}% + \edef\etb@tempb{\expandafter\strip@prefix\meaning#2}% + \ifx\etb@tempa\etb@tempb + \aftergroup\@firstoftwo + \else + \aftergroup\@secondoftwo + \fi + \endgroup} {\@secondoftwo}} {\@secondoftwo}} @@ -362,7 +362,7 @@ {\@secondoftwo} {\expandafter\ifdefstrequal \csname#1\expandafter\endcsname - \csname#2\endcsname}}} + \csname#2\endcsname}}} % {}{}{}{} @@ -1520,7 +1520,7 @@ {\noexpand\etb@listitem\noexpand\do{####1}% \expandafter\noexpand \csname etb@lst@\expandafter\@gobble\string#1\endcsname - \noexpand\@nil}}}% + \noexpand\@nil}}}% \@tempa} \long\def\etb@lst@@notoken@do#1{% @@ -1558,7 +1558,7 @@ {\noexpand\etb@listitem{####1}{####2}% \expandafter\noexpand \csname etb@lst@\expandafter\@gobble\string#1\endcsname - {####1}\noexpand\@nil}}}% + {####1}\noexpand\@nil}}}% \@tempa} \long\def\etb@lst@@notoken@arg#1#2{% @@ -1751,20 +1751,41 @@ \newrobustcmd{\AtBeginEnvironment}[1]{% \csgappto{@begin@#1@hook}} -\patchcmd\begin - {\csname #1\endcsname} - {\csuse{@begin@#1@hook}% - \csname #1\endcsname} - {} - {\etb@warning{% - Patching '\string\begin' failed!\MessageBreak - '\string\AtBeginEnvironment' will not work\@gobble}} +\ifcsname begin \endcsname + \expandafter\patchcmd\csname begin \endcsname + {\csname #1\endcsname} + {\csuse{@begin@#1@hook}% + \csname #1\endcsname} + {} + {\etb@warning{% + Patching '\string\begin' failed!\MessageBreak + '\string\AtBeginEnvironment' will not work\@gobble}} +\else + \patchcmd\begin + {\csname #1\endcsname} + {\csuse{@begin@#1@hook}% + \csname #1\endcsname} + {} + {\etb@warning{% + Patching '\string\begin' failed!\MessageBreak + '\string\AtBeginEnvironment' will not work\@gobble}} +\fi % {}{} \newrobustcmd{\AtEndEnvironment}[1]{% \csgappto{@end@#1@hook}} +\ifcsname end \endcsname +\expandafter\patchcmd\csname end \endcsname + {\csname end#1\endcsname} + {\csuse{@end@#1@hook}% + \csname end#1\endcsname} + {} + {\etb@warning{% + Patching '\string\end' failed!\MessageBreak + '\string\AtEndEnvironment' will not work\@gobble}} +\else \patchcmd\end {\csname end#1\endcsname} {\csuse{@end@#1@hook}% @@ -1773,31 +1794,54 @@ {\etb@warning{% Patching '\string\end' failed!\MessageBreak '\string\AtEndEnvironment' will not work\@gobble}} +\fi % {}{} \newrobustcmd{\BeforeBeginEnvironment}[1]{% \csgappto{@beforebegin@#1@hook}} -\pretocmd\begin - {\csuse{@beforebegin@#1@hook}} - {} - {\etb@warning{% - Patching '\string\begin' failed!\MessageBreak - '\string\BeforeBeginEnvironment' will not work\@gobble}} +\ifcsname begin \endcsname + \expandafter\pretocmd\csname begin \endcsname + {\csuse{@beforebegin@#1@hook}} + {} + {\etb@warning{% + Patching '\string\begin' failed!\MessageBreak + '\string\BeforeBeginEnvironment' will not work\@gobble}} +\else + \pretocmd\begin + {\csuse{@beforebegin@#1@hook}} + {} + {\etb@warning{% + Patching '\string\begin' failed!\MessageBreak + '\string\BeforeBeginEnvironment' will not work\@gobble}} +\fi % {}{} \newrobustcmd{\AfterEndEnvironment}[1]{% \csgappto{@afterend@#1@hook}} -\patchcmd\end - {\if@ignore} - {\csuse{@afterend@#1@hook}% - \if@ignore} - {} - {\etb@warning{% - Patching '\string\end' failed!\MessageBreak - '\string\AfterEndEnvironment' will not work\@gobble}} +\let\if@ignore\relax +\ifcsname end \endcsname + \expandafter\patchcmd\csname end \endcsname + {\if@ignore} + {\csuse{@afterend@#1@hook}% + \if@ignore} + {} + {\etb@warning{% + Patching '\string\end' failed!\MessageBreak + '\string\AfterEndEnvironment' will not work\@gobble}} +\else + \patchcmd\end + {\if@ignore} + {\csuse{@afterend@#1@hook}% + \if@ignore} + {} + {\etb@warning{% + Patching '\string\end' failed!\MessageBreak + '\string\AfterEndEnvironment' will not work\@gobble}} +\fi +\let\if@ignore\iffalse \endinput -- cgit v1.2.3