From 4cc63125c198c95120c614619f6adca51ed8b7e3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 8 Jul 2015 22:32:05 +0000 Subject: etex-pkg (8jul15) git-svn-id: svn://tug.org/texlive/trunk@37807 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/etex-pkg/etex.sty | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/etex-pkg/etex.sty b/Master/texmf-dist/tex/latex/etex-pkg/etex.sty index 4558369d7bc..7c153a45b47 100644 --- a/Master/texmf-dist/tex/latex/etex-pkg/etex.sty +++ b/Master/texmf-dist/tex/latex/etex-pkg/etex.sty @@ -20,15 +20,8 @@ % [1997/08/12 v0.1 eTeX basic definition package (DPC)] % [1998/03/26 v2.0 eTeX basic definition package (PEB)] % [2015/03/02 v2.1 eTeX basic definition package (PEB,DPC)] - [2015/07/06 v2.2 eTeX basic definition package (PEB,DPC)] - -\DeclareOption{grouptypes}{\catcode`\G=9} -\DeclareOption{interactionmodes}{\catcode`\I=9} -\DeclareOption{nodetypes}{\catcode`\N=9} -\DeclareOption{iftypes}{\catcode`\C=9} -\DeclareOption{localalloclog}{\let\et@xwlog\wlog} % the default -\DeclareOption{localallocnolog}{\let\et@xwlog\@gobble} % be quiet -\DeclareOption{localallocshow}{\let\et@xwlog\typeout} % debugging +% [2015/07/06 v2.2 eTeX basic definition package (PEB,DPC)] + [2015/07/08 v2.3 eTeX basic definition package (PEB,DPC)] %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -114,7 +107,7 @@ \if@tempswa \PackageWarningNoLine{etex}{% Extended allocation already in use.\MessageBreak -Aborting etex.sty.\MessageBreak +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} @@ -122,6 +115,15 @@ at the start of the document} % End of 2.2 addition. +% 2.3 move option handling after the above error checks. +\DeclareOption{grouptypes}{\catcode`\G=9} +\DeclareOption{interactionmodes}{\catcode`\I=9} +\DeclareOption{nodetypes}{\catcode`\N=9} +\DeclareOption{iftypes}{\catcode`\C=9} +\DeclareOption{localalloclog}{\let\et@xwlog\wlog} % the default +\DeclareOption{localallocnolog}{\let\et@xwlog\@gobble} % be quiet +\DeclareOption{localallocshow}{\let\et@xwlog\typeout} % debugging +% End of 2.3 addition. \def\eTeX{% $\m@th\varepsilon$-\TeX} -- cgit v1.2.3