From f789f7dc19b1f3737f132f585393a446aee1654f Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 13 Apr 2015 06:37:11 +0000 Subject: Update output expected from TRIP and TRAP tests git-svn-id: svn://tug.org/texlive/trunk@36824 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 4 ++ Build/source/texk/web2c/eptexdir/ChangeLog | 4 ++ .../source/texk/web2c/eptexdir/eptrip/eptrip.diffs | 73 +++++++++++++--------- Build/source/texk/web2c/etexdir/ChangeLog | 4 ++ Build/source/texk/web2c/etexdir/etrip/etrip.diffs | 45 +++++++------ Build/source/texk/web2c/euptexdir/ChangeLog | 4 ++ .../texk/web2c/euptexdir/euptrip/euptrip.diffs | 69 +++++++++++--------- Build/source/texk/web2c/ptexdir/ChangeLog | 4 ++ Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs | 17 ++--- Build/source/texk/web2c/triptrap/mftrap.diffs | 23 +++---- Build/source/texk/web2c/triptrap/mptrap.diffs | 44 ++++++------- Build/source/texk/web2c/triptrap/trip.diffs | 17 ++--- Build/source/texk/web2c/uptexdir/ChangeLog | 4 ++ .../source/texk/web2c/uptexdir/uptrip/uptrip.diffs | 19 +++--- 14 files changed, 192 insertions(+), 139 deletions(-) (limited to 'Build/source/texk/web2c') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 634a8bd00a4..2ed8bc52eb6 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2015-04-12 Peter Breitenlohner + + * triptrap/{mftrap,mptrap,trip}.diffs: Updated for TL 2015. + 2015-03-31 Peter Breitenlohner * mftalk.h (removed): Moved from here to window/mftalk.h. diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index bc3c7b9a521..660b668fb2c 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,7 @@ +2015-04-12 Peter Breitenlohner + + * eptrip/eptrip.diffs: Updated for TL 2015. + 2014-12-12 Peter Breitenlohner * eptriptest: Complain early if (e)trip.fmt is not created. diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs index 9c315fb3714..d1da9ae8eff 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs @@ -8,12 +8,13 @@ + ln -s SRCDIR/triptrap/trip.tex . + rm -f trip.log + ./eptex --progname=epinitex --ini ++ test '!' -s trip.fmt + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log cptripin.log 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 +> This is e-pTeX, Version 3.14159265-p3.6-141210-2.6 (utf8.euc) (TeX Live 2015) (INITEX) 12 APR 2015 16:22 3c3 < (trip.tex --- @@ -33,8 +34,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.5.1) -> 1607 strings of total length 27811 +> (preloaded format=trip 2015.4.12) +> 1616 strings of total length 27981 > 489 memory locations dumped; current usage is 110&278 > 387 multiletter control sequences 461c462 @@ -50,7 +51,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) +> This is e-pTeX, Version 3.14159265-p3.6-141210-2.6 (utf8.euc) (TeX Live 2015) (preloaded format=eptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -64,7 +65,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.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:45 +> This is e-pTeX, Version 3.14159265-p3.6-141210-2.6 (utf8.euc) (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:22 3c3 < (trip.tex ## --- @@ -298,8 +299,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1693 -> 261 string characters out of 8189 +> 44 strings out of 1684 +> 261 string characters out of 8019 > 4017 words of memory out of 4500 > 418 multiletter control sequences out of 15000+0 7301c7310 @@ -312,11 +313,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2014) +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.05.01:1345' +> ' TeX output 2015.04.12:1622' 419c419 < 1121: down4 639342208 --- @@ -327,10 +328,12 @@ --- > 2535: y4 203921756 > 2540: y0 203921756 ++ mv trip.fmt ctrip.fmt + echo '*** TRIP test for e-pTeX in extended mode ***.' *** TRIP test for e-pTeX in extended mode ***. + rm -f trip.log + ./eptex --progname=epinitex --ini ++ test '!' -s trip.fmt + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log xptripin.log 1,3c1,4 @@ -338,7 +341,7 @@ < **\input trip < (trip.tex --- -> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 +> This is e-pTeX, Version 3.14159265-p3.6-141210-2.6 (utf8.euc) (TeX Live 2015) (INITEX) 12 APR 2015 16:22 > entering extended mode > ***\input trip > (./trip.tex @@ -364,10 +367,10 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.5.1) -> 1607 strings of total length 27811 +> (preloaded format=trip 2015.4.12) +> 1616 strings of total length 27981 > 536 memory locations dumped; current usage is 157&278 -> 462 multiletter control sequences +> 465 multiletter control sequences 461c457 < Hyphenation trie of length 273 has 9 ops out of 500 --- @@ -381,7 +384,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) +> This is e-pTeX, Version 3.14159265-p3.6-141210-2.6 (utf8.euc) (TeX Live 2015) (preloaded format=eptex) > **entering extended mode > ## (./trip.tex 17c17 @@ -402,7 +405,7 @@ < ** &trip trip < (trip.tex ## --- -> 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 +> This is e-pTeX, Version 3.14159265-p3.6-141210-2.6 (utf8.euc) (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:22 > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex @@ -700,10 +703,10 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1693 -> 261 string characters out of 8189 +> 44 strings out of 1684 +> 261 string characters out of 8019 > 4017 words of memory out of 4500 -> 493 multiletter control sequences out of 15000+0 +> 496 multiletter control sequences out of 15000+0 7301,7302c7307,7308 < 2 hyphenation exceptions out of 307 < 7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s @@ -716,11 +719,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2014) +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.05.01:1345' +> ' TeX output 2015.04.12:1622' 419c419 < 1121: down4 639342208 --- @@ -731,6 +734,7 @@ --- > 2535: y4 203921756 > 2540: y0 203921756 ++ mv trip.fmt xtrip.fmt + echo '*** e-TeX specific part of e-TRIP test for e-pTeX ***.' *** e-TeX specific part of e-TRIP test for e-pTeX ***. + ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm @@ -738,44 +742,55 @@ + diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl + ln -s SRCDIR/eptexdir/eptrip/eptrip.tex etrip.tex + ./eptex --progname=epinitex --ini ++ test '!' -s etrip.fmt + sed 's/, yoko direction//;s/yoko direction, //' etrip.log + diff SRCDIR/etexdir/etrip/etripin.log eptripin.log 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.5-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 +> This is e-pTeX, Version 3.14159265-p3.6-141210-2.6 (utf8.euc) (TeX Live 2015) (INITEX) 12 APR 2015 16:22 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 --- -> (preloaded format=etrip 2014.5.1) -> 1608 strings of total length 27842 +> (preloaded format=etrip 2015.4.12) +> 1617 strings of total length 28012 > 284 memory locations dumped; current usage is 40&167 -> 462 multiletter control sequences +> 465 multiletter control sequences + ./eptex --progname=eptex + sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' etrip.log + diff SRCDIR/etexdir/etrip/etrip.fot eptrip.fot 1c1 < This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) --- -> This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) +> This is e-pTeX, Version 3.14159265-p3.6-141210-2.6 (utf8.euc) (TeX Live 2015) (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.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=etrip 2014.5.1) 1 MAY 2014 13:45 -4422c4422 +> This is e-pTeX, Version 3.14159265-p3.6-141210-2.6 (utf8.euc) (TeX Live 2015) (preloaded format=etrip 2015.4.12) 12 APR 2015 16:22 +4421,4422c4421,4422 +< 19 strings out of 1692 < 145 string characters out of 8157 --- -> 145 string characters out of 8158 +> 19 strings out of 1683 +> 145 string characters out of 7988 +4424c4424 +< 463 multiletter control sequences out of 15000+0 +--- +> 466 multiletter control sequences out of 15000+0 + 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 +1c1 +< This is DVItype, Version 3.6 (TeX Live 2014) +--- +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.22:1125' --- -> ' TeX output 2014.05.01:1345' +> ' TeX output 2015.04.12:1622' + : PASS: eptexdir/eptriptest diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index de07fd9014b..25ddb6194d2 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,7 @@ +2015-04-12 Peter Breitenlohner + + * etrip/etrip.diffs: Updated for TL 2015. + 2014-12-12 Peter Breitenlohner * etriptest: Complain early if (e)trip.fmt is not created. diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs index 9421400e5ae..adf22fe7978 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs @@ -7,12 +7,13 @@ + diff SRCDIR/triptrap/trip.pl trip.pl + ln -s SRCDIR/triptrap/trip.tex . + ./etex --progname=einitex --ini ++ test '!' -s trip.fmt + mv trip.log ctripin.log + diff SRCDIR/triptrap/tripin.log ctripin.log 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) 1 MAY 2014 13:45 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2015) (INITEX) 12 APR 2015 16:23 3c3 < (trip.tex --- @@ -23,8 +24,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.5.1) -> 1490 strings of total length 26226 +> (preloaded format=trip 2015.4.12) +> 1490 strings of total length 26227 > 479 memory locations dumped; current usage is 104&278 > 342 multiletter control sequences 461c461 @@ -39,7 +40,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2015) (preloaded format=etex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -53,7 +54,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.5.1) 1 MAY 2014 13:45 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:23 3c3 < (trip.tex ## --- @@ -174,7 +175,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1810 -> 261 string characters out of 7774 +> 261 string characters out of 7773 > 3821 words of memory out of 3999 > 373 multiletter control sequences out of 15000+0 7301c7305 @@ -187,11 +188,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2014) +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.05.01:1345' +> ' TeX output 2015.04.12:1623' 419c419 < 1121: down4 639342208 --- @@ -202,9 +203,11 @@ --- > 2535: y4 203921756 > 2540: y0 203921756 ++ mv trip.fmt ctrip.fmt + echo '*** TRIP test for e-TeX in extended mode ***.' *** TRIP test for e-TeX in extended mode ***. + ./etex --progname=einitex --ini ++ test '!' -s trip.fmt + mv trip.log xtripin.log + diff ctripin.log xtripin.log 2c2,3 @@ -328,6 +331,7 @@ + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi + diff ctrip.typ xtrip.typ ++ mv trip.fmt xtrip.fmt + echo '*** e-TeX specific part of e-TRIP test ***.' *** e-TeX specific part of e-TRIP test ***. + ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm @@ -335,35 +339,38 @@ + diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl + ln -s SRCDIR/etexdir/etrip/etrip.tex . + ./etex --progname=einitex --ini ++ test '!' -s etrip.fmt + mv etrip.log etripin.log + diff SRCDIR/etexdir/etrip/etripin.log etripin.log 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) 1 MAY 2014 13:45 -26,27c26,27 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2015) (INITEX) 12 APR 2015 16:23 +26c26 < (preloaded format=etrip 2014.1.22) -< 1491 strings of total length 26258 --- -> (preloaded format=etrip 2014.5.1) -> 1491 strings of total length 26257 +> (preloaded format=etrip 2015.4.12) + ./etex --progname=etex + diff SRCDIR/etexdir/etrip/etrip.fot etrip.fot +1c1 +< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) +--- +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2015) (preloaded format=etex) + 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.5.1) 1 MAY 2014 13:45 -4422c4422 -< 145 string characters out of 7742 ---- -> 145 string characters out of 7743 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2015) (preloaded format=etrip 2015.4.12) 12 APR 2015 16:23 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi + diff SRCDIR/etexdir/etrip/etrip.typ etrip.typ +1c1 +< This is DVItype, Version 3.6 (TeX Live 2014) +--- +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.22:1125' --- -> ' TeX output 2014.05.01:1345' +> ' TeX output 2015.04.12:1623' + : PASS: etexdir/etriptest diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 81af3e95aa9..2ab67db21a1 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2015-04-12 Peter Breitenlohner + + * euptrip/euptrip.diffs: Updated for TL 2015. + 2014-12-12 Peter Breitenlohner * euptriptest: Complain early if (e)trip.fmt is not created. diff --git a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs index 584b917515c..f8ef75d4b7d 100644 --- a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs +++ b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs @@ -8,12 +8,13 @@ + ln -s SRCDIR/triptrap/trip.tex . + rm -f trip.log + ./euptex --progname=eupinitex --ini ++ test '!' -s trip.fmt + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log cuptripin.log 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> 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 +> This is e-upTeX, Version 3.14159265-p3.6-u1.20-141210-2.6 (utf8.uptex) (TeX Live 2015) (INITEX) 12 APR 2015 16:22 3,11c3 < (trip.tex < ! Bad character code (256). @@ -37,8 +38,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.5.1) -> 1617 strings of total length 27832 +> (preloaded format=trip 2015.4.12) +> 1627 strings of total length 28005 > 489 memory locations dumped; current usage is 110&278 > 393 multiletter control sequences 461c454 @@ -54,7 +55,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) +> This is e-upTeX, Version 3.14159265-p3.6-u1.20-141210-2.6 (utf8.uptex) (TeX Live 2015) (preloaded format=euptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -68,7 +69,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.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:45 +> This is e-upTeX, Version 3.14159265-p3.6-u1.20-141210-2.6 (utf8.uptex) (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:22 3c3 < (trip.tex ## --- @@ -332,8 +333,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1683 -> 261 string characters out of 8168 +> 44 strings out of 1673 +> 261 string characters out of 7995 > 4017 words of memory out of 4500 > 424 multiletter control sequences out of 15000+0 7301c7310 @@ -346,11 +347,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2014) +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.05.01:1345' +> ' TeX output 2015.04.12:1622' 419c419 < 1121: down4 639342208 --- @@ -361,10 +362,12 @@ --- > 2535: y4 203921756 > 2540: y0 203921756 ++ mv trip.fmt ctrip.fmt + echo '*** TRIP test for e-upTeX in extended mode ***.' *** TRIP test for e-upTeX in extended mode ***. + rm -f trip.log + ./euptex --progname=eupinitex --ini ++ test '!' -s trip.fmt + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log xuptripin.log 1,11c1,4 @@ -380,7 +383,7 @@ < I changed this one to zero. < --- -> 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 +> This is e-upTeX, Version 3.14159265-p3.6-u1.20-141210-2.6 (utf8.uptex) (TeX Live 2015) (INITEX) 12 APR 2015 16:22 > entering extended mode > ***\input trip > (./trip.tex @@ -402,10 +405,10 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.5.1) -> 1617 strings of total length 27832 +> (preloaded format=trip 2015.4.12) +> 1627 strings of total length 28005 > 536 memory locations dumped; current usage is 157&278 -> 468 multiletter control sequences +> 471 multiletter control sequences 461c449 < Hyphenation trie of length 273 has 9 ops out of 500 --- @@ -419,7 +422,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) +> This is e-upTeX, Version 3.14159265-p3.6-u1.20-141210-2.6 (utf8.uptex) (TeX Live 2015) (preloaded format=euptex) > **entering extended mode > ## (./trip.tex 17c17 @@ -440,7 +443,7 @@ < ** &trip trip < (trip.tex ## --- -> 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 +> This is e-upTeX, Version 3.14159265-p3.6-u1.20-141210-2.6 (utf8.uptex) (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:22 > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex @@ -768,10 +771,10 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1683 -> 261 string characters out of 8168 +> 44 strings out of 1673 +> 261 string characters out of 7995 > 4017 words of memory out of 4500 -> 499 multiletter control sequences out of 15000+0 +> 502 multiletter control sequences out of 15000+0 7301,7302c7307,7308 < 2 hyphenation exceptions out of 307 < 7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s @@ -784,11 +787,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2014) +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.05.01:1345' +> ' TeX output 2015.04.12:1622' 419c419 < 1121: down4 639342208 --- @@ -799,6 +802,7 @@ --- > 2535: y4 203921756 > 2540: y0 203921756 ++ mv trip.fmt xtrip.fmt + echo '*** e-TeX specific part of e-TRIP test for e-upTeX ***.' *** e-TeX specific part of e-TRIP test for e-upTeX ***. + ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm @@ -806,34 +810,35 @@ + diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl + ln -s SRCDIR/eptexdir/eptrip/eptrip.tex etrip.tex + ./euptex --progname=eupinitex --ini ++ test '!' -s etrip.fmt + sed 's/, yoko direction//;s/yoko direction, //' etrip.log + diff SRCDIR/etexdir/etrip/etripin.log euptripin.log 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.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 +> This is e-upTeX, Version 3.14159265-p3.6-u1.20-141210-2.6 (utf8.uptex) (TeX Live 2015) (INITEX) 12 APR 2015 16:22 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 --- -> (preloaded format=etrip 2014.5.1) -> 1618 strings of total length 27863 +> (preloaded format=etrip 2015.4.12) +> 1628 strings of total length 28036 > 284 memory locations dumped; current usage is 40&167 -> 468 multiletter control sequences +> 471 multiletter control sequences + ./euptex --progname=euptex + sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' etrip.log + diff SRCDIR/etexdir/etrip/etrip.fot euptrip.fot 1c1 < This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) --- -> This is e-upTeX, Version 3.14159265-p3.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) +> This is e-upTeX, Version 3.14159265-p3.6-u1.20-141210-2.6 (utf8.uptex) (TeX Live 2015) (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.5-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=etrip 2014.5.1) 1 MAY 2014 13:45 +> This is e-upTeX, Version 3.14159265-p3.6-u1.20-141210-2.6 (utf8.uptex) (TeX Live 2015) (preloaded format=etrip 2015.4.12) 12 APR 2015 16:22 2210,2215d2209 < ! Bad character code (256). < l.676 \iffontchar\font 256 @@ -845,18 +850,22 @@ < 19 strings out of 1692 < 145 string characters out of 8157 --- -> 19 strings out of 1682 -> 145 string characters out of 8137 +> 19 strings out of 1672 +> 145 string characters out of 7964 4424c4418 < 463 multiletter control sequences out of 15000+0 --- -> 469 multiletter control sequences out of 15000+0 +> 472 multiletter control sequences out of 15000+0 + 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 euptrip.typ +1c1 +< This is DVItype, Version 3.6 (TeX Live 2014) +--- +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.22:1125' --- -> ' TeX output 2014.05.01:1345' +> ' TeX output 2015.04.12:1622' + : PASS: euptexdir/euptriptest diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index a5de2388a58..ec2a4e5580e 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2015-04-12 Peter Breitenlohner + + * ptrip/ptrip.diffs: Updated for TL 2015. + 2015-03-14 Karl Berry * ptex-base.ch (pTeX_version_string): bump to 3.6 (per Akira). diff --git a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs index a5aa190e8f6..a94d85a869e 100644 --- a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs +++ b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs @@ -8,12 +8,13 @@ + ln -s SRCDIR/triptrap/trip.tex . + rm -f trip.log + ./ptex --progname=pinitex --ini ++ test '!' -s trip.fmt + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log ptripin.log 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is pTeX, Version 3.14159265-p3.5 (utf8.euc) (TeX Live 2014) (INITEX) 1 MAY 2014 13:44 +> This is pTeX, Version 3.14159265-p3.6 (utf8.euc) (TeX Live 2015) (INITEX) 12 APR 2015 16:22 3c3 < (trip.tex --- @@ -33,8 +34,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.5.1) -> 1451 strings of total length 25480 +> (preloaded format=trip 2015.4.12) +> 1451 strings of total length 25481 > 485 memory locations dumped; current usage is 106&278 > 377 multiletter control sequences 461c462 @@ -50,7 +51,7 @@ < ** &trip trip < (trip.tex ## --- -> This is pTeX, Version 3.14159265-p3.5 (utf8.euc) (TeX Live 2014) (preloaded format=ptex) +> This is pTeX, Version 3.14159265-p3.6 (utf8.euc) (TeX Live 2015) (preloaded format=ptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -64,7 +65,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.5 (utf8.euc) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:44 +> This is pTeX, Version 3.14159265-p3.6 (utf8.euc) (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:22 3c3 < (trip.tex ## --- @@ -271,7 +272,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1549 -> 261 string characters out of 14520 +> 261 string characters out of 14519 > 4259 words of memory out of 4500 > 408 multiletter control sequences out of 15000+0 7301c7312 @@ -284,11 +285,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2014) +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.05.01:1344' +> ' TeX output 2015.04.12:1622' 419c419 < 1121: down4 639342208 --- diff --git a/Build/source/texk/web2c/triptrap/mftrap.diffs b/Build/source/texk/web2c/triptrap/mftrap.diffs index 7930f033ffc..35b00ea2c2f 100644 --- a/Build/source/texk/web2c/triptrap/mftrap.diffs +++ b/Build/source/texk/web2c/triptrap/mftrap.diffs @@ -2,12 +2,13 @@ >>> See SRCDIR/triptrap/mftrap.diffs for example of acceptable diffs. + ln -s SRCDIR/triptrap/trap.mf . + ./mf --progname=inimf ++ test '!' -s trap.base + mv trap.log mftrapin.log + diff SRCDIR/triptrap/mftrapin.log mftrapin.log 1c1 < This is METAFONT, Version 2.7182818 (INIMF) 7 JAN 2014 17:51 --- -> This is METAFONT, Version 2.7182818 (TeX Live 2014) (INIMF) 1 MAY 2014 13:44 +> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF) 12 APR 2015 16:22 150c150 < String usage 26&83 (891&11438 still untouched) --- @@ -16,8 +17,8 @@ < (preloaded base=trap 2014.1.7) < 1117 strings of total length 20614 --- -> (preloaded base=trap 2014.5.1) -> 1123 strings of total length 20612 +> (preloaded base=trap 2015.4.12) +> 1123 strings of total length 20613 + ./mf --progname=inimf + mv trap.log mftrap.log + mv trap.tfm mftrap.tfm @@ -27,21 +28,21 @@ < ** &trap trap < (trap.mf --- -> This is METAFONT, Version 2.7182818 (TeX Live 2014) (INIMF) +> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF) > **(trap.mf 39c38 < String usage 41&161 (815&7634 still untouched) --- -> String usage 50&202 (6300&75595 still untouched) +> String usage 50&202 (6300&75594 still untouched) + diff SRCDIR/triptrap/mftrap.log mftrap.log 1c1 < This is METAFONT, Version 2.7182818 (preloaded base=trap 2014.1.7) 7 JAN 2014 18:11 --- -> This is METAFONT, Version 2.7182818 (TeX Live 2014) (preloaded base=trap 2014.5.1) 1 MAY 2014 13:44 +> This is METAFONT, Version 2.7182818 (TeX Live 2015) (preloaded base=trap 2015.4.12) 12 APR 2015 16:22 1825c1825 < String usage 24&92 (858&11309 still untouched) --- -> String usage 30&119 (6346&79263 still untouched) +> String usage 30&119 (6346&79262 still untouched) 3693,3695c3693,3695 < xpart %CAPSULE1359=xx < %CAPSULE1367=2yy-2 @@ -141,13 +142,13 @@ 4235c4235 < String usage 41&161 (815&7634 still untouched) --- -> String usage 50&202 (6300&75595 still untouched) +> String usage 50&202 (6300&75594 still untouched) 4251,4252c4251,4252 < 68 strings out of 883 < 3752 string characters out of 11386 --- > 77 strings out of 6377 -> 3793 string characters out of 79388 +> 3793 string characters out of 79387 4254,4255c4254,4255 < 289 symbolic tokens out of 2100 < 8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b @@ -165,11 +166,11 @@ 1c1 < This is GFtype, Version 3.1 --- -> This is GFtype, Version 3.1 (TeX Live 2014) +> This is GFtype, Version 3.1 (TeX Live 2015) 3c3 < ' METAFONT output 2014.01.07:1811' --- -> ' METAFONT output 2014.05.01:1344' +> ' METAFONT output 2015.04.12:1622' + for f in mftrapin.log mftrap.fot mftrap.log trap.typ + sed SRCDIR/triptrap/mftrapin.log -f filter + sed mftrapin.log -f filter diff --git a/Build/source/texk/web2c/triptrap/mptrap.diffs b/Build/source/texk/web2c/triptrap/mptrap.diffs index 4c72157bd88..870e2be6008 100644 --- a/Build/source/texk/web2c/triptrap/mptrap.diffs +++ b/Build/source/texk/web2c/triptrap/mptrap.diffs @@ -3,13 +3,13 @@ + ./pltotf SRCDIR/triptrap/trapf.pl trapf.tfm + ln -s SRCDIR/triptrap/mtrap.mp . + ./mpost --ini mtrap -This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) +This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) (./mtrap.mp + diff SRCDIR/triptrap/mtrap.log mtrap.log 1c1 < This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP) 25 MAY 2009 12:47 --- -> This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) 1 MAY 2014 13:44 +> This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) 12 APR 2015 16:22 4,5c4,5 < Memory usage 19&13 (3972 still untouched) < String usage 3&12 (101&7774 now untouched) @@ -185,7 +185,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) 929c929 < >> "%%Creator: MetaPost 1.203" --- -> >> "%%Creator: MetaPost 1.902" +> >> "%%Creator: MetaPost 1.999" 931c931 < >> "%*Font: trapf 9.9628 9.96265 35:c008" --- @@ -227,7 +227,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) 978c978 < >> "%%CreationDate: 2009.05.25:1247" --- -> >> "%%CreationDate: 2014.05.01:1344" +> >> "%%CreationDate: 2015.04.12:1622" 982,984c982,984 < >> "%*Font: trapf 9.9628 9.96265 35:c008" < Memory usage 359&13 (2867 still untouched) @@ -278,7 +278,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) --- > 173 strings using 2917 characters > 18856 bytes of node memory -> 315 symbolic tokens +> 317 symbolic tokens > 6i,48n,6p,99b,2f stack positions out of 16i,96n,7p,200b,4f 1082a1081 > @@ -287,8 +287,8 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) < %%Creator: MetaPost 1.203 < %%CreationDate: 2009.05.25:1247 --- -> %%Creator: MetaPost 1.902 -> %%CreationDate: 2014.05.01:1344 +> %%Creator: MetaPost 1.999 +> %%CreationDate: 2015.04.12:1622 7c7 < %*Font: trapf 9.9628 9.96265 35:c008 --- @@ -308,8 +308,8 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) < %%Creator: MetaPost 1.203 < %%CreationDate: 2009.05.25:1247 --- -> %%Creator: MetaPost 1.902 -> %%CreationDate: 2014.05.01:1344 +> %%Creator: MetaPost 1.999 +> %%CreationDate: 2015.04.12:1622 23,25c23,24 < 0 0 0 setrgbcolor 1 < 0 dtransform exch truncate exch idtransform pop setlinewidth [] 0 setdash @@ -337,14 +337,8 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) 1c1 < This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP) 25 MAY 2009 12:47 --- -> This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) 1 MAY 2014 13:44 -32,34c32 -< << == >> ::: ||`` ''--!! ??## && @@ $$[[]]{{ }}(([][]))=numeric -< << == >> ::: ||`` ''--!! ??## && @@ $$[[]]{{ }}((5.5 0.5))=<< == >> ::: ||`` '' -< --!! ??## && @@ $$[[]]{{ }}((5.5 0.5)) ---- -> > <<=tag -40,60c38,45 +> This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) 12 APR 2015 16:22 +40,60c40,47 < ! Missing `:' has been inserted. < < ; @@ -373,13 +367,13 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) > I'm not currently working on a for loop, > so I had better not try to end anything. > -> Memory usage 14048 +> Memory usage 14128 > String usage 6&49 -62c47 +62c49 < l.9 ... tracingcommands>2 endfor; showtoken |=:|>; --- > l.17 ...gspecs step 1 until $:fi endfor showstats; -65,98c50,52 +65,98c52,54 < ! Arithmetic overflow. < l.10 tracinglostchars:=1/.00001 < ; tracingequations:=$+1; p~=tracinglostchar... @@ -418,7 +412,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) > >> unknown path p~ > >> (0 > ! Equation cannot be performed (unknown path=numeric). -100,148c54,58 +100,148c56,60 < ; < l.12 ...utput:=tracingmacros:=1; $:=ASCII""; $:=x; < p~:=p~; @@ -474,12 +468,12 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) > 0)..controls (15,4) and (-15,-12)..(4,0); > I'm sorry, but I don't know how to make such things equal. > (See the two expressions just above the error message.) -150,151c60 +150,151c62 < >> 4 < ! OK. --- > ! Extra tokens will be flushed. -153,165c62,71 +153,165c64,73 < endgroup < l.17 ),2+2endtext < ; for n=tracingspecs step 1 until $:fi endfor showstats; @@ -504,7 +498,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) > now in front of anything that you don't want me to delete. > (See Chapter 27 of The METAFONTbook for an example.) > -167,191d72 +167,191d74 < {let} < {path} < {-(15)} @@ -530,7 +524,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) < {elseif} < {endinput} < {\} -194,198c75 +194,198c77 < Beginning to dump on file trap.mem < (mem=trap 2009.05.25) < at most 553 strings of total length 2302 diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs index b9be8885c31..e5b0d45dd36 100644 --- a/Build/source/texk/web2c/triptrap/trip.diffs +++ b/Build/source/texk/web2c/triptrap/trip.diffs @@ -5,12 +5,13 @@ + diff SRCDIR/triptrap/trip.pl trip.pl + ln -s SRCDIR/triptrap/trip.tex . + ./tex --progname=initex --ini ++ test '!' -s trip.fmt + mv trip.log tripin.log + diff SRCDIR/triptrap/tripin.log tripin.log 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is TeX, Version 3.14159265 (TeX Live 2014) (INITEX) 1 MAY 2014 13:44 +> This is TeX, Version 3.14159265 (TeX Live 2015) (INITEX) 12 APR 2015 16:22 3c3 < (trip.tex --- @@ -19,8 +20,8 @@ < (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 --- -> (preloaded format=trip 2014.5.1) -> 1371 strings of total length 24605 +> (preloaded format=trip 2015.4.12) +> 1371 strings of total length 24606 461c461 < Hyphenation trie of length 273 has 9 ops out of 500 --- @@ -32,13 +33,13 @@ < ** &trip trip < (trip.tex ## --- -> This is TeX, Version 3.14159265 (TeX Live 2014) (preloaded format=tex) +> This is TeX, Version 3.14159265 (TeX Live 2015) (preloaded format=tex) > **(./trip.tex ## + diff SRCDIR/triptrap/trip.log trip.log 1c1 < This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is TeX, Version 3.14159265 (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:44 +> This is TeX, Version 3.14159265 (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:22 3c3 < (trip.tex ## --- @@ -93,7 +94,7 @@ < 253 string characters out of 8354 --- > 44 strings out of 1629 -> 261 string characters out of 15395 +> 261 string characters out of 15394 7299c7303 < 372 multiletter control sequences out of 2100 --- @@ -108,11 +109,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2014) +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.05.01:1344' +> ' TeX output 2015.04.12:1622' 419c419 < 1121: down4 639342208 --- diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 9f2a24e617e..638448f123d 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2015-04-12 Peter Breitenlohner + + * uptrip/uptrip.diffs: Updated for TL 2015. + 2014-12-29 TANAKA Takuji * uptex-m.ch, kanji.c: diff --git a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs index 5d85726c7da..fc0f354ecd1 100644 --- a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs +++ b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs @@ -8,12 +8,13 @@ + ln -s SRCDIR/triptrap/trip.tex . + rm -f trip.log + ./uptex --progname=upinitex --ini ++ test '!' -s trip.fmt + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log uptripin.log 1c1 < This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is upTeX, Version 3.14159265-p3.5-u1.11 (utf8.uptex) (TeX Live 2014) (INITEX) 1 MAY 2014 13:45 +> This is upTeX, Version 3.14159265-p3.6-u1.20 (utf8.uptex) (TeX Live 2015) (INITEX) 12 APR 2015 16:22 3,11c3 < (trip.tex < ! Bad character code (256). @@ -37,8 +38,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2014.5.1) -> 1461 strings of total length 25501 +> (preloaded format=trip 2015.4.12) +> 1462 strings of total length 25505 > 485 memory locations dumped; current usage is 106&278 > 383 multiletter control sequences 461c454 @@ -54,7 +55,7 @@ < ** &trip trip < (trip.tex ## --- -> This is upTeX, Version 3.14159265-p3.5-u1.11 (utf8.uptex) (TeX Live 2014) (preloaded format=uptex) +> This is upTeX, Version 3.14159265-p3.6-u1.20 (utf8.uptex) (TeX Live 2015) (preloaded format=uptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -68,7 +69,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.5-u1.11 (utf8.uptex) (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:45 +> This is upTeX, Version 3.14159265-p3.6-u1.20 (utf8.uptex) (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:22 3c3 < (trip.tex ## --- @@ -304,8 +305,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1539 -> 261 string characters out of 14499 +> 44 strings out of 1538 +> 261 string characters out of 14495 > 4259 words of memory out of 4500 > 414 multiletter control sequences out of 15000+0 7301c7312 @@ -318,11 +319,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2014) +> This is DVItype, Version 3.6 (TeX Live 2015) 9c9 < ' TeX output 2014.01.07:0959' --- -> ' TeX output 2014.05.01:1345' +> ' TeX output 2015.04.12:1622' 419c419 < 1121: down4 639342208 --- -- cgit v1.2.3