From 82e2a3901929fe371b47e7243f3c749e9df3d236 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 24 Aug 2020 20:55:42 +0000 Subject: etoolbox (24aug20) git-svn-id: svn://tug.org/texlive/trunk@56173 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf | Bin 227357 -> 227908 bytes Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex | 8 +++- Master/texmf-dist/tex/latex/etoolbox/etoolbox.def | 2 +- Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty | 43 +++++++++++++++++++++- 4 files changed, 48 insertions(+), 5 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 995fa2140f9..2117815e0c7 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 9eae0698744..415a88b797a 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.5i}, - date={2020/07/15}} + revision={v2.5j}, + date={2020/08/24}} \hypersetup{% pdftitle={The etoolbox Package}, @@ -1297,6 +1297,10 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{2.5j}{2020-08-24} +\item Track \LaTeXe{} kernel changes +\end{release} + \begin{release}{2.5i}{2020-07-13} \item Track \LaTeXe{} kernel changes \end{release} diff --git a/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def b/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def index fb9dfc0ac3f..ad4ac6df7e1 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} - [2020/07/15 v2.5i etoolbox debug messages (JAW)] + [2020/08/24 v2.5j 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 43e00958b5d..39b4a791b03 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} - [2020/07/15 v2.5i e-TeX tools for LaTeX (JAW)] + [2020/08/24 v2.5j e-TeX tools for LaTeX (JAW)] \begingroup \@ifundefined{eTeXversion} @@ -878,6 +878,45 @@ \csname#2\endcsname} {\csundef{#1}}} +\ifdef\NewCommandCopy + {% + \def\etb@carsquare#1#2#3\@nil{#1#2} + % + % {}{}{} + % + \newrobustcmd*{\etb@if@robustcmd}[1]{% + \begingroup + \escapechar=`\\ + \edef\etb@tempa{% + \endgroup + \def\noexpand\etb@tempa{\noexpand\@testopt + \expandafter\noexpand\csname\string#1\endcsname}% + \def\noexpand\etb@tempb{\unexpanded\expandafter\expandafter\expandafter + {\expandafter\etb@carsquare#1{}{}\@nil}}% + }\etb@tempa + \ifx\etb@tempa\etb@tempb + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} + % + % {}{} + % + \newrobustcmd*{\etb@copy@robustcmd}[2]{% + \begingroup + \escapechar=`\\ + \edef\etb@tempa{% + \endgroup + \protected\def\noexpand#1{\noexpand\@testopt + \expandafter\noexpand\csname\string#1\endcsname + \unexpanded\expandafter\expandafter\expandafter + {\expandafter\@gobbletwo#2}}% + \let\expandafter\noexpand\csname\string#1\endcsname + \expandafter\noexpand\csname\string#2\endcsname + }\etb@tempa} + \g@addto@macro\@declarecommandcopylisthook + {{\etb@if@robustcmd\etb@copy@robustcmd}} + }{} % {} \newcommand*{\csuse}[1]{% @@ -1699,7 +1738,7 @@ \ifdef\AddToHook {% - \newrobustcmd*{\AtEndPreamble}{\AddToHook{env/document/begin}}% + \newrobustcmd*{\AtEndPreamble}{\AddToHook{begindocument/before}}% \let\AfterPreamble\AtBeginDocument \newrobustcmd*{\AfterEndPreamble}{\AddToHook{begindocument/end}}% \newrobustcmd*{\AfterEndDocument}{\AddToHook{enddocument/end}}% -- cgit v1.2.3