etex-pkg (8mar15)

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

2 files changed, 22 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/etex-pkg/README b/Master/texmf-dist/doc/latex/etex-pkg/README
index 40bffdc8636..db6795974f2 100644
--- a/Master/texmf-dist/doc/latex/etex-pkg/README
+++ b/Master/texmf-dist/doc/latex/etex-pkg/README
@@ -1,6 +1,8 @@
 The package provides a straightforward interface to many of the extensions 
-offered by e-TeX; in particular, it modifies LaTeX\u2019s register 
+offered by e-TeX; in particular, it modifies LaTeX's register 
 allocation macros to make use of the extended register range.
 
-The etoolbox provides macros that make more sophisticated use of 
-e-TeX's facilities.
+Note that for LaTeX releases from 2015 onwards, this package
+is not required to use the extended register range.
+
+
diff --git a/Master/texmf-dist/tex/latex/etex-pkg/etex.sty b/Master/texmf-dist/tex/latex/etex-pkg/etex.sty
index 593f8cf3cba..19c24b6ad8f 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 LaTeX Project and Peter Breitenlohner.
+% Copyright 1997, 1998, 2008 2015 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
@@ -18,7 +18,8 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{etex}
 %        [1997/08/12 v0.1 eTeX basic definition package (DPC)]
-         [1998/03/26 v2.0 eTeX basic definition package (PEB)]
+%        [1998/03/26 v2.0 eTeX basic definition package (PEB)]
+         [2015/03/02 v2.1 eTeX basic definition package (PEB,DPC)]
 
 \DeclareOption{grouptypes}{\catcode`\G=9}
 \DeclareOption{interactionmodes}{\catcode`\I=9}
@@ -157,8 +158,20 @@
 
 \et@xins=\insc@unt % \et@xins=255 % allocates insertions 254, 253, ...
 
-%% We don't change the LaTeX definitions of \newcount, etc., but the
-%% \alloc@ macro doing the actual work is redefined.
+
+%% To ensure working in LaTeX 2015 release do define \newcount etc
+%% with their pre 2015 LaTeX definitions
+\def\newcount{\alloc@0\count\countdef\insc@unt}
+\def\newdimen{\alloc@1\dimen\dimendef\insc@unt}
+\def\newskip{\alloc@2\skip\skipdef\insc@unt}
+\def\newmuskip{\alloc@3\muskip\muskipdef\@cclvi}
+\def\newbox{\alloc@4\box\chardef\insc@unt}
+\def\newtoks{\alloc@5\toks\toksdef\@cclvi}
+\def\newread{\alloc@6\read\chardef\sixt@@n}
+\def\newwrite{\alloc@7\write\chardef\sixt@@n}
+\def\new@mathgroup{\alloc@8\mathgroup\chardef\sixt@@n}
+\let\newfam\new@mathgroup
+\def\newlanguage{\alloc@9\language\chardef\@cclvi}
 
 %% When the normal register pool for \count, \dimen, \skip, \muskip,
 %% \box, or \toks registers is exhausted, we switch to the extended pool.