summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/web2c/triptrap/mftrap.diffs91
-rw-r--r--Build/source/texk/web2c/triptrap/trip.diffs91
2 files changed, 80 insertions, 102 deletions
diff --git a/Build/source/texk/web2c/triptrap/mftrap.diffs b/Build/source/texk/web2c/triptrap/mftrap.diffs
index b8051bcfb3a..f97e36c58bf 100644
--- a/Build/source/texk/web2c/triptrap/mftrap.diffs
+++ b/Build/source/texk/web2c/triptrap/mftrap.diffs
@@ -1,80 +1,70 @@
-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'
+cd /home/texlive/karl/Build/source/Work/texk/web2c/
+make trap
rm -f trap.mf trap.base
rm -f mftrapin.fot mftrapin.log
rm -f mftrap.fot mftrap.log mftrap.tfm
rm -f mftrap.pl trap.72270gf trap.typ
-ln -s ./triptrap/trap.mf . # get same filename in log
-/bin/sh -c 'TEXMFCNF=./triptrap ./mf --progname=inimf <./triptrap/mftrap1.in >mftrapin.fot'
+>>> See ../../../texk/web2c/triptrap/mftrap.diffs for example of acceptable diffs.
+ln -s ../../../texk/web2c/triptrap/trap.mf . # get same filename in log
+/bin/sh -c 'TEXMFCNF=../../../texk/web2c/triptrap ./mf --progname=inimf <../../../texk/web2c/triptrap/mftrap1.in >mftrapin.fot'
+make: [trap] Error 1 (ignored)
mv trap.log mftrapin.log
-diff ./triptrap/mftrapin.log mftrapin.log
+diff ../../../texk/web2c/triptrap/mftrapin.log mftrapin.log
1c1
-< This is METAFONT, Version 2.71828 (INIMF) 23 DEC 2002 11:57
+< This is METAFONT, Version 2.718281 (INIMF) 15 MAR 2008 02:23
---
-> This is METAFONT, Version 2.71828 (Web2C 7.5.5) (INIMF) 3 AUG 2005 10:46
+> This is METAFONT, Version 2.718281 (Web2C 7.5.6) (INIMF) 25 APR 2008 19:08
150c150
-< String usage 26&83 (1895&21534 still untouched)
+< String usage 26&83 (891&11438 still untouched)
---
> String usage 30&98 (6387&79485 still untouched)
176,177c176,177
-< (preloaded base=trap 98.8.8)
-< 1113 strings of total length 20515
+< (preloaded base=trap 2008.3.15)
+< 1117 strings of total length 20614
---
-> (base=trap 2005.8.3)
-> 1122 strings of total length 20565
-/bin/sh -c 'TEXMFCNF=./triptrap ./mf --progname=inimf <./triptrap/mftrap2.in >mftrap.fot'
+> (base=trap 2008.4.25)
+> 1122 strings of total length 20566
+make: [trap] Error 1 (ignored)
+/bin/sh -c 'TEXMFCNF=../../../texk/web2c/triptrap ./mf --progname=inimf <../../../texk/web2c/triptrap/mftrap2.in >mftrap.fot'
+make: [trap] Error 1 (ignored)
mv trap.log mftrap.log
mv trap.tfm mftrap.tfm
-diff ./triptrap/mftrap.fot mftrap.fot
+diff ../../../texk/web2c/triptrap/mftrap.fot mftrap.fot
1,3c1,2
-< This is METAFONT, Version 2.71828 (INIMF)
+< This is METAFONT, Version 2.718281 (INIMF)
< ** &trap trap
< (trap.mf
---
-> This is METAFONT, Version 2.71828 (Web2C 7.5.5) (INIMF)
+> This is METAFONT, Version 2.718281 (Web2C 7.5.6) (INIMF)
> **(trap.mf
39c38
-< String usage 42&168 (1818&17726 still untouched)
+< String usage 41&161 (815&7634 still untouched)
---
-> String usage 50&202 (6301&75642 still untouched)
-diff ./triptrap/mftrap.log mftrap.log
+> String usage 50&202 (6301&75641 still untouched)
+make: [trap] Error 1 (ignored)
+diff ../../../texk/web2c/triptrap/mftrap.log mftrap.log
1c1
-< This is METAFONT, Version 2.71828 (preloaded base=trap 2002.12.23) 23 DEC 2002 11:57
+< This is METAFONT, Version 2.718281 (preloaded base=trap 2008.3.15) 15 MAR 2008 02:23
---
-> This is METAFONT, Version 2.71828 (Web2C 7.5.5) (base=trap 2005.8.3) 3 AUG 2005 10:46
+> This is METAFONT, Version 2.718281 (Web2C 7.5.6) (base=trap 2008.4.25) 25 APR 2008 19:08
1825c1825
-< String usage 24&92 (1863&21408 still untouched)
+< String usage 24&92 (858&11309 still untouched)
---
-> String usage 30&119 (6347&79310 still untouched)
+> String usage 30&119 (6347&79309 still untouched)
2738c2738
< Calling BLANKRECTANGLE(100,100,0,1)
---
> Calling BLANKRECTANGLE(1664,1664,0,1)
4235c4235
-< String usage 42&168 (1818&17726 still untouched)
+< 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
-< 69 strings out of 1887
-< 3759 string characters out of 21485
+< 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
@@ -85,16 +75,17 @@ diff ./triptrap/mftrap.log mftrap.log
< out of 256w,16h,16d,64i,5000l,500k,256e,50p)
---
> out of 256w,16h,16d,64i,15000l,2500k,256e,60p)
+make: [trap] Error 1 (ignored)
./tftopl ./mftrap.tfm mftrap.pl
-diff ./triptrap/mftrap.pl mftrap.pl
-/bin/sh -c 'TEXMFCNF=./triptrap ./gftype -m -i ./trap.72270gf >trap.typ'
-diff ./triptrap/trap.typ trap.typ
+diff ../../../texk/web2c/triptrap/mftrap.pl mftrap.pl
+/bin/sh -c 'TEXMFCNF=../../../texk/web2c/triptrap ./gftype -m -i ./trap.72270gf >trap.typ'
+diff ../../../texk/web2c/triptrap/trap.typ trap.typ
1c1
< This is GFtype, Version 3.1
---
-> This is GFtype, Version 3.1 (Web2C 7.5.5)
+> This is GFtype, Version 3.1 (Web2C 7.5.6)
3c3
-< ' METAFONT output 2002.12.23:1157'
+< ' METAFONT output 2008.03.15:0223'
---
-> ' METAFONT output 2005.08.03:1046'
-make[1]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c'
+> ' METAFONT output 2008.04.25:1908'
+make: [trap] Error 1 (ignored)
diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs
index 1bfd68deec3..f324bef3c1d 100644
--- a/Build/source/texk/web2c/triptrap/trip.diffs
+++ b/Build/source/texk/web2c/triptrap/trip.diffs
@@ -1,62 +1,52 @@
-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'
+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
-./pltotf ./triptrap/trip.pl trip.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 ./triptrap/trip.pl trip.pl
-ln -s ./triptrap/trip.tex . # get same filename in log
-/bin/sh -c 'TEXMFCNF=./triptrap ./tex --progname=initex --ini <./triptrap/trip1.in >tripin.fot'
+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 ./triptrap/tripin.log tripin.log
+diff ../../../texk/web2c/triptrap/tripin.log tripin.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 TeX, Version 3.141592 (Web2C 7.5.5) (INITEX) 3 AUG 2005 10:46
+> This is TeX, Version 3.1415926 (Web2C 7.5.6) (INITEX) 25 APR 2008 19:06
3c3
< (trip.tex
---
> (./trip.tex
450,451c450,451
-< (preloaded format=trip 2002.12.20)
-< 1320 strings of total length 23539
+< (preloaded format=trip 2008.3.15)
+< 1326 strings of total length 23646
---
-> (format=trip 2005.8.3)
-> 1364 strings of total length 24385
+> (format=trip 2008.4.25)
+> 1366 strings of total length 24430
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=./triptrap ./tex --progname=tex <./triptrap/trip2.in >trip.fot'
-diff ./triptrap/trip.fot trip.fot
+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
1,3c1,2
-< This is TeX, Version 3.141592 (INITEX)
+< This is TeX, Version 3.1415926 (INITEX)
< ** &trip trip
< (trip.tex ##
---
-> This is TeX, Version 3.141592 (Web2C 7.5.5)
+> This is TeX, Version 3.1415926 (Web2C 7.5.6)
> **(./trip.tex ##
-diff ./triptrap/trip.log trip.log
+make: [trip] Error 1 (ignored)
+diff ../../../texk/web2c/triptrap/trip.log trip.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 TeX, Version 3.141592 (Web2C 7.5.5) (format=trip 2005.8.3) 3 AUG 2005 10:46
+> This is TeX, Version 3.1415926 (Web2C 7.5.6) (format=trip 2008.4.25) 25 APR 2008 19:06
3c3
< (trip.tex ##
---
@@ -102,36 +92,35 @@ diff ./triptrap/trip.log trip.log
< \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil
---
> \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil
-6370c6374
+6380c6384
< (tripos.tex
---
> (./tripos.tex
-7287,7288c7291,7292
+7296,7297c7300,7301
< 47 strings out of 1674
-< 251 string characters out of 8353
+< 253 string characters out of 8354
---
-> 44 strings out of 1636
-> 261 string characters out of 15615
-7290c7294
+> 44 strings out of 1634
+> 261 string characters out of 15570
+7299c7303
< 372 multiletter control sequences out of 2100
---
> 372 multiletter control sequences out of 10000+0
-7292,7293c7296,7297
+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=./triptrap ./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' trip.dvi >trip.typ'
-diff ./triptrap/trip.typ trip.typ
+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
1c1
< This is DVItype, Version 3.6
---
-> This is DVItype, Version 3.6 (Web2C 7.5.5)
+> This is DVItype, Version 3.6 (Web2C 7.5.6)
9c9
-< ' TeX output 2002.12.20:2128'
+< ' TeX output 2008.03.15:0223'
---
-> ' TeX output 2005.08.03:1046'
+> ' TeX output 2008.04.25:1906'
419c419
< 1121: down4 639342208
---
@@ -142,6 +131,4 @@ diff ./triptrap/trip.typ trip.typ
---
> 2535: y4 203921756
> 2540: y0 203921756
-1215d1214
-<
-make[1]: Leaving directory `/home/olaf/web2c/src/texk/texk/web2c'
+make: [trip] Error 1 (ignored)