etex-pkg (1aug16)

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

1 files changed, 22 insertions, 1 deletions

diff --git a/Master/texmf-dist/tex/latex/etex-pkg/etex.sty b/Master/texmf-dist/tex/latex/etex-pkg/etex.sty
index 78fc27726a8..ed2577c20fa 100644
--- a/Master/texmf-dist/tex/latex/etex-pkg/etex.sty
+++ b/Master/texmf-dist/tex/latex/etex-pkg/etex.sty
@@ -13,6 +13,7 @@
 % This work has the LPPL maintenance status "maintained".
 % 
 % The Current Maintainer of this work is David Carlisle.
+% https://github.com/davidcarlisle/dpctex/issues
 % \fi
 
 \NeedsTeXFormat{LaTeX2e}
@@ -24,7 +25,8 @@
 %        [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/11 v2.6 eTeX basic definition package (PEB,DPC)]
+%        [2016/01/11 v2.6 eTeX basic definition package (PEB,DPC)]
+         [2016/08/01 v2.7 eTeX basic definition package (PEB,DPC)]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -148,6 +150,25 @@ at the start of the document}
 \DeclareOption{localallocshow}{\let\et@xwlog\typeout} % debugging
 % End of 2.3 addition.
 
+% v2.7
+% \extrafloats does not work with this package
+% but make it give a sensible error, not mis-parse \ifnum.
+%
+% Note that using \extrafloats earlier might not be safe as
+% it could in principle clash with registers used for local allocation.
+% However it probably works (as local allocation is used locally...).
+% A better fix would be not to load this package with current LaTeX.
+% This current etex package is just provided to force the old behaviour
+% and such documents should not be using new features such as \extrafloats).
+\ifdefined\extrafloats
+\def\extrafloats#1{%
+  \PackageError{etex}{%
+    \noexpand\extrafloats is incompatible with etex.sty allocation.\MessageBreak
+    Try using \noexpand\extrafloats before loading etex}%
+    \@ehc}
+\fi
+% end of v2.7 change
+
 \def\eTeX{%
   $\m@th\varepsilon$-\TeX}