From d4448f82dcc77711f4ff520ec6fe31463991ac8b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 11 Jan 2016 22:13:51 +0000 Subject: etex-pkg (11jan16) git-svn-id: svn://tug.org/texlive/trunk@39355 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/etex-pkg/etex.sty | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/etex-pkg') diff --git a/Master/texmf-dist/tex/latex/etex-pkg/etex.sty b/Master/texmf-dist/tex/latex/etex-pkg/etex.sty index 187af27f682..78fc27726a8 100644 --- a/Master/texmf-dist/tex/latex/etex-pkg/etex.sty +++ b/Master/texmf-dist/tex/latex/etex-pkg/etex.sty @@ -23,7 +23,8 @@ % [2015/07/06 v2.2 eTeX basic definition package (PEB,DPC)] % [2015/07/08 v2.3 eTeX basic definition package (PEB,DPC)] % [2015/09/02 v2.4 eTeX basic definition package (PEB,DPC)] - [2016/01/07 v2.5 eTeX basic definition package (PEB,DPC)] +% [2016/01/07 v2.5 eTeX basic definition package (PEB,DPC)] + [2016/01/11 v2.6 eTeX basic definition package (PEB,DPC)] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -118,13 +119,20 @@ at the start of the document} % as extended allocation is already in use. Helps with % compatibility with some packages that use these commands % after loading etex. -\let \globcount \newcount -\let \globdimen \newdimen -\let \globskip \newskip -\let \globmuskip\newmuskip -\let \globtoks \newtoks -\let \globmarks \newmarks -% end of 2.5 change +% 2.6 avoid error from outer if used with (e)plain +\expandafter\let\csname globcount\expandafter\endcsname + \csname newcount\endcsname +\expandafter\let\csname globdimen\expandafter\endcsname + \csname newdimen\endcsname +\expandafter\let\csname globskip\expandafter\endcsname + \csname newskip\endcsname +\expandafter\let\csname globmuskip\expandafter\endcsname + \csname newmuskip\endcsname +\expandafter\let\csname globtoks\expandafter\endcsname + \csname newtoks\endcsname +\expandafter\let\csname globmarks\expandafter\endcsname + \csname newmarks\endcsname +% end of 2.5/2.6 change \expandafter\endinput\fi -- cgit v1.2.3