summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-04-07 12:06:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-04-07 12:06:18 +0000
commitc3c44f17a8ee71b0eff3d6c41290d25c0ed6d5d0 (patch)
tree20e1e0d822287aebb61374c7ff7f2c06c4372ca5 /Build/source/texk
parent28dcd1e9be3b5448984372f748b2e65f1d380fb9 (diff)
e-TeX Version 2.3
git-svn-id: svn://tug.org/texlive/trunk@22009 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/eptexdir/ChangeLog.TL5
-rw-r--r--Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffsbin25797 -> 25389 bytes
-rw-r--r--Build/source/texk/web2c/eptexdir/eptrip/etrip.log6
-rw-r--r--Build/source/texk/web2c/eptexdir/eptrip/etrip.tex10
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/etexdir/etex.ch6
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.diffs103
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.fot13
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.log30
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.tex8
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etrip.typ2
-rw-r--r--Build/source/texk/web2c/etexdir/etrip/etripin.log17
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web6
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.ch21
16 files changed, 96 insertions, 145 deletions
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog.TL b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
index 0cb4282b1f4..75ae3ddb88b 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog.TL
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog.TL
@@ -1,6 +1,11 @@
ChangeLog.TL: TeX Live (TL) changes for e-pTeX
==============================================
+2011-04-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * eptrip/etrip.tex, eptrip/etrip.log, eptrip/eptrip.diffs:
+ Adapted to e-TeX Version 2.3.
+
2011-04-01 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* eptex.ech: Yet an other Bug fix.
diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs
index 353816d2ec9..0a0099d2707 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs
+++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs
Binary files differ
diff --git a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log
index a838b070ad6..fc5402bece9 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log
+++ b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log
@@ -1,9 +1,9 @@
-This is e-TeX, Version 3.141592-2.2 (preloaded format=etrip 2004.9.6) 6 SEP 2004 23:13
+This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46
entering extended mode
**&etrip etrip
(etrip.tex e-IniTeX: e-Trip format loaded.
-This is the e-Trip test [2004-09-06] for e-TeX v3.141592-2.2.
-(You are using e-TeX version/revision 2.2)
+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)
Missing character: There is no b in font nullfont!
Missing character: There is no c in font nullfont!
diff --git a/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex b/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex
index 38fcbf9f248..50d83a56604 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex
+++ b/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex
@@ -1,6 +1,6 @@
-%%; This is `etrip.tex' for e-TeX v3.141592-2.2 as of August 21, 2004.
+%%; This is `eptrip.tex' for e-pTeX v3.1415926-2.3 as of April 7, 2011.
%%;
-%%; This is a diabolical test file for e-TeX, an extension of TeX82.
+%%; This is a diabolical test file for e-pTeX, an extension of TeX82.
%%; It is not as diabolical as `trip.tex', Knuth's torture test for TeX.
%%;
%%; ==>> Do not use this TeX code and its macros as an example <<==
@@ -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 {2004-09-06}
-\def\texversion {3.141592}
-\def\etripversion{2.2}
+\def\etripdate {2011-04-07}
+\def\texversion {3.1415926}
+\def\etripversion{2.3}
%
\message{This is the e-Trip test [\etripdate] for
e-TeX v\texversion-\etripversion.}
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index 217cf4d9390..ed0003af67b 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * etex.ch: Version 2.3, dated April 7, 2011.
+ * etrip/etrip.tex, etrip/etripin.log, etrip/etrip.log,
+ etrip/etrip.fot, etrip/etrip.typ, etrip/etrip.diffs: Adapted.
+
2011-04-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* etex.ch: Remove remove_end_M and insert_end_M (now unused).
diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch
index 9e3ef537041..d662fb062cf 100644
--- a/Build/source/texk/web2c/etexdir/etex.ch
+++ b/Build/source/texk/web2c/etexdir/etex.ch
@@ -89,7 +89,7 @@
% direction typesetting;
% fixed a bug in the revised glue rounding code, detected by
% Tigran Aivazian <tigran@@aivazian.fsnet.co.uk>, Oct 2004.
-% Version 2.3 development was started in Feb 2008; released in Mon Year.
+% Version 2.3 development was started in Feb 2008; released in Apr 2011.
% fixed a bug in hyph_code handling (\savinghyphcodes)
% reported by Vladimir Volovich <vvv@@vsu.ru>, Feb 2008.
% fixed the error messages for improper use of \protected,
@@ -183,8 +183,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==".2" { \.{\\eTeXrevision} }
-@d eTeX_version_string=='-2.2' {current \eTeX\ version}
+@d eTeX_revision==".3" { \.{\\eTeXrevision} }
+@d eTeX_version_string=='-2.3' {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 4048641dd43..8e1ae9e6f86 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.2 (TeX Live 2011/dev/MPP) (INITEX) 14 JAN 2011 11:24
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 13:29
3c3
< (trip.tex
---
@@ -23,8 +23,8 @@
< 471 memory locations dumped; current usage is 96&278
< 341 multiletter control sequences
---
-> (format=trip 2011.1.14)
-> 1488 strings of total length 26174
+> (format=trip 2011.4.7)
+> 1489 strings of total length 26178
> 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.2 (TeX Live 2011/dev/MPP)
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev)
> **(./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.2 (TeX Live 2011/dev/MPP) (format=trip 2011.1.14) 14 JAN 2011 11:24
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=trip 2011.4.7) 7 APR 2011 13:29
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 1812
-> 261 string characters out of 7826
+> 44 strings out of 1811
+> 261 string characters out of 7822
> 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/dev/MPP)
+> This is DVItype, Version 3.6 (TeX Live 2011/dev)
9c9
< ' TeX output 2008.03.15:0223'
---
-> ' TeX output 2011.01.14:1124'
+> ' TeX output 2011.04.07:1329'
419c419
< 1121: down4 639342208
---
@@ -338,95 +338,30 @@
+ mv etrip.log etripin.log
+ diff SRCDIR/etexdir/etrip/etripin.log etripin.log
1c1
-< This is e-TeX, Version 3.141592-2.2 (INITEX) 6 SEP 2004 23:13
+< 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.2 (TeX Live 2011/dev/MPP) (INITEX) 14 JAN 2011 11:24
-4c4,5
-< (etrip.tex This is the e-Trip test [2004-09-06] for e-TeX v3.141592-2.2.
----
-> (./etrip.tex
-> This is the e-Trip test [2004-09-06] for e-TeX v3.141592-2.2.
-25,26c26,27
-< (preloaded format=etrip 2004.9.6)
-< 1435 strings of total length 24590
----
-> (format=etrip 2011.1.14)
-> 1489 strings of total length 26205
-28c29
-< 407 multiletter control sequences
----
-> 408 multiletter control sequences
-35c36
-< Hyphenation trie of length 434 has 12 ops out of 500
----
-> Hyphenation trie of length 434 has 12 ops out of 35111
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 13:29
+ ./etex --progname=etex
+ diff SRCDIR/etexdir/etrip/etrip.fot etrip.fot
-1,4c1,3
-< This is e-TeX, Version 3.141592-2.2 (INITEX)
-< **&etrip etrip
-< entering extended mode
-< (etrip.tex e-IniTeX: e-Trip format loaded.
+1c1
+< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev)
---
-> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2011/dev/MPP)
-> **entering extended mode
-> (./etrip.tex e-IniTeX: e-Trip format loaded.
-45a45,46
->
-> \openout1 = `etrip.out'.
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev)
+ diff SRCDIR/etexdir/etrip/etrip.log etrip.log
1c1
-< This is e-TeX, Version 3.141592-2.2 (preloaded format=etrip 2004.9.6) 6 SEP 2004 23:13
----
-> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2011/dev/MPP) (format=etrip 2011.1.14) 14 JAN 2011 11:24
-4c4
-< (etrip.tex e-IniTeX: e-Trip format loaded.
+< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46
---
-> (./etrip.tex e-IniTeX: e-Trip format loaded.
-671,672c671,674
-< Memory usage before: 50&182; after: 36&176; still untouched: 680
-< (etrip.out) (
----
-> \openout1 = `etrip.out'.
->
-> Memory usage before: 52&182; after: 36&176; still untouched: 1679
-> (./etrip.out) (
-764c766
-< % end of outer \scantokens) (etrip.out
----
-> % end of outer \scantokens) (./etrip.out
-2697c2699
-< Memory usage before: 51&320; after: 44&320; still untouched: 680
----
-> Memory usage before: 53&320; after: 44&320; still untouched: 838
-2699c2701
-< Memory usage before: 51&320; after: 44&320; still untouched: 680
----
-> Memory usage before: 53&320; after: 44&320; still untouched: 838
-4273,4276c4275,4278
-< 22 strings out of 1665
-< 132 string characters out of 8410
-< 2661 words of memory out of 3000
-< 408 multiletter control sequences out of 2100
----
-> 18 strings out of 1811
-> 140 string characters out of 7795
-> 3161 words of memory out of 3999
-> 409 multiletter control sequences out of 15000+0
-4278c4280
-< 10 hyphenation exceptions out of 307
----
-> 9 hyphenation exceptions out of 659
+> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 13:29
+ 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/dev/MPP)
+> This is DVItype, Version 3.6 (TeX Live 2011/dev)
9c9
-< ' TeX output 2004.09.06:2313'
+< ' TeX output 2011.04.07:1213'
---
-> ' TeX output 2011.01.14:1124'
+> ' TeX output 2011.04.07:1329'
+ :
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 eb255a09cc3..a4f0b9fa4d3 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.fot
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.fot
@@ -1,9 +1,8 @@
-This is e-TeX, Version 3.141592-2.2 (INITEX)
-**&etrip etrip
-entering extended mode
-(etrip.tex e-IniTeX: e-Trip format loaded.
-This is the e-Trip test [2004-09-06] for e-TeX v3.141592-2.2.
-(You are using e-TeX version/revision 2.2)
+This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev)
+**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)
Missing character: There is no c in font nullfont!
@@ -44,3 +43,5 @@ current interactionmode (l.247): scroll
current interactionmode (l.247): nonstop
+\openout1 = `etrip.out'.
+
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.log b/Build/source/texk/web2c/etexdir/etrip/etrip.log
index fca746ee6c6..60479be6820 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.141592-2.2 (preloaded format=etrip 2004.9.6) 6 SEP 2004 23:13
+This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46
entering extended mode
**&etrip etrip
-(etrip.tex e-IniTeX: e-Trip format loaded.
-This is the e-Trip test [2004-09-06] for e-TeX v3.141592-2.2.
-(You are using e-TeX version/revision 2.2)
+(./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)
Missing character: There is no b in font nullfont!
Missing character: There is no c in font nullfont!
@@ -668,8 +668,10 @@ Completed box being shipped out [1]
.\write1{\unexpanded \expandafter {\1}}
.\closeout1
-Memory usage before: 50&182; after: 36&176; still untouched: 680
-(etrip.out) (
+\openout1 = `etrip.out'.
+
+Memory usage before: 52&183; after: 36&177; still untouched: 1673
+(./etrip.out) (
Warning: end of semi simple group (level 3) entered at line 431 of a dif
ferent file
Warning: end of \iftrue entered on line 431 of a different file
@@ -761,7 +763,7 @@ Warning: end of file when \ifnum entered on line 6 is incomplete
l.9 \fi
l.444 }
- % end of outer \scantokens) (etrip.out
+ % end of outer \scantokens) (./etrip.out
! Undefined control sequence.
\endgroup ->\9\9
@@ -2694,9 +2696,9 @@ since the result is out of range.
Expr fraction rounding 3 OK
[1]
-Memory usage before: 51&320; after: 44&320; still untouched: 680
+Memory usage before: 53&321; after: 44&321; still untouched: 835
[1]
-Memory usage before: 51&320; after: 44&320; still untouched: 680
+Memory usage before: 53&321; after: 44&321; still untouched: 835
Checking \mutoglue and \gluetomu:
! You can't use `\mutoglue' in vertical mode.
l.903 \mutoglue
@@ -4270,12 +4272,12 @@ laywidowpenalties:
{restoring \interlinepenalties=0}
)
Here is how much of TeX's memory you used:
- 22 strings out of 1665
- 132 string characters out of 8410
- 2661 words of memory out of 3000
- 408 multiletter control sequences out of 2100
+ 18 strings out of 1810
+ 140 string characters out of 7791
+ 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
- 10 hyphenation exceptions out of 307
+ 9 hyphenation exceptions out of 659
10i,15n,8p,137b,78s stack positions out of 200i,40n,60p,500b,600s
Output written on etrip.dvi (3 pages, 220 bytes).
diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.tex b/Build/source/texk/web2c/etexdir/etrip/etrip.tex
index 33f747a8b18..3bc4bd27bf4 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.141592-2.2 as of August 21, 2004.
+%%; This is `etrip.tex' for e-TeX v3.1415926-2.3 as of April 7, 2011.
%%;
%%; 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 {2004-09-06}
-\def\texversion {3.141592}
-\def\etripversion{2.2}
+\def\etripdate {2011-04-07}
+\def\texversion {3.1415926}
+\def\etripversion{2.3}
%
\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 a0b0d0f6856..78a8668c6df 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.typ
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ
@@ -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 2004.09.06:2313'
+' TeX output 2011.04.07:1213'
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 5e8c0286e90..93e9ca0ecb1 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etripin.log
+++ b/Build/source/texk/web2c/etexdir/etrip/etripin.log
@@ -1,8 +1,9 @@
-This is e-TeX, Version 3.141592-2.2 (INITEX) 6 SEP 2004 23:13
+This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 11:46
entering extended mode
***etrip
-(etrip.tex This is the e-Trip test [2004-09-06] for e-TeX v3.141592-2.2.
-(You are using e-TeX version/revision 2.2)
+(./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)
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,
@@ -22,17 +23,17 @@ 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
- (preloaded format=etrip 2004.9.6)
-1435 strings of total length 24590
-279 memory locations dumped; current usage is 36&165
-407 multiletter control sequences
+ (format=etrip 2011.4.7)
+1490 strings of total length 26209
+280 memory locations dumped; current usage is 36&166
+408 multiletter control sequences
\font\nullfont=nullfont
\font\trip=etrip
\font\smalltrip=etrip at 5.0pt
\font\bigtrip=etrip at 20.0pt
2279 words of font info for 3 preloaded fonts
2 hyphenation exceptions
-Hyphenation trie of length 434 has 12 ops out of 500
+Hyphenation trie of length 434 has 12 ops out of 35111
3 for language 3
3 for language 2
3 for language 1
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index faac50fe8f4..fb16ecba423 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftex.web: Adapted to e-TeX Version 2.3.
+
2011-04-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdftex.web: Adapt to ../etexdir/etex.ch: simplify e-pTeX.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index baf69073c11..d090bf980df 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -100,7 +100,7 @@
% direction typesetting;
% fixed a bug in the revised glue rounding code, detected by
% Tigran Aivazian <tigran@@aivazian.fsnet.co.uk>, Oct 2004.
-% Version 2.3 development was started in Feb 2008; released in Mon Year.
+% Version 2.3 development was started in Feb 2008; released in Apr 2011.
% fixed a bug in hyph_code handling (\savinghyphcodes)
% reported by Vladimir Volovich <vvv@@vsu.ru>, Feb 2008.
% fixed the error messages for improper use of \protected,
@@ -289,8 +289,8 @@ helping to determine whether a particular implementation deserves to be
known as `\eTeX'.
@d eTeX_version=2 { \.{\\eTeXversion} }
-@d eTeX_revision==".2" { \.{\\eTeXrevision} }
-@d eTeX_version_string=='-2.2' {current \eTeX\ version}
+@d eTeX_revision==".3" { \.{\\eTeXrevision} }
+@d eTeX_version_string=='-2.3' {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/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 355e0f0cee1..635f6e505c8 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * xetex.ch: Reformulate to not depend on eTeX_version_string.
+
2011-02-25 Peter Breitenlohner <peb@mppmu.mpg.de>
* XeTeXFontInst.h: Fix prototype for xmalloc().
diff --git a/Build/source/texk/web2c/xetexdir/xetex.ch b/Build/source/texk/web2c/xetexdir/xetex.ch
index 97e0afba710..5f00960e35f 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.ch
+++ b/Build/source/texk/web2c/xetexdir/xetex.ch
@@ -61,30 +61,23 @@ authorization from the copyright holders.
@z
@x
-@d eTeX_version_string=='-2.2' {current \eTeX\ version}
+@d TeX_banner=='This is TeX, Version 3.1415926' {printed when \TeX\ starts}
@y
-@d eTeX_version_string=='-2.2' {current \eTeX\ version}
-
+@d TeX_banner=='This is TeX, Version 3.1415926' {printed when \TeX\ starts}
+@#
@d XeTeX_version=0
@d XeTeX_revision==".9997"
@d XeTeX_version_string=='-0.9997.4' {current \XeTeX\ version}
+@#
+@d XeTeX_banner=='This is XeTeX, Version 3.1415926',eTeX_version_string,XeTeX_version_string
+ {printed when \XeTeX\ starts}
+@d XeTeX_banner_k==XeTeX_banner
@z
@x
-@d eTeX_banner_k=='This is e-TeXk, Version 3.1415926',eTeX_version_string
-@d eTeX_banner=='This is e-TeX, Version 3.1415926',eTeX_version_string
- {printed when \eTeX\ starts}
-@#
-@d TeX_banner_k=='This is TeXk, Version 3.1415926' {printed when \TeX\ starts}
-@d TeX_banner=='This is TeX, Version 3.1415926' {printed when \TeX\ starts}
-@#
@d banner==eTeX_banner
@d banner_k==eTeX_banner_k
@y
-@d XeTeX_banner=='This is XeTeX, Version 3.1415926',eTeX_version_string,XeTeX_version_string
- {printed when \XeTeX\ starts}
-@d XeTeX_banner_k==XeTeX_banner
-@#
@d banner==XeTeX_banner
@d banner_k==XeTeX_banner_k
@z