texlive[52073] Master/texmf-dist: etoolbox (10sep19)
commits+karl at tug.org
commits+karl at tug.org
Tue Sep 10 23:45:07 CEST 2019
Revision: 52073
http://tug.org/svn/texlive?view=revision&revision=52073
Author: karl
Date: 2019-09-10 23:45:07 +0200 (Tue, 10 Sep 2019)
Log Message:
-----------
etoolbox (10sep19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
Modified: trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex 2019-09-10 21:44:53 UTC (rev 52072)
+++ trunk/Master/texmf-dist/doc/latex/etoolbox/etoolbox.tex 2019-09-10 21:45:07 UTC (rev 52073)
@@ -12,8 +12,8 @@
url={http://www.ctan.org/pkg/etoolbox/},
author={Philipp Lehman, Joseph Wright},
email={joseph.wright at 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 @@
\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
Modified: trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def 2019-09-10 21:44:53 UTC (rev 52072)
+++ trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.def 2019-09-10 21:45:07 UTC (rev 52073)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty 2019-09-10 21:44:53 UTC (rev 52072)
+++ trunk/Master/texmf-dist/tex/latex/etoolbox/etoolbox.sty 2019-09-10 21:45:07 UTC (rev 52073)
@@ -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 at ifdefempty{#1}}}
+ {\@secondoftwo}
+ {\etb at ifdefempty{#1}}}
{\@secondoftwo}}}
\def\etb at ifdefempty#1{%
@@ -295,8 +295,8 @@
{\@firstoftwo}
{\ifdefmacro{#1}
{\ifdefparam{#1}
- {\@secondoftwo}
- {\etb at ifdefempty{#1}}}
+ {\@secondoftwo}
+ {\etb at ifdefempty{#1}}}
{\@secondoftwo}}}
% {<csname>}{<true>}{<false>}
@@ -342,14 +342,14 @@
\ifdefmacro{#1}
{\ifdefmacro{#2}
{\begingroup
- \edef\etb at tempa{\expandafter\strip at prefix\meaning#1}%
- \edef\etb at tempb{\expandafter\strip at prefix\meaning#2}%
- \ifx\etb at tempa\etb at tempb
- \aftergroup\@firstoftwo
- \else
- \aftergroup\@secondoftwo
- \fi
- \endgroup}
+ \edef\etb at tempa{\expandafter\strip at prefix\meaning#1}%
+ \edef\etb at tempb{\expandafter\strip at prefix\meaning#2}%
+ \ifx\etb at tempa\etb at 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}}}
% {<cstoken>}{<string>}{<true>}{<false>}
@@ -1520,7 +1520,7 @@
{\noexpand\etb at listitem\noexpand\do{####1}%
\expandafter\noexpand
\csname etb at lst@\expandafter\@gobble\string#1\endcsname
- \noexpand\@nil}}}%
+ \noexpand\@nil}}}%
\@tempa}
\long\def\etb at lst@@notoken at do#1{%
@@ -1558,7 +1558,7 @@
{\noexpand\etb at listitem{####1}{####2}%
\expandafter\noexpand
\csname etb at lst@\expandafter\@gobble\string#1\endcsname
- {####1}\noexpand\@nil}}}%
+ {####1}\noexpand\@nil}}}%
\@tempa}
\long\def\etb at lst@@notoken at arg#1#2{%
@@ -1751,14 +1751,25 @@
\newrobustcmd{\AtBeginEnvironment}[1]{%
\csgappto{@begin@#1 at hook}}
-\patchcmd\begin
- {\csname #1\endcsname}
- {\csuse{@begin@#1 at hook}%
- \csname #1\endcsname}
- {}
- {\etb at 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 at hook}%
+ \csname #1\endcsname}
+ {}
+ {\etb at warning{%
+ Patching '\string\begin' failed!\MessageBreak
+ '\string\AtBeginEnvironment' will not work\@gobble}}
+\else
+ \patchcmd\begin
+ {\csname #1\endcsname}
+ {\csuse{@begin@#1 at hook}%
+ \csname #1\endcsname}
+ {}
+ {\etb at warning{%
+ Patching '\string\begin' failed!\MessageBreak
+ '\string\AtBeginEnvironment' will not work\@gobble}}
+\fi
% {<environment>}{<code>}
@@ -1765,6 +1776,16 @@
\newrobustcmd{\AtEndEnvironment}[1]{%
\csgappto{@end@#1 at hook}}
+\ifcsname end \endcsname
+\expandafter\patchcmd\csname end \endcsname
+ {\csname end#1\endcsname}
+ {\csuse{@end@#1 at hook}%
+ \csname end#1\endcsname}
+ {}
+ {\etb at warning{%
+ Patching '\string\end' failed!\MessageBreak
+ '\string\AtEndEnvironment' will not work\@gobble}}
+\else
\patchcmd\end
{\csname end#1\endcsname}
{\csuse{@end@#1 at hook}%
@@ -1773,6 +1794,7 @@
{\etb at warning{%
Patching '\string\end' failed!\MessageBreak
'\string\AtEndEnvironment' will not work\@gobble}}
+\fi
% {<environment>}{<code>}
@@ -1779,12 +1801,21 @@
\newrobustcmd{\BeforeBeginEnvironment}[1]{%
\csgappto{@beforebegin@#1 at hook}}
-\pretocmd\begin
- {\csuse{@beforebegin@#1 at hook}}
- {}
- {\etb at warning{%
- Patching '\string\begin' failed!\MessageBreak
- '\string\BeforeBeginEnvironment' will not work\@gobble}}
+\ifcsname begin \endcsname
+ \expandafter\pretocmd\csname begin \endcsname
+ {\csuse{@beforebegin@#1 at hook}}
+ {}
+ {\etb at warning{%
+ Patching '\string\begin' failed!\MessageBreak
+ '\string\BeforeBeginEnvironment' will not work\@gobble}}
+\else
+ \pretocmd\begin
+ {\csuse{@beforebegin@#1 at hook}}
+ {}
+ {\etb at warning{%
+ Patching '\string\begin' failed!\MessageBreak
+ '\string\BeforeBeginEnvironment' will not work\@gobble}}
+\fi
% {<environment>}{<code>}
@@ -1791,13 +1822,26 @@
\newrobustcmd{\AfterEndEnvironment}[1]{%
\csgappto{@afterend@#1 at hook}}
-\patchcmd\end
- {\if at ignore}
- {\csuse{@afterend@#1 at hook}%
- \if at ignore}
- {}
- {\etb at warning{%
- Patching '\string\end' failed!\MessageBreak
- '\string\AfterEndEnvironment' will not work\@gobble}}
+\let\if at ignore\relax
+\ifcsname end \endcsname
+ \expandafter\patchcmd\csname end \endcsname
+ {\if at ignore}
+ {\csuse{@afterend@#1 at hook}%
+ \if at ignore}
+ {}
+ {\etb at warning{%
+ Patching '\string\end' failed!\MessageBreak
+ '\string\AfterEndEnvironment' will not work\@gobble}}
+\else
+ \patchcmd\end
+ {\if at ignore}
+ {\csuse{@afterend@#1 at hook}%
+ \if at ignore}
+ {}
+ {\etb at warning{%
+ Patching '\string\end' failed!\MessageBreak
+ '\string\AfterEndEnvironment' will not work\@gobble}}
+\fi
+\let\if at ignore\iffalse
\endinput
More information about the tex-live-commits
mailing list