e-TeX 2.4, pTeX 3.3, triptrap diffs

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

8 files changed, 42 insertions, 53 deletions

diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index 2da4c04c04c..d7f5267f019 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* etex.ch: Version 2.4, dated May 11, 2012.
+	* etrip/etrip.tex, etrip/etripin.log, etrip/etrip.log,
+	etrip/etrip.fot, etrip/etrip.typ, etrip/etrip.diffs: Adapted.
+
 2012-04-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* etex.ch: Fixed a typo in TeX text.
diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch
index 7bb480e215e..3974121ce84 100644
--- a/Build/source/texk/web2c/etexdir/etex.ch
+++ b/Build/source/texk/web2c/etexdir/etex.ch
@@ -98,6 +98,7 @@
 %             some rearrangements to reduce interferences between
 %                 e-TeX and pTeX, in part suggested by Hironori Kitagawa
 %                 <h_kitagawa2001@@yahoo.co.jp>, Mar 2011.
+% Version 2.4 fixed an uninitialized line number bug, released in May 2012.
 
 % Although considerable effort has been expended to make the e-TeX program
 % correct and reliable, no warranty is implied; the author disclaims any
@@ -183,8 +184,8 @@ known as `\eTeX'.
 @d banner=='This is TeX, Version 3.1415926' {printed when \TeX\ starts}
 @y
 @d eTeX_version=2 { \.{\\eTeXversion} }
-@d eTeX_revision==".3" { \.{\\eTeXrevision} }
-@d eTeX_version_string=='-2.3' {current \eTeX\ version}
+@d eTeX_revision==".4" { \.{\\eTeXrevision} }
+@d eTeX_version_string=='-2.4' {current \eTeX\ version}
 @#
 @d eTeX_banner=='This is e-TeX, Version 3.1415926',eTeX_version_string
   {printed when \eTeX\ starts}
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
index 44b152a91e3..e14c153b000 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
@@ -12,7 +12,7 @@
 1c1
 < This is TeX, Version 3.1415926 (INITEX)  15 MAR 2008 02:23
 ---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (INITEX)  15 APR 2011 13:04
+> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX)  11 MAY 2012 13:57
 3c3
 < (trip.tex
 ---
@@ -23,8 +23,8 @@
 < 471 memory locations dumped; current usage is 96&278
 < 341 multiletter control sequences
 ---
->  (format=trip 2011.4.15)
-> 1489 strings of total length 26179
+>  (format=trip 2012.5.11)
+> 1490 strings of total length 26207
 > 479 memory locations dumped; current usage is 104&278
 > 342 multiletter control sequences
 461c461
@@ -39,7 +39,7 @@
 < ** &trip  trip 
 < (trip.tex ##
 ---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011)
+> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012)
 > **(./trip.tex ##
 17c16
 < Memory usage before: 159&313; after: 102&278; still untouched: 1613
@@ -53,7 +53,7 @@
 1c1
 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15)  15 MAR 2008 02:23
 ---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (format=trip 2011.4.15)  15 APR 2011 13:04
+> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (format=trip 2012.5.11)  11 MAY 2012 13:57
 3c3
 < (trip.tex ##
 ---
@@ -173,8 +173,8 @@
 <  2825 words of memory out of 3000
 <  372 multiletter control sequences out of 2100
 ---
->  44 strings out of 1811
->  261 string characters out of 7821
+>  44 strings out of 1810
+>  261 string characters out of 7793
 >  3821 words of memory out of 3999
 >  373 multiletter control sequences out of 15000+0
 7301c7305
@@ -187,11 +187,11 @@
 1c1
 < This is DVItype, Version 3.6
 ---
-> This is DVItype, Version 3.6 (TeX Live 2011)
+> This is DVItype, Version 3.6 (TeX Live 2012)
 9c9
 < ' TeX output 2008.03.15:0223'
 ---
-> ' TeX output 2011.04.15:1304'
+> ' TeX output 2012.05.11:1357'
 419c419
 < 1121: down4 639342208 
 ---
@@ -338,40 +338,22 @@
 + mv etrip.log etripin.log
 + diff SRCDIR/etexdir/etrip/etripin.log etripin.log
 1c1
-< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX)  7 APR 2011 11:46
+< This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX)  11 MAY 2012 13:47
 ---
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (INITEX)  15 APR 2011 13:04
-26,27c26,27
-<  (format=etrip 2011.4.7)
-< 1490 strings of total length 26209
----
->  (format=etrip 2011.4.15)
-> 1490 strings of total length 26210
+> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX)  11 MAY 2012 13:57
 + ./etex --progname=etex
 + diff SRCDIR/etexdir/etrip/etrip.fot etrip.fot
-1c1
-< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev)
----
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011)
 + diff SRCDIR/etexdir/etrip/etrip.log etrip.log
 1c1
-< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7)  7 APR 2011 11:46
----
-> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (format=etrip 2011.4.15)  15 APR 2011 13:04
-4276c4276
-<  140 string characters out of 7791
+< This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (format=etrip 2012.5.11)  11 MAY 2012 13:47
 ---
->  140 string characters out of 7790
+> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (format=etrip 2012.5.11)  11 MAY 2012 13:57
 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi
 ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi
 + diff SRCDIR/etexdir/etrip/etrip.typ etrip.typ
-1c1
-< This is DVItype, Version 3.6
----
-> This is DVItype, Version 3.6 (TeX Live 2011)
 9c9
-< ' TeX output 2011.04.07:1213'
+< ' TeX output 2012.05.11:1347'
 ---
-> ' TeX output 2011.04.15:1304'
+> ' TeX output 2012.05.11:1357'
 + :
 PASS: etexdir/etrip.test
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.fot b/Build/source/texk/web2c/etexdir/etrip/etrip.fot
index a4f0b9fa4d3..6aa000a3cee 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.fot
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.fot
@@ -1,8 +1,8 @@
-This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev)
+This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012)
 **entering extended mode
 (./etrip.tex e-IniTeX: e-Trip format loaded.
-This is the e-Trip test [2011-04-07] for e-TeX v3.1415926-2.3.
-(You are using e-TeX version/revision 2.3)
+This is the e-Trip test [2012-05-11] for e-TeX v3.1415926-2.4.
+(You are using e-TeX version/revision 2.4)
 Missing character: There is no c in font nullfont!
 
 
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.log b/Build/source/texk/web2c/etexdir/etrip/etrip.log
index 60479be6820..209b0197b5a 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.log
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.log
@@ -1,9 +1,9 @@
-This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7)  7 APR 2011 11:46
+This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (format=etrip 2012.5.11)  11 MAY 2012 13:47
 entering extended mode
 **&etrip etrip
 (./etrip.tex e-IniTeX: e-Trip format loaded.
-This is the e-Trip test [2011-04-07] for e-TeX v3.1415926-2.3.
-(You are using e-TeX version/revision 2.3)
+This is the e-Trip test [2012-05-11] for e-TeX v3.1415926-2.4.
+(You are using e-TeX version/revision 2.4)
 Missing character: There is no b in font nullfont!
 
 Missing character: There is no c in font nullfont!
@@ -4272,8 +4272,8 @@ laywidowpenalties:
 {restoring \interlinepenalties=0}
  ) 
 Here is how much of TeX's memory you used:
- 18 strings out of 1810
- 140 string characters out of 7791
+ 18 strings out of 1809
+ 140 string characters out of 7762
  3164 words of memory out of 3999
  409 multiletter control sequences out of 15000+0
  2286 words of font info for 3 fonts, out of 20000 for 75
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.tex b/Build/source/texk/web2c/etexdir/etrip/etrip.tex
index 3bc4bd27bf4..0b9c794f011 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.tex
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.tex
@@ -1,4 +1,4 @@
-%%; This is `etrip.tex' for e-TeX v3.1415926-2.3 as of April 7, 2011.
+%%; This is `etrip.tex' for e-TeX v3.1415926-2.4 as of May 11, 2012.
 %%;
 %%; This is a diabolical test file for e-TeX, an extension of TeX82.
 %%; It is not as diabolical as `trip.tex', Knuth's torture test for TeX.
@@ -9,9 +9,9 @@
 %%; ==>> wrong e-TeX input to produce errors and warnings.      <<==
 %%;
 \catcode`\{=1\catcode`\}=2\catcode`\#=6 \let\bgroup={ \let\egroup=}
-\def\etripdate   {2011-04-07}
+\def\etripdate   {2012-05-11}
 \def\texversion  {3.1415926}
-\def\etripversion{2.3}
+\def\etripversion{2.4}
 %
 \message{This is the e-Trip test [\etripdate] for
          e-TeX v\texversion-\etripversion.}
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.typ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ
index 78a8668c6df..d65d7d9adc7 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.typ
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ
@@ -1,4 +1,4 @@
-This is DVItype, Version 3.6
+This is DVItype, Version 3.6 (TeX Live 2012)
 Options selected:
   Starting page = *.*.*.*.*.*.*.*.*.* 
   Maximum number of pages = 1000000
@@ -6,7 +6,7 @@ Options selected:
   Resolution =  72.27000000 pixels per inch
 numerator/denominator=25400000/473628672
 magnification=1000;       0.00001526 pixels per DVI unit
-' TeX output 2011.04.07:1213'
+' TeX output 2012.05.11:1347'
  
 42: beginning of page 1.0.0.0.0.0.0.0.0.0 
 87: eop 
diff --git a/Build/source/texk/web2c/etexdir/etrip/etripin.log b/Build/source/texk/web2c/etexdir/etrip/etripin.log
index 93e9ca0ecb1..b76c0b7fde6 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etripin.log
+++ b/Build/source/texk/web2c/etexdir/etrip/etripin.log
@@ -1,9 +1,9 @@
-This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX)  7 APR 2011 11:46
+This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX)  11 MAY 2012 13:47
 entering extended mode
 ***etrip
 (./etrip.tex
-This is the e-Trip test [2011-04-07] for e-TeX v3.1415926-2.3.
-(You are using e-TeX version/revision 2.3)
+This is the e-Trip test [2012-05-11] for e-TeX v3.1415926-2.4.
+(You are using e-TeX version/revision 2.4)
 e-IniTeX: Assigning category codes, tracing switches, other codes,
 definitions for e-VirTeX e-Trip test run, constants and registers,
 fonts, some math characters, some math parameters, hyphenation,
@@ -23,8 +23,8 @@ Proceed; I'll ignore the character I just read.
 enable e-TeX enhancements (TeXXeT),
 prepare saved items (not to be dumped), everyjob ...dumped. )
 Beginning to dump on file etrip.fmt
- (format=etrip 2011.4.7)
-1490 strings of total length 26209
+ (format=etrip 2012.5.11)
+1491 strings of total length 26238
 280 memory locations dumped; current usage is 36&166
 408 multiletter control sequences
 \font\nullfont=nullfont