update

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

5 files changed, 352 insertions, 782 deletions

diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
index 3f0d96075b4..904c2db1306 100644
--- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
+++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs
@@ -1,73 +1,59 @@
-make[1]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c'
-cd ../kpathsea && make -w CC='gcc' CFLAGS='-g ' 
-make[2]: Entering directory `/home/olaf/web2c/src/texk/texk/kpathsea'
-make[2]: Nothing to be done for `default'.
-make[2]: Leaving directory `/home/olaf/web2c/src/texk/texk/kpathsea'
-cd lib && make -w CC='gcc' CFLAGS='-g ' LDFLAGS='' 
-make[2]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c/lib'
-make[2]: Nothing to be done for `default'.
-make[2]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c/lib'
-cd web2c && make -w CC='gcc' CFLAGS='-g ' LDFLAGS=''  fixwrites
-make[2]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-make[2]: `fixwrites' is up to date.
-make[2]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-cd web2c && make -w CC='gcc' CFLAGS='-g ' LDFLAGS=''  splitup
-make[2]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-make[2]: `splitup' is up to date.
-make[2]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-cd web2c && make -w CC='gcc' CFLAGS='-g ' LDFLAGS=''  web2c
-make[2]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-make[2]: `web2c' is up to date.
-make[2]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-rm -f trip.tfm trip.pl trip.tex trip.fmt ctripin.fot ctripin.log
-rm -f ctrip.fot ctrip.log trip.dvi ctrip.typ
-rm -f xtripin.fot xtripin.log
-rm -f xtrip.fot xtrip.log xtrip.typ
-rm -f etrip.tfm etrip.pl etrip.tex etrip.fmt etripin.fot etripin.log
-rm -f etrip.fot etrip.log etrip.dvi etrip.out etrip.typ
-rm -f tripos.tex 8terminal.tex
-rm -rf tfm
+>>> Running e-TRIP test for e-TeX.
+>>> See SRCDIR/etexdir/etrip/etrip.diffs for example of acceptable diffs.
++ echo '*** TRIP test for e-TeX in compatibility mode ***.'
 *** TRIP test for e-TeX in compatibility mode ***.
-./pltotf ./triptrap/trip.pl trip.tfm
-./tftopl ./trip.tfm trip.pl
-diff ./triptrap/trip.pl trip.pl
-ln -s ./triptrap/trip.tex . # get same filename in log
-/bin/sh -c 'TEXMFCNF=./etexdir/etrip ./etex --progname=einitex --ini <./triptrap/trip1.in >ctripin.fot'
-mv trip.log ctripin.log
-diff ./triptrap/tripin.log ctripin.log
++ ./pltotf SRCDIR/triptrap/trip.pl trip.tfm
++ ./tftopl ./trip.tfm trip.pl
++ diff SRCDIR/triptrap/trip.pl trip.pl
++ ln -s SRCDIR/triptrap/trip.tex .
++ ./etex --progname=einitex --ini
++ mv trip.log ctripin.log
++ diff SRCDIR/triptrap/tripin.log ctripin.log
 1c1
-< This is TeX, Version 3.141592 (INITEX)  20 DEC 2002 20:24
+< This is TeX, Version 3.1415926 (INITEX)  15 MAR 2008 02:23
 ---
-> This is e-TeX, Version 3.141592-2.2 (Web2C 7.5.5) (INITEX)  3 AUG 2005 10:50
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest) (INITEX)  18 MAY 2010 13:31
 3c3
 < (trip.tex
 ---
 > (./trip.tex
-450,451c450,451
-<  (preloaded format=trip 2002.12.20)
-< 1320 strings of total length 23539
+450,453c450,453
+<  (preloaded format=trip 2008.3.15)
+< 1326 strings of total length 23646
+< 471 memory locations dumped; current usage is 96&278
+< 341 multiletter control sequences
 ---
->  (format=trip 2005.8.3)
-> 1479 strings of total length 25862
+>  (format=trip 2010.5.18)
+> 1486 strings of total length 26070
+> 479 memory locations dumped; current usage is 104&278
+> 342 multiletter control sequences
 461c461
 < Hyphenation trie of length 273 has 9 ops out of 500
 ---
 > Hyphenation trie of length 273 has 9 ops out of 35111
-/bin/sh -c 'TEXMFCNF=./etexdir/etrip ./etex --progname=etex <./triptrap/trip2.in >ctrip.fot'
-mv trip.log ctrip.log
-diff ./triptrap/trip.fot ctrip.fot
++ ./etex --progname=etex
++ mv trip.log ctrip.log
++ diff SRCDIR/triptrap/trip.fot ctrip.fot
 1,3c1,2
-< This is TeX, Version 3.141592 (INITEX)
+< This is TeX, Version 3.1415926 (INITEX)
 < ** &trip  trip 
 < (trip.tex ##
 ---
-> This is e-TeX, Version 3.141592-2.2 (Web2C 7.5.5)
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest)
 > **(./trip.tex ##
-diff  ./triptrap/trip.log ctrip.log
+17c16
+< Memory usage before: 159&313; after: 102&278; still untouched: 1613
+---
+> Memory usage before: 185&313; after: 112&278; still untouched: 2612
+75c74
+< Memory usage before: 334&431; after: 292&418; still untouched: 175
+---
+> Memory usage before: 434&431; after: 376&418; still untouched: 178
++ diff SRCDIR/triptrap/trip.log ctrip.log
 1c1
-< This is TeX, Version 3.141592 (preloaded format=trip 2002.12.20)  20 DEC 2002 21:28
+< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15)  15 MAR 2008 02:23
 ---
-> This is e-TeX, Version 3.141592-2.2 (Web2C 7.5.5) (format=trip 2005.8.3)  3 AUG 2005 10:50
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest) (format=trip 2010.5.18)  18 MAY 2010 13:31
 3c3
 < (trip.tex ##
 ---
@@ -77,10 +63,34 @@ diff  ./triptrap/trip.log ctrip.log
 > 
 > \openout10 = `tripos.tex'.
 > 
+73c77
+< Memory usage before: 159&313; after: 102&278; still untouched: 1613
+---
+> Memory usage before: 185&313; after: 112&278; still untouched: 2612
+642c646
+< Memory usage before: 747&484; after: 581&481; still untouched: 1492
+---
+> Memory usage before: 1027&484; after: 795&481; still untouched: 1491
+815c819
+< Memory usage before: 475&470; after: 290&466; still untouched: 1473
+---
+> Memory usage before: 653&470; after: 384&466; still untouched: 1472
+915c919
+< Memory usage before: 218&459; after: 149&458; still untouched: 1473
+---
+> Memory usage before: 286&459; after: 181&458; still untouched: 1472
+1070c1074
+< Memory usage before: 118&328; after: 102&328; still untouched: 1473
+---
+> Memory usage before: 132&328; after: 110&328; still untouched: 1472
 1405c1409
 < \vbox(16383.99998+0.0)x1000.0, glue set 16342.0fil
 ---
 > \vbox(16383.99998+0.0)x1000.0, glue set 16341.99998fil
+1511c1515
+< Memory usage before: 990&376; after: 584&370; still untouched: 735
+---
+> Memory usage before: 1396&376; after: 788&370; still untouched: 1472
 1954c1958
 < (tripos.tex
 ---
@@ -89,60 +99,103 @@ diff  ./triptrap/trip.log ctrip.log
 < \vbox(16383.99998+1.0)x100.0, glue set 16239.0fil
 ---
 > \vbox(16383.99998+1.0)x100.0, glue set 16238.99998fil
+2189c2193
+< Memory usage before: 950&531; after: 546&448; still untouched: 706
+---
+> Memory usage before: 1400&531; after: 772&448; still untouched: 1443
 2533c2537
 < \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil
 ---
 > \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil
+2575c2579
+< Memory usage before: 339&413; after: 236&405; still untouched: 706
+---
+> Memory usage before: 455&413; after: 296&405; still untouched: 1443
 3326c3330
 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil
 ---
 > \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil
+3616c3620
+< Memory usage before: 2170&521; after: 1181&459; still untouched: 175
+---
+> Memory usage before: 3016&521; after: 1607&459; still untouched: 178
 3864c3868
 < \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil
 ---
 > \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil
+3951c3955
+< Memory usage before: 640&415; after: 397&410; still untouched: 175
+---
+> Memory usage before: 888&415; after: 525&410; still untouched: 178
 4034c4038
 < \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil
 ---
 > \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil
+4053c4057
+< Memory usage before: 235&401; after: 178&399; still untouched: 175
+---
+> Memory usage before: 307&401; after: 218&399; still untouched: 178
 4420c4424
 < \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil
 ---
 > \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil
+4506c4510
+< Memory usage before: 651&432; after: 417&418; still untouched: 175
+---
+> Memory usage before: 941&432; after: 565&418; still untouched: 178
 4742c4746
 < \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil
 ---
 > \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil
-6370c6374
+4828c4832
+< Memory usage before: 776&458; after: 464&452; still untouched: 175
+---
+> Memory usage before: 1098&458; after: 630&452; still untouched: 178
+4845c4849
+< I'll pretend you didn't say \long or \outer or \global.
+---
+> I'll pretend you didn't say \long or \outer or \global or \protected.
+6380c6384
 < (tripos.tex
 ---
 > (./tripos.tex
-7287,7288c7291,7292
-<  47 strings out of 1674
-<  251 string characters out of 8353
+6595c6599
+< Memory usage before: 819&428; after: 720&426; still untouched: 175
 ---
->  44 strings out of 1821
->  261 string characters out of 8138
-7290c7294
+> Memory usage before: 1155&428; after: 1016&426; still untouched: 178
+7155c7159
+< Memory usage before: 895&439; after: 290&420; still untouched: 175
+---
+> Memory usage before: 1269&439; after: 374&420; still untouched: 178
+7288c7292
+< Memory usage before: 334&431; after: 292&418; still untouched: 175
+---
+> Memory usage before: 434&431; after: 376&418; still untouched: 178
+7296,7299c7300,7303
+<  47 strings out of 1674
+<  253 string characters out of 8354
+<  2825 words of memory out of 3000
 <  372 multiletter control sequences out of 2100
 ---
->  372 multiletter control sequences out of 10000+0
-7292,7293c7296,7297
+>  44 strings out of 1814
+>  261 string characters out of 7930
+>  3821 words of memory out of 3999
+>  373 multiletter control sequences out of 15000+0
+7301c7305
 <  2 hyphenation exceptions out of 307
-<  5i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s
 ---
 >  1 hyphenation exception out of 659
->  7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s
-/bin/sh -c 'TEXMFCNF=./etexdir/etrip ./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' trip.dvi >ctrip.typ'
-diff  ./triptrap/trip.typ ctrip.typ
++ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi
+++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi
++ diff SRCDIR/triptrap/trip.typ ctrip.typ
 1c1
 < This is DVItype, Version 3.6
 ---
-> This is DVItype, Version 3.6 (Web2C 7.5.5)
+> This is DVItype, Version 3.6 (TeX Live 2010/pretest)
 9c9
-< ' TeX output 2002.12.20:2128'
+< ' TeX output 2008.03.15:0223'
 ---
-> ' TeX output 2005.08.03:1050'
+> ' TeX output 2010.05.18:1331'
 419c419
 < 1121: down4 639342208 
 ---
@@ -153,12 +206,11 @@ diff  ./triptrap/trip.typ ctrip.typ
 ---
 > 2535: y4 203921756 
 > 2540: y0 203921756 
-1215d1214
-<  
++ echo '*** TRIP test for e-TeX in extended mode ***.'
 *** TRIP test for e-TeX in extended mode ***.
-/bin/sh -c 'TEXMFCNF=./etexdir/etrip ./etex --progname=einitex --ini <./etexdir/etrip/etrip1.in >xtripin.fot'
-mv trip.log xtripin.log
-diff ctripin.log xtripin.log
++ ./etex --progname=einitex --ini
++ mv trip.log xtripin.log
++ diff ctripin.log xtripin.log
 2c2,3
 < **\input trip
 ---
@@ -172,24 +224,28 @@ diff ctripin.log xtripin.log
 < I changed this one to zero.
 < 
 452,453c447,448
-< 471 memory locations dumped; current usage is 96&278
-< 341 multiletter control sequences
----
-> 509 memory locations dumped; current usage is 134&278
-> 407 multiletter control sequences
-/bin/sh -c 'TEXMFCNF=./etexdir/etrip ./etex --progname=etex <./etexdir/etrip/trip2.in >xtrip.fot'
-mv trip.log xtrip.log
-diff ctrip.fot xtrip.fot
+< 479 memory locations dumped; current usage is 104&278
+< 342 multiletter control sequences
+---
+> 517 memory locations dumped; current usage is 142&278
+> 408 multiletter control sequences
++ ./etex --progname=etex
++ mv trip.log xtrip.log
++ diff ctrip.fot xtrip.fot
 2c2,3
 < **(./trip.tex ##
 ---
 > **entering extended mode
 > ## (./trip.tex
+16c17
+< Memory usage before: 185&313; after: 112&278; still untouched: 2612
+---
+> Memory usage before: 185&313; after: 112&278; still untouched: 1612
 76a78,80
 > 
 > ### semi simple group (level 1) entered at line 429 (begingroup)
 > ### bottom level
-diff  ctrip.log xtrip.log
++ diff ctrip.log xtrip.log
 2,3c2,4
 < ** &trip  trip
 < (./trip.tex ##
@@ -197,6 +253,10 @@ diff  ctrip.log xtrip.log
 > entering extended mode
 > **&trip \toksdef\tokens=0 \input trip
 >  (./trip.tex
+77c78
+< Memory usage before: 185&313; after: 112&278; still untouched: 2612
+---
+> Memory usage before: 185&313; after: 112&278; still untouched: 1612
 1773d1773
 < {restoring \fam=-1}
 1783d1782
@@ -253,32 +313,34 @@ diff  ctrip.log xtrip.log
 < .\hbox(0.0+0.0)x-7127.0, shifted 7227.0
 ---
 > .\hbox(0.0+0.0)x-7127.0, shifted 7227.0, display
-7286a7280,7282
+7295a7289,7291
 > 
 > ### semi simple group (level 1) entered at line 429 (begingroup)
 > ### bottom level
-7294c7290
-<  372 multiletter control sequences out of 10000+0
+7303c7299
+<  373 multiletter control sequences out of 15000+0
 ---
->  438 multiletter control sequences out of 10000+0
-7297c7293
+>  439 multiletter control sequences out of 15000+0
+7306c7302
 <  7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s
 ---
 >  7i,7n,9p,136b,40s stack positions out of 200i,40n,60p,500b,600s
-/bin/sh -c 'TEXMFCNF=./etexdir/etrip ./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' trip.dvi >xtrip.typ'
-diff  ctrip.typ xtrip.typ
++ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi
+++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi
++ diff ctrip.typ xtrip.typ
++ echo '*** e-TeX specific part of e-TRIP test ***.'
 *** e-TeX specific part of e-TRIP test ***.
-./pltotf ./etexdir/etrip/etrip.pl etrip.tfm
-./tftopl ./etrip.tfm etrip.pl
-diff ./etexdir/etrip/etrip.pl etrip.pl
-ln -s ./etexdir/etrip/etrip.tex . # get same filename in log
-/bin/sh -c 'TEXMFCNF=./etexdir/etrip ./etex --progname=einitex --ini <./etexdir/etrip/etrip2.in >etripin.fot'
-mv etrip.log etripin.log
-diff ./etexdir/etrip/etripin.log etripin.log
++ ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm
++ ./tftopl ./etrip.tfm etrip.pl
++ diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl
++ ln -s SRCDIR/etexdir/etrip/etrip.tex .
++ ./etex --progname=einitex --ini
++ 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.141592-2.2 (Web2C 7.5.5) (INITEX)  3 AUG 2005 10:50
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest) (INITEX)  18 MAY 2010 13:31
 4c4,5
 < (etrip.tex This is the e-Trip test [2004-09-06] for e-TeX v3.141592-2.2.
 ---
@@ -288,69 +350,83 @@ diff ./etexdir/etrip/etripin.log etripin.log
 <  (preloaded format=etrip 2004.9.6)
 < 1435 strings of total length 24590
 ---
->  (format=etrip 2005.8.3)
-> 1480 strings of total length 25893
+>  (format=etrip 2010.5.18)
+> 1487 strings of total length 26101
+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
-/bin/sh -c 'TEXMFCNF=./etexdir/etrip ./etex --progname=etex <./etexdir/etrip/etrip3.in >etrip.fot'
-diff ./etexdir/etrip/etrip.fot etrip.fot
++ ./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.
 ---
-> This is e-TeX, Version 3.141592-2.2 (Web2C 7.5.5)
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest)
 > **entering extended mode
 > (./etrip.tex e-IniTeX: e-Trip format loaded.
-46a46,47
-> \openout1 = `etrip.out'.
+45a45,46
 > 
-diff  ./etexdir/etrip/etrip.log etrip.log
+> \openout1 = `etrip.out'.
++ 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.141592-2.2 (Web2C 7.5.5) (format=etrip 2005.8.3)  3 AUG 2005 10:50
+> This is e-TeX, Version 3.1415926-2.2 (TeX Live 2010/pretest) (format=etrip 2010.5.18)  18 MAY 2010 13:31
 4c4
 < (etrip.tex e-IniTeX: e-Trip format loaded.
 ---
 > (./etrip.tex e-IniTeX: e-Trip format loaded.
-670a671,672
-> \openout1 = `etrip.out'.
-> 
-672c674
+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
-4273,4274c4275,4276
+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
----
->  18 strings out of 1820
->  140 string characters out of 8107
-4276c4278
+<  2661 words of memory out of 3000
 <  408 multiletter control sequences out of 2100
 ---
->  408 multiletter control sequences out of 10000+0
+>  18 strings out of 1813
+>  140 string characters out of 7899
+>  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
-diff ./etexdir/etrip/etrip.out etrip.out
-/bin/sh -c 'TEXMFCNF=./etexdir/etrip ./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' etrip.dvi >etrip.typ'
-diff  ./etexdir/etrip/etrip.typ etrip.typ
++ 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 (Web2C 7.5.5)
+> This is DVItype, Version 3.6 (TeX Live 2010/pretest)
 9c9
 < ' TeX output 2004.09.06:2313'
 ---
-> ' TeX output 2005.08.03:1050'
-make[1]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c'
+> ' TeX output 2010.05.18:1331'
++ :
+PASS: etexdir/etrip.test
diff --git a/Build/source/texk/web2c/ptexdir/ptrip.diffs b/Build/source/texk/web2c/ptexdir/ptrip.diffs
index 15f344a5fc7..ed0ac8098b4 100644
--- a/Build/source/texk/web2c/ptexdir/ptrip.diffs
+++ b/Build/source/texk/web2c/ptexdir/ptrip.diffs
diff --git a/Build/source/texk/web2c/triptrap/mftrap.diffs b/Build/source/texk/web2c/triptrap/mftrap.diffs
index 4eb1b744e35..eced3f7f277 100644
--- a/Build/source/texk/web2c/triptrap/mftrap.diffs
+++ b/Build/source/texk/web2c/triptrap/mftrap.diffs
@@ -7,7 +7,7 @@
 1c1
 < This is METAFONT, Version 2.718281 (INIMF)  15 MAR 2008 02:23
 ---
-> This is METAFONT, Version 2.718281 (TeX Live 2010/dev) (INIMF)  5 MAR 2010 14:21
+> This is METAFONT, Version 2.718281 (TeX Live 2010/pretest) (INIMF)  18 MAY 2010 13:31
 150c150
 < String usage 26&83 (891&11438 still untouched)
 ---
@@ -16,8 +16,8 @@
 <  (preloaded base=trap 2008.3.15)
 < 1117 strings of total length 20614
 ---
->  (base=trap 2010.3.5)
-> 1122 strings of total length 20565
+>  (base=trap 2010.5.18)
+> 1122 strings of total length 20566
 + ./mf --progname=inimf
 + mv trap.log mftrap.log
 + mv trap.tfm mftrap.tfm
@@ -27,31 +27,31 @@
 < ** &trap  trap 
 < (trap.mf
 ---
-> This is METAFONT, Version 2.718281 (TeX Live 2010/dev) (INIMF)
+> This is METAFONT, Version 2.718281 (TeX Live 2010/pretest) (INIMF)
 > **(trap.mf
 39c38
 < String usage 41&161 (815&7634 still untouched)
 ---
-> String usage 50&202 (6301&75642 still untouched)
+> String usage 50&202 (6301&75641 still untouched)
 + diff SRCDIR/triptrap/mftrap.log mftrap.log
 1c1
 < This is METAFONT, Version 2.718281 (preloaded base=trap 2008.3.15)  15 MAR 2008 02:23
 ---
-> This is METAFONT, Version 2.718281 (TeX Live 2010/dev) (base=trap 2010.3.5)  5 MAR 2010 14:21
+> This is METAFONT, Version 2.718281 (TeX Live 2010/pretest) (base=trap 2010.5.18)  18 MAY 2010 13:31
 1825c1825
 < String usage 24&92 (858&11309 still untouched)
 ---
-> String usage 30&119 (6347&79310 still untouched)
+> String usage 30&119 (6347&79309 still untouched)
 4235c4235
 < String usage 41&161 (815&7634 still untouched)
 ---
-> String usage 50&202 (6301&75642 still untouched)
+> String usage 50&202 (6301&75641 still untouched)
 4251,4252c4251,4252
 <  68 strings out of 883
 <  3752 string characters out of 11386
 ---
 >  77 strings out of 6378
->  3793 string characters out of 79435
+>  3793 string characters out of 79434
 4254,4255c4254,4255
 <  289 symbolic tokens out of 2100
 <  8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b
@@ -69,10 +69,10 @@
 1c1
 < This is GFtype, Version 3.1
 ---
-> This is GFtype, Version 3.1 (TeX Live 2010/dev)
+> This is GFtype, Version 3.1 (TeX Live 2010/pretest)
 3c3
 < ' METAFONT output 2008.03.15:0223'
 ---
-> ' METAFONT output 2010.03.05:1421'
+> ' METAFONT output 2010.05.18:1331'
 + exit 0
 PASS: trap.test
diff --git a/Build/source/texk/web2c/triptrap/mptrap.diffs b/Build/source/texk/web2c/triptrap/mptrap.diffs
index cf317039f39..993393f06cd 100644
--- a/Build/source/texk/web2c/triptrap/mptrap.diffs
+++ b/Build/source/texk/web2c/triptrap/mptrap.diffs
@@ -1,621 +1,122 @@
-make[1]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c'
-cd lib && make -w CC='gcc' CFLAGS='-g ' LDFLAGS='' 
-make[2]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c/lib'
-make[2]: Nothing to be done for `default'.
-make[2]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c/lib'
-cd web2c && make -w CC='gcc' CFLAGS='-g ' LDFLAGS=''  fixwrites
-make[2]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-make[2]: `fixwrites' is up to date.
-make[2]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-cd web2c && make -w CC='gcc' CFLAGS='-g ' LDFLAGS=''  splitup
-make[2]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-make[2]: `splitup' is up to date.
-make[2]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-cd web2c && make -w CC='gcc' CFLAGS='-g ' LDFLAGS=''  web2c
-make[2]: Entering directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-make[2]: `web2c' is up to date.
-make[2]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c/web2c'
-rm -f mtrap.mp mtrap.mem trapf.tfm
-rm -f mtrap.log mtrap.0 mtrap.1 writeo writeo.log writeo.2
-rm -f trap.mp trap.mpx mptrapin.fot mptrapin.log
-rm -f mptrap.fot mptrap.log mptrap.tfm
-rm -f trap.ps trap.mem trap.0 trap.5 trap.6 trap.95 trap.96 trap.97
-rm -f trap.98 trap.99 trap.100 trap.101 trap.102 trap.103 trap.104
-rm -f trap.105 trap.106 trap.107 trap.108 trap.109 trap.148
-rm -f trap.149 trap.150 trap.151 trap.197 trap.200
-rm -f mptrap.pl
-ln -s ./triptrap/mtrap.mp . # get same filename in log
-./pltotf ./triptrap/trapf.pl trapf.tfm
-/bin/sh -c 'TEXMFCNF=./triptrap ./mpost --progname=inimpost mtrap'
-This is MetaPost, Version 0.901 (Web2C 7.5.5) (INIMP)
-(mtrap.mp
-diff ./triptrap/mtrap.log mtrap.log
-1,2c1,2
-< This is MetaPost, C Version 0.64 (INIMP)  28 JAN 1998 11:18
-< **mtrap 
----
-> This is MetaPost, Version 0.901 (Web2C 7.5.5) (INIMP)  3 AUG 2005 10:46
-> **mtrap
-5c5
-< String usage 4&24 (1306&9877 now untouched)
----
-> String usage 5&29 (1297&17816 now untouched)
-300,306c300,306
-< String usage 8&32 (1302&9869 now untouched)
-< Memory usage 109&13 (3358 still untouched)
-< String usage 10&42 (1300&9859 now untouched)
-< Memory usage 116&13 (3358 still untouched)
-< String usage 11&45 (1299&9856 now untouched)
-< Memory usage 139&56 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> String usage 9&37 (1293&17808 now untouched)
-> Memory usage 120&13 (3358 still untouched)
-> String usage 11&47 (1291&17798 now untouched)
-> Memory usage 127&13 (3358 still untouched)
-> String usage 12&50 (1290&17795 now untouched)
-> Memory usage 150&56 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-316,317c316,317
-< Memory usage 152&59 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> Memory usage 163&59 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-341,342c341,342
-< Memory usage 220&59 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> Memory usage 239&59 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-358,359c358,359
-< Memory usage 245&59 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> Memory usage 267&59 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-374,375c374,375
-< Memory usage 293&72 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> Memory usage 318&72 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-404,405c404,405
-< Memory usage 314&59 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> Memory usage 342&59 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-442,443c442,443
-< Memory usage 339&59 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> Memory usage 370&59 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-480,481c480,481
-< Memory usage 339&59 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> Memory usage 370&59 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-496,497c496,497
-< Memory usage 345&70 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> Memory usage 376&70 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-537,538c537,538
-< Memory usage 364&59 (3358 still untouched)
-< String usage 14&51 (1296&9850 now untouched)
----
-> Memory usage 398&59 (3358 still untouched)
-> String usage 15&56 (1287&17789 now untouched)
-550,551c550,551
-< Memory usage 355&64 (3358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 386&64 (3358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-594,595c594,595
-< Memory usage 365&59 (3358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 396&59 (3358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-610,611c610,611
-< Memory usage 390&73 (3358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 424&73 (3358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-659,660c659,660
-< Memory usage 409&59 (3358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 446&59 (3358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-668,671c668,671
-< Memory usage 409&59 (3358 still untouched)
-< String usage 18&75 (1292&9826 now untouched)
-< Memory usage 308&13 (3358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 446&59 (3358 still untouched)
-> String usage 19&80 (1283&17765 now untouched)
-> Memory usage 339&13 (3358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-721,722c721,722
-< Memory usage 308&13 (3358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 339&13 (3358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-724,725c724,725
-< Memory usage 563&13 (3358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 622&13 (3358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-817,818c817,818
-< Memory usage 747&13 (3358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 826&13 (3358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-847,848c847,848
-< Memory usage 1003&85 (2358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 1110&85 (2358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-872,873c872,873
-< Memory usage 873&85 (2358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 966&85 (2358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-897,898c897,898
-< Memory usage 786&85 (2358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 868&85 (2358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-919,920c919,920
-< Memory usage 773&85 (2358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 852&85 (2358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-942,943c942,943
-< Memory usage 788&85 (2358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 870&85 (2358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-949,950c949,950
-< Memory usage 319&13 (2358 still untouched)
-< String usage 17&64 (1293&9837 now untouched)
----
-> Memory usage 350&13 (2358 still untouched)
-> String usage 18&69 (1284&17776 now untouched)
-952,953c952,953
-< Memory usage 325&13 (2358 still untouched)
-< String usage 20&78 (1287&9809 now untouched)
----
-> Memory usage 356&13 (2358 still untouched)
-> String usage 21&83 (1278&17748 now untouched)
-956c956,957
-< >> "%%Creator: MetaPost"
----
-> >> "%%HiResBoundingBox: -36 -24 84 84"
-> >> "%%Creator: MetaPost 0.901"
-958a960
-> >> "%%BeginProlog"
-988,989c990,991
-< Memory usage 325&13 (2358 still untouched)
-< String usage 22&84 (1247&8769 now untouched)
----
-> Memory usage 356&13 (2358 still untouched)
-> String usage 23&89 (1236&16656 now untouched)
-992,994c994,996
-< >> 40
-< Memory usage 325&13 (2358 still untouched)
-< String usage 22&84 (1206&7603 now untouched)
----
-> >> 42
-> Memory usage 356&13 (2358 still untouched)
-> String usage 23&89 (1193&15438 now untouched)
-998,1002c1000,1008
-< >> "%%Creator: MetaPost"
-< Memory usage 325&13 (2358 still untouched)
-< String usage 24&110 (1197&7522 now untouched)
-< Memory usage 325&13 (2358 still untouched)
-< String usage 26&125 (1148&7358 now untouched)
----
-> >> "%%HiResBoundingBox: -36 -24 84 84"
-> Memory usage 356&13 (2358 still untouched)
-> String usage 25&129 (1184&15343 now untouched)
-> write0 = `writeo'.
-> 
-> write1 = `writeo.2'.
-> 
-> Memory usage 356&13 (2358 still untouched)
-> String usage 27&144 (1135&15179 now untouched)
-1004c1010
-< >> "%%Pages: 1"
----
-> >> "%%CreationDate: 2005.08.03:1046"
-1006c1012
-< >> "%*Font: trapf 9.9628 9.96265 35:c008"
----
-> >> "%%Pages: 1"
-1008,1010c1014,1018
-< >> "%%EndProlog"
-< Memory usage 325&13 (2358 still untouched)
-< String usage 25&135 (1144&7308 now untouched)
----
-> >> "%*Font: trapf 9.9628 9.96265 35:c008"
-> Memory usage 356&13 (2358 still untouched)
-> String usage 26&134 (1131&15135 now untouched)
-> write0 = `writeo'.
-> 
-1013,1014c1021,1022
-< Memory usage 325&13 (2358 still untouched)
-< String usage 26&141 (1195&1840 now untouched)
----
-> Memory usage 356&13 (2358 still untouched)
-> String usage 27&140 (1258&16265 now untouched)
-1038,1039c1046,1047
-< Memory usage 325&13 (2358 still untouched)
-< String usage 26&141 (1195&1840 now untouched)
----
-> Memory usage 356&13 (2358 still untouched)
-> String usage 27&140 (1258&16265 now untouched)
-1048,1049c1056,1057
-< Memory usage 327&13 (2358 still untouched)
-< String usage 27&149 (1194&1832 now untouched)
----
-> Memory usage 358&13 (2358 still untouched)
-> String usage 28&148 (1257&16257 now untouched)
-1097,1098c1105,1106
-< Memory usage 327&13 (2358 still untouched)
-< String usage 27&149 (1193&1824 now untouched)
----
-> Memory usage 358&13 (2358 still untouched)
-> String usage 28&148 (1256&16249 now untouched)
-1101,1102c1109,1110
-<  32 strings out of 1310
-<  561 string characters out of 9901
----
->  33 strings out of 1302
->  560 string characters out of 17845
-1104,1106c1112,1114
-<  237 symbolic tokens out of 2100
-<  5i,33n,6p,100b stack positions out of 30i,100n,150p,500b
-<  3 string compactions (moved 1368 characters, 89 strings)
----
->  238 symbolic tokens out of 9500
->  5i,33n,6p,99b stack positions out of 300i,300n,1500p,500b
->  2 string compactions (moved 880 characters, 63 strings)
-diff ./triptrap/mtrap.0 mtrap.0
-3,4c3,5
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
----
-> %%HiResBoundingBox: -36 -24 84 84 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-6a8
-> %%BeginProlog
-diff ./triptrap/mtrap.1 mtrap.1
-3,4c3,5
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
----
-> %%HiResBoundingBox: -84 -36 24 84 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-6a8
-> %%BeginProlog
-diff ./triptrap/writeo writeo
-diff ./triptrap/writeo.2 writeo.2
-ln -s ./triptrap/trap.mp .
-ln -s ./triptrap/trap.mpx .
-/bin/sh -c 'TEXMFCNF=./triptrap ./mpost --progname=inimpost <./triptrap/mptrap1.in >mptrapin.fot'
-mv trap.log mptrapin.log
-diff ./triptrap/mptrapin.log mptrapin.log
+>>> Running MPTRAP test for MetaPost.
+>>> See SRCDIR/triptrap/mptrap.diffs for example of acceptable diffs.
++ ./pltotf SRCDIR/triptrap/trapf.pl trapf.tfm
++ ln -s SRCDIR/triptrap/mtrap.mp .
++ ./mpost --progname=inimpost --ini mtrap
+This is MetaPost, version 1.211 (kpathsea version 6.0.0dev) (INIMP)
+(./mtrap.mp
++ diff SRCDIR/triptrap/mtrap.log mtrap.log
 1c1
-< This is MetaPost, C Version 0.632 (INIMP)  24 JAN 1997 11:13
----
-> This is MetaPost, Version 0.901 (Web2C 7.5.5) (INIMP)  3 AUG 2005 10:46
-162c162
-< String usage 28&93 (1282&9362 now untouched)
----
-> String usage 29&97 (1272&17743 now untouched)
-195,198c195,198
-<  (preloaded mem=trap 97.1.24)
-< at most 1226 strings of total length 22670
-< 398 memory locations dumped; current usage is 318&68
-< 279 symbolic tokens
----
->  (mem=trap 2005.8.3)
-> at most 1236 strings of total length 22276
-> 400 memory locations dumped; current usage is 320&68
-> 281 symbolic tokens
-/bin/sh -c 'TEXMFCNF=./triptrap ./mpost --progname=inimpost <./triptrap/mptrap2.in >mptrap.fot'
-mv trap.log mptrap.log
-mv trap.tfm mptrap.tfm
-diff ./triptrap/mptrap.fot mptrap.fot
-0a1
-> This is MetaPost, Version 0.901 (Web2C 7.5.5) (INIMP)
-34,35c35,36
-< Memory usage 2147&536 (39 still untouched)
-< String usage 73&277 (1110&5373 now untouched)
----
-> Memory usage 2315&536 (39 still untouched)
-> String usage 74&281 (1103&13766 now untouched)
-diff ./triptrap/mptrap.log mptrap.log
+< This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP)  25 MAY 2009 12:47
+---
+> This is MetaPost, version 1.211 (kpathsea version 6.0.0dev) (INIMP)  18 MAY 2010 13:31
+929c929
+< >> "%%Creator: MetaPost 1.203"
+---
+> >> "%%Creator: MetaPost 1.211"
+978c978
+< >> "%%CreationDate: 2009.05.25:1247"
+---
+> >> "%%CreationDate: 2010.05.18:1331"
++ diff SRCDIR/triptrap/mtrap.0 mtrap.0
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.05.25:1247
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ diff SRCDIR/triptrap/mtrap.1 mtrap.1
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.05.25:1247
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ diff SRCDIR/triptrap/writeo writeo
++ diff SRCDIR/triptrap/writeo.2 writeo.2
++ ln -s SRCDIR/triptrap/trap.mp .
++ ln -s SRCDIR/triptrap/trap.mpx .
++ ./mpost --progname=inimpost --jobname=trap --ini
++ mv trap.log mptrapin.log
++ diff SRCDIR/triptrap/mptrapin.log mptrapin.log
 1c1
-< This is MetaPost, C Version 0.632 (preloaded mem=trap 97.1.24)  24 JAN 1997 11:13
----
-> This is MetaPost, Version 0.901 (Web2C 7.5.5) (mem=trap 2005.8.3)  3 AUG 2005 10:46
-1621,1622c1621,1622
-< Memory usage 1178&115 (2344 still untouched)
-< String usage 22&84 (1244&9177 now untouched)
----
-> Memory usage 1244&115 (2344 still untouched)
-> String usage 23&88 (1236&17569 now untouched)
-2612c2612
-< >> unknown path %CAPSULE1695
----
-> >> unknown path %CAPSULE1901
-2665c2665
-< dashed (on 3 off 0) shifted 0
----
-> dashed (on 0 off 0) shifted 0
-2816,2818c2816,2818
-< xpart %CAPSULE2512=xx
-< %CAPSULE2520=2yy-2
-< %CAPSULE2528 = 3.3333xx+3.3333
----
-> xpart %CAPSULE2366=xx
-> %CAPSULE2374=2yy-2
-> %CAPSULE2382 = 3.3333xx+3.3333
-2877,2880c2877,2880
-< %CAPSULE2440 = 3ooo-0.01o3
-< %CAPSULE2460 = 8000o2-4000o1+1000o3+9
-< xpart %CAPSULE2536=xpart '
-< ypart %CAPSULE2536=ypart '
----
-> %CAPSULE2294 = 3ooo-0.01o3
-> %CAPSULE2314 = 8000o2-4000o1+1000o3+9
-> xpart %CAPSULE2390=xpart '
-> ypart %CAPSULE2390=ypart '
-2883,2884c2883,2884
-< ### 4000o1 = -%CAPSULE2460+8000o2+1000o3+9
-< ### -4.87383o2 = -oo-0.0004%CAPSULE2460+0.39673o3-17.99643
----
-> ### 4000o1 = -%CAPSULE2314+8000o2+1000o3+9
-> ### -4.87383o2 = -oo-0.0004%CAPSULE2314+0.39673o3-17.99643
-2888c2888
-< ### 0.22894o5 = -%CAPSULE2440+0.10689oo+3ooo+1.92412
----
-> ### 0.22894o5 = -%CAPSULE2294+0.10689oo+3ooo+1.92412
-2891c2891
-< ### -alfa=-%CAPSULE2428
----
-> ### -alfa=-%CAPSULE2282
-2893,2900c2893,2900
-< ### -%CAPSULE2428=-xpart %CAPSULE2426
-< {xpart((xpart %CAPSULE2426,0))}
-< ### -xpart %CAPSULE9=-%CAPSULE2416
-< {endgroup}
-< {(%CAPSULE2440)+(%CAPSULE2416)}
-< ### -%CAPSULE2440=-%CAPSULE2404+%CAPSULE2416
-< ### -%CAPSULE2404=-ypart %CAPSULE2402
-< ### -%CAPSULE2460=-xpart %CAPSULE2402
----
-> ### -%CAPSULE2282=-xpart %CAPSULE2280
-> {xpart((xpart %CAPSULE2280,0))}
-> ### -xpart %CAPSULE9=-%CAPSULE2270
-> {endgroup}
-> {(%CAPSULE2294)+(%CAPSULE2270)}
-> ### -%CAPSULE2294=-%CAPSULE2258+%CAPSULE2270
-> ### -%CAPSULE2258=-ypart %CAPSULE2256
-> ### -%CAPSULE2314=-xpart %CAPSULE2256
-2905c2905
-< ### p$=-ypart %CAPSULE2368+1
----
-> ### p$=-ypart %CAPSULE2222+1
-2907,2919c2907,2919
-< {(2/3)*((-ypart %CAPSULE2368+1,ypart %CAPSULE2368))}
-< ### ypart %CAPSULE2368=-xpart %CAPSULE2368+1
-< ### -0.66667xpart %CAPSULE2368=-xpart %CAPSULE2360
-< {-((xpart %CAPSULE2360,-xpart %CAPSULE2360+0.66667))}
-< ### xpart %CAPSULE2360=-xpart %CAPSULE2340
-< {((xpart %CAPSULE2402,ypart %CAPSULE2402))=((xpart %CAPSULE2340,-xpart %
-< CAPSULE2340-0.66667))}
-< ## xpart %CAPSULE2340=-ypart %CAPSULE2402-0.66667
-< ## xpart %CAPSULE2402=-ypart %CAPSULE2402-0.66667
-< ### ypart %CAPSULE2402=-xpart %CAPSULE2402-0.66667
-< ### -xpart %CAPSULE2402=-xpart %CAPSULE2340
-< {((xpart ',ypart '))=((xpart %CAPSULE2340,-xpart %CAPSULE2340-0.66667))}
-< ## xpart %CAPSULE2340=-ypart '-0.66667
+< This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP)  25 MAY 2009 12:47
 ---
-> {(2/3)*((-ypart %CAPSULE2222+1,ypart %CAPSULE2222))}
-> ### ypart %CAPSULE2222=-xpart %CAPSULE2222+1
-> ### -0.66667xpart %CAPSULE2222=-xpart %CAPSULE2214
-> {-((xpart %CAPSULE2214,-xpart %CAPSULE2214+0.66667))}
-> ### xpart %CAPSULE2214=-xpart %CAPSULE2194
-> {((xpart %CAPSULE2256,ypart %CAPSULE2256))=((xpart %CAPSULE2194,-xpart %
-> CAPSULE2194-0.66667))}
-> ## xpart %CAPSULE2194=-ypart %CAPSULE2256-0.66667
-> ## xpart %CAPSULE2256=-ypart %CAPSULE2256-0.66667
-> ### ypart %CAPSULE2256=-xpart %CAPSULE2256-0.66667
-> ### -xpart %CAPSULE2256=-xpart %CAPSULE2194
-> {((xpart ',ypart '))=((xpart %CAPSULE2194,-xpart %CAPSULE2194-0.66667))}
-> ## xpart %CAPSULE2194=-ypart '-0.66667
-2925c2925
-< ### -ooo=-%CAPSULE2302
+> This is MetaPost, version 1.211 (kpathsea version 6.0.0dev) (INIMP)  18 MAY 2010 13:31
+195c195
+<  (mem=trap 2009.05.25)
 ---
-> ### -ooo=-%CAPSULE2156
-2927,2936c2927,2936
-< {(%CAPSULE2302)+(1)}
-< ### -%CAPSULE2302=-%CAPSULE2290+1
-< {(1/2)*(%CAPSULE2290)}
-< ### -0.5%CAPSULE2290=-%CAPSULE2282
-< {-(%CAPSULE2282)}
-< ### %CAPSULE2282=-%CAPSULE2274
-< {(2)*(%CAPSULE2274)}
-< ### -2%CAPSULE2274=-%CAPSULE2266
-< {(-0.5%CAPSULE2266-0.5)=(%CAPSULE2266)}
-< ## %CAPSULE2266=-0.33333
----
-> {(%CAPSULE2156)+(1)}
-> ### -%CAPSULE2156=-%CAPSULE2144+1
-> {(1/2)*(%CAPSULE2144)}
-> ### -0.5%CAPSULE2144=-%CAPSULE2136
-> {-(%CAPSULE2136)}
-> ### %CAPSULE2136=-%CAPSULE2128
-> {(2)*(%CAPSULE2128)}
-> ### -2%CAPSULE2128=-%CAPSULE2120
-> {(-0.5%CAPSULE2120-0.5)=(%CAPSULE2120)}
-> ## %CAPSULE2120=-0.33333
-3509,3510c3509,3510
-< Memory usage 3017&264 (273 still untouched)
-< String usage 68&249 (1155&8794 now untouched)
----
-> Memory usage 3275&264 (273 still untouched)
-> String usage 69&253 (1147&17186 now untouched)
-3520,3521c3520,3521
-< Memory usage 2267&264 (273 still untouched)
-< String usage 66&241 (1154&8790 now untouched)
----
-> Memory usage 2446&264 (273 still untouched)
-> String usage 67&245 (1146&17182 now untouched)
-3990a3991,3992
->  ..(10,10)
->    ..controls (10,10) and (10,10)
-4378,4379c4380,4381
-< Memory usage 2744&607 (39 still untouched)
-< String usage 73&279 (1138&8717 now untouched)
----
-> Memory usage 2959&607 (39 still untouched)
-> String usage 74&283 (1130&17109 now untouched)
-4384,4385c4386,4387
-< Memory usage 2704&536 (39 still untouched)
-< String usage 73&279 (1138&8717 now untouched)
----
-> Memory usage 2919&536 (39 still untouched)
-> String usage 74&283 (1130&17109 now untouched)
-4673,4674c4675,4676
-< Memory usage 2147&536 (39 still untouched)
-< String usage 73&277 (1110&5373 now untouched)
----
-> Memory usage 2315&536 (39 still untouched)
-> String usage 74&281 (1103&13766 now untouched)
-4739,4740c4741,4742
-<  75 strings out of 1277
-<  768 string characters out of 9330
----
->  76 strings out of 1268
->  772 string characters out of 17724
-4742,4743c4744,4745
-<  337 symbolic tokens out of 2100
-<  8i,35n,8p,167b stack positions out of 30i,100n,150p,500b
----
->  339 symbolic tokens out of 9500
->  8i,35n,8p,167b stack positions out of 300i,300n,1500p,500b
-4752c4754
-<   out of 256w,16h,16d,64i,5000l,500k,256e,50p)
----
->   out of 256w,16h,16d,64i,15000l,2500k,256e,50p)
-diff ./triptrap/trap.5 trap.5
-3,4c3,5
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
----
-> %%HiResBoundingBox: -150.99219 -2 168.99219 20.00024 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-5a7
-> %%BeginProlog
-diff ./triptrap/trap.6 trap.6
-3,4c3,5
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
----
-> %%HiResBoundingBox: 3 0 6 2.25 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-5a7
-> %%BeginProlog
-diff ./triptrap/trap.148 trap.148
-2,4c2,5
-< %%BoundingBox: -5 -5 13 5 
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
----
-> %%BoundingBox: -4 -6 13 6 
-> %%HiResBoundingBox: -3.5 -5.5 12.5 5.5 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-5a7
-> %%BeginProlog
-diff ./triptrap/trap.149 trap.149
-3,4c3,5
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
----
-> %%HiResBoundingBox: -27.5 -27.5 51.6906 36.71318 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-5a7
-> %%BeginProlog
-diff ./triptrap/trap.150 trap.150
-3,4c3,5
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
----
-> %%HiResBoundingBox: -5 -5 33 25 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-5a7
-> %%BeginProlog
-28c30
-< 15 10 lineto
----
-> 10 5 lineto
-diff ./triptrap/trap.151 trap.151
-3,4c3,5
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
----
-> %%HiResBoundingBox: -4095.49998 -101.96362 4095.49998 261 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-5a7
-> %%BeginProlog
-diff ./triptrap/trap.197 trap.197
-3,4c3,5
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
----
-> %%HiResBoundingBox: -1.99254 -3.98508 7.97011 3.98506 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-6a8
-> %%BeginProlog
-diff ./triptrap/trap.200 trap.200
-3,4c3,5
-< %%Creator: MetaPost
-< %%CreationDate: 1998.01.28:1118
+>  (mem=trap 2010.05.18)
++ ./mpost --progname=inimpost --jobname=trap --mem=trap
++ mv trap.log mptrap.log
++ mv trap.tfm mptrap.tfm
++ diff SRCDIR/triptrap/mptrap.fot mptrap.fot
+1c1
+< This is MetaPost, version 1.203 (kpathsea version 3.5.7dev)
 ---
-> %%HiResBoundingBox: -6.2132 -5.9851 36.21318 37.00375 
-> %%Creator: MetaPost 0.901
-> %%CreationDate: 2005.08.03:1046
-7a9
-> %%BeginProlog
-./tftopl ./mptrap.tfm mptrap.pl
-diff ./triptrap/mptrap.pl mptrap.pl
-make[1]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c'
+> This is MetaPost, version 1.211 (kpathsea version 6.0.0dev)
++ diff SRCDIR/triptrap/mptrap.log mptrap.log
+1c1
+< This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (mem=trap 2009.06.02)  2 JUN 2009 22:19
+---
+> This is MetaPost, version 1.211 (kpathsea version 6.0.0dev) (mem=trap 2010.05.18)  18 MAY 2010 13:31
++ diff SRCDIR/triptrap/trap.5 trap.5
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.06.02:2219
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ diff SRCDIR/triptrap/trap.6 trap.6
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.06.02:2219
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ diff SRCDIR/triptrap/trap.148 trap.148
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.06.02:2230
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ diff SRCDIR/triptrap/trap.149 trap.149
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.06.02:2238
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ diff SRCDIR/triptrap/trap.150 trap.150
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.06.02:2235
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ diff SRCDIR/triptrap/trap.151 trap.151
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.06.02:2234
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ diff SRCDIR/triptrap/trap.197 trap.197
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.06.02:2231
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ diff SRCDIR/triptrap/trap.200 trap.200
+4,5c4,5
+< %%Creator: MetaPost 1.203
+< %%CreationDate: 2009.06.02:2231
+---
+> %%Creator: MetaPost 1.211
+> %%CreationDate: 2010.05.18:1331
++ ./tftopl ./mptrap.tfm mptrap.pl
++ diff SRCDIR/triptrap/mptrap.pl mptrap.pl
++ exit 0
+PASS: mplibdir/mptrap.test
diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs
index f324bef3c1d..f47446e97e8 100644
--- a/Build/source/texk/web2c/triptrap/trip.diffs
+++ b/Build/source/texk/web2c/triptrap/trip.diffs
@@ -1,21 +1,16 @@
-cd /home/texlive/karl/Build/source/Work/texk/web2c/
-make trip
-rm -f trip.tfm trip.pl trip.tex trip.fmt tripin.fot tripin.log
-rm -f trip.fot trip.log trip.dvi trip.typ tripos.tex 8terminal.tex
-rm -rf tfm
->>> See ../../../texk/web2c/triptrap/trip.diffs for example of acceptable diffs.
-./pltotf ../../../texk/web2c/triptrap/trip.pl trip.tfm
-./tftopl ./trip.tfm trip.pl
-diff ../../../texk/web2c/triptrap/trip.pl trip.pl
-ln -s ../../../texk/web2c/triptrap/trip.tex . # get same filename in log
-/bin/sh -c 'TEXMFCNF=../../../texk/web2c/triptrap ./tex --progname=initex --ini <../../../texk/web2c/triptrap/trip1.in >tripin.fot'
-make: [trip] Error 1 (ignored)
-mv trip.log tripin.log
-diff ../../../texk/web2c/triptrap/tripin.log tripin.log
+>>> Running TRIP test for TeX.
+>>> See SRCDIR/triptrap/trip.diffs for example of acceptable diffs.
++ ./pltotf SRCDIR/triptrap/trip.pl trip.tfm
++ ./tftopl ./trip.tfm trip.pl
++ diff SRCDIR/triptrap/trip.pl trip.pl
++ ln -s SRCDIR/triptrap/trip.tex .
++ ./tex --progname=initex --ini
++ mv trip.log tripin.log
++ diff SRCDIR/triptrap/tripin.log tripin.log
 1c1
 < This is TeX, Version 3.1415926 (INITEX)  15 MAR 2008 02:23
 ---
-> This is TeX, Version 3.1415926 (Web2C 7.5.6) (INITEX)  25 APR 2008 19:06
+> This is TeX, Version 3.1415926 (TeX Live 2010/pretest) (INITEX)  18 MAY 2010 13:31
 3c3
 < (trip.tex
 ---
@@ -24,29 +19,26 @@ diff ../../../texk/web2c/triptrap/tripin.log tripin.log
 <  (preloaded format=trip 2008.3.15)
 < 1326 strings of total length 23646
 ---
->  (format=trip 2008.4.25)
-> 1366 strings of total length 24430
+>  (format=trip 2010.5.18)
+> 1370 strings of total length 24558
 461c461
 < Hyphenation trie of length 273 has 9 ops out of 500
 ---
 > Hyphenation trie of length 273 has 9 ops out of 35111
-make: [trip] Error 1 (ignored)
-/bin/sh -c 'TEXMFCNF=../../../texk/web2c/triptrap ./tex --progname=tex <../../../texk/web2c/triptrap/trip2.in >trip.fot'
-make: [trip] Error 1 (ignored)
-diff ../../../texk/web2c/triptrap/trip.fot trip.fot
++ ./tex --progname=tex
++ diff SRCDIR/triptrap/trip.fot trip.fot
 1,3c1,2
 < This is TeX, Version 3.1415926 (INITEX)
 < ** &trip  trip 
 < (trip.tex ##
 ---
-> This is TeX, Version 3.1415926 (Web2C 7.5.6)
+> This is TeX, Version 3.1415926 (TeX Live 2010/pretest)
 > **(./trip.tex ##
-make: [trip] Error 1 (ignored)
-diff  ../../../texk/web2c/triptrap/trip.log trip.log
++ diff SRCDIR/triptrap/trip.log trip.log
 1c1
 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15)  15 MAR 2008 02:23
 ---
-> This is TeX, Version 3.1415926 (Web2C 7.5.6) (format=trip 2008.4.25)  25 APR 2008 19:06
+> This is TeX, Version 3.1415926 (TeX Live 2010/pretest) (format=trip 2010.5.18)  18 MAY 2010 13:31
 3c3
 < (trip.tex ##
 ---
@@ -100,27 +92,27 @@ diff  ../../../texk/web2c/triptrap/trip.log trip.log
 <  47 strings out of 1674
 <  253 string characters out of 8354
 ---
->  44 strings out of 1634
->  261 string characters out of 15570
+>  44 strings out of 1630
+>  261 string characters out of 15442
 7299c7303
 <  372 multiletter control sequences out of 2100
 ---
->  372 multiletter control sequences out of 10000+0
+>  372 multiletter control sequences out of 15000+0
 7301c7305
 <  2 hyphenation exceptions out of 307
 ---
 >  1 hyphenation exception out of 659
-make: [trip] Error 1 (ignored)
-/bin/sh -c 'TEXMFCNF=../../../texk/web2c/triptrap ./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' trip.dvi >trip.typ'
-diff  ../../../texk/web2c/triptrap/trip.typ trip.typ
++ eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi
+++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi
++ diff SRCDIR/triptrap/trip.typ trip.typ
 1c1
 < This is DVItype, Version 3.6
 ---
-> This is DVItype, Version 3.6 (Web2C 7.5.6)
+> This is DVItype, Version 3.6 (TeX Live 2010/pretest)
 9c9
 < ' TeX output 2008.03.15:0223'
 ---
-> ' TeX output 2008.04.25:1906'
+> ' TeX output 2010.05.18:1331'
 419c419
 < 1121: down4 639342208 
 ---
@@ -131,4 +123,5 @@ diff  ../../../texk/web2c/triptrap/trip.typ trip.typ
 ---
 > 2535: y4 203921756 
 > 2540: y0 203921756 
-make: [trip] Error 1 (ignored)
++ :
+PASS: trip.test