etex-pkg (7jan16)

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

1 files changed, 16 insertions, 2 deletions

diff --git a/Master/texmf-dist/tex/latex/etex-pkg/etex.sty b/Master/texmf-dist/tex/latex/etex-pkg/etex.sty
index 0288553c0ec..187af27f682 100644
--- a/Master/texmf-dist/tex/latex/etex-pkg/etex.sty
+++ b/Master/texmf-dist/tex/latex/etex-pkg/etex.sty
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright 1997, 1998, 2008 2015 LaTeX Project and Peter Breitenlohner.
+% Copyright 1997, 1998, 2008 2015 2016 LaTeX Project and Peter Breitenlohner.
 % 
 % This file (etex.sty) may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3 of
@@ -22,7 +22,8 @@
 %        [2015/03/02 v2.1 eTeX basic definition package (PEB,DPC)]
 %        [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)]
+%        [2015/09/02 v2.4 eTeX basic definition package (PEB,DPC)]
+         [2016/01/07 v2.5 eTeX basic definition package (PEB,DPC)]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -112,6 +113,19 @@ etex.sty code will not be used.\MessageBreak
 To force etex package to load, add\MessageBreak
 \string\RequirePackage{etex}\MessageBreak
 at the start of the document}
+
+% 2.5 define the global allocation to be the standard ones
+% 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
+
 \expandafter\endinput\fi
 
 % End of 2.2 addition.