From d1b1c31d54d6b7267ef350885840b46868c90da0 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 2 May 2014 07:33:03 +0000 Subject: Update TRIP and TRAP files for TL14 git-svn-id: svn://tug.org/texlive/trunk@33787 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 6 + Build/source/texk/web2c/eptexdir/ChangeLog | 4 + .../source/texk/web2c/eptexdir/eptrip/eptrip.diffs | 46 +- Build/source/texk/web2c/etexdir/ChangeLog | 4 + Build/source/texk/web2c/etexdir/etrip/etrip.diffs | 28 +- Build/source/texk/web2c/euptexdir/ChangeLog | 4 + .../texk/web2c/euptexdir/euptrip/euptrip.diffs | 44 +- Build/source/texk/web2c/mftraptest | 7 +- Build/source/texk/web2c/ptexdir/ChangeLog | 4 + Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs | 14 +- Build/source/texk/web2c/triptest | 7 +- Build/source/texk/web2c/triptrap/mftrap.diffs | 152 +++++- Build/source/texk/web2c/triptrap/mptrap.diffs | 578 ++++++++++++++++++--- Build/source/texk/web2c/triptrap/trip.diffs | 12 +- Build/source/texk/web2c/uptexdir/ChangeLog | 4 + .../source/texk/web2c/uptexdir/uptrip/uptrip.diffs | 14 +- 16 files changed, 758 insertions(+), 170 deletions(-) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 244f05ac200..a5c3e00b0b3 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,9 @@ +2014-05-02 Peter Breitenlohner + + * mftraptest: Separate generic and capsule diffs. + * triptest: Separate generic and glue rounding diffs. + * triptrap/{mftrap,mptrap,trip}.diffs: Updated for TL14. + 2014-03-13 Peter Breitenlohner * configure.ac: Use LUAJIT_LDEXTRA instead of luajittex_extra. diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 92af74ad6c8..c89a24280f6 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-05-02 Peter Breitenlohner + + * eptrip/eptrip.diffs: Updated for TL14. + 2014-01-22 Peter Breitenlohner * eptrip/etrip.{log,tex} (removed): Renamed ... diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs index 7d218b72a74..9c315fb3714 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 +> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 3c3 < (trip.tex --- @@ -33,8 +33,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.1.22) -> 1607 strings of total length 27812 +> (preloaded format=trip 2014.5.1) +> 1607 strings of total length 27811 > 489 memory locations dumped; current usage is 110&278 > 387 multiletter control sequences 461c462 @@ -50,7 +50,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) +> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -64,7 +64,7 @@ 1c1 < This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 +> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:45 3c3 < (trip.tex ## --- @@ -299,7 +299,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1693 -> 261 string characters out of 8188 +> 261 string characters out of 8189 > 4017 words of memory out of 4500 > 418 multiletter control sequences out of 15000+0 7301c7310 @@ -316,7 +316,7 @@ 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1345' 419c419 < 1121: down4 639342208 --- @@ -338,7 +338,7 @@ < **\input trip < (trip.tex --- -> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 +> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 > entering extended mode > ***\input trip > (./trip.tex @@ -364,8 +364,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.1.22) -> 1607 strings of total length 27812 +> (preloaded format=trip 2014.5.1) +> 1607 strings of total length 27811 > 536 memory locations dumped; current usage is 157&278 > 462 multiletter control sequences 461c457 @@ -381,7 +381,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) +> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) > **entering extended mode > ## (./trip.tex 17c17 @@ -402,7 +402,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 +> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:45 > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex @@ -701,7 +701,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1693 -> 261 string characters out of 8188 +> 261 string characters out of 8189 > 4017 words of memory out of 4500 > 493 multiletter control sequences out of 15000+0 7301,7302c7307,7308 @@ -720,7 +720,7 @@ 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1345' 419c419 < 1121: down4 639342208 --- @@ -743,13 +743,15 @@ 1c1 < This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25 --- -> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 -27,29c27,29 +> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 +26,29c26,29 +< (preloaded format=etrip 2014.1.22) < 1491 strings of total length 26258 < 281 memory locations dumped; current usage is 36&167 < 408 multiletter control sequences --- -> 1608 strings of total length 27843 +> (preloaded format=etrip 2014.5.1) +> 1608 strings of total length 27842 > 284 memory locations dumped; current usage is 40&167 > 462 multiletter control sequences + ./eptex --progname=eptex @@ -758,18 +760,22 @@ 1c1 < This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) --- -> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) +> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) + diff SRCDIR/eptexdir/eptrip/eptrip.log eptrip.log 1c1 < This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:25 --- -> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:37 +> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=etrip 2014.5.1) 1 MAY 2014 13:45 +4422c4422 +< 145 string characters out of 8157 +--- +> 145 string characters out of 8158 + 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 eptrip.typ 9c9 < ' TeX output 2014.01.22:1125' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1345' + : PASS: eptexdir/eptriptest diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index c86f2fe61b7..e84ef676c94 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-05-02 Peter Breitenlohner + + * etrip/etrip.diffs: Updated for TL14. + 2014-01-22 Peter Breitenlohner * etrip/etrip.{diffs,fot,log,tex,typ}, etrip/etripin.log: diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs index 16271f1944a..9421400e5ae 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs @@ -12,7 +12,7 @@ 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 3c3 < (trip.tex --- @@ -23,8 +23,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.1.22) -> 1490 strings of total length 26227 +> (preloaded format=trip 2014.5.1) +> 1490 strings of total length 26226 > 479 memory locations dumped; current usage is 104&278 > 342 multiletter control sequences 461c461 @@ -53,7 +53,7 @@ 1c1 < This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:45 3c3 < (trip.tex ## --- @@ -174,7 +174,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1810 -> 261 string characters out of 7773 +> 261 string characters out of 7774 > 3821 words of memory out of 3999 > 373 multiletter control sequences out of 15000+0 7301c7305 @@ -191,7 +191,7 @@ 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1345' 419c419 < 1121: down4 639342208 --- @@ -340,20 +340,30 @@ 1c1 < This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25 --- -> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 +26,27c26,27 +< (preloaded format=etrip 2014.1.22) +< 1491 strings of total length 26258 +--- +> (preloaded format=etrip 2014.5.1) +> 1491 strings of total length 26257 + ./etex --progname=etex + diff SRCDIR/etexdir/etrip/etrip.fot etrip.fot + diff SRCDIR/etexdir/etrip/etrip.log etrip.log 1c1 < This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:25 --- -> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:37 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etrip 2014.5.1) 1 MAY 2014 13:45 +4422c4422 +< 145 string characters out of 7742 +--- +> 145 string characters out of 7743 + 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 9c9 < ' TeX output 2014.01.22:1125' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1345' + : PASS: etexdir/etriptest diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index cb7d54ebce1..420ad950715 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-05-02 Peter Breitenlohner + + * euptrip/euptrip.diffs: Updated for TL14. + 2014-01-22 Peter Breitenlohner * eptrip/etrip.{log,tex} (removed): Renamed ... diff --git a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs index 570e57a0d90..584b917515c 100644 --- a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs +++ b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 +> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 3,11c3 < (trip.tex < ! Bad character code (256). @@ -37,8 +37,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.1.22) -> 1617 strings of total length 27833 +> (preloaded format=trip 2014.5.1) +> 1617 strings of total length 27832 > 489 memory locations dumped; current usage is 110&278 > 393 multiletter control sequences 461c454 @@ -54,7 +54,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) +> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -68,7 +68,7 @@ 1c1 < This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 +> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:45 3c3 < (trip.tex ## --- @@ -333,7 +333,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1683 -> 261 string characters out of 8167 +> 261 string characters out of 8168 > 4017 words of memory out of 4500 > 424 multiletter control sequences out of 15000+0 7301c7310 @@ -350,7 +350,7 @@ 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1345' 419c419 < 1121: down4 639342208 --- @@ -380,7 +380,7 @@ < I changed this one to zero. < --- -> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 +> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 > entering extended mode > ***\input trip > (./trip.tex @@ -402,8 +402,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.1.22) -> 1617 strings of total length 27833 +> (preloaded format=trip 2014.5.1) +> 1617 strings of total length 27832 > 536 memory locations dumped; current usage is 157&278 > 468 multiletter control sequences 461c449 @@ -419,7 +419,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) +> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) > **entering extended mode > ## (./trip.tex 17c17 @@ -440,7 +440,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 +> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:45 > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex @@ -769,7 +769,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1683 -> 261 string characters out of 8167 +> 261 string characters out of 8168 > 4017 words of memory out of 4500 > 499 multiletter control sequences out of 15000+0 7301,7302c7307,7308 @@ -788,7 +788,7 @@ 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1345' 419c419 < 1121: down4 639342208 --- @@ -811,13 +811,15 @@ 1c1 < This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25 --- -> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 -27,29c27,29 +> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 +26,29c26,29 +< (preloaded format=etrip 2014.1.22) < 1491 strings of total length 26258 < 281 memory locations dumped; current usage is 36&167 < 408 multiletter control sequences --- -> 1618 strings of total length 27864 +> (preloaded format=etrip 2014.5.1) +> 1618 strings of total length 27863 > 284 memory locations dumped; current usage is 40&167 > 468 multiletter control sequences + ./euptex --progname=euptex @@ -826,12 +828,12 @@ 1c1 < This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) --- -> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) +> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) + diff SRCDIR/eptexdir/eptrip/eptrip.log euptrip.log 1c1 < This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:25 --- -> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:37 +> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=etrip 2014.5.1) 1 MAY 2014 13:45 2210,2215d2209 < ! Bad character code (256). < l.676 \iffontchar\font 256 @@ -844,7 +846,7 @@ < 145 string characters out of 8157 --- > 19 strings out of 1682 -> 145 string characters out of 8136 +> 145 string characters out of 8137 4424c4418 < 463 multiletter control sequences out of 15000+0 --- @@ -855,6 +857,6 @@ 9c9 < ' TeX output 2014.01.22:1125' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1345' + : PASS: euptexdir/euptriptest diff --git a/Build/source/texk/web2c/mftraptest b/Build/source/texk/web2c/mftraptest index 74567ab180e..3f7eabfd6e5 100755 --- a/Build/source/texk/web2c/mftraptest +++ b/Build/source/texk/web2c/mftraptest @@ -14,6 +14,7 @@ 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, @@ -27,10 +28,14 @@ cat >filter <<-\_EOF 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 20..\...\...:..../METAFONT output 20YY.MM.DD:hhmm/ + _EOF + +# Capsule numbers +cat >>filter <<-\_EOF s/ %CA$/ %/ s/^PSULE1675/CAPSULE1172/ s/%CAPSULE[1-9][0-9]*/%CAPSULEnnnn/g - s/METAFONT output 20..\...\...:..../METAFONT output 20YY.MM.DD:hhmm/ _EOF echo ">>> Running TRAP test for Metafont." >&2 diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 92f3f26d3ed..1b13f882cf9 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-05-02 Peter Breitenlohner + + * ptrip/ptrip.diffs: Updated for TL14. + 2014-01-23 Peter Breitenlohner * ptftopl.ch: Slightly simplified. Fixed some typos. diff --git a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs index c7124de242f..a5aa190e8f6 100644 --- a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs +++ b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is pTeX, Version 3.14159265-p3.4 (utf8.euc) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 +> This is pTeX, Version 3.14159265-p3.5 (utf8.euc) (TeX Live 2014) (INITEX) 1 MAY 2014 13:44 3c3 < (trip.tex --- @@ -33,8 +33,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.1.22) -> 1451 strings of total length 25481 +> (preloaded format=trip 2014.5.1) +> 1451 strings of total length 25480 > 485 memory locations dumped; current usage is 106&278 > 377 multiletter control sequences 461c462 @@ -50,7 +50,7 @@ < ** &trip trip < (trip.tex ## --- -> This is pTeX, Version 3.14159265-p3.4 (utf8.euc) (TeX Live 2014) (preloaded format=ptex) +> This is pTeX, Version 3.14159265-p3.5 (utf8.euc) (TeX Live 2014) (preloaded format=ptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -64,7 +64,7 @@ 1c1 < This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is pTeX, Version 3.14159265-p3.4 (utf8.euc) (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 +> This is pTeX, Version 3.14159265-p3.5 (utf8.euc) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:44 3c3 < (trip.tex ## --- @@ -271,7 +271,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1549 -> 261 string characters out of 14519 +> 261 string characters out of 14520 > 4259 words of memory out of 4500 > 408 multiletter control sequences out of 15000+0 7301c7312 @@ -288,7 +288,7 @@ 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1344' 419c419 < 1121: down4 639342208 --- diff --git a/Build/source/texk/web2c/triptest b/Build/source/texk/web2c/triptest index 41663d191b4..a522fe75ed3 100755 --- a/Build/source/texk/web2c/triptest +++ b/Build/source/texk/web2c/triptest @@ -13,6 +13,7 @@ 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 ##, @@ -28,6 +29,11 @@ cat >filter <<-\_EOF 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 20..\...\...:..../TeX output 20YY.MM.DD:hhmm/ + _EOF + +# x86 glue rounding +cat >>filter <<-\_EOF s/ 16341\.999.*fil/ 16342.0fil/ s/ 16238\.999.*fil/ 16239.0fil/ s/ 16317\.999.*fil/ 16318.0fil/ @@ -35,7 +41,6 @@ cat >filter <<-\_EOF s/ 16331\.999.*fil/ 16332.0fil/ s/ 16343\.999.*fil/ 16344.0fil/ s/ 9737\.587..fil/ 9737.58789fil/ - s/TeX output 20..\...\...:..../TeX output 20YY.MM.DD:hhmm/ s/down4 639342.../down4 639342208/ s/y4 2039217../y4 203921760/ s/y0 2039217../y0 203921760/ diff --git a/Build/source/texk/web2c/triptrap/mftrap.diffs b/Build/source/texk/web2c/triptrap/mftrap.diffs index 8ab6c2a8b2e..7930f033ffc 100644 --- a/Build/source/texk/web2c/triptrap/mftrap.diffs +++ b/Build/source/texk/web2c/triptrap/mftrap.diffs @@ -5,53 +5,149 @@ + mv trap.log mftrapin.log + diff SRCDIR/triptrap/mftrapin.log mftrapin.log 1c1 -< This is METAFONT, Version 2.718281 (INIMF) 15 MAR 2008 02:23 +< This is METAFONT, Version 2.7182818 (INIMF) 7 JAN 2014 17:51 --- -> This is METAFONT, Version 2.718281 (TeX Live 2013) (INIMF) 9 APR 2013 11:27 +> This is METAFONT, Version 2.7182818 (TeX Live 2014) (INIMF) 1 MAY 2014 13:44 150c150 < String usage 26&83 (891&11438 still untouched) --- -> String usage 30&98 (6386&79458 still untouched) +> String usage 30&98 (6386&79448 still untouched) 176,177c176,177 -< (preloaded base=trap 2008.3.15) +< (preloaded base=trap 2014.1.7) < 1117 strings of total length 20614 --- -> (base=trap 2013.4.9) -> 1123 strings of total length 20592 +> (preloaded base=trap 2014.5.1) +> 1123 strings of total length 20612 + ./mf --progname=inimf + mv trap.log mftrap.log + mv trap.tfm mftrap.tfm + diff SRCDIR/triptrap/mftrap.fot mftrap.fot 1,3c1,2 -< This is METAFONT, Version 2.718281 (INIMF) +< This is METAFONT, Version 2.7182818 (INIMF) < ** &trap trap < (trap.mf --- -> This is METAFONT, Version 2.718281 (TeX Live 2013) (INIMF) +> This is METAFONT, Version 2.7182818 (TeX Live 2014) (INIMF) > **(trap.mf 39c38 < String usage 41&161 (815&7634 still untouched) --- -> String usage 50&202 (6300&75615 still untouched) +> String usage 50&202 (6300&75595 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.7182818 (preloaded base=trap 2014.1.7) 7 JAN 2014 18:11 --- -> This is METAFONT, Version 2.718281 (TeX Live 2013) (base=trap 2013.4.9) 9 APR 2013 11:27 +> This is METAFONT, Version 2.7182818 (TeX Live 2014) (preloaded base=trap 2014.5.1) 1 MAY 2014 13:44 1825c1825 < String usage 24&92 (858&11309 still untouched) --- -> String usage 30&119 (6346&79283 still untouched) +> String usage 30&119 (6346&79263 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 4235c4235 < String usage 41&161 (815&7634 still untouched) --- -> String usage 50&202 (6300&75615 still untouched) +> String usage 50&202 (6300&75595 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 79408 +> 3793 string characters out of 79388 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 +165,28 @@ 1c1 < This is GFtype, Version 3.1 --- -> This is GFtype, Version 3.1 (TeX Live 2013) +> This is GFtype, Version 3.1 (TeX Live 2014) 3c3 -< ' METAFONT output 2008.03.15:0223' +< ' METAFONT output 2014.01.07:1811' --- -> ' METAFONT output 2013.04.09:1127' -+ exit 0 -PASS: trap.test +> ' METAFONT output 2014.05.01:1344' ++ for f in mftrapin.log mftrap.fot mftrap.log trap.typ ++ sed SRCDIR/triptrap/mftrapin.log -f filter ++ sed mftrapin.log -f filter ++ diff a/mftrapin.log b/mftrapin.log ++ for f in mftrapin.log mftrap.fot mftrap.log trap.typ ++ sed SRCDIR/triptrap/mftrap.fot -f filter ++ sed mftrap.fot -f filter ++ diff a/mftrap.fot b/mftrap.fot ++ for f in mftrapin.log mftrap.fot mftrap.log trap.typ ++ sed SRCDIR/triptrap/mftrap.log -f filter ++ sed mftrap.log -f filter ++ diff a/mftrap.log b/mftrap.log ++ for f in mftrapin.log mftrap.fot mftrap.log trap.typ ++ sed SRCDIR/triptrap/trap.typ -f filter ++ sed trap.typ -f filter ++ diff a/trap.typ b/trap.typ ++ : ++ echo '>>> All differences are acceptable.' +>>> All differences are acceptable. +PASS: mftraptest diff --git a/Build/source/texk/web2c/triptrap/mptrap.diffs b/Build/source/texk/web2c/triptrap/mptrap.diffs index 993393f06cd..4c72157bd88 100644 --- a/Build/source/texk/web2c/triptrap/mptrap.diffs +++ b/Build/source/texk/web2c/triptrap/mptrap.diffs @@ -2,121 +2,541 @@ >>> 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) ++ ./mpost --ini mtrap +This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) (./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.211 (kpathsea version 6.0.0dev) (INIMP) 18 MAY 2010 13:31 +> This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) 1 MAY 2014 13:44 +4,5c4,5 +< Memory usage 19&13 (3972 still untouched) +< String usage 3&12 (101&7774 now untouched) +--- +> Memory usage 2048 +> String usage 1&10 +299,306c299,306 +< Memory usage 19&13 (3867 still untouched) +< String usage 7&20 (97&7766 now untouched) +< Memory usage 111&13 (3867 still untouched) +< String usage 9&30 (95&7756 now untouched) +< Memory usage 118&13 (3867 still untouched) +< String usage 10&33 (94&7753 now untouched) +< Memory usage 141&56 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 11664 +> String usage 3&19 +> Memory usage 12600 +> String usage 3&19 +> Memory usage 12600 +> String usage 3&19 +> Memory usage 12600 +> String usage 3&19 +316,317c316,317 +< Memory usage 154&59 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 12784 +> String usage 3&19 +338,339c338,339 +< Memory usage 230&59 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 13792 +> String usage 3&19 +355,356c355,356 +< Memory usage 258&59 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 13928 +> String usage 3&19 +371,372c371,372 +< Memory usage 312&72 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 14696 +> String usage 3&19 +398,399c398,399 +< Memory usage 339&59 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 14880 +> String usage 3&19 +433,434c433,434 +< Memory usage 367&59 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 15064 +> String usage 3&19 +468,469c468,469 +< Memory usage 367&59 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 15064 +> String usage 3&19 +484,485c484,485 +< Memory usage 373&70 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 15112 +> String usage 3&19 +522,523c522,523 +< Memory usage 398&59 (3867 still untouched) +< String usage 13&39 (91&7747 now untouched) +--- +> Memory usage 15264 +> String usage 3&19 +535,536c535,536 +< Memory usage 386&64 (3867 still untouched) +< String usage 15&47 (89&7739 now untouched) +--- +> Memory usage 15384 +> String usage 5&27 +576,577c576,577 +< Memory usage 399&59 (3867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 15912 +> String usage 5&27 +592,593c592,593 +< Memory usage 427&73 (3867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 15904 +> String usage 5&27 +638,639c638,639 +< Memory usage 452&59 (3867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 16088 +> String usage 5&27 +647,650c647,650 +< Memory usage 452&59 (3867 still untouched) +< String usage 15&53 (89&7733 now untouched) +< Memory usage 342&13 (3867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 16088 +> String usage 6&38 +> Memory usage 15480 +> String usage 6&38 +697,698c697,698 +< Memory usage 342&13 (3867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 15480 +> String usage 6&38 +700,701c700,701 +< Memory usage 637&13 (3867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 16624 +> String usage 6&38 +787,788c787,788 +< Memory usage 853&13 (3867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 17528 +> String usage 6&38 +817,818c817,818 +< Memory usage 1149&85 (2867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 18672 +> String usage 6&38 +842,843c842,843 +< Memory usage 996&85 (2867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 18008 +> String usage 6&38 +867,868c867,868 +< Memory usage 898&85 (2867 still untouched) +< String usage 14&42 (90&7744 now untouched) +--- +> Memory usage 17864 +> String usage 6&38 +889,890c889,890 +< Memory usage 882&85 (2867 still untouched) +< String usage 15&47 (89&7739 now untouched) +--- +> Memory usage 17984 +> String usage 6&38 +912,913c912,913 +< Memory usage 900&85 (2867 still untouched) +< String usage 15&47 (89&7739 now untouched) +--- +> Memory usage 17896 +> String usage 6&38 +919,920c919,920 +< Memory usage 353&13 (2867 still untouched) +< String usage 15&47 (89&7739 now untouched) +--- +> Memory usage 15664 +> String usage 7&41 +924,925c924,925 +< Memory usage 359&13 (2867 still untouched) +< String usage 16&50 (84&7716 now untouched) +--- +> Memory usage 15664 +> String usage 9&45 929c929 < >> "%%Creator: MetaPost 1.203" --- -> >> "%%Creator: MetaPost 1.211" +> >> "%%Creator: MetaPost 1.902" +931c931 +< >> "%*Font: trapf 9.9628 9.96265 35:c008" +--- +> >> "%*Font: trapf 9.96266 9.96265 35:c008" +955,956c955,956 +< >> "gsave [0.86601 0.5 -0.5 0.86601 2 3 ] concat 0 0 moveto" +< >> "(A56) trapf 9.9628 fshow grestore" +--- +> >> "gsave [0.86601 0.49998 -0.49998 0.86601 2 3 ] concat 0 0 moveto" +> >> "(A56) trapf 9.96266 fshow grestore" +959c959 +< >> "0.00064 1 scale stroke grestore" +--- +> >> "1.00067 1 scale stroke grestore" +962,963c962,963 +< Memory usage 359&13 (2867 still untouched) +< String usage 16&50 (46&6607 now untouched) +--- +> Memory usage 15664 +> String usage 70&1484 +966,968c966,968 +< >> 42 +< Memory usage 359&13 (2867 still untouched) +< String usage 16&50 (5&5366 now untouched) +--- +> >> 41 +> Memory usage 15664 +> String usage 90&2139 +973,976c973,976 +< Memory usage 359&13 (2867 still untouched) +< String usage 17&84 (1&5292 now untouched) +< Memory usage 359&13 (2867 still untouched) +< String usage 30&97 (43&7558 now untouched) +--- +> Memory usage 15664 +> String usage 91&2147 +> Memory usage 15664 +> String usage 152&2401 978c978 < >> "%%CreationDate: 2009.05.25:1247" --- -> >> "%%CreationDate: 2010.05.18:1331" +> >> "%%CreationDate: 2014.05.01:1344" +982,984c982,984 +< >> "%*Font: trapf 9.9628 9.96265 35:c008" +< Memory usage 359&13 (2867 still untouched) +< String usage 30&88 (41&7527 now untouched) +--- +> >> "%*Font: trapf 9.96266 9.96265 35:c008" +> Memory usage 15664 +> String usage 152&2401 +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 +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 +< with that big value; but it might be dangerous. +--- +> The equation I just processed has given some variable a +> value outside of the safetyp range. Continue and I'll try +> to cope with that big value; but it might be dangerous. +1012,1013c1012,1013 +< Memory usage 359&13 (2867 still untouched) +< String usage 30&88 (61&6618 now untouched) +--- +> Memory usage 16432 +> String usage 172&2909 +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 +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 +1076,1081c1076,1079 +< 37 strings out of 104 +< 508 string characters out of 7786 +< 2134 words of memory out of 5000 +< 265 symbolic tokens out of 16384 +< 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 +> 18856 bytes of node memory +> 315 symbolic tokens +> 6i,48n,6p,99b,2f stack positions out of 16i,96n,7p,200b,4f +1082a1081 +> + 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 +> %%Creator: MetaPost 1.902 +> %%CreationDate: 2014.05.01:1344 +7c7 +< %*Font: trapf 9.9628 9.96265 35:c008 +--- +> %*Font: trapf 9.96266 9.96265 35:c008 +31,32c31,32 +< gsave [0.86601 0.5 -0.5 0.86601 2 3 ] concat 0 0 moveto +< (A56) trapf 9.9628 fshow grestore +--- +> gsave [0.86601 0.49998 -0.49998 0.86601 2 3 ] concat 0 0 moveto +> (A56) trapf 9.96266 fshow grestore +35c35 +< 0.00064 1 scale stroke grestore +--- +> 1.00067 1 scale stroke grestore + 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 +> %%Creator: MetaPost 1.902 +> %%CreationDate: 2014.05.01:1344 +23,25c23,24 +< 0 0 0 setrgbcolor 1 +< 0 dtransform exch truncate exch idtransform pop setlinewidth [] 0 setdash +< 0 setlinecap 0 setlinejoin 1 setmiterlimit +--- +> 0 0 0 setrgbcolor 1 0 dtransform exch truncate exch idtransform pop setlinewidth +> [] 0 setdash 0 setlinecap 0 setlinejoin 1 setmiterlimit +35,36c34,35 +< gsave [-0.5 0.86601 -0.86601 -0.5 -3 2 ] concat 0 0 moveto +< (A56) trapf 9.9628 fshow grestore +--- +> gsave [-0.49998 0.86601 -0.86601 -0.49998 -3 2 ] concat 0 0 moveto +> (A56) trapf 9.96266 fshow grestore +39c38 +< [0 -0.00064 -1 0 0 0] concat stroke grestore +--- +> [0 -1.00067 -1 0 0 0] concat stroke grestore + 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 ++ ./mpost --ini --jobname=trap + mv trap.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.211 (kpathsea version 6.0.0dev) (INIMP) 18 MAY 2010 13:31 -195c195 -< (mem=trap 2009.05.25) ---- -> (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) ---- -> 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 +> 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)) --- -> %%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 +> > <<=tag +40,60c38,45 +< ! Missing `:' has been inserted. +< +< ; +< l.8 ...acingcommands:=if not cycle "":1.1 forever; +< fi; +< The next thing in this loop should have been a `:'. +< So I'll pretend that a colon was present; +< everything from here to `endfor' will be iterated. +< +< {fi} +< {exitif} +< {[repeat the loop]} +< {false} +< {fi} +< {exitif} +< {[repeat the loop]} +< {(2.1)>(2)} +< {true} +< {tracingcommands:=2.1} +< {showtoken} +< > |=:|>=|=:|> --- -> %%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 +> ! Extra `endfor'. +> l.17 ...or n=tracingspecs step 1 until $:fi endfor +> showstats; +> I'm not currently working on a for loop, +> so I had better not try to end anything. +> +> Memory usage 14048 +> String usage 6&49 +62c47 +< l.9 ... tracingcommands>2 endfor; showtoken |=:|>; --- -> %%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 +> l.17 ...gspecs step 1 until $:fi endfor showstats; +65,98c50,52 +< ! Arithmetic overflow. +< l.10 tracinglostchars:=1/.00001 +< ; tracingequations:=$+1; p~=tracinglostchar... +< Uh, oh. A little while ago one of the quantities that I was +< computing got too large, so I'm afraid your answers will be +< somewhat askew. You'll probably have to adopt different +< tactics next time. But I shall try to carry on anyway. +< +< {tracinglostchars:=32767.99998} +< {(0)+(1)} +< {tracingequations:=1} +< {(32767.99998)+(0.00002)} +< ! Arithmetic overflow. +< l.10 ...quations:=$+1; p~=tracinglostchars+.00001; +< +< Uh, oh. A little while ago one of the quantities that I was +< computing got too large, so I'm afraid your answers will be +< somewhat askew. You'll probably have to adopt different +< tactics next time. But I shall try to carry on anyway. +< +< {(p~)=(32767.99998)} +< ## p~=32767.99998 +< {interim} +< {tracingmacros:=1} +< {tracingoutput:=1} +< {warningcheck:=1} +< {tracingstats:=1} +< {tracingchoices:=1} +< {tracingspecs:=1} +< {ASCII("")} +< {$:=-1} +< {$:=x} +< >> x +< ! Internal quantity `$' must receive a known numeric or string. --- -> %%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 +> >> unknown path p~ +> >> (0 +> ! Equation cannot be performed (unknown path=numeric). +100,148c54,58 +< ; +< l.12 ...utput:=tracingmacros:=1; $:=ASCII""; $:=x; +< p~:=p~; +< I can't set an internal quantity to anything but a known string +< or known numeric value, so I'll have to ignore this assignment. +< +< {p~:=32767.99998} +< ## p~=32767.99998 +< ! Value is too large (32767.99998). +< l.12 ...racingmacros:=1; $:=ASCII""; $:=x; p~:=p~; +< +< The equation I just processed has given some variable +< a value of 4096 or more. Continue and I'll try to cope +< with that big value; but it might be dangerous. +< (Set warningcheck:=0 to suppress this message.) +< +< {delimiters} +< {delimiters} +< {vardef} +< {def} +< +< foo(TEXT2)->begingroup(TEXT2)endgroup +< (SUFFIX0)<- +< (SUFFIX1)<-foo +< (TEXT2)<-interim.tracinglostchars:=(0.5;show.urcorner("flubo"infont"trapf"),2+2 +< {begingroup} +< {interim} +< ! Missing `)' has been inserted. +< +< ; +< interim.tracinglostchars:=(0.5; +< show.urcorner("flubo"infont"trapf"... +< +< foo->begingroup(TEXT2) +< endgroup +< l.17 ),2+2endtext +< ; for n=tracingspecs step 1 until $:fi endfor showstats; +< I found no right delimiter to match a left one. So I've +< put one in, behind the scenes; this may fix the problem. +< +< {tracinglostchars:=0.5} +< {show} +< {("flubo")infont("trapf")} +< Missing character: There is no f in font trapf! +< Missing character: There is no l in font trapf! +< Missing character: There is no o in font trapf! +< {urcorner(picture)} +< >> (2.9888,7.97011) +< {(2)+(2)} --- -> %%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 +> , +> l.18 let!!=skipto; path p~; p~=(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 +< >> 4 +< ! OK. --- -> %%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 +> ! Extra tokens will be flushed. +153,165c62,71 +< endgroup +< l.17 ),2+2endtext +< ; for n=tracingspecs step 1 until $:fi endfor showstats; +< +< {restoring tracinglostchars=32767.99998} +< {endgroup} +< {for} +< {showstats} +< Memory usage 283&42 (3927 still untouched) +< String usage 25&72 (78&7709 now untouched) +< ! OK. +< l.17 ...gspecs step 1 until $:fi endfor showstats; +< --- -> %%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 +> , +> l.18 let!!=skipto; path p~; p~=(0, +> 0)..controls (15,4) and (-15,-12)..(4,0); +> I've just read as much of that statement as I could fathom, +> so a semicolon should have been next. It's very puzzling... +> but I'll try to get myself back together, by ignoring +> everything up to the next `;'. Please insert a semicolon +> now in front of anything that you don't want me to delete. +> (See Chapter 27 of The METAFONTbook for an example.) +> +167,191d72 +< {let} +< {path} +< {-(15)} +< {-(12)} +< Path at line 18, before choices: +< (0,0)..controls (15,4) and (-15,-12) +< ..(4,0) +< +< Path at line 18, after choices: +< (0,0)..controls (15,4) and (-15,-12) +< ..(4,0) +< +< {(unknown path p~)=(path)} +< {everyjob} +< {vardef} +< {let} +< {vardef} +< {def} +< {begingroup} +< {errorstopmode} +< +< {endgroup} +< {elseif} +< {endinput} +< {\} +194,198c75 +< Beginning to dump on file trap.mem +< (mem=trap 2009.05.25) +< at most 553 strings of total length 2302 +< 391 memory locations dumped; current usage is 311&68 +< 308 symbolic tokens --- -> %%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 +PASS: mplibdir/mptraptest diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs index 704de4b46b1..b9be8885c31 100644 --- a/Build/source/texk/web2c/triptrap/trip.diffs +++ b/Build/source/texk/web2c/triptrap/trip.diffs @@ -10,7 +10,7 @@ 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is TeX, Version 3.14159265 (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 +> This is TeX, Version 3.14159265 (TeX Live 2014) (INITEX) 1 MAY 2014 13:44 3c3 < (trip.tex --- @@ -19,8 +19,8 @@ < (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 --- -> (preloaded format=trip 2014.1.22) -> 1371 strings of total length 24606 +> (preloaded format=trip 2014.5.1) +> 1371 strings of total length 24605 461c461 < Hyphenation trie of length 273 has 9 ops out of 500 --- @@ -38,7 +38,7 @@ 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.1.22) 22 JAN 2014 11:37 +> This is TeX, Version 3.14159265 (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:44 3c3 < (trip.tex ## --- @@ -93,7 +93,7 @@ < 253 string characters out of 8354 --- > 44 strings out of 1629 -> 261 string characters out of 15394 +> 261 string characters out of 15395 7299c7303 < 372 multiletter control sequences out of 2100 --- @@ -112,7 +112,7 @@ 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1344' 419c419 < 1121: down4 639342208 --- diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 7c72e468bbd..bae45919502 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-05-02 Peter Breitenlohner + + * uptrip/uptrip.diffs: Updated for TL14. + 2014-01-22 Peter Breitenlohner * uptrip/uptrip.diffs: Updated for upTeX 3.14159265. diff --git a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs index 60301083422..5d85726c7da 100644 --- a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs +++ b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is upTeX, Version 3.14159265-p3.4-u1.11 (utf8.uptex) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 +> This is upTeX, Version 3.14159265-p3.5-u1.11 (utf8.uptex) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 3,11c3 < (trip.tex < ! Bad character code (256). @@ -37,8 +37,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.1.22) -> 1461 strings of total length 25502 +> (preloaded format=trip 2014.5.1) +> 1461 strings of total length 25501 > 485 memory locations dumped; current usage is 106&278 > 383 multiletter control sequences 461c454 @@ -54,7 +54,7 @@ < ** &trip trip < (trip.tex ## --- -> This is upTeX, Version 3.14159265-p3.4-u1.11 (utf8.uptex) (TeX Live 2014) (preloaded format=uptex) +> This is upTeX, Version 3.14159265-p3.5-u1.11 (utf8.uptex) (TeX Live 2014) (preloaded format=uptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -68,7 +68,7 @@ 1c1 < This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is upTeX, Version 3.14159265-p3.4-u1.11 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 +> This is upTeX, Version 3.14159265-p3.5-u1.11 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:45 3c3 < (trip.tex ## --- @@ -305,7 +305,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1539 -> 261 string characters out of 14498 +> 261 string characters out of 14499 > 4259 words of memory out of 4500 > 414 multiletter control sequences out of 15000+0 7301c7312 @@ -322,7 +322,7 @@ 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.01.22:1137' +> ' TeX output 2014.05.01:1345' 419c419 < 1121: down4 639342208 --- -- cgit v1.2.3