diff options
author | Karl Berry <karl@freefriends.org> | 2021-01-30 01:42:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-01-30 01:42:07 +0000 |
commit | 0bf3e49d4d147727e1daf1007362a871972b214f (patch) | |
tree | 63a54dcf8830af3f1f4672589b1ebce917693e57 /Build/source/texk/web2c/triptrap | |
parent | 62203043f467d3a24b34f2df151b65e6ea35144b (diff) |
tuneup2021 from DEK, with adaptations for TL
git-svn-id: svn://tug.org/texlive/trunk@57558 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/triptrap')
-rw-r--r-- | Build/source/texk/web2c/triptrap/README | 22 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/mftrap.diffs | 251 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/mftrap.fot | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/mftrap.log | 90 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/mftrapin.log | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/mptrap.diffs | 94 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/trap.typ | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/trip.diffs | 168 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/trip.fot | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/trip.log | 15 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/trip.tex | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/trip.typ | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/triptrap/tripin.log | 6 |
13 files changed, 428 insertions, 238 deletions
diff --git a/Build/source/texk/web2c/triptrap/README b/Build/source/texk/web2c/triptrap/README index 4a3b6e1909a..c6c23ce5e56 100644 --- a/Build/source/texk/web2c/triptrap/README +++ b/Build/source/texk/web2c/triptrap/README @@ -1,12 +1,13 @@ +$Id$ +(This file is public domain.) + web2c/triptrap -- The trip and trap tests are Knuth's torture tests for -TeX and Metafont. The MetaPost test is also named `trap', so I've -renamed the conflicting files to `mftrap...' and `mptrap...'. (The -contents of all files remain absolutely unaltered, of course.) +TeX and Metafont. The MetaPost test is also named `trap', so +renamed the conflicting files to `mftrap...' and `mptrap...'. +The contents of all files remain absolutely unaltered, of course. -The tests are exercised in the web2c distribution via `make trip trap mptrap' -(from the top-level or web2c/ directories). They do not and cannot -exercise the path searching capabilities; for that, a few ``normal'' -test runs before and after installation should suffice. +The tests are exercised in TeX Live via `make triptrap' in the web2c/ +directory. {trip,mftrap,mptrap}.diffs -- show the diffs from Knuth's originals as generated on my development machine. tripman.tex, trapman.tex, and @@ -28,9 +29,10 @@ For trip: hyphenation exception table is to be dynamic at all). Knuth has said this discrepancy is ok. -For trap, additionally, the capsule numbers will be different. We -believe this is because the master trap.log was not updated completed -after the 2.7182818 (2014) tune-up, and have asked Knuth to review. +For trap, additionally, the capsule numbers have sometimes been +different, because the master trap.log was not updated completely after +the 2.7182818 (2014) tune-up, as confirmed by Knuth. The 2.7182818 (2021) +tuneup restores correct values. texmf.cnf -- sets up various constants the way the tests want them. Not all constants can be changed, alas, but this suffices to avoid building diff --git a/Build/source/texk/web2c/triptrap/mftrap.diffs b/Build/source/texk/web2c/triptrap/mftrap.diffs index 35b00ea2c2f..950dcb6c9d5 100644 --- a/Build/source/texk/web2c/triptrap/mftrap.diffs +++ b/Build/source/texk/web2c/triptrap/mftrap.diffs @@ -1,154 +1,145 @@ +#! /bin/sh -vx +# $Id: mftraptest.test 53154 2019-12-17 19:06:20Z karl $ +# Copyright 2017-2021 Karl Berry <tex-live@tug.org> +# Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE ++ LC_ALL=C ++ export LC_ALL ++ LANGUAGE=C ++ export LANGUAGE + +testdir=$abs_srcdir/triptrap ++ testdir=SRCDIR/triptrap +TEXMFCNF=$testdir; export TEXMFCNF ++ TEXMFCNF=SRCDIR/triptrap ++ export TEXMFCNF + +rm -rf trapdir ++ rm -rf trapdir +mkdir trapdir ++ mkdir trapdir +cd trapdir ++ cd trapdir +mkdir a b ++ mkdir a b + +# See triptrap/README for explanation of why we believe these diffs are ok, +# notably including the capsule numbers. + +# TeX Live generic +cat >filter <<-\_EOF + s,^\*\*(trap\.mf,** \&trap trap \ + (trap.mf, + s/ (TeX Live 20[^)]*)// + s/base=trap [^)][^)]*)/base=trap)/ + s/) [0-9A-Z: ]*$/)/ + s/usage [1-9][0-9&]* ([1-9][0-9&]* still/usage XX\&XX (YYY\&YYYYY still/ + s/[1-9][0-9]* strings of total length [1-9][0-9]*/XXXX strings of total length YYYYY/ + s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ + s/[1-9][0-9]* string characters out of [1-9].*/XXXX string characters out of YYYYY/ + s/tokens out of [1-9][0-9]*/tokens out of YYYY/ + s/out of [1-9][0-9]*i,[0-9nrpb,]*/out of YYi,YYYn,YYYr,YYYp,YYYb/ + s/out of [1-9][0-9]*w,[0-9hdilkep,]*)/out of YYYw,YYh,YYd,YYi,YYYYl,YYYk,YYYe,YYp)/ + s/METAFONT output ....\...\...:.../METAFONT output YYYY.MM.DD:hhmm/ + _EOF ++ cat + +# Capsule numbers +cat >>filter <<-\_EOF + s/ %CA$/ %/ + s/^PSULE1675/CAPSULE1172/ + s/%CAPSULE[1-9][0-9]*/%CAPSULEnnnn/g + _EOF ++ cat + +echo ">>> Running TRAP test for Metafont." >&2 ++ echo '>>> Running TRAP test for Metafont.' >>> Running TRAP test for Metafont. +echo ">>> See $testdir/mftrap.diffs for example of acceptable diffs." >&2 ++ echo '>>> See SRCDIR/triptrap/mftrap.diffs for example of acceptable diffs.' >>> See SRCDIR/triptrap/mftrap.diffs for example of acceptable diffs. + +is_OK=: ++ is_OK=: + +set -x ++ set -x + +# get same filename in log +rm -f trap.mf ++ rm -f trap.mf +$LN_S $testdir/trap.mf . || exit 1 + ln -s SRCDIR/triptrap/trap.mf . + +rm -f trap.base ++ rm -f trap.base +./mf --progname=inimf <$testdir/mftrap1.in >mftrapin.fot + ./mf --progname=inimf +if test ! -s trap.base; then + echo "*** trap.base not created by mftrap1.in, investigate!" >&2 + exit 1 +fi + test '!' -s trap.base +mv trap.log mftrapin.log || exit 1 + mv trap.log mftrapin.log +diff $testdir/mftrapin.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.71828182 (INIMF) 4 JUL 1776 12:00 --- -> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF) 12 APR 2015 16:22 +> This is METAFONT, Version 2.71828182 (INIMF) 27 JAN 2021 18:03 150c150 -< String usage 26&83 (891&11438 still untouched) +< String usage 26&83 (892&11481 still untouched) --- -> String usage 30&98 (6386&79448 still untouched) +> String usage 30&98 (6386&79447 still untouched) 176,177c176,177 -< (preloaded base=trap 2014.1.7) -< 1117 strings of total length 20614 +< (preloaded base=trap 1776.7.4) +< 1116 strings of total length 20570 --- -> (preloaded base=trap 2015.4.12) -> 1123 strings of total length 20613 +> (preloaded base=trap 2021.1.27) +> 1123 strings of total length 20614 + +./mf --progname=inimf <$testdir/mftrap2.in >mftrap.fot + ./mf --progname=inimf +mv trap.log mftrap.log || exit 1 + mv trap.log mftrap.log +mv trap.tfm mftrap.tfm || exit 1 + mv trap.tfm mftrap.tfm +diff $testdir/mftrap.fot mftrap.fot + diff SRCDIR/triptrap/mftrap.fot mftrap.fot 1,3c1,2 -< This is METAFONT, Version 2.7182818 (INIMF) +< This is METAFONT, Version 2.71828182 (INIMF) < ** &trap trap < (trap.mf --- -> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF) +> This is METAFONT, Version 2.71828182 (TeX Live 2021/dev) (INIMF) > **(trap.mf 39c38 -< String usage 41&161 (815&7634 still untouched) +< String usage 41&161 (816&7678 still untouched) --- -> String usage 50&202 (6300&75594 still untouched) +> String usage 50&202 (6300&75593 still untouched) +diff $testdir/mftrap.log mftrap.log + 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.71828182 (preloaded base=trap 1776.7.4) 4 JUL 1776 12:00 --- -> This is METAFONT, Version 2.7182818 (TeX Live 2015) (preloaded base=trap 2015.4.12) 12 APR 2015 16:22 +> This is METAFONT, Version 2.71828182 (preloaded base=trap 2021.1.27) 27 JAN 2021 18:03 1825c1825 -< String usage 24&92 (858&11309 still untouched) +< String usage 24&92 (859&11353 still untouched) --- -> String usage 30&119 (6346&79262 still untouched) -3693,3695c3693,3695 -< xpart %CAPSULE1359=xx -< %CAPSULE1367=2yy-2 -< %CAPSULE1375 = 3.3333xx+3.3333 ---- -> xpart %CAPSULE1370=xx -> %CAPSULE1378=2yy-2 -> %CAPSULE1386 = 3.3333xx+3.3333 -3755,3757c3755,3757 -< xpart %CAPSULE1049 = 8000o2-4000o1+1000o3+9 -< xpart %CAPSULE1383=xpart ' -< ypart %CAPSULE1383=ypart ' ---- -> xpart %CAPSULE604 = 8000o2-4000o1+1000o3+9 -> xpart %CAPSULE1394=xpart ' -> ypart %CAPSULE1394=ypart ' -3760,3761c3760,3761 -< ### 4000o1 = -xpart %CAPSULE1049+8000o2+1000o3+9 -< ### -4.87383o2 = -oo-0.0004xpart %CAPSULE1049+0.39673o3-17.99643 ---- -> ### 4000o1 = -xpart %CAPSULE604+8000o2+1000o3+9 -> ### -4.87383o2 = -oo-0.0004xpart %CAPSULE604+0.39673o3-17.99643 -3768c3768 -< ### -alfa=-xpart %CAPSULE1494 ---- -> ### -alfa=-xpart %CAPSULE368 -3770,3771c3770,3771 -< {xpart((xpart %CAPSULE1494,0))} -< ### -xpart %CAPSULE17=-%CAPSULE1176 ---- -> {xpart((xpart %CAPSULE368,0))} -> ### -xpart %CAPSULE17=-%CAPSULE1376 -3773,3775c3773,3775 -< {(%CAPSULE382)+(%CAPSULE1176)} -< ### -%CAPSULE382=-%CAPSULE1893+%CAPSULE1176 -< ### -%CAPSULE1893=-ypart %CAPSULE1049 ---- -> {(%CAPSULE382)+(%CAPSULE1376)} -> ### -%CAPSULE382=-%CAPSULE1364+%CAPSULE1376 -> ### -%CAPSULE1364=-ypart %CAPSULE604 -3780c3780 -< ### p$=-ypart %CAPSULE604+1 ---- -> ### p$=-ypart %CAPSULE1360+1 -3782,3793c3782,3793 -< {(2/3)*((-ypart %CAPSULE604+1,ypart %CAPSULE604))} -< ### ypart %CAPSULE604=-xpart %CAPSULE604+1 -< ### -0.66667xpart %CAPSULE604=-xpart %CAPSULE1889 -< {-((xpart %CAPSULE1889,-xpart %CAPSULE1889+0.66667))} -< ### xpart %CAPSULE1889=-xpart %CAPSULE1172 -< {((xpart %CAPSULE1049,ypart %CAPSULE1049))=((xpart %CAPSULE1172,-xpart % -< CAPSULE1172-0.66667))} -< ## xpart %CAPSULE1172=-ypart %CAPSULE1049-0.66667 -< ## ypart %CAPSULE1049=-xpart %CAPSULE1049-0.66667 -< ### -xpart %CAPSULE1049=-xpart %CAPSULE1172 -< {((xpart ',ypart '))=((xpart %CAPSULE1172,-xpart %CAPSULE1172-0.66667))} -< ## xpart %CAPSULE1172=-ypart '-0.66667 ---- -> {(2/3)*((-ypart %CAPSULE1360+1,ypart %CAPSULE1360))} -> ### ypart %CAPSULE1360=-xpart %CAPSULE1360+1 -> ### -0.66667xpart %CAPSULE1360=-xpart %CAPSULE1744 -> {-((xpart %CAPSULE1744,-xpart %CAPSULE1744+0.66667))} -> ### xpart %CAPSULE1744=-xpart %CAPSULE1675 -> {((xpart %CAPSULE604,ypart %CAPSULE604))=((xpart %CAPSULE1675,-xpart %CA -> PSULE1675-0.66667))} -> ## xpart %CAPSULE1675=-ypart %CAPSULE604-0.66667 -> ## ypart %CAPSULE604=-xpart %CAPSULE604-0.66667 -> ### -xpart %CAPSULE604=-xpart %CAPSULE1675 -> {((xpart ',ypart '))=((xpart %CAPSULE1675,-xpart %CAPSULE1675-0.66667))} -> ## xpart %CAPSULE1675=-ypart '-0.66667 -3799c3799 -< ### -ooo=-%CAPSULE1494 ---- -> ### -ooo=-%CAPSULE1051 -3801,3810c3801,3810 -< {(%CAPSULE1494)+(1)} -< ### -%CAPSULE1494=-%CAPSULE1350+1 -< {(1/2)*(%CAPSULE1350)} -< ### -0.5%CAPSULE1350=-%CAPSULE1367 -< {-(%CAPSULE1367)} -< ### %CAPSULE1367=-%CAPSULE1893 -< {(2)*(%CAPSULE1893)} -< ### -2%CAPSULE1893=-%CAPSULE1885 -< {(-0.5%CAPSULE1885-0.5)=(%CAPSULE1885)} -< ## %CAPSULE1885=-0.33333 ---- -> {(%CAPSULE1051)+(1)} -> ### -%CAPSULE1051=-%CAPSULE1378+1 -> {(1/2)*(%CAPSULE1378)} -> ### -0.5%CAPSULE1378=-%CAPSULE1370 -> {-(%CAPSULE1370)} -> ### %CAPSULE1370=-%CAPSULE1362 -> {(2)*(%CAPSULE1362)} -> ### -2%CAPSULE1362=-%CAPSULE1354 -> {(-0.5%CAPSULE1354-0.5)=(%CAPSULE1354)} -> ## %CAPSULE1354=-0.33333 +> String usage 30&119 (6346&79261 still untouched) 4235c4235 -< String usage 41&161 (815&7634 still untouched) +< String usage 41&161 (816&7678 still untouched) --- -> String usage 50&202 (6300&75594 still untouched) +> String usage 50&202 (6300&75593 still untouched) 4251,4252c4251,4252 -< 68 strings out of 883 -< 3752 string characters out of 11386 +< 68 strings out of 884 +< 3752 string characters out of 11430 --- > 77 strings out of 6377 -> 3793 string characters out of 79387 +> 3793 string characters out of 79386 4254,4255c4254,4255 < 289 symbolic tokens out of 2100 < 8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b @@ -159,18 +150,30 @@ < out of 256w,16h,16d,64i,5000l,500k,256e,50p) --- > out of 256w,16h,16d,64i,15000l,2500k,256e,60p) + +./tftopl ./mftrap.tfm mftrap.pl || exit 1 + ./tftopl ./mftrap.tfm mftrap.pl +diff $testdir/mftrap.pl mftrap.pl || is_OK=false + diff SRCDIR/triptrap/mftrap.pl mftrap.pl + +./gftype -m -i ./trap.72270gf >trap.typ || exit 1 + ./gftype -m -i ./trap.72270gf +diff $testdir/trap.typ trap.typ + diff SRCDIR/triptrap/trap.typ trap.typ 1c1 < This is GFtype, Version 3.1 --- -> This is GFtype, Version 3.1 (TeX Live 2015) +> This is GFtype, Version 3.1 (TeX Live 2021/dev) 3c3 < ' METAFONT output 2014.01.07:1811' --- -> ' METAFONT output 2015.04.12:1622' +> ' METAFONT output 2021.01.27:1803' + +for f in mftrapin.log mftrap.fot mftrap.log trap.typ; do + sed $testdir/$f -f filter >a/$f + sed $f -f filter >b/$f + diff a/$f b/$f || is_OK=false +done + for f in mftrapin.log mftrap.fot mftrap.log trap.typ + sed SRCDIR/triptrap/mftrapin.log -f filter + sed mftrapin.log -f filter @@ -187,7 +190,15 @@ + sed SRCDIR/triptrap/trap.typ -f filter + sed trap.typ -f filter + diff a/trap.typ b/trap.typ + +$is_OK && { + echo ">>> All differences are acceptable." >&2 +} || { + echo "*** Error(s) found in mf trap test, investigate!" >&2 + exit 1 +} + : + echo '>>> All differences are acceptable.' >>> All differences are acceptable. -PASS: mftraptest +PASS mftraptest.test (exit status: 0) +PASS: mftraptest.test diff --git a/Build/source/texk/web2c/triptrap/mftrap.fot b/Build/source/texk/web2c/triptrap/mftrap.fot index 6bceb9f67e0..b5551c805c7 100644 --- a/Build/source/texk/web2c/triptrap/mftrap.fot +++ b/Build/source/texk/web2c/triptrap/mftrap.fot @@ -1,4 +1,4 @@ -This is METAFONT, Version 2.7182818 (INIMF) +This is METAFONT, Version 2.71828182 (INIMF) ** &trap trap (trap.mf \*//*\trap\pass2! @@ -36,7 +36,7 @@ xpart '=-ypart '-0.66667 {qq:=pen} {showstats} Memory usage 1462&588 (104 still untouched) -String usage 41&161 (815&7634 still untouched) +String usage 41&161 (816&7678 still untouched) {[repeat the loop]} ! A group begun on line 163 never ended. <to be read again> diff --git a/Build/source/texk/web2c/triptrap/mftrap.log b/Build/source/texk/web2c/triptrap/mftrap.log index 611ce589e2f..18612678988 100644 --- a/Build/source/texk/web2c/triptrap/mftrap.log +++ b/Build/source/texk/web2c/triptrap/mftrap.log @@ -1,4 +1,4 @@ -This is METAFONT, Version 2.7182818 (preloaded base=trap 2014.1.7) 7 JAN 2014 18:11 +This is METAFONT, Version 2.71828182 (preloaded base=trap 1776.7.4) 4 JUL 1776 12:00 ** &trap trap (trap.mf {if} @@ -161,7 +161,7 @@ true-or-false value. I'm changing it to `false'. path l.25 path p[][]p,w,qw; qw=(1,-2)..(2,-1)..(2.5,0.5)..(1,2)..(... -After `exitif <boolean exp>' I expect to see a semicolon. +After `exitif <boolean expr>' I expect to see a semicolon. I shall pretend that one was there. {pair} @@ -1822,7 +1822,7 @@ row -2: | -4+ -3- -2+ -1- {showstats} Memory usage 1084&202 (749 still untouched) -String usage 24&92 (858&11309 still untouched) +String usage 24&92 (859&11353 still untouched) {addto} {(path)yscaled(0.01666)} Path at line 82, before subdivision into octants: @@ -3046,7 +3046,7 @@ For safety's sake I'll ignore the present command. substring l.124 ...aderbyte(48.5)substring (-9,9)of"long"; for\=0:\ -A colon should follow a headerbyte or fontinfo location. +A colon should follow a headerbyte or fontdimen location. {-(9)} {((-9,9))substring("long")} @@ -3690,9 +3690,9 @@ XPR1)+2)-(1,(EXPR1)+2)rotated90 alpha=0.45p3~+7 {tracingcapsules:=1} {showdependencies} -xpart %CAPSULE1359=xx -%CAPSULE1367=2yy-2 -%CAPSULE1375 = 3.3333xx+3.3333 +xpart %CAPSULE1370=xx +%CAPSULE1378=2yy-2 +%CAPSULE1386 = 3.3333xx+3.3333 alpha=0.45p3~+7 {show} {(1/3)*((3,6))} @@ -3752,62 +3752,62 @@ o4=0.44444o2+0.88889o1 o5=0.44444o2+0.88889o1 oo=1.7o2+1.6o1-18 %CAPSULE382 = 3ooo-0.01o3 -xpart %CAPSULE1049 = 8000o2-4000o1+1000o3+9 -xpart %CAPSULE1383=xpart ' -ypart %CAPSULE1383=ypart ' +xpart %CAPSULE604 = 8000o2-4000o1+1000o3+9 +xpart %CAPSULE1394=xpart ' +ypart %CAPSULE1394=ypart ' alpha=0.45p3~+7 {numeric} -### 4000o1 = -xpart %CAPSULE1049+8000o2+1000o3+9 -### -4.87383o2 = -oo-0.0004xpart %CAPSULE1049+0.39673o3-17.99643 +### 4000o1 = -xpart %CAPSULE604+8000o2+1000o3+9 +### -4.87383o2 = -oo-0.0004xpart %CAPSULE604+0.39673o3-17.99643 #### o6=-0.00027 ### -0.04366o3 = -o4+0.46689oo+8.40439 ### -o4 = -o5 ### 0.22894o5 = -%CAPSULE382+0.10689oo+3ooo+1.92412 {begingroup} {pair} -### -alfa=-xpart %CAPSULE1494 +### -alfa=-xpart %CAPSULE368 {endgroup} -{xpart((xpart %CAPSULE1494,0))} -### -xpart %CAPSULE17=-%CAPSULE1176 +{xpart((xpart %CAPSULE368,0))} +### -xpart %CAPSULE17=-%CAPSULE1376 {endgroup} -{(%CAPSULE382)+(%CAPSULE1176)} -### -%CAPSULE382=-%CAPSULE1893+%CAPSULE1176 -### -%CAPSULE1893=-ypart %CAPSULE1049 +{(%CAPSULE382)+(%CAPSULE1376)} +### -%CAPSULE382=-%CAPSULE1364+%CAPSULE1376 +### -%CAPSULE1364=-ypart %CAPSULE604 {begingroup} {save} {(1)-(p$)} {restoring p} -### p$=-ypart %CAPSULE604+1 +### p$=-ypart %CAPSULE1360+1 {endgroup} -{(2/3)*((-ypart %CAPSULE604+1,ypart %CAPSULE604))} -### ypart %CAPSULE604=-xpart %CAPSULE604+1 -### -0.66667xpart %CAPSULE604=-xpart %CAPSULE1889 -{-((xpart %CAPSULE1889,-xpart %CAPSULE1889+0.66667))} -### xpart %CAPSULE1889=-xpart %CAPSULE1172 -{((xpart %CAPSULE1049,ypart %CAPSULE1049))=((xpart %CAPSULE1172,-xpart % -CAPSULE1172-0.66667))} -## xpart %CAPSULE1172=-ypart %CAPSULE1049-0.66667 -## ypart %CAPSULE1049=-xpart %CAPSULE1049-0.66667 -### -xpart %CAPSULE1049=-xpart %CAPSULE1172 -{((xpart ',ypart '))=((xpart %CAPSULE1172,-xpart %CAPSULE1172-0.66667))} -## xpart %CAPSULE1172=-ypart '-0.66667 +{(2/3)*((-ypart %CAPSULE1360+1,ypart %CAPSULE1360))} +### ypart %CAPSULE1360=-xpart %CAPSULE1360+1 +### -0.66667xpart %CAPSULE1360=-xpart %CAPSULE1744 +{-((xpart %CAPSULE1744,-xpart %CAPSULE1744+0.66667))} +### xpart %CAPSULE1744=-xpart %CAPSULE1675 +{((xpart %CAPSULE604,ypart %CAPSULE604))=((xpart %CAPSULE1675,-xpart %CA +PSULE1675-0.66667))} +## xpart %CAPSULE1675=-ypart %CAPSULE604-0.66667 +## ypart %CAPSULE604=-xpart %CAPSULE604-0.66667 +### -xpart %CAPSULE604=-xpart %CAPSULE1675 +{((xpart ',ypart '))=((xpart %CAPSULE1675,-xpart %CAPSULE1675-0.66667))} +## xpart %CAPSULE1675=-ypart '-0.66667 ## xpart '=-ypart '-0.66667 {begingroup} {(0.5)*(ooo)} {begingroup} {numeric} -### -ooo=-%CAPSULE1494 +### -ooo=-%CAPSULE1051 {endgroup} -{(%CAPSULE1494)+(1)} -### -%CAPSULE1494=-%CAPSULE1350+1 -{(1/2)*(%CAPSULE1350)} -### -0.5%CAPSULE1350=-%CAPSULE1367 -{-(%CAPSULE1367)} -### %CAPSULE1367=-%CAPSULE1893 -{(2)*(%CAPSULE1893)} -### -2%CAPSULE1893=-%CAPSULE1885 -{(-0.5%CAPSULE1885-0.5)=(%CAPSULE1885)} -## %CAPSULE1885=-0.33333 +{(%CAPSULE1051)+(1)} +### -%CAPSULE1051=-%CAPSULE1378+1 +{(1/2)*(%CAPSULE1378)} +### -0.5%CAPSULE1378=-%CAPSULE1370 +{-(%CAPSULE1370)} +### %CAPSULE1370=-%CAPSULE1362 +{(2)*(%CAPSULE1362)} +### -2%CAPSULE1362=-%CAPSULE1354 +{(-0.5%CAPSULE1354-0.5)=(%CAPSULE1354)} +## %CAPSULE1354=-0.33333 {(oo)=(-0.33333)} ## oo=-0.33333 {endgroup} @@ -4232,7 +4232,7 @@ xpart '=-ypart '-0.66667 {qq:=pen} {showstats} Memory usage 1462&588 (104 still untouched) -String usage 41&161 (815&7634 still untouched) +String usage 41&161 (816&7678 still untouched) {[repeat the loop]} ! A group begun on line 163 never ended. <to be read again> @@ -4248,8 +4248,8 @@ by `endgroup'. So I've inserted `endgroup' now. (end occurred when if on line 36 was incomplete) (end occurred when elseif on line 21 was incomplete) Here is how much of METAFONT's memory you used: - 68 strings out of 883 - 3752 string characters out of 11386 + 68 strings out of 884 + 3752 string characters out of 11430 2897 words of memory out of 3001 289 symbolic tokens out of 2100 8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b diff --git a/Build/source/texk/web2c/triptrap/mftrapin.log b/Build/source/texk/web2c/triptrap/mftrapin.log index 2fbafd0e6bc..c07ae627747 100644 --- a/Build/source/texk/web2c/triptrap/mftrapin.log +++ b/Build/source/texk/web2c/triptrap/mftrapin.log @@ -1,4 +1,4 @@ -This is METAFONT, Version 2.7182818 (INIMF) 7 JAN 2014 17:51 +This is METAFONT, Version 2.71828182 (INIMF) 4 JUL 1776 12:00 **\input trap (trap.mf >> << == >> ::: ||`` ''--!! ??## && @@ $$[[]]{{ }}((5.5 0.5)) @@ -147,7 +147,7 @@ put one in, behind the scenes; this may fix the problem. {for} {showstats} Memory usage 291&41 (1922 still untouched) -String usage 26&83 (891&11438 still untouched) +String usage 26&83 (892&11481 still untouched) ! OK. l.17 ...ing:fi endfor showstats; let!!=skipto; @@ -173,7 +173,7 @@ Path at line 18, after choices: {elseif} ) Beginning to dump on file trap.base - (preloaded base=trap 2014.1.7) -1117 strings of total length 20614 + (preloaded base=trap 1776.7.4) +1116 strings of total length 20570 395 memory locations dumped; current usage is 317&67 265 symbolic tokens diff --git a/Build/source/texk/web2c/triptrap/mptrap.diffs b/Build/source/texk/web2c/triptrap/mptrap.diffs index 870e2be6008..8fc9daad2bf 100644 --- a/Build/source/texk/web2c/triptrap/mptrap.diffs +++ b/Build/source/texk/web2c/triptrap/mptrap.diffs @@ -1,15 +1,50 @@ +#! /bin/sh -vx +# Public domain. + +testdir=$abs_srcdir/triptrap ++ testdir=SRCDIR/triptrap + +TEXMFCNF=$testdir; export TEXMFCNF ++ TEXMFCNF=SRCDIR/triptrap ++ export TEXMFCNF + +rm -rf mptrapdir ++ rm -rf mptrapdir +mkdir mptrapdir ++ mkdir mptrapdir +cd mptrapdir ++ cd mptrapdir + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" ++ dvitype_args='-output-level=2 -dpi=72.27 -page-start='\''*.*.*.*.*.*.*.*.*.*'\''' + +echo ">>> Running MPTRAP test for MetaPost." >&2 ++ echo '>>> Running MPTRAP test for MetaPost.' >>> Running MPTRAP test for MetaPost. +echo ">>> See $testdir/mptrap.diffs for example of acceptable diffs." >&2 ++ echo '>>> See SRCDIR/triptrap/mptrap.diffs for example of acceptable diffs.' >>> See SRCDIR/triptrap/mptrap.diffs for example of acceptable diffs. + +set -x ++ set -x + +./pltotf $testdir/trapf.pl trapf.tfm + ./pltotf SRCDIR/triptrap/trapf.pl trapf.tfm + +# get same filename in log +$LN_S $testdir/mtrap.mp . || exit 1 + ln -s SRCDIR/triptrap/mtrap.mp . + +./mpost --ini mtrap + ./mpost --ini mtrap -This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) +This is MetaPost, version 2.00 (TeX Live 2021/dev) (kpathsea version 6.3.3/dev) (./mtrap.mp +diff $testdir/mtrap.log mtrap.log + 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.999 (TeX Live 2015) (kpathsea version 6.2.1) 12 APR 2015 16:22 +> This is MetaPost, version 2.00 (TeX Live 2021/dev) (kpathsea version 6.3.3/dev) 27 JAN 2021 18:03 4,5c4,5 < Memory usage 19&13 (3972 still untouched) < String usage 3&12 (101&7774 now untouched) @@ -185,7 +220,7 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) 929c929 < >> "%%Creator: MetaPost 1.203" --- -> >> "%%Creator: MetaPost 1.999" +> >> "%%Creator: MetaPost 2.00" 931c931 < >> "%*Font: trapf 9.9628 9.96265 35:c008" --- @@ -205,7 +240,7 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) < String usage 16&50 (46&6607 now untouched) --- > Memory usage 15664 -> String usage 70&1484 +> String usage 70&1483 966,968c966,968 < >> 42 < Memory usage 359&13 (2867 still untouched) @@ -213,7 +248,7 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) --- > >> 41 > Memory usage 15664 -> String usage 90&2139 +> String usage 90&2138 973,976c973,976 < Memory usage 359&13 (2867 still untouched) < String usage 17&84 (1&5292 now untouched) @@ -221,13 +256,13 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) < String usage 30&97 (43&7558 now untouched) --- > Memory usage 15664 -> String usage 91&2147 +> String usage 91&2146 > Memory usage 15664 -> String usage 152&2401 +> String usage 152&2400 978c978 < >> "%%CreationDate: 2009.05.25:1247" --- -> >> "%%CreationDate: 2015.04.12:1622" +> >> "%%CreationDate: 2021.01.27:1803" 982,984c982,984 < >> "%*Font: trapf 9.9628 9.96265 35:c008" < Memory usage 359&13 (2867 still untouched) @@ -235,13 +270,13 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) --- > >> "%*Font: trapf 9.96266 9.96265 35:c008" > Memory usage 15664 -> String usage 152&2401 +> String usage 152&2400 987,988c987,988 < Memory usage 359&13 (2867 still untouched) < String usage 30&88 (61&6618 now untouched) --- > Memory usage 16432 -> String usage 172&2909 +> String usage 172&2908 999,1001c999,1001 < The equation I just processed has given some variable < a value of 4096 or more. Continue and I'll try to cope @@ -255,19 +290,19 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) < String usage 30&88 (61&6618 now untouched) --- > Memory usage 16432 -> String usage 172&2909 +> String usage 172&2908 1022,1023c1022,1023 < Memory usage 361&13 (2867 still untouched) < String usage 31&96 (60&6610 now untouched) --- > Memory usage 16432 -> String usage 172&2909 +> String usage 172&2908 1071,1072c1071,1072 < Memory usage 361&13 (2867 still untouched) < String usage 31&96 (59&6602 now untouched) --- > Memory usage 16432 -> String usage 173&2917 +> String usage 173&2916 1076,1081c1076,1079 < 37 strings out of 104 < 508 string characters out of 7786 @@ -276,19 +311,20 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) < 5i,42n,6p,99b,2f stack positions out of 300i,84n,1500p,200b,25f < 8 string compactions (moved 2756 characters, 222 strings) --- -> 173 strings using 2917 characters +> 173 strings using 2916 characters > 18856 bytes of node memory -> 317 symbolic tokens -> 6i,48n,6p,99b,2f stack positions out of 16i,96n,7p,200b,4f +> 320 symbolic tokens +> 6i,49n,6p,99b,2f stack positions out of 16i,98n,7p,200b,4f 1082a1081 > +diff $testdir/mtrap.0 mtrap.0 + diff SRCDIR/triptrap/mtrap.0 mtrap.0 4,5c4,5 < %%Creator: MetaPost 1.203 < %%CreationDate: 2009.05.25:1247 --- -> %%Creator: MetaPost 1.999 -> %%CreationDate: 2015.04.12:1622 +> %%Creator: MetaPost 2.00 +> %%CreationDate: 2021.01.27:1803 7c7 < %*Font: trapf 9.9628 9.96265 35:c008 --- @@ -303,13 +339,14 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) < 0.00064 1 scale stroke grestore --- > 1.00067 1 scale stroke grestore +diff $testdir/mtrap.1 mtrap.1 + diff SRCDIR/triptrap/mtrap.1 mtrap.1 4,5c4,5 < %%Creator: MetaPost 1.203 < %%CreationDate: 2009.05.25:1247 --- -> %%Creator: MetaPost 1.999 -> %%CreationDate: 2015.04.12:1622 +> %%Creator: MetaPost 2.00 +> %%CreationDate: 2021.01.27:1803 23,25c23,24 < 0 0 0 setrgbcolor 1 < 0 dtransform exch truncate exch idtransform pop setlinewidth [] 0 setdash @@ -327,17 +364,27 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) < [0 -0.00064 -1 0 0 0] concat stroke grestore --- > [0 -1.00067 -1 0 0 0] concat stroke grestore +diff $testdir/writeo writeo + diff SRCDIR/triptrap/writeo writeo +diff $testdir/writeo.2 writeo.2 + diff SRCDIR/triptrap/writeo.2 writeo.2 + +$LN_S $testdir/trap.mp . || exit 1 + ln -s SRCDIR/triptrap/trap.mp . +$LN_S $testdir/trap.mpx . || exit 1 + ln -s SRCDIR/triptrap/trap.mpx . + +## Why is --jobname required? And why --ini? +./mpost --ini --jobname=trap <$testdir/mptrap1.in >mptrapin.fot + ./mpost --ini --jobname=trap +mv trap.log mptrapin.log || exit 1 + mv trap.log mptrapin.log +diff $testdir/mptrapin.log mptrapin.log + diff SRCDIR/triptrap/mptrapin.log mptrapin.log 1c1 < This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP) 25 MAY 2009 12:47 --- -> This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) 12 APR 2015 16:22 +> This is MetaPost, version 2.00 (TeX Live 2021/dev) (kpathsea version 6.3.3/dev) 27 JAN 2021 18:03 40,60c40,47 < ! Missing `:' has been inserted. < <to be read again> @@ -532,5 +579,8 @@ This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) < 308 symbolic tokens --- > + +exit 0 + exit 0 -PASS: mplibdir/mptraptest +PASS mplibdir/mptraptest.test (exit status: 0) +PASS: mplibdir/mptraptest.test diff --git a/Build/source/texk/web2c/triptrap/trap.typ b/Build/source/texk/web2c/triptrap/trap.typ index 159c5ce7fc0..9994dcc000f 100644 --- a/Build/source/texk/web2c/triptrap/trap.typ +++ b/Build/source/texk/web2c/triptrap/trap.typ @@ -1,6 +1,6 @@ This is GFtype, Version 3.1 Options selected: Mnemonic output = true; pixel output = true. -' METAFONT output 2014.01.07:1811' +' METAFONT output 1776.07.04:1200' 35: beginning of char 5: -4096<=m<=4094 -2<=n<=1 (initially n=1) paint (4095)1 diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs index 639ff619a6c..7d9c024aa24 100644 --- a/Build/source/texk/web2c/triptrap/trip.diffs +++ b/Build/source/texk/web2c/triptrap/trip.diffs @@ -1,45 +1,150 @@ +#! /bin/sh -vx +# $Id: triptest.test 53154 2019-12-17 19:06:20Z karl $ +# Copyright 2017-2021 Karl Berry <tex-live@tug.org> +# Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE ++ LC_ALL=C ++ export LC_ALL ++ LANGUAGE=C ++ export LANGUAGE + +testdir=$abs_srcdir/triptrap ++ testdir=SRCDIR/triptrap +TEXMFCNF=$testdir; export TEXMFCNF ++ TEXMFCNF=SRCDIR/triptrap ++ export TEXMFCNF + +rm -rf tripdir ++ rm -rf tripdir +mkdir tripdir ++ mkdir tripdir +cd tripdir ++ cd tripdir +mkdir a b ++ mkdir a b + +# See triptrap/README for explanation of why we believe these diffs are ok. + +# TeX Live generic +cat >filter <<-\_EOF + s,^\*\*(\./trip\.tex ##,** \&trip trip \ + (trip.tex ##, + s/ (TeX Live 20[^)]*)// + s/(preloaded format=tex)/(INITEX)/ + s/format=trip [^)][^)]*)/format=trip)/ + s/) [0-9A-Z: ]*$/)/ + s,^(\./,(, + s/[1-9][0-9]* strings out of [1-9].*/XX strings out of YYY/ + s/[1-9][0-9]* string characters out of [1-9].*/XXX string characters out of YYYY/ + s/sequences out of [1-9].*/sequences out of YYYY/ + s/[1-9] hyphenation exceptions* out of [1-9].*/X hyphenation exceptions out of YYY/ + s/[1-9][0-9]* strings of total length [1-9].*/XXXX strings of total length YYYYY/ + s/9 ops out of [1-9][0-9]*/9 ops out of YYY/ + s/TeX output ....\...\...:.../TeX output YYYY.MM.DD:hhmm/ + _EOF ++ cat + +# x86 glue rounding +cat >>filter <<-\_EOF + s/ 16341\.999.*fil/ 16342.0fil/ + s/ 16238\.999.*fil/ 16239.0fil/ + s/ 16317\.999.*fil/ 16318.0fil/ + s/ 16330\.999.*fil/ 16331.0fil/ + s/ 16331\.999.*fil/ 16332.0fil/ + s/ 16343\.999.*fil/ 16344.0fil/ + s/ 9737\.587..fil/ 9737.58789fil/ + s/down4 639342../down4 639342208/ + s/y4 2039217./y4 203921760/ + s/y0 2039217./y0 203921760/ + _EOF ++ cat + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" ++ dvitype_args='-output-level=2 -dpi=72.27 -page-start='\''*.*.*.*.*.*.*.*.*.*'\''' + +echo ">>> Running TRIP test for TeX." >&2 ++ echo '>>> Running TRIP test for TeX.' >>> Running TRIP test for TeX. +echo ">>> See $testdir/trip.diffs for example of acceptable diffs." >&2 ++ echo '>>> See SRCDIR/triptrap/trip.diffs for example of acceptable diffs.' >>> See SRCDIR/triptrap/trip.diffs for example of acceptable diffs. + +is_OK=: ++ is_OK=: + +set -x ++ set -x + +./pltotf $testdir/trip.pl trip.tfm || exit 1 + ./pltotf SRCDIR/triptrap/trip.pl trip.tfm + +./tftopl ./trip.tfm trip.pl || exit 1 + ./tftopl ./trip.tfm trip.pl + +diff $testdir/trip.pl trip.pl || is_OK=false + diff SRCDIR/triptrap/trip.pl trip.pl + +# get same filename in log +rm -f trip.tex ++ rm -f trip.tex +$LN_S $testdir/trip.tex . || exit 1 + ln -s SRCDIR/triptrap/trip.tex . + +rm -f trip.fmt ++ rm -f trip.fmt +./tex --progname=initex --ini <$testdir/trip1.in >tripin.fot + ./tex --progname=initex --ini +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by trip1.in, investigate!" >&2 + exit 1 +fi + test '!' -s trip.fmt +mv trip.log tripin.log || exit 1 + mv trip.log tripin.log +diff $testdir/tripin.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.141592653 (INITEX) 4 JUL 1776 12:00 --- -> This is TeX, Version 3.14159265 (TeX Live 2015) (INITEX) 12 APR 2015 16:22 +> This is TeX, Version 3.141592653 (TeX Live 2021/dev) (INITEX) 27 JAN 2021 18:03 3c3 < (trip.tex --- > (./trip.tex 450,451c450,451 -< (preloaded format=trip 2014.1.7) -< 1326 strings of total length 23646 +< (preloaded format=trip 1776.7.4) +< 1326 strings of total length 23633 --- -> (preloaded format=trip 2015.4.12) -> 1371 strings of total length 24606 +> (preloaded format=trip 2021.1.27) +> 1372 strings of total length 24645 461c461 < Hyphenation trie of length 273 has 9 ops out of 500 --- > Hyphenation trie of length 273 has 9 ops out of 35111 + +# May as well test non-ini second time through. +./tex --progname=tex <$testdir/trip2.in >trip.fot + ./tex --progname=tex +diff $testdir/trip.fot trip.fot + diff SRCDIR/triptrap/trip.fot trip.fot 1,3c1,2 -< This is TeX, Version 3.14159265 (INITEX) +< This is TeX, Version 3.141592653 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is TeX, Version 3.14159265 (TeX Live 2015) (preloaded format=tex) +> This is TeX, Version 3.141592653 (TeX Live 2021/dev) (preloaded format=tex) > **(./trip.tex ## + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log trip.log + 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.141592653 (preloaded format=trip 1776.7.4) 4 JUL 1776 12:00 --- -> This is TeX, Version 3.14159265 (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:22 +> This is TeX, Version 3.141592653 (TeX Live 2021/dev) (preloaded format=trip 2021.1.27) 27 JAN 2021 18:03 3c3 < (trip.tex ## --- @@ -80,35 +185,42 @@ < \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil --- > \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil -6380c6380 +6381c6381 < (tripos.tex --- > (./tripos.tex -7296,7297c7296,7297 +7297,7298c7297,7298 < 47 strings out of 1674 -< 253 string characters out of 8354 +< 253 string characters out of 8367 --- -> 44 strings out of 1629 -> 261 string characters out of 15395 -7299c7299 +> 44 strings out of 1628 +> 261 string characters out of 15355 +7300c7300 < 372 multiletter control sequences out of 2100 --- > 372 multiletter control sequences out of 15000+0 -7301c7301 +7302c7302 < 2 hyphenation exceptions out of 307 --- > 1 hyphenation exception out of 659 + +diff $testdir/tripos.tex tripos.tex || is_OK=false ++ diff SRCDIR/triptrap/tripos.tex tripos.tex + +eval ./dvitype $dvitype_args trip.dvi >trip.typ || exit 1 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi +./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' trip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi +$DIFF $DIFFFLAGS $testdir/trip.typ trip.typ + diff SRCDIR/triptrap/trip.typ trip.typ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2015) +> This is DVItype, Version 3.6 (TeX Live 2021/dev) 9c9 -< ' TeX output 2014.01.07:0959' +< ' TeX output 1776.07.04:1200' --- -> ' TeX output 2015.04.12:1622' +> ' TeX output 2021.01.27:1803' 419c419 < 1121: down4 639342208 --- @@ -119,6 +231,12 @@ --- > 2535: y4 203921756 > 2540: y0 203921756 + +for f in tripin.log trip.fot trip.log trip.typ; do + sed $testdir/$f -f filter >a/$f + sed $f -f filter >b/$f + diff a/$f b/$f || is_OK=false +done + for f in tripin.log trip.fot trip.log trip.typ + sed SRCDIR/triptrap/tripin.log -f filter + sed tripin.log -f filter @@ -135,7 +253,15 @@ + sed SRCDIR/triptrap/trip.typ -f filter + sed trip.typ -f filter + diff a/trip.typ b/trip.typ + +$is_OK && { + echo ">>> All differences are acceptable." >&2 +} || { + echo "*** Error(s) found in trip test, investigate!" >&2 + exit 1 +} + : + echo '>>> All differences are acceptable.' >>> All differences are acceptable. -PASS: triptest +PASS triptest.test (exit status: 0) +PASS: triptest.test diff --git a/Build/source/texk/web2c/triptrap/trip.fot b/Build/source/texk/web2c/triptrap/trip.fot index 7ae8e89d871..a6b3800563d 100644 --- a/Build/source/texk/web2c/triptrap/trip.fot +++ b/Build/source/texk/web2c/triptrap/trip.fot @@ -1,4 +1,4 @@ -This is TeX, Version 3.14159265 (INITEX) +This is TeX, Version 3.141592653 (INITEX) ** &trip trip (trip.tex ## ! Bad number (-7). diff --git a/Build/source/texk/web2c/triptrap/trip.log b/Build/source/texk/web2c/triptrap/trip.log index 585bf9b1fa5..13b2af19d83 100644 --- a/Build/source/texk/web2c/triptrap/trip.log +++ b/Build/source/texk/web2c/triptrap/trip.log @@ -1,4 +1,4 @@ -This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 +This is TeX, Version 3.141592653 (preloaded format=trip 1776.7.4) 4 JUL 1776 12:00 ** &trip trip (trip.tex ## {vertical mode: \tracingrestores} @@ -2428,7 +2428,7 @@ deleted material, e.g., by typing `I$}'. ### display math mode entered at line 249 \mathord .{} -this will be denominator of: +this will begin denominator of: \fraction, thickness = default \\mathord [] \\mathord [] @@ -3021,7 +3021,7 @@ oxbreadth 9999 \showboxdepth 9999 \showlists \pagegoal =10000pt} ./.\.\fam1 q ././\rule(9.0+*)x0.4 \mathord -this will be denominator of: +this will begin denominator of: \fraction, thickness 9.0 \{} ### math mode entered at line 280 @@ -5015,14 +5015,15 @@ you'd better type `E' or `X' now and fix your file. <to be read again> 8 l.356 ...ef\lo#1#2U3#4#5#6#7#8#8 - #9#{\relax} + #99#{\relax} I've inserted the digit you should have used after the #. Type `1' to delete what you did use. ! You already have nine parameters. l.356 ...\lo#1#2U3#4#5#6#7#8#8#9 - #{\relax} -I'm going to ignore the # sign you just used. + 9#{\relax} +I'm going to ignore the # sign you just used, +as well as the token that followed it. {blank space } {\ifcase} @@ -7294,7 +7295,7 @@ Memory usage before: 334&431; after: 292&418; still untouched: 175 (end occurred when iftrue on line 413 was incomplete) Here is how much of TeX's memory you used: 47 strings out of 1674 - 253 string characters out of 8354 + 253 string characters out of 8367 2825 words of memory out of 3000 372 multiletter control sequences out of 2100 3041 words of font info for 4 fonts, out of 20000 for 75 diff --git a/Build/source/texk/web2c/triptrap/trip.tex b/Build/source/texk/web2c/triptrap/trip.tex index a9205e52d5e..0bcfe5c1a8f 100644 --- a/Build/source/texk/web2c/triptrap/trip.tex +++ b/Build/source/texk/web2c/triptrap/trip.tex @@ -353,7 +353,7 @@ A \char'202$$\global\count8=\predisplaysize\leqno\kern1009pt$\par \def\b#1\par{} \outer\gdef\a^^@^^@a#1\par#2{}\tokens{\a^^@^^@a\par! \long\gdef\l#1{} -\outer\global\long\edef\lo#1#2U3#4#5#6#7#8#8#9#{\relax} +\outer\global\long\edef\lo#1#2U3#4#5#6#7#8#8#99#{\relax} \ifcase 1 \undefined\or\l\par\b{\par % occurrence of \par aborts \b \b{\l\undefined}\par\else\b{\par}\fi % but not there! \ifcase\iftrue-1a\else\fi \ifcase0\fi\else\ifcase5\fi\fi diff --git a/Build/source/texk/web2c/triptrap/trip.typ b/Build/source/texk/web2c/triptrap/trip.typ index 2ef2781289a..8bc03e15f7e 100644 --- a/Build/source/texk/web2c/triptrap/trip.typ +++ b/Build/source/texk/web2c/triptrap/trip.typ @@ -6,7 +6,7 @@ Options selected: Resolution = 72.27000000 pixels per inch numerator/denominator=25400000/473628672 magnification=2000; 0.00003052 pixels per DVI unit -' TeX output 2014.01.07:0959' +' TeX output 1776.07.04:1200' 42: beginning of page 0.0.0.0.11.0.0.0.0.0 87: down4 129105920 diff --git a/Build/source/texk/web2c/triptrap/tripin.log b/Build/source/texk/web2c/triptrap/tripin.log index 1d983794568..b74d9ca61a8 100644 --- a/Build/source/texk/web2c/triptrap/tripin.log +++ b/Build/source/texk/web2c/triptrap/tripin.log @@ -1,4 +1,4 @@ -This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 +This is TeX, Version 3.141592653 (INITEX) 4 JUL 1776 12:00 **\input trip (trip.tex ! Bad character code (256). @@ -447,8 +447,8 @@ l.79 ...terns{toolate}\showbox0} ) Beginning to dump on file trip.fmt - (preloaded format=trip 2014.1.7) -1326 strings of total length 23646 + (preloaded format=trip 1776.7.4) +1326 strings of total length 23633 471 memory locations dumped; current usage is 96&278 341 multiletter control sequences \font\nullfont=nullfont |