Update output expected from TRIP and TRAP tests

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

3 files changed, 40 insertions, 44 deletions

diff --git a/Build/source/texk/web2c/triptrap/mftrap.diffs b/Build/source/texk/web2c/triptrap/mftrap.diffs
index 7930f033ffc..35b00ea2c2f 100644
--- a/Build/source/texk/web2c/triptrap/mftrap.diffs
+++ b/Build/source/texk/web2c/triptrap/mftrap.diffs
@@ -2,12 +2,13 @@
 >>> See SRCDIR/triptrap/mftrap.diffs for example of acceptable diffs.
 + ln -s SRCDIR/triptrap/trap.mf .
 + ./mf --progname=inimf
++ test '!' -s trap.base
 + mv trap.log mftrapin.log
 + diff SRCDIR/triptrap/mftrapin.log mftrapin.log
 1c1
 < This is METAFONT, Version 2.7182818 (INIMF)  7 JAN 2014 17:51
 ---
-> This is METAFONT, Version 2.7182818 (TeX Live 2014) (INIMF)  1 MAY 2014 13:44
+> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF)  12 APR 2015 16:22
 150c150
 < String usage 26&83 (891&11438 still untouched)
 ---
@@ -16,8 +17,8 @@
 <  (preloaded base=trap 2014.1.7)
 < 1117 strings of total length 20614
 ---
->  (preloaded base=trap 2014.5.1)
-> 1123 strings of total length 20612
+>  (preloaded base=trap 2015.4.12)
+> 1123 strings of total length 20613
 + ./mf --progname=inimf
 + mv trap.log mftrap.log
 + mv trap.tfm mftrap.tfm
@@ -27,21 +28,21 @@
 < ** &trap  trap 
 < (trap.mf
 ---
-> This is METAFONT, Version 2.7182818 (TeX Live 2014) (INIMF)
+> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF)
 > **(trap.mf
 39c38
 < String usage 41&161 (815&7634 still untouched)
 ---
-> String usage 50&202 (6300&75595 still untouched)
+> String usage 50&202 (6300&75594 still untouched)
 + diff SRCDIR/triptrap/mftrap.log mftrap.log
 1c1
 < This is METAFONT, Version 2.7182818 (preloaded base=trap 2014.1.7)  7 JAN 2014 18:11
 ---
-> This is METAFONT, Version 2.7182818 (TeX Live 2014) (preloaded base=trap 2014.5.1)  1 MAY 2014 13:44
+> This is METAFONT, Version 2.7182818 (TeX Live 2015) (preloaded base=trap 2015.4.12)  12 APR 2015 16:22
 1825c1825
 < String usage 24&92 (858&11309 still untouched)
 ---
-> String usage 30&119 (6346&79263 still untouched)
+> String usage 30&119 (6346&79262 still untouched)
 3693,3695c3693,3695
 < xpart %CAPSULE1359=xx
 < %CAPSULE1367=2yy-2
@@ -141,13 +142,13 @@
 4235c4235
 < String usage 41&161 (815&7634 still untouched)
 ---
-> String usage 50&202 (6300&75595 still untouched)
+> String usage 50&202 (6300&75594 still untouched)
 4251,4252c4251,4252
 <  68 strings out of 883
 <  3752 string characters out of 11386
 ---
 >  77 strings out of 6377
->  3793 string characters out of 79388
+>  3793 string characters out of 79387
 4254,4255c4254,4255
 <  289 symbolic tokens out of 2100
 <  8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b
@@ -165,11 +166,11 @@
 1c1
 < This is GFtype, Version 3.1
 ---
-> This is GFtype, Version 3.1 (TeX Live 2014)
+> This is GFtype, Version 3.1 (TeX Live 2015)
 3c3
 < ' METAFONT output 2014.01.07:1811'
 ---
-> ' METAFONT output 2014.05.01:1344'
+> ' METAFONT output 2015.04.12:1622'
 + for f in mftrapin.log mftrap.fot mftrap.log trap.typ
 + sed SRCDIR/triptrap/mftrapin.log -f filter
 + sed mftrapin.log -f filter
diff --git a/Build/source/texk/web2c/triptrap/mptrap.diffs b/Build/source/texk/web2c/triptrap/mptrap.diffs
index 4c72157bd88..870e2be6008 100644
--- a/Build/source/texk/web2c/triptrap/mptrap.diffs
+++ b/Build/source/texk/web2c/triptrap/mptrap.diffs
@@ -3,13 +3,13 @@
 + ./pltotf SRCDIR/triptrap/trapf.pl trapf.tfm
 + ln -s SRCDIR/triptrap/mtrap.mp .
 + ./mpost --ini mtrap
-This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
+This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1)
 (./mtrap.mp
 + diff SRCDIR/triptrap/mtrap.log mtrap.log
 1c1
 < This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP)  25 MAY 2009 12:47
 ---
-> This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)  1 MAY 2014 13:44
+> This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1)  12 APR 2015 16:22
 4,5c4,5
 < Memory usage 19&13 (3972 still untouched)
 < String usage 3&12 (101&7774 now untouched)
@@ -185,7 +185,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 929c929
 < >> "%%Creator: MetaPost 1.203"
 ---
-> >> "%%Creator: MetaPost 1.902"
+> >> "%%Creator: MetaPost 1.999"
 931c931
 < >> "%*Font: trapf 9.9628 9.96265 35:c008"
 ---
@@ -227,7 +227,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 978c978
 < >> "%%CreationDate: 2009.05.25:1247"
 ---
-> >> "%%CreationDate: 2014.05.01:1344"
+> >> "%%CreationDate: 2015.04.12:1622"
 982,984c982,984
 < >> "%*Font: trapf 9.9628 9.96265 35:c008"
 < Memory usage 359&13 (2867 still untouched)
@@ -278,7 +278,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 ---
 >  173 strings using 2917 characters
 >  18856 bytes of node memory
->  315 symbolic tokens
+>  317 symbolic tokens
 >  6i,48n,6p,99b,2f stack positions out of 16i,96n,7p,200b,4f
 1082a1081
 > 
@@ -287,8 +287,8 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 < %%Creator: MetaPost 1.203
 < %%CreationDate: 2009.05.25:1247
 ---
-> %%Creator: MetaPost 1.902
-> %%CreationDate: 2014.05.01:1344
+> %%Creator: MetaPost 1.999
+> %%CreationDate: 2015.04.12:1622
 7c7
 < %*Font: trapf 9.9628 9.96265 35:c008
 ---
@@ -308,8 +308,8 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 < %%Creator: MetaPost 1.203
 < %%CreationDate: 2009.05.25:1247
 ---
-> %%Creator: MetaPost 1.902
-> %%CreationDate: 2014.05.01:1344
+> %%Creator: MetaPost 1.999
+> %%CreationDate: 2015.04.12:1622
 23,25c23,24
 <  0 0 0 setrgbcolor 1
 <  0 dtransform exch truncate exch idtransform pop setlinewidth [] 0 setdash
@@ -337,14 +337,8 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 1c1
 < This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP)  25 MAY 2009 12:47
 ---
-> This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)  1 MAY 2014 13:44
-32,34c32
-< << == >> ::: ||`` ''--!! ??## && @@ $$[[]]{{ }}(([][]))=numeric
-< << == >> ::: ||`` ''--!! ??## && @@ $$[[]]{{ }}((5.5 0.5))=<< == >> ::: ||`` ''
-< --!! ??## && @@ $$[[]]{{ }}((5.5 0.5))
----
-> > <<=tag
-40,60c38,45
+> This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1)  12 APR 2015 16:22
+40,60c40,47
 < ! Missing `:' has been inserted.
 < <to be read again> 
 <                    ;
@@ -373,13 +367,13 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 > I'm not currently working on a for loop,
 > so I had better not try to end anything.
 > 
-> Memory usage 14048
+> Memory usage 14128
 > String usage 6&49
-62c47
+62c49
 < l.9 ... tracingcommands>2 endfor; showtoken |=:|>;
 ---
 > l.17 ...gspecs step 1 until $:fi endfor showstats;
-65,98c50,52
+65,98c52,54
 < ! Arithmetic overflow.
 < l.10   tracinglostchars:=1/.00001
 <                                  ; tracingequations:=$+1; p~=tracinglostchar...
@@ -418,7 +412,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 > >> unknown path p~
 > >> (0
 > ! Equation cannot be performed (unknown path=numeric).
-100,148c54,58
+100,148c56,60
 <                    ;
 < l.12 ...utput:=tracingmacros:=1; $:=ASCII""; $:=x;
 <                                                    p~:=p~;
@@ -474,12 +468,12 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 >                                     0)..controls (15,4) and (-15,-12)..(4,0);
 > I'm sorry, but I don't know how to make such things equal.
 > (See the two expressions just above the error message.)
-150,151c60
+150,151c62
 < >> 4
 < ! OK.
 ---
 > ! Extra tokens will be flushed.
-153,165c62,71
+153,165c64,73
 <                    endgroup
 < l.17   ),2+2endtext
 <                    ; for n=tracingspecs step 1 until $:fi endfor showstats;
@@ -504,7 +498,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 > now in front of anything that you don't want me to delete.
 > (See Chapter 27 of The METAFONTbook for an example.)
 > 
-167,191d72
+167,191d74
 < {let}
 < {path}
 < {-(15)}
@@ -530,7 +524,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
 < {elseif}
 < {endinput}
 < {\}
-194,198c75
+194,198c77
 < Beginning to dump on file trap.mem
 <  (mem=trap 2009.05.25)
 < at most 553 strings of total length 2302
diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs
index b9be8885c31..e5b0d45dd36 100644
--- a/Build/source/texk/web2c/triptrap/trip.diffs
+++ b/Build/source/texk/web2c/triptrap/trip.diffs
@@ -5,12 +5,13 @@
 + diff SRCDIR/triptrap/trip.pl trip.pl
 + ln -s SRCDIR/triptrap/trip.tex .
 + ./tex --progname=initex --ini
++ test '!' -s trip.fmt
 + mv trip.log tripin.log
 + diff SRCDIR/triptrap/tripin.log tripin.log
 1c1
 < This is TeX, Version 3.14159265 (INITEX)  7 JAN 2014 09:09
 ---
-> This is TeX, Version 3.14159265 (TeX Live 2014) (INITEX)  1 MAY 2014 13:44
+> This is TeX, Version 3.14159265 (TeX Live 2015) (INITEX)  12 APR 2015 16:22
 3c3
 < (trip.tex
 ---
@@ -19,8 +20,8 @@
 <  (preloaded format=trip 2014.1.7)
 < 1326 strings of total length 23646
 ---
->  (preloaded format=trip 2014.5.1)
-> 1371 strings of total length 24605
+>  (preloaded format=trip 2015.4.12)
+> 1371 strings of total length 24606
 461c461
 < Hyphenation trie of length 273 has 9 ops out of 500
 ---
@@ -32,13 +33,13 @@
 < ** &trip  trip 
 < (trip.tex ##
 ---
-> This is TeX, Version 3.14159265 (TeX Live 2014) (preloaded format=tex)
+> This is TeX, Version 3.14159265 (TeX Live 2015) (preloaded format=tex)
 > **(./trip.tex ##
 + diff SRCDIR/triptrap/trip.log trip.log
 1c1
 < This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7)  7 JAN 2014 09:59
 ---
-> This is TeX, Version 3.14159265 (TeX Live 2014) (preloaded format=trip 2014.5.1)  1 MAY 2014 13:44
+> This is TeX, Version 3.14159265 (TeX Live 2015) (preloaded format=trip 2015.4.12)  12 APR 2015 16:22
 3c3
 < (trip.tex ##
 ---
@@ -93,7 +94,7 @@
 <  253 string characters out of 8354
 ---
 >  44 strings out of 1629
->  261 string characters out of 15395
+>  261 string characters out of 15394
 7299c7303
 <  372 multiletter control sequences out of 2100
 ---
@@ -108,11 +109,11 @@
 1c1
 < This is DVItype, Version 3.6
 ---
-> This is DVItype, Version 3.6 (TeX Live 2014)
+> This is DVItype, Version 3.6 (TeX Live 2015)
 9c9
 < ' TeX output 2014.01.07:0959'
 ---
-> ' TeX output 2014.05.01:1344'
+> ' TeX output 2015.04.12:1622'
 419c419
 < 1121: down4 639342208 
 ---