diff options
author | Karl Berry <karl@freefriends.org> | 2021-01-30 01:42:07 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-01-30 01:42:07 +0000 |
commit | 0bf3e49d4d147727e1daf1007362a871972b214f (patch) | |
tree | 63a54dcf8830af3f1f4672589b1ebce917693e57 /Build/source/texk/web2c/etexdir | |
parent | 62203043f467d3a24b34f2df151b65e6ea35144b (diff) |
tuneup2021 from DEK, with adaptations for TL
git-svn-id: svn://tug.org/texlive/trunk@57558 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/etexdir')
-rw-r--r-- | Build/source/texk/web2c/etexdir/etex.ch | 23 | ||||
-rw-r--r-- | Build/source/texk/web2c/etexdir/etexextra.h | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/etexdir/etrip/etrip.diffs | 334 | ||||
-rw-r--r-- | Build/source/texk/web2c/etexdir/etrip/etrip.tex | 8 | ||||
-rw-r--r-- | Build/source/texk/web2c/etexdir/tex.ch0 | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/etexdir/tex.ech | 6 |
6 files changed, 276 insertions, 101 deletions
diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch index 742cbec47ab..cf0d56c6479 100644 --- a/Build/source/texk/web2c/etexdir/etex.ch +++ b/Build/source/texk/web2c/etexdir/etex.ch @@ -20,8 +20,9 @@ @x limbo l.1 - this is e-TeX % This program is copyright (C) 1982 by D. E. Knuth; all rights are reserved. -% Copying of this file is authorized only if (1) you are D. E. Knuth, or if -% (2) you make absolutely no changes to your copy. (The WEB system provides +% Unlimited copying and redistribution of this file are permitted as long +% as this file is not modified. Modifications are permitted, but only if +% the resulting file is not named tex.web. (The WEB system provides % for alterations via an auxiliary file; the master file should stay intact.) % See Appendix H of the WEB manual for hints on how to install this program. % And see Appendix A of the TRIP manual for details about how to validate it. @@ -189,16 +190,16 @@ known as `\eTeX'. @z %--------------------------------------- @x [1] m.2 l.190 - e-TeX basic -@d banner=='This is TeX, Version 3.14159265' {printed when \TeX\ starts} +@d banner=='This is TeX, Version 3.141592653' {printed when \TeX\ starts} @y @d eTeX_version=2 { \.{\\eTeXversion} } @d eTeX_revision==".6" { \.{\\eTeXrevision} } @d eTeX_version_string=='-2.6' {current \eTeX\ version} @# -@d eTeX_banner=='This is e-TeX, Version 3.14159265',eTeX_version_string +@d eTeX_banner=='This is e-TeX, Version 3.141592653',eTeX_version_string {printed when \eTeX\ starts} @# -@d TeX_banner=='This is TeX, Version 3.14159265' {printed when \TeX\ starts} +@d TeX_banner=='This is TeX, Version 3.141592653' {printed when \TeX\ starts} @# @d banner==eTeX_banner @# @@ -1490,9 +1491,9 @@ end @z %--------------------------------------- @x [29] m.536 l.10348 - e-TeX basic -print_two(time div 60); print_char(":"); print_two(time mod 60); +print_two(sys_time div 60); print_char(":"); print_two(sys_time mod 60); @y -print_two(time div 60); print_char(":"); print_two(time mod 60); +print_two(sys_time div 60); print_char(":"); print_two(sys_time mod 60); if eTeX_ex then begin; wlog_cr; wlog('entering extended mode'); end; @@ -1947,9 +1948,9 @@ LR_save:=LR_ptr; @z %--------------------------------------- @x [39] m.879 l.17293 - e-TeX TeXXeT - r:=q; {now |type(q)=glue_node|, |kern_node|, |math_node| or |penalty_node|} + r:=q; {now |type(q)=glue_node|, |kern_node|, |math_node|, or |penalty_node|} @y - r:=q; {now |type(q)=glue_node|, |kern_node|, |math_node| or |penalty_node|} + r:=q; {now |type(q)=glue_node|, |kern_node|, |math_node|, or |penalty_node|} if type(q)=math_node then if TeXXeT_en then @<Adjust \(t)the LR stack for the |post_line_break| routine@>; @z @@ -3019,9 +3020,9 @@ common_ending: define(u,set_font,f); eqtb[font_id_base+f]:=eqtb[u]; font_id_text @z %--------------------------------------- @x [49] m.1292 l.23633 - e-TeX show_groups - show_lists:print_esc("showlists"); + show_lists_code:print_esc("showlists"); @y - show_lists:print_esc("showlists"); + show_lists_code:print_esc("showlists"); @<Cases of |xray| for |print_cmd_chr|@>@;@/ @z %--------------------------------------- diff --git a/Build/source/texk/web2c/etexdir/etexextra.h b/Build/source/texk/web2c/etexdir/etexextra.h index 1ed4a35d67d..77a2a9d4246 100644 --- a/Build/source/texk/web2c/etexdir/etexextra.h +++ b/Build/source/texk/web2c/etexdir/etexextra.h @@ -20,7 +20,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <etexdir/etex_version.h> /* for ETEX_VERSION */ -#define BANNER "This is e-TeX, Version 3.14159265-" ETEX_VERSION +#define BANNER "This is e-TeX, Version 3.141592653-" ETEX_VERSION #define COPYRIGHT_HOLDER "Peter Breitenlohner et al" #define AUTHOR NULL #define PROGRAM_HELP ETEXHELP diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs index adf22fe7978..0c635a9e6b2 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs @@ -1,46 +1,105 @@ +#! /bin/sh -vx +# $Id: etriptest.test 45809 2017-11-15 00:36:56Z karl $ +# Copyright 2017 Karl Berry <tex-live@tug.org> +# Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org> +# You may freely use, modify and/or distribute this file. + +testdir=$abs_srcdir/triptrap ++ testdir=SRCDIR/triptrap +etestdir=$abs_srcdir/etexdir/etrip ++ etestdir=SRCDIR/etexdir/etrip + +TEXMFCNF=$etestdir; export TEXMFCNF ++ TEXMFCNF=SRCDIR/etexdir/etrip ++ export TEXMFCNF + +rm -rf etripdir ++ rm -rf etripdir +mkdir etripdir ++ mkdir etripdir +cd etripdir ++ cd etripdir + +dvitype_args="-output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*'" ++ dvitype_args='-output-level=2 -dpi=72.27 -page-start='\''*.*.*.*.*.*.*.*.*.*'\''' + +echo ">>> Running e-TRIP test for e-TeX." >&2 ++ echo '>>> Running e-TRIP test for e-TeX.' >>> Running e-TRIP test for e-TeX. +echo ">>> See $etestdir/etrip.diffs for example of acceptable diffs." >&2 ++ echo '>>> See SRCDIR/etexdir/etrip/etrip.diffs for example of acceptable diffs.' >>> See SRCDIR/etexdir/etrip/etrip.diffs for example of acceptable diffs. + +is_OK=: ++ is_OK=: + +set -x ++ set -x + +echo "*** TRIP test for e-TeX in compatibility mode ***." + echo '*** TRIP test for e-TeX in compatibility mode ***.' *** TRIP test for e-TeX in compatibility mode ***. + +./pltotf $testdir/trip.pl trip.tfm || exit 1 + ./pltotf SRCDIR/triptrap/trip.pl trip.tfm + +./tftopl ./trip.tfm trip.pl || exit 1 + ./tftopl ./trip.tfm trip.pl + +diff $testdir/trip.pl trip.pl || is_OK=false + diff SRCDIR/triptrap/trip.pl trip.pl + +# get same filename in log +$LN_S $testdir/trip.tex . + ln -s SRCDIR/triptrap/trip.tex . + +./etex --progname=einitex --ini <$testdir/trip1.in >ctripin.fot + ./etex --progname=einitex --ini +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by trip1.in, investigate!" >&2 + exit 1 +fi + test '!' -s trip.fmt +mv trip.log ctripin.log || exit 1 + mv trip.log ctripin.log +diff $testdir/tripin.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 TeX, Version 3.141592653 (INITEX) 4 JUL 1776 12:00 --- -> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2015) (INITEX) 12 APR 2015 16:23 +> This is e-TeX, Version 3.141592653-2.6 (TeX Live 2021/dev) (INITEX) 27 JAN 2021 18:01 3c3 < (trip.tex --- > (./trip.tex 450,453c450,453 -< (preloaded format=trip 2014.1.7) -< 1326 strings of total length 23646 +< (preloaded format=trip 1776.7.4) +< 1326 strings of total length 23633 < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (preloaded format=trip 2015.4.12) -> 1490 strings of total length 26227 +> (preloaded format=trip 2021.1.27) +> 1491 strings of total length 26266 > 479 memory locations dumped; current usage is 104&278 > 342 multiletter control sequences 461c461 < Hyphenation trie of length 273 has 9 ops out of 500 --- > Hyphenation trie of length 273 has 9 ops out of 35111 + +# May as well test non-ini second time through. +./etex --progname=etex <$testdir/trip2.in >ctrip.fot + ./etex --progname=etex +mv trip.log ctrip.log + mv trip.log ctrip.log +diff $testdir/trip.fot ctrip.fot + diff SRCDIR/triptrap/trip.fot ctrip.fot 1,3c1,2 -< This is TeX, Version 3.14159265 (INITEX) +< This is TeX, Version 3.141592653 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2015) (preloaded format=etex) +> This is e-TeX, Version 3.141592653-2.6 (TeX Live 2021/dev) (preloaded format=etex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -50,149 +109,157 @@ < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- > Memory usage before: 434&431; after: 376&418; still untouched: 178 + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $testdir/trip.log ctrip.log + diff SRCDIR/triptrap/trip.log ctrip.log 1c1 -< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 +< This is TeX, Version 3.141592653 (preloaded format=trip 1776.7.4) 4 JUL 1776 12:00 --- -> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:23 +> This is e-TeX, Version 3.141592653-2.6 (TeX Live 2021/dev) (preloaded format=trip 2021.1.27) 27 JAN 2021 18:01 3c3 < (trip.tex ## --- > (./trip.tex ## -58a59,62 -> \openout0 = `8terminal.tex'. -> -> \openout10 = `tripos.tex'. -> -73c77 +73c73 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 --- > Memory usage before: 185&313; after: 112&278; still untouched: 2612 -642c646 +642c642 < Memory usage before: 747&484; after: 581&481; still untouched: 1492 --- > Memory usage before: 1027&484; after: 795&481; still untouched: 1491 -815c819 +815c815 < Memory usage before: 475&470; after: 290&466; still untouched: 1473 --- > Memory usage before: 653&470; after: 384&466; still untouched: 1472 -915c919 +915c915 < Memory usage before: 218&459; after: 149&458; still untouched: 1473 --- > Memory usage before: 286&459; after: 181&458; still untouched: 1472 -1070c1074 +1070c1070 < Memory usage before: 118&328; after: 102&328; still untouched: 1473 --- > Memory usage before: 132&328; after: 110&328; still untouched: 1472 -1405c1409 +1405c1405 < \vbox(16383.99998+0.0)x1000.0, glue set 16342.0fil --- > \vbox(16383.99998+0.0)x1000.0, glue set 16341.99998fil -1511c1515 +1511c1511 < Memory usage before: 990&376; after: 584&370; still untouched: 735 --- > Memory usage before: 1396&376; after: 788&370; still untouched: 1472 -1954c1958 +1954c1954 < (tripos.tex --- > (./tripos.tex -2018c2022 +2018c2018 < \vbox(16383.99998+1.0)x100.0, glue set 16239.0fil --- > \vbox(16383.99998+1.0)x100.0, glue set 16238.99998fil -2189c2193 +2189c2189 < Memory usage before: 950&531; after: 546&448; still untouched: 706 --- > Memory usage before: 1400&531; after: 772&448; still untouched: 1443 -2533c2537 +2533c2533 < \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil --- > \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil -2575c2579 +2575c2575 < Memory usage before: 339&413; after: 236&405; still untouched: 706 --- > Memory usage before: 455&413; after: 296&405; still untouched: 1443 -3326c3330 +3326c3326 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil --- > \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil -3616c3620 +3616c3616 < Memory usage before: 2170&521; after: 1181&459; still untouched: 175 --- > Memory usage before: 3016&521; after: 1607&459; still untouched: 178 -3864c3868 +3864c3864 < \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil --- > \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil -3951c3955 +3951c3951 < Memory usage before: 640&415; after: 397&410; still untouched: 175 --- > Memory usage before: 888&415; after: 525&410; still untouched: 178 -4034c4038 +4034c4034 < \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil --- > \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil -4053c4057 +4053c4053 < Memory usage before: 235&401; after: 178&399; still untouched: 175 --- > Memory usage before: 307&401; after: 218&399; still untouched: 178 -4420c4424 +4420c4420 < \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil --- > \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil -4506c4510 +4506c4506 < Memory usage before: 651&432; after: 417&418; still untouched: 175 --- > Memory usage before: 941&432; after: 565&418; still untouched: 178 -4742c4746 +4742c4742 < \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil --- > \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil -4828c4832 +4828c4828 < Memory usage before: 776&458; after: 464&452; still untouched: 175 --- > Memory usage before: 1098&458; after: 630&452; still untouched: 178 -6380c6384 +6381c6381 < (tripos.tex --- > (./tripos.tex -6595c6599 +6596c6596 < Memory usage before: 819&428; after: 720&426; still untouched: 175 --- > Memory usage before: 1155&428; after: 1016&426; still untouched: 178 -7155c7159 +7156c7156 < Memory usage before: 895&439; after: 290&420; still untouched: 175 --- > Memory usage before: 1269&439; after: 374&420; still untouched: 178 -7288c7292 +7289c7289 < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- > Memory usage before: 434&431; after: 376&418; still untouched: 178 -7296,7299c7300,7303 +7297,7300c7297,7300 < 47 strings out of 1674 -< 253 string characters out of 8354 +< 253 string characters out of 8367 < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1810 -> 261 string characters out of 7773 +> 44 strings out of 1809 +> 261 string characters out of 7734 > 3821 words of memory out of 3999 > 373 multiletter control sequences out of 15000+0 -7301c7305 +7302c7302 < 2 hyphenation exceptions out of 307 --- > 1 hyphenation exception out of 659 + +mv tripos.tex ctripos.tex ++ mv tripos.tex ctripos.tex +diff $testdir/tripos.tex ctripos.tex ++ diff SRCDIR/triptrap/tripos.tex ctripos.tex + +eval ./dvitype $dvitype_args trip.dvi >ctrip.typ || exit 1 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi +./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' trip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi +$DIFF $DIFFFLAGS $testdir/trip.typ ctrip.typ + diff SRCDIR/triptrap/trip.typ ctrip.typ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2015) +> This is DVItype, Version 3.6 (TeX Live 2021/dev) 9c9 -< ' TeX output 2014.01.07:0959' +< ' TeX output 1776.07.04:1200' --- -> ' TeX output 2015.04.12:1623' +> ' TeX output 2021.01.27:1801' 419c419 < 1121: down4 639342208 --- @@ -203,12 +270,26 @@ --- > 2535: y4 203921756 > 2540: y0 203921756 + +mv trip.fmt ctrip.fmt + mv trip.fmt ctrip.fmt + +# ============================== + +echo "*** TRIP test for e-TeX in extended mode ***." + echo '*** TRIP test for e-TeX in extended mode ***.' *** TRIP test for e-TeX in extended mode ***. + +./etex --progname=einitex --ini <$etestdir/etrip1.in >xtripin.fot + ./etex --progname=einitex --ini +if test ! -s trip.fmt; then + echo "*** trip.fmt not created by etrip1.in, investigate!" >&2 + exit 1 +fi + test '!' -s trip.fmt +mv trip.log xtripin.log || exit 1 + mv trip.log xtripin.log +diff ctripin.log xtripin.log + diff ctripin.log xtripin.log 2c2,3 < **\input trip @@ -228,8 +309,13 @@ --- > 517 memory locations dumped; current usage is 142&278 > 408 multiletter control sequences + +# May as well test non-ini second time through. +./etex --progname=etex <$etestdir/trip2.in >xtrip.fot + ./etex --progname=etex +mv trip.log xtrip.log + mv trip.log xtrip.log +diff ctrip.fot xtrip.fot + diff ctrip.fot xtrip.fot 2c2,3 < **(./trip.tex ## @@ -244,6 +330,10 @@ > > ### semi simple group (level 1) entered at line 429 (begingroup) > ### bottom level + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS ctrip.log xtrip.log + diff ctrip.log xtrip.log 2,3c2,4 < ** &trip trip @@ -252,125 +342,209 @@ > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex -77c78 +73c74 < Memory usage before: 185&313; after: 112&278; still untouched: 2612 --- > Memory usage before: 185&313; after: 112&278; still untouched: 1612 -1773d1773 +1769d1769 < {restoring \fam=-1} -1783d1782 +1779d1778 < {restoring \displayindent=0.0pt} -1837d1835 +1833d1831 < {restoring \fam=-1} -2139c2137 +2135c2133 < .\hbox(0.0+0.0)x0.0, shifted 50.0 --- > .\hbox(0.0+0.0)x0.0, shifted 50.0, display -2142c2140 +2138c2136 < .\hbox(0.0+0.0)x0.0, shifted 100.0 --- > .\hbox(0.0+0.0)x0.0, shifted 100.0, display -2574c2572 +2570c2568 < .\hbox(0.0+0.0)x15.0, glue set 0.1875, shifted 5.0 --- > .\hbox(0.0+0.0)x15.0, glue set 0.1875, shifted 5.0, display -2839d2836 +2835d2832 < {restoring current font=\ip} -3227d3223 +3223d3219 < {restoring \fam=-1} -3376c3372 +3372c3368 < .\hbox(68.26251+98.15005)x19.0, glue set - 1.0, shifted 9.0 --- > .\hbox(68.26251+98.15005)x19.0, glue set - 1.0, shifted 9.0, display -3561c3557 +3557c3553 < .\hbox(20.5+50.80002)x8.27895, shifted 19.72105 --- > .\hbox(20.5+50.80002)x8.27895, shifted 19.72105, display -3770d3765 +3766d3761 < {restoring \fam=-1} -3843d3837 +3839d3833 < {restoring \fam=-1} -3899c3893 +3895c3889 < ..\hbox(12.0+4.0)x8.1778 --- > ..\hbox(12.0+4.0)x8.1778, display -3921c3915 +3917c3911 < ..\hbox(0.0+13.00002)x-0.1778, glue set - 57.67767fil --- > ..\hbox(0.0+13.00002)x-0.1778, glue set - 57.67767fil, display -3929c3923 +3925c3919 < ....\hbox(7.0+1.0)x5.0, shifted 47.5 --- > ....\hbox(7.0+1.0)x5.0, shifted 47.5, display -4015d4008 +4011d4004 < {restoring \fam=-1} -4051c4044 +4047c4040 < .\hbox(0.0+0.0)x1009.0, shifted 7227.0 --- > .\hbox(0.0+0.0)x1009.0, shifted 7227.0, display -4055c4048 +4051c4044 < .\hbox(0.0+0.0)x-7127.0, shifted 7227.0 --- > .\hbox(0.0+0.0)x-7127.0, shifted 7227.0, display -4849c4842 +4845c4838 < I'll pretend you didn't say \long or \outer or \global. --- > I'll pretend you didn't say \long or \outer or \global or \protected. -7295a7289,7291 +7292a7286,7288 > > ### semi simple group (level 1) entered at line 429 (begingroup) > ### bottom level -7303c7299 +7300c7296 < 373 multiletter control sequences out of 15000+0 --- > 439 multiletter control sequences out of 15000+0 -7306c7302 +7303c7299 < 7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s --- > 7i,7n,9p,136b,40s stack positions out of 200i,40n,60p,500b,600s + +mv tripos.tex xtripos.tex ++ mv tripos.tex xtripos.tex +diff $testdir/tripos.tex xtripos.tex ++ diff SRCDIR/triptrap/tripos.tex xtripos.tex + +eval ./dvitype $dvitype_args trip.dvi >xtrip.typ || exit 1 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' trip.dvi +./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' trip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' trip.dvi +$DIFF $DIFFFLAGS ctrip.typ xtrip.typ + diff ctrip.typ xtrip.typ + +mv trip.fmt xtrip.fmt + mv trip.fmt xtrip.fmt + +# ============================== + +echo "*** e-TeX specific part of e-TRIP test ***." + echo '*** e-TeX specific part of e-TRIP test ***.' *** e-TeX specific part of e-TRIP test ***. + +./pltotf $etestdir/etrip.pl etrip.tfm || exit 1 + ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm + +./tftopl ./etrip.tfm etrip.pl || exit 1 + ./tftopl ./etrip.tfm etrip.pl + +diff $etestdir/etrip.pl etrip.pl || is_OK=false + diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl + +# get same filename in log +$LN_S $etestdir/etrip.tex . + ln -s SRCDIR/etexdir/etrip/etrip.tex . + +./etex --progname=einitex --ini <$etestdir/etrip2.in >etripin.fot + ./etex --progname=einitex --ini +if test ! -s etrip.fmt; then + echo "*** etrip.fmt not created by etrip2.in, investigate!" >&2 + exit 1 +fi + test '!' -s etrip.fmt +mv etrip.log etripin.log || exit 1 + mv etrip.log etripin.log +diff $etestdir/etripin.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 2015) (INITEX) 12 APR 2015 16:23 -26c26 +> This is e-TeX, Version 3.141592653-2.6 (TeX Live 2021/dev) (INITEX) 27 JAN 2021 18:01 +26,27c26,27 < (preloaded format=etrip 2014.1.22) +< 1491 strings of total length 26258 --- -> (preloaded format=etrip 2015.4.12) +> (preloaded format=etrip 2021.1.27) +> 1492 strings of total length 26297 + +# May as well test non-ini second time through. +./etex --progname=etex <$etestdir/etrip3.in >etrip.fot + ./etex --progname=etex +diff $etestdir/etrip.fot etrip.fot + 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) +> This is e-TeX, Version 3.141592653-2.6 (TeX Live 2021/dev) (preloaded format=etex) +45,46d44 +< +< \openout1 = `etrip.out'. + +# We use $DIFF instead of `diff' only for those files where there +# might actually be legitimate numerical differences. +$DIFF $DIFFFLAGS $etestdir/etrip.log etrip.log + 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 2015) (preloaded format=etrip 2015.4.12) 12 APR 2015 16:23 +> This is e-TeX, Version 3.141592653-2.6 (TeX Live 2021/dev) (preloaded format=etrip 2021.1.27) 27 JAN 2021 18:01 +692,693d691 +< \openout1 = `etrip.out'. +< +1426c1424 +< this will be denominator of: +--- +> this will begin denominator of: +1450c1448 +< this will be denominator of: +--- +> this will begin denominator of: +1497c1495 +< this will be denominator of: +--- +> this will begin denominator of: +1545c1543 +< this will be denominator of: +--- +> this will begin denominator of: +4421,4422c4419,4420 +< 19 strings out of 1809 +< 145 string characters out of 7742 +--- +> 19 strings out of 1808 +> 145 string characters out of 7703 + +diff $etestdir/etrip.out etrip.out ++ diff SRCDIR/etexdir/etrip/etrip.out etrip.out + +eval ./dvitype $dvitype_args etrip.dvi >etrip.typ || exit 1 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi +./dvitype -output-level=2 -dpi=72.27 -page-start='*.*.*.*.*.*.*.*.*.*' etrip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi +$DIFF $DIFFFLAGS $etestdir/etrip.typ etrip.typ + 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) +> This is DVItype, Version 3.6 (TeX Live 2021/dev) 9c9 < ' TeX output 2014.01.22:1125' --- -> ' TeX output 2015.04.12:1623' +> ' TeX output 2021.01.27:1801' + +$is_OK || { + echo ">>> There were some errors." >&2 + exit 1 +} + : -PASS: etexdir/etriptest + +PASS etexdir/etriptest.test (exit status: 0) +PASS: etexdir/etriptest.test diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.tex b/Build/source/texk/web2c/etexdir/etrip/etrip.tex index 1ab15f7a708..bb688740f82 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.tex +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.tex @@ -1,16 +1,16 @@ -%%; This is `etrip.tex' for e-TeX v3.14159265-2.6 as of Jan 22, 2014. +%%; This is `etrip.tex' for e-TeX v3.141592653-2.6 as of Jan 28, 2021. %%; %%; This is a diabolical test file for e-TeX, an extension of TeX82. %%; It is not as diabolical as `trip.tex', Knuth's torture test for TeX. %%; -%%; ==>> Do not use this TeX code and its macros as an example <<== +%%; ==>> Do not use this TeX code and macros as an example of <<== %%; ==>> how you can make use of the new e-TeX features! It is <<== %%; ==>> meant to test these extensions and often uses slightly <<== %%; ==>> wrong e-TeX input to produce errors and warnings. <<== %%; \catcode`\{=1\catcode`\}=2\catcode`\#=6 \let\bgroup={ \let\egroup=} -\def\etripdate {2014-01-22} -\def\texversion {3.14159265} +\def\etripdate {2021-01-28} +\def\texversion {3.141592653} \def\etripversion{2.6} % \message{This is the e-Trip test [\etripdate] for diff --git a/Build/source/texk/web2c/etexdir/tex.ch0 b/Build/source/texk/web2c/etexdir/tex.ch0 index 775e75259f8..43370703dd4 100644 --- a/Build/source/texk/web2c/etexdir/tex.ch0 +++ b/Build/source/texk/web2c/etexdir/tex.ch0 @@ -4,11 +4,11 @@ % Public domain. @x [1.2] l.188 -@d TeX_banner=='This is TeX, Version 3.14159265' {printed when \TeX\ starts} +@d TeX_banner=='This is TeX, Version 3.141592653' {printed when \TeX\ starts} @# @d banner==eTeX_banner @y -@d banner=='This is TeX, Version 3.14159265' {printed when \TeX\ starts} +@d banner=='This is TeX, Version 3.141592653' {printed when \TeX\ starts} @z @x [17.236] l.4960 - first web2c, then e-TeX additional integer parameters diff --git a/Build/source/texk/web2c/etexdir/tex.ech b/Build/source/texk/web2c/etexdir/tex.ech index feaea51e9a4..9fa445db42c 100644 --- a/Build/source/texk/web2c/etexdir/tex.ech +++ b/Build/source/texk/web2c/etexdir/tex.ech @@ -35,10 +35,10 @@ % Consequently, changes in all these files have to be coordinated. @x [1] m.2 l.188 - Web2C: extensions imply we're not e-TeX -@d eTeX_banner=='This is e-TeX, Version 3.14159265',eTeX_version_string +@d eTeX_banner=='This is e-TeX, Version 3.141592653',eTeX_version_string @y -@d eTeX_banner_k=='This is e-TeXk, Version 3.14159265',eTeX_version_string -@d eTeX_banner=='This is e-TeX, Version 3.14159265',eTeX_version_string +@d eTeX_banner_k=='This is e-TeXk, Version 3.141592653',eTeX_version_string +@d eTeX_banner=='This is e-TeX, Version 3.141592653',eTeX_version_string @z @x [16.215] - e-TeX last_node_type |