diff options
Diffstat (limited to 'Build')
24 files changed, 552 insertions, 385 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 624998caee8..8a6d5e8e597 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2014-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * triptrap/trip.diffs: Updated for TeX 3.14159265. + 2014-01-20 Peter Breitenlohner <peb@mppmu.mpg.de> TeX tuneup of 2014. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 686c18bcc58..f27a29524d0 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -1808,8 +1808,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ ptexdir/ptrip/texmf.cnf $(eptex_tests) $(eptex_web_srcs) \ $(eptex_ch_srcs) eptexdir/eptex.defines eptexdir/ChangeLog \ eptexdir/Changes.txt eptexdir/README.txt \ - eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/etrip.log \ - eptexdir/eptrip/etrip.tex eptexdir/eptrip/texmf.cnf \ + eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/eptrip.log \ + eptexdir/eptrip/eptrip.tex eptexdir/eptrip/texmf.cnf \ $(uptex_tests) $(upweb_tests) $(uptex_web_srcs) \ $(uptex_ch_srcs) uptexdir/uptex.defines ptexdir/pbibtex.ch \ uptexdir/upbibtex.ch ptexdir/pdvitype.ch uptexdir/updvitype.ch \ @@ -1821,8 +1821,8 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \ uptexdir/uptrip/texmf.cnf $(euptex_tests) $(euptex_web_srcs) \ $(euptex_ch_srcs) euptexdir/euptex.defines euptexdir/COPYRIGHT \ euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \ - euptexdir/EUPTEX.txt eptexdir/eptrip/etrip.log \ - eptexdir/eptrip/etrip.tex euptexdir/euptrip/euptrip.diffs \ + euptexdir/EUPTEX.txt eptexdir/eptrip/eptrip.log \ + eptexdir/eptrip/eptrip.tex euptexdir/euptrip/euptrip.diffs \ euptexdir/euptrip/texmf.cnf pdftexdir/regex/COPYING.LIB \ pdftexdir/regex/README $(pdftex_ch_srcs) \ pdftexdir/pdftex.defines pdftexdir/ChangeLog pdftexdir/NEWS \ diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 7b41ad704cb..92af74ad6c8 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,10 @@ +2014-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * eptrip/etrip.{log,tex} (removed): Renamed ... + * eptrip/eptrip.{log,tex} (new): ... into these. + * eptriptest, am/eptex.am: Adapted. + * eptrip/eptrip.{diffs,log}: Updated for e-pTeX 3.14159265. + 2014-01-20 Peter Breitenlohner <peb@mppmu.mpg.de> TeX tuneup of 2014. diff --git a/Build/source/texk/web2c/eptexdir/am/eptex.am b/Build/source/texk/web2c/eptexdir/am/eptex.am index 22cf35bacb0..579e7542892 100644 --- a/Build/source/texk/web2c/eptexdir/am/eptex.am +++ b/Build/source/texk/web2c/eptexdir/am/eptex.am @@ -97,8 +97,8 @@ endif EPTEX ## eptexdir/eptriptest EXTRA_DIST += \ eptexdir/eptrip/eptrip.diffs \ - eptexdir/eptrip/etrip.log \ - eptexdir/eptrip/etrip.tex \ + eptexdir/eptrip/eptrip.log \ + eptexdir/eptrip/eptrip.tex \ eptexdir/eptrip/texmf.cnf eptrip.diffs: eptex$(EXEEXT) $(triptrap_diffs) $@ diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs index 83b488bba75..7d218b72a74 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs @@ -11,9 +11,9 @@ + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log cptripin.log 1c1 -< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 +> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 3c3 < (trip.tex --- @@ -28,13 +28,13 @@ > ### horizontal mode entered at line 77 (language255:hyph > enmin1,63) 450,453c451,454 -< (preloaded format=trip 2008.3.15) +< (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.11.21) -> 1607 strings of total length 27793 +> (preloaded format=trip 2014.1.22) +> 1607 strings of total length 27812 > 489 memory locations dumped; current usage is 110&278 > 387 multiletter control sequences 461c462 @@ -46,11 +46,11 @@ + sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log + diff SRCDIR/triptrap/trip.fot cptrip.fot 1,3c1,2 -< This is TeX, Version 3.1415926 (INITEX) +< This is TeX, Version 3.14159265 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) +> This is e-pTeX, Version 3.14159265-p3.4-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 @@ -62,9 +62,9 @@ > Memory usage before: 456&431; after: 394&418; still untouched: 483 + diff SRCDIR/triptrap/trip.log cptrip.log 1c1 -< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (format=trip 2013.11.21) 21 NOV 2013 10:53 +> 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 3c3 < (trip.tex ## --- @@ -299,7 +299,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1693 -> 261 string characters out of 8207 +> 261 string characters out of 8188 > 4017 words of memory out of 4500 > 418 multiletter control sequences out of 15000+0 7301c7310 @@ -314,9 +314,9 @@ --- > This is DVItype, Version 3.6 (TeX Live 2014) 9c9 -< ' TeX output 2008.03.15:0223' +< ' TeX output 2014.01.07:0959' --- -> ' TeX output 2013.11.21:1053' +> ' TeX output 2014.01.22:1137' 419c419 < 1121: down4 639342208 --- @@ -334,11 +334,11 @@ + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log xptripin.log 1,3c1,4 -< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 < **\input trip < (trip.tex --- -> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 +> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 > entering extended mode > ***\input trip > (./trip.tex @@ -359,13 +359,13 @@ > ### horizontal mode entered at line 77 (language255:hyph > enmin1,63) 450,453c446,449 -< (preloaded format=trip 2008.3.15) +< (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.11.21) -> 1607 strings of total length 27793 +> (preloaded format=trip 2014.1.22) +> 1607 strings of total length 27812 > 536 memory locations dumped; current usage is 157&278 > 462 multiletter control sequences 461c457 @@ -377,11 +377,11 @@ + sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log + diff SRCDIR/triptrap/trip.fot xptrip.fot 1,3c1,3 -< This is TeX, Version 3.1415926 (INITEX) +< This is TeX, Version 3.14159265 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) +> This is e-pTeX, Version 3.14159265-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=eptex) > **entering extended mode > ## (./trip.tex 17c17 @@ -398,11 +398,11 @@ > ### bottom level + diff SRCDIR/triptrap/trip.log xptrip.log 1,3c1,4 -< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (format=trip 2013.11.21) 21 NOV 2013 10:53 +> 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 > 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 8207 +> 261 string characters out of 8188 > 4017 words of memory out of 4500 > 493 multiletter control sequences out of 15000+0 7301,7302c7307,7308 @@ -718,9 +718,9 @@ --- > This is DVItype, Version 3.6 (TeX Live 2014) 9c9 -< ' TeX output 2008.03.15:0223' +< ' TeX output 2014.01.07:0959' --- -> ' TeX output 2013.11.21:1053' +> ' TeX output 2014.01.22:1137' 419c419 < 1121: down4 639342208 --- @@ -736,58 +736,40 @@ + ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm + ./tftopl ./etrip.tfm etrip.pl + diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl -+ ln -s SRCDIR/eptexdir/eptrip/etrip.tex . ++ ln -s SRCDIR/eptexdir/eptrip/eptrip.tex etrip.tex + ./eptex --progname=epinitex --ini + sed 's/, yoko direction//;s/yoko direction, //' etrip.log + diff SRCDIR/etexdir/etrip/etripin.log eptripin.log 1c1 -< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43 +< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25 --- -> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 -5c5 -< This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6. ---- -> This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6. +> 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 -< 1491 strings of total length 26239 -< 280 memory locations dumped; current usage is 36&166 +< 1491 strings of total length 26258 +< 281 memory locations dumped; current usage is 36&167 < 408 multiletter control sequences --- -> 1608 strings of total length 27824 -> 283 memory locations dumped; current usage is 40&166 +> 1608 strings of total length 27843 +> 284 memory locations dumped; current usage is 40&167 > 462 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.1415926-2.6 (TeX Live 2014) ---- -> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) -4c4 -< This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6. +< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) --- -> This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6. -+ diff SRCDIR/eptexdir/eptrip/etrip.log eptrip.log +> This is e-pTeX, Version 3.14159265-p3.4-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.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:43 ---- -> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:53 -4296,4297c4296,4297 -< 18 strings out of 1695 -< 140 string characters out of 8218 ---- -> 18 strings out of 1692 -> 140 string characters out of 8176 -4299c4299 -< 460 multiletter control sequences out of 15000+0 +< 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 --- -> 463 multiletter control sequences out of 15000+0 +> 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 + 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 2013.11.21:1043' +< ' TeX output 2014.01.22:1125' --- -> ' TeX output 2013.11.21:1053' +> ' TeX output 2014.01.22:1137' + : -PASS: eptexdir/eptrip.test +PASS: eptexdir/eptriptest diff --git a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.log index 7f0eebbe9a7..ee7da67d4fe 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.log @@ -1,8 +1,8 @@ -This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:53 +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 entering extended mode **&etrip etrip (./etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6. +This is the e-Trip test [2014-01-22] for e-TeX v3.14159265-2.6. (You are using e-TeX version/revision 2.6) Missing character: There is no b in font nullfont! @@ -200,7 +200,7 @@ Overfull \hbox (3.0pt too wide) in paragraph at lines 205--211 .\glue(\rightskip) 0.0 > \box0= -\vbox(30.00002+0.0)x0.0, yoko direction +\vbox(30.00002+0.0)x0.0 .\hbox(17.0+3.00002)x0.0 ..\hbox(0.0+0.0)x0.0 ..\trip a @@ -659,7 +659,7 @@ l.406 ...cted\def\1{\2}} \show\1 \1->\2 > \box0= -\vbox(0.0+0.0)x0.0, yoko direction +\vbox(0.0+0.0)x0.0 .\special{\1\2} ! OK. @@ -684,14 +684,14 @@ l.411 ...xpandafter\1\1} \show\5 Checking \scantokens, \tracingscantokens, \readline, and \everyeof: Completed box being shipped out [1] -\vbox(0.0+0.0)x0.0, yoko direction +\vbox(0.0+0.0)x0.0 .\openout1=etrip.out .\write1{\unexpanded \expandafter {\1}} .\closeout1 \openout1 = `etrip.out'. -Memory usage before: 57&183; after: 40&177; still untouched: 2171 +Memory usage before: 57&184; after: 40&178; still untouched: 2170 (./etrip.out) ( Warning: end of semi simple group (level 3) entered at line 433 of a dif ferent file @@ -960,7 +960,7 @@ Missing character: There is no e in font etrip! {false} {\showlists} -### yoko direction, restricted horizontal mode entered at line 470 +### restricted horizontal mode entered at line 470 \trip r \trip r (ligature up) \trip b @@ -971,7 +971,7 @@ Missing character: There is no e in font etrip! \glue 4.0 plus 2.0 minus 1.0 \trip s spacefactor 1000 -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -983,7 +983,7 @@ l.470 ...ox25=\hbox{\1\showlists {restoring \2=macro:->\begingroup \scantokens {\message \ETC.} {changing \box25=void} {into \box25= -\hbox(8.0+2.0)x9.0, yoko direction []} +\hbox(8.0+2.0)x9.0 []} {vertical mode: blank space } {end-group character }} {restoring \box25=void} @@ -998,15 +998,15 @@ Current marks: \splitfirstmarks 3=. \splitbotmarks 3=. > \box0= -\vbox(188.0+0.0)x10.0, yoko direction +\vbox(188.0+0.0)x10.0 .\mark{0-1} .\marks1{1-1} .\glue 1.0 -.\vbox(9.0+0.0)x0.0, yoko direction +.\vbox(9.0+0.0)x0.0 .\mark{0-2} .\marks3{} .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x0.0, yoko direction +.\hbox(0.0+0.0)x0.0 .\glue 5.0 .\glue 0.0 plus 1.0fil .\penalty 0 @@ -1014,18 +1014,18 @@ Current marks: .\mark{0-3} .\glue 1.0 .\glue(\lineskip) 0.0 -.\vbox(19.0+0.0)x0.0, yoko direction +.\vbox(19.0+0.0)x0.0 .\marks3{3-3} .\glue 3.0 plus 1.0fil .\penalty 0 .\glue 40.0 .\glue(\lineskip) 0.0 -.\vbox(30.0+0.0)x0.0, yoko direction +.\vbox(30.0+0.0)x0.0 .\glue 0.0 plus 1.0fil .\penalty 0 .\glue 40.0 .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x10.0, yoko direction +.\hbox(0.0+0.0)x10.0 ! OK. l.493 \1 \showbox0 @@ -1082,15 +1082,15 @@ Current marks: \splitfirstmarks 3=. \splitbotmarks 3=. > \box1= -\vbox(17.0+0.0)x0.0, glue set 2.0fil, yoko direction +\vbox(17.0+0.0)x0.0, glue set 2.0fil .\mark{0-1} .\marks1{1-1} .\glue 1.0 -.\vbox(9.0+0.0)x0.0, yoko direction +.\vbox(9.0+0.0)x0.0 .\mark{0-2} .\marks3{} .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x0.0, yoko direction +.\hbox(0.0+0.0)x0.0 .\glue 5.0 .\glue 0.0 plus 1.0fil @@ -1099,21 +1099,21 @@ l.495 \1 \showbox1 \showbox0 \let\3=\5 > \box0= -\vbox(132.0+0.0)x10.0, yoko direction +\vbox(132.0+0.0)x10.0 .\mark{0-3} .\glue(\splittopskip) 0.0 -.\vbox(19.0+0.0)x0.0, yoko direction +.\vbox(19.0+0.0)x0.0 .\marks3{3-3} .\glue 3.0 plus 1.0fil .\penalty 0 .\glue 40.0 .\glue(\lineskip) 0.0 -.\vbox(30.0+0.0)x0.0, yoko direction +.\vbox(30.0+0.0)x0.0 .\glue 0.0 plus 1.0fil .\penalty 0 .\glue 40.0 .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x10.0, yoko direction +.\hbox(0.0+0.0)x10.0 ! OK. l.495 \1 \showbox1 \showbox0 @@ -1128,10 +1128,10 @@ Current marks: \splitfirstmarks 3=3-3. \splitbotmarks 3=3-3. > \box1= -\vbox(27.0+0.0)x0.0, glue set 5.0fil, yoko direction +\vbox(27.0+0.0)x0.0, glue set 5.0fil .\mark{0-3} .\glue(\splittopskip) 0.0 -.\vbox(19.0+0.0)x0.0, yoko direction +.\vbox(19.0+0.0)x0.0 .\marks3{3-3} .\glue 3.0 plus 1.0fil @@ -1140,14 +1140,14 @@ l.497 \1 \showbox1 \showbox0 > \box0= -\vbox(70.0+0.0)x10.0, yoko direction +\vbox(70.0+0.0)x10.0 .\glue(\splittopskip) 0.0 -.\vbox(30.0+0.0)x0.0, yoko direction +.\vbox(30.0+0.0)x0.0 .\glue 0.0 plus 1.0fil .\penalty 0 .\glue 40.0 .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x10.0, yoko direction +.\hbox(0.0+0.0)x10.0 ! OK. l.497 \1 \showbox1 \showbox0 @@ -1162,9 +1162,9 @@ Current marks: \splitfirstmarks 3=. \splitbotmarks 3=. > \box1= -\vbox(37.0+0.0)x0.0, glue set 7.0fil, yoko direction +\vbox(37.0+0.0)x0.0, glue set 7.0fil .\glue(\splittopskip) 0.0 -.\vbox(30.0+0.0)x0.0, yoko direction +.\vbox(30.0+0.0)x0.0 .\glue 0.0 plus 1.0fil ! OK. @@ -1172,9 +1172,9 @@ l.499 \1 \showbox1 \showbox0 > \box0= -\vbox(0.0+0.0)x10.0, yoko direction +\vbox(0.0+0.0)x10.0 .\glue(\splittopskip) 0.0 -.\hbox(0.0+0.0)x10.0, yoko direction +.\hbox(0.0+0.0)x10.0 ! OK. l.499 \1 \showbox1 \showbox0 @@ -1203,15 +1203,15 @@ Current marks: \firstmarks 3=. \botmarks 3=. > \box255= -\vbox(35.0+0.0)x0.0, glue set 21.0fil, yoko direction +\vbox(35.0+0.0)x0.0, glue set 21.0fil .\mark{0-1} .\marks1{1-1} .\glue(\topskip) 0.0 -.\vbox(9.0+0.0)x0.0, yoko direction +.\vbox(9.0+0.0)x0.0 .\mark{0-2} .\marks3{} .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x0.0, yoko direction +.\hbox(0.0+0.0)x0.0 .\glue 5.0 .\glue 0.0 plus 1.0fil @@ -1233,10 +1233,10 @@ Current marks: \firstmarks 3=3-3. \botmarks 3=3-3. > \box255= -\vbox(35.0+0.0)x0.0, glue set 13.0fil, yoko direction +\vbox(35.0+0.0)x0.0, glue set 13.0fil .\mark{0-3} .\glue(\topskip) 0.0 -.\vbox(19.0+0.0)x0.0, yoko direction +.\vbox(19.0+0.0)x0.0 .\marks3{3-3} .\glue 3.0 plus 1.0fil @@ -1258,9 +1258,9 @@ Current marks: \firstmarks 3=3-3. \botmarks 3=3-3. > \box255= -\vbox(35.0+0.0)x0.0, glue set 5.0fil, yoko direction +\vbox(35.0+0.0)x0.0, glue set 5.0fil .\glue(\topskip) 0.0 -.\vbox(30.0+0.0)x0.0, yoko direction +.\vbox(30.0+0.0)x0.0 .\glue 0.0 plus 1.0fil ! OK. @@ -1281,9 +1281,9 @@ Current marks: \firstmarks 3=. \botmarks 3=. > \box255= -\vbox(35.0+0.0)x10.0, glue set 35.0fil, yoko direction +\vbox(35.0+0.0)x10.0, glue set 35.0fil .\glue(\topskip) 0.0 -.\hbox(0.0+0.0)x10.0, yoko direction +.\hbox(0.0+0.0)x10.0 .\mark{} .\marks1{} .\marks3{} @@ -1307,9 +1307,9 @@ Current marks: \firstmarks 3=. \botmarks 3=. > \box255= -\vbox(35.0+0.0)x0.0, glue set 35.0fil, yoko direction +\vbox(35.0+0.0)x0.0, glue set 35.0fil .\glue(\topskip) 0.0 -.\hbox(0.0+0.0)x0.0, yoko direction +.\hbox(0.0+0.0)x0.0 .\mark{} .\marks1{} .\marks3{} @@ -1333,9 +1333,9 @@ Current marks: \firstmarks 3=. \botmarks 3=. > \box255= -\vbox(35.0+0.0)x0.0, glue set 35.0fil, yoko direction +\vbox(35.0+0.0)x0.0, glue set 35.0fil .\glue(\topskip) 0.0 -.\hbox(0.0+0.0)x0.0, yoko direction +.\hbox(0.0+0.0)x0.0 .\glue 0.0 plus 1.0fil ! OK. @@ -1420,7 +1420,7 @@ I've inserted a begin-math/end-math symbol since I think you left one out. Proceed, with fingers crossed. -### yoko(math) direction, math mode entered at line 524 +### math mode entered at line 524 \mathord .\fam1 r this will be denominator of: @@ -1434,7 +1434,7 @@ this will be denominator of: \\middle"142342 \\mathord \.\fam1 q -### yoko(math) direction, math mode entered at line 521 +### math mode entered at line 521 \left"161361 \mathord .\fam1 p @@ -1444,7 +1444,7 @@ this will be denominator of: \middle"142342 \mathord .\fam1 q -### yoko(math) direction, math mode entered at line 517 +### math mode entered at line 517 \mathord .\fam1 r this will be denominator of: @@ -1452,14 +1452,14 @@ this will be denominator of: \\left"161361 \\mathord \.\fam1 q -### yoko(math) direction, math mode entered at line 516 +### math mode entered at line 516 \left"161361 \mathord .\fam1 p -### yoko(math) direction, math mode entered at line 515 -### yoko direction, restricted horizontal mode entered at line 514 +### math mode entered at line 515 +### restricted horizontal mode entered at line 514 spacefactor 1000 -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1467,7 +1467,7 @@ l.525 ... \over r\showlists -### yoko(math) direction, math mode entered at line 521 +### math mode entered at line 521 \left"161361 \mathord .\fam1 p @@ -1491,7 +1491,7 @@ l.525 ... \over r\showlists ./\mathord ./.\fam1 r .\right"162362 -### yoko(math) direction, math mode entered at line 517 +### math mode entered at line 517 \mathord .\fam1 r this will be denominator of: @@ -1499,14 +1499,14 @@ this will be denominator of: \\left"161361 \\mathord \.\fam1 q -### yoko(math) direction, math mode entered at line 516 +### math mode entered at line 516 \left"161361 \mathord .\fam1 p -### yoko(math) direction, math mode entered at line 515 -### yoko direction, restricted horizontal mode entered at line 514 +### math mode entered at line 515 +### restricted horizontal mode entered at line 514 spacefactor 1000 -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1514,7 +1514,7 @@ l.526 ... \right]\showlists -### yoko(math) direction, math mode entered at line 517 +### math mode entered at line 517 \mathord .\fam1 r \mathinner @@ -1547,14 +1547,14 @@ this will be denominator of: \\left"161361 \\mathord \.\fam1 q -### yoko(math) direction, math mode entered at line 516 +### math mode entered at line 516 \left"161361 \mathord .\fam1 p -### yoko(math) direction, math mode entered at line 515 -### yoko direction, restricted horizontal mode entered at line 514 +### math mode entered at line 515 +### restricted horizontal mode entered at line 514 spacefactor 1000 -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1562,7 +1562,7 @@ l.527 ... \right]\showlists -### yoko(math) direction, math mode entered at line 516 +### math mode entered at line 516 \left"161361 \mathord .\fam1 p @@ -1599,10 +1599,10 @@ l.527 ... \right]\showlists ./..\right"162362 ./.\right"162362 .\right"162362 -### yoko(math) direction, math mode entered at line 515 -### yoko direction, restricted horizontal mode entered at line 514 +### math mode entered at line 515 +### restricted horizontal mode entered at line 514 spacefactor 1000 -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1610,7 +1610,7 @@ l.528 \right]\showlists -### yoko(math) direction, math mode entered at line 515 +### math mode entered at line 515 \mathinner .\left"161361 .\mathord @@ -1649,9 +1649,9 @@ l.528 \right]\showlists ../.\right"162362 ..\right"162362 .\right"162362 -### yoko direction, restricted horizontal mode entered at line 514 +### restricted horizontal mode entered at line 514 spacefactor 1000 -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1659,7 +1659,7 @@ l.529 \right]\showlists -### yoko direction, restricted horizontal mode entered at line 514 +### restricted horizontal mode entered at line 514 \mathon \hbox(30.99977+16.99977)x80.99994 .\hbox(14.00002+2.0)x6.00002, shifted -0.99998 @@ -1862,7 +1862,7 @@ l.529 \right]\showlists ...\trip B \mathoff spacefactor 1000 -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1870,7 +1870,7 @@ l.530 $\showlists -### yoko direction, restricted horizontal mode entered at line 532 +### restricted horizontal mode entered at line 532 \mathon \hbox(17.0+3.00002)x19.00002 .\hbox(14.00002+2.0)x6.00002, shifted -0.99998 @@ -1878,7 +1878,7 @@ l.530 $\showlists .\hbox(16.0+4.00002)x6.0, shifted -1.0 ..\bigtrip B .\trip p -.\hbox(0.0+0.0)x0.0, shifted -16.5, yoko direction +.\hbox(0.0+0.0)x0.0, shifted -16.5 .\vbox(-1.00002+20.99998)x7.0, shifted -18.0 ..\hbox(-1.00002+2.0)x7.0 ...\trip ^^@ @@ -1890,7 +1890,7 @@ l.530 $\showlists ...\trip B \mathoff spacefactor 1000 -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1898,12 +1898,12 @@ l.534 ...box{}\right]$\showlists } -### yoko direction, restricted horizontal mode entered at line 535 +### restricted horizontal mode entered at line 535 \mathon \hbox(17.99997+3.99997)x19.00002 .\hbox(14.00002+2.0)x6.00002, shifted -0.99998 ..\bigtrip a -.\hbox(0.0+0.0)x0.0, shifted 3.0, yoko direction +.\hbox(0.0+0.0)x0.0, shifted 3.0 .\hbox(16.0+4.00002)x6.0, shifted -1.0 ..\bigtrip B .\trip s @@ -1922,7 +1922,7 @@ l.534 ...box{}\right]$\showlists ...\trip B \mathoff spacefactor 1000 -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1941,7 +1941,7 @@ Checking TeX--XeT enhancements: .\beginR .\kern 3.0 .\penalty 0 -.\hbox(0.0+0.0)x0.0, yoko direction +.\hbox(0.0+0.0)x0.0 .\kern 3.0 .\kern 0.0 .\endR @@ -1965,7 +1965,7 @@ Checking TeX--XeT enhancements: .\glue(\rightskip) 0.0 > \box0= -\vbox(0.0+0.0)x10.0, yoko direction +\vbox(0.0+0.0)x10.0 .\hbox(0.0+0.0)x10.0, glue set 8.5fil ..\hbox(0.0+0.0)x0.5 ..\beginL @@ -1992,7 +1992,7 @@ Checking TeX--XeT enhancements: ..\beginR ..\kern 3.0 ..\penalty 0 -..\hbox(0.0+0.0)x0.0, yoko direction +..\hbox(0.0+0.0)x0.0 ..\kern 3.0 ..\kern 0.0 ..\endR @@ -2717,9 +2717,9 @@ since the result is out of range. Expr fraction rounding 3 OK [1] -Memory usage before: 58&321; after: 48&321; still untouched: 1171 +Memory usage before: 58&322; after: 48&322; still untouched: 1170 [1] -Memory usage before: 58&321; after: 48&321; still untouched: 1171 +Memory usage before: 58&322; after: 48&322; still untouched: 1170 Checking \mutoglue and \gluetomu: ! You can't use `\mutoglue' in vertical mode. l.905 \mutoglue @@ -3210,7 +3210,7 @@ l.1046 \showbox32100 > \box32101= -\hbox(0.0+0.0)x3.0, yoko direction +\hbox(0.0+0.0)x3.0 ! OK. l.1047 \showbox32101 @@ -3263,7 +3263,7 @@ Checking \lastlinefit: @@4: line 2.2- t=144 -> @@2 > \box0= -\vbox(0.0+0.0)x96.0, yoko direction +\vbox(0.0+0.0)x96.0 .\hbox(0.0+0.0)x96.0, glue set - 0.5 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x96.0, glue set 31.0fill [] @@ -3275,10 +3275,10 @@ l.1081 \lastlinefit=-1 \1 > \box0= -\hbox(0.0+0.0)x96.0, glue set 31.0fill, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x96.0, glue set 31.0fill +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 0.0 plus 1.0fill .\glue(\rightskip) 0.0 @@ -3306,7 +3306,7 @@ l.1081 \lastlinefit=-1 \1 @@4: line 2.2- t=148 s=31.0 a=-1.0 -> @@2 > \box0= -\vbox(0.0+0.0)x96.0, yoko direction +\vbox(0.0+0.0)x96.0 .\hbox(0.0+0.0)x96.0, glue set - 0.5 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x96.0, glue set - 0.25 [] @@ -3318,10 +3318,10 @@ l.1082 \lastlinefit=500 \1 > \box0= -\hbox(0.0+0.0)x96.0, glue set - 0.25, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x96.0, glue set - 0.25 +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 32.0 .\glue(\rightskip) 0.0 @@ -3349,7 +3349,7 @@ l.1082 \lastlinefit=500 \1 @@4: line 2.2- t=288 s=31.0 a=-2.0 -> @@2 > \box0= -\vbox(0.0+0.0)x96.0, yoko direction +\vbox(0.0+0.0)x96.0 .\hbox(0.0+0.0)x96.0, glue set - 0.5 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x96.0, glue set - 0.5 [] @@ -3361,10 +3361,10 @@ l.1083 \lastlinefit=1001 \1 > \box0= -\hbox(0.0+0.0)x96.0, glue set - 0.5, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x96.0, glue set - 0.5 +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 33.0 .\glue(\rightskip) 0.0 @@ -3400,7 +3400,7 @@ l.1083 \lastlinefit=1001 \1 @@5: line 5.2- t=0 -> @@4 > \box0= -\vbox(0.0+0.0)x98.0, yoko direction +\vbox(0.0+0.0)x98.0 .\hbox(0.0+0.0)x98.0, glue set 68.0fill [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x98.0, glue set 68.0fill [] @@ -3418,8 +3418,8 @@ l.1087 ... \lastlinefit=1000 \1 > \box0= -\hbox(0.0+0.0)x98.0, glue set 34.0fill, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x98.0, glue set 34.0fill +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 0.0 plus 1.0fill .\glue(\rightskip) 0.0 plus 1.0fill @@ -3447,7 +3447,7 @@ l.1087 ... \lastlinefit=1000 \1 @@4: line 2.2- t=4 s=33.0 a=-0.5 -> @@2 > \box0= -\vbox(0.0+0.0)x98.0, yoko direction +\vbox(0.0+0.0)x98.0 .\hbox(0.0+0.0)x98.0, glue set - 0.25 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x98.0, glue set - 0.125 [] @@ -3459,11 +3459,11 @@ l.1089 \lastlinefit=500 \1 > \box0= -\hbox(0.0+0.0)x98.0, glue set - 0.125, yoko direction +\hbox(0.0+0.0)x98.0, glue set - 0.125 .\glue(\leftskip) 0.0 plus -1.0fill -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 33.5 .\glue(\rightskip) 0.0 plus 1.0fill @@ -3491,7 +3491,7 @@ l.1089 \lastlinefit=500 \1 @@4: line 2.2- t=8 s=33.0 a=-1.0 -> @@2 > \box0= -\vbox(0.0+0.0)x98.0, yoko direction +\vbox(0.0+0.0)x98.0 .\hbox(0.0+0.0)x98.0, glue set - 0.25 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x98.0, glue set - 0.25 [] @@ -3503,10 +3503,10 @@ l.1091 \lastlinefit=1000 \1 > \box0= -\hbox(0.0+0.0)x98.0, glue set - 0.25, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x98.0, glue set - 0.25 +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 34.0 .\glue(\rightskip) 0.0 @@ -3534,7 +3534,7 @@ l.1091 \lastlinefit=1000 \1 @@4: line 2.2- t=0 -> @@2 > \box0= -\vbox(0.0+0.0)x100.0, yoko direction +\vbox(0.0+0.0)x100.0 .\hbox(0.0+0.0)x100.0 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x100.0, glue set 35.0fill [] @@ -3546,10 +3546,10 @@ l.1093 \lastlinefit=0 \1 > \box0= -\hbox(0.0+0.0)x100.0, glue set 35.0fill, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x100.0, glue set 35.0fill +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 0.0 plus 1.0fill .\glue(\rightskip) 0.0 @@ -3577,7 +3577,7 @@ l.1093 \lastlinefit=0 \1 @@4: line 2.2- t=0 s=0.0 a=0.0 -> @@2 > \box0= -\vbox(0.0+0.0)x100.0, yoko direction +\vbox(0.0+0.0)x100.0 .\hbox(0.0+0.0)x100.0 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x100.0, glue set 35.0fill [] @@ -3589,10 +3589,10 @@ l.1094 \lastlinefit=500 \1 > \box0= -\hbox(0.0+0.0)x100.0, glue set 35.0fill, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x100.0, glue set 35.0fill +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 0.0 plus 1.0fill .\glue(\rightskip) 0.0 @@ -3620,7 +3620,7 @@ l.1094 \lastlinefit=500 \1 @@4: line 2.2- t=0 s=0.0 a=0.0 -> @@2 > \box0= -\vbox(0.0+0.0)x100.0, yoko direction +\vbox(0.0+0.0)x100.0 .\hbox(0.0+0.0)x100.0 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x100.0, glue set 35.0fill [] @@ -3632,10 +3632,10 @@ l.1095 \lastlinefit=1000 \1 > \box0= -\hbox(0.0+0.0)x100.0, glue set 35.0fill, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x100.0, glue set 35.0fill +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 0.0 plus 1.0fill .\glue(\rightskip) 0.0 @@ -3663,7 +3663,7 @@ l.1095 \lastlinefit=1000 \1 @@4: line 2.2- t=4 s=0.0 a=0.0 -> @@2 > \box0= -\vbox(0.0+0.0)x110.0, yoko direction +\vbox(0.0+0.0)x110.0 .\hbox(0.0+0.0)x110.0, glue set 0.25 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x110.0, glue set 45.0fill [] @@ -3675,11 +3675,11 @@ l.1099 ... \lastlinefit=1000 \1 > \box0= -\hbox(0.0+0.0)x110.0, glue set 45.0fill, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x110.0, glue set 45.0fill +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 .\glue 0.0 plus 1.0fil -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 0.0 plus 1.0fill .\glue(\rightskip) 0.0 @@ -3707,7 +3707,7 @@ l.1099 ... \lastlinefit=1000 \1 @@4: line 2.2- t=4 s=45.0 a=2.5 -> @@2 > \box0= -\vbox(0.0+0.0)x110.0, yoko direction +\vbox(0.0+0.0)x110.0 .\hbox(0.0+0.0)x110.0, glue set 0.25 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x110.0, glue set 0.125 [] @@ -3719,10 +3719,10 @@ l.1101 \lastlinefit=500 \1 > \box0= -\hbox(0.0+0.0)x110.0, glue set 0.125, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x110.0, glue set 0.125 +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 42.5 .\glue(\rightskip) 0.0 @@ -3750,7 +3750,7 @@ l.1101 \lastlinefit=500 \1 @@4: line 2.2- t=8 s=45.0 a=5.0 -> @@2 > \box0= -\vbox(0.0+0.0)x110.0, yoko direction +\vbox(0.0+0.0)x110.0 .\hbox(0.0+0.0)x110.0, glue set 0.25 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x110.0, glue set 0.25 [] @@ -3762,10 +3762,10 @@ l.1102 \lastlinefit=1000 \1 > \box0= -\hbox(0.0+0.0)x110.0, glue set 0.25, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x110.0, glue set 0.25 +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 40.0 .\glue(\rightskip) 0.0 @@ -3793,7 +3793,7 @@ l.1102 \lastlinefit=1000 \1 @@4: line 2.2- t=144 -> @@2 > \box0= -\vbox(0.0+0.0)x120.0, yoko direction +\vbox(0.0+0.0)x120.0 .\hbox(0.0+0.0)x120.0, glue set 0.5 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x120.0, glue set 55.0fill [] @@ -3805,10 +3805,10 @@ l.1104 \lastlinefit=0 \1 > \box0= -\hbox(0.0+0.0)x120.0, glue set 55.0fill, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x120.0, glue set 55.0fill +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 0.0 plus 1.0fill .\glue(\rightskip) 0.0 @@ -3836,7 +3836,7 @@ l.1104 \lastlinefit=0 \1 @@4: line 2.2- t=148 s=55.0 a=5.0 -> @@2 > \box0= -\vbox(0.0+0.0)x120.0, yoko direction +\vbox(0.0+0.0)x120.0 .\hbox(0.0+0.0)x120.0, glue set 0.5 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x120.0, glue set 0.25 [] @@ -3848,10 +3848,10 @@ l.1105 \lastlinefit=500 \1 > \box0= -\hbox(0.0+0.0)x120.0, glue set 0.25, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x120.0, glue set 0.25 +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 50.0 .\glue(\rightskip) 0.0 @@ -3879,7 +3879,7 @@ l.1105 \lastlinefit=500 \1 @@4: line 2.2- t=288 s=55.0 a=10.0 -> @@2 > \box0= -\vbox(0.0+0.0)x120.0, yoko direction +\vbox(0.0+0.0)x120.0 .\hbox(0.0+0.0)x120.0, glue set 0.5 [] .\glue(\baselineskip) 0.0 .\hbox(0.0+0.0)x120.0, glue set 0.5 [] @@ -3891,10 +3891,10 @@ l.1106 \lastlinefit=1000 \1 > \box0= -\hbox(0.0+0.0)x120.0, glue set 0.5, yoko direction -.\hbox(0.0+0.0)x30.0, yoko direction +\hbox(0.0+0.0)x120.0, glue set 0.5 +.\hbox(0.0+0.0)x30.0 .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0, yoko direction +.\hbox(0.0+0.0)x30.0 .\penalty 10000 .\glue(\parfillskip) 45.0 .\glue(\rightskip) 0.0 @@ -4021,7 +4021,7 @@ I've inserted a begin-math/end-math symbol since I think you left one out. Proceed, with fingers crossed. > \box27= -\vbox(0.0+0.0)x0.0, yoko direction +\vbox(0.0+0.0)x0.0 .\hbox(0.0+0.0)x0.0 ..\mathon ..\mathoff @@ -4042,17 +4042,17 @@ l.1149 \showbox27 > \box0= -\vbox(40.0+0.0)x0.0, yoko direction -.\vbox(20.0+0.0)x0.0, yoko direction -..\vbox(20.0+0.0)x0.0, yoko direction +\vbox(40.0+0.0)x0.0 +.\vbox(20.0+0.0)x0.0 +..\vbox(20.0+0.0)x0.0 ..\openout0=abc ..\penalty 0 ..\write1{write 1} -.\vbox(20.0+0.0)x0.0, yoko direction +.\vbox(20.0+0.0)x0.0 ..\write2{write 2} ..\closeout3 ..\glue(\splittopskip) 0.0 -..\vbox(20.0+0.0)x0.0, yoko direction +..\vbox(20.0+0.0)x0.0 ..\glue 0.0 plus 1.0fil ! OK. @@ -4062,18 +4062,18 @@ l.1177 \1 -1 20 \1 0 30 \1 1 20 \1 2 30 > \box0= -\vbox(50.0+0.0)x0.0, yoko direction -.\vbox(30.0+0.0)x0.0, yoko direction -..\vbox(20.0+0.0)x0.0, yoko direction +\vbox(50.0+0.0)x0.0 +.\vbox(30.0+0.0)x0.0 +..\vbox(20.0+0.0)x0.0 ..\openout0=abc ..\penalty 0 ..\write1{write 1} ..\glue 10.0 plus 1.0 minus 1.0 ..\write2{write 2} -.\vbox(20.0+0.0)x0.0, yoko direction +.\vbox(20.0+0.0)x0.0 ..\closeout3 ..\glue(\splittopskip) 0.0 -..\vbox(20.0+0.0)x0.0, yoko direction +..\vbox(20.0+0.0)x0.0 ..\glue 0.0 plus 1.0fil ! OK. @@ -4083,20 +4083,20 @@ l.1177 \1 -1 20 \1 0 30 \1 1 20 \1 2 30 > \box0= -\vbox(60.0+0.0)x0.0, yoko direction -.\vbox(20.0+0.0)x0.0, yoko direction -..\vbox(20.0+0.0)x0.0, yoko direction +\vbox(60.0+0.0)x0.0 +.\vbox(20.0+0.0)x0.0 +..\vbox(20.0+0.0)x0.0 ..\openout0=abc ..\penalty 0 ..\write1{write 1} .\glue 10.0 plus 1.0 minus 1.0 .\penalty 0 .\kern 10.0 -.\vbox(20.0+0.0)x0.0, yoko direction +.\vbox(20.0+0.0)x0.0 ..\write2{write 2} ..\closeout3 ..\glue(\splittopskip) 0.0 -..\vbox(20.0+0.0)x0.0, yoko direction +..\vbox(20.0+0.0)x0.0 ..\glue 0.0 plus 1.0fil ! OK. @@ -4106,9 +4106,9 @@ l.1177 ... \1 0 30 \1 1 20 \1 2 30 > \box0= -\vbox(60.0+0.0)x0.0, yoko direction -.\vbox(30.0+0.0)x0.0, yoko direction -..\vbox(20.0+0.0)x0.0, yoko direction +\vbox(60.0+0.0)x0.0 +.\vbox(30.0+0.0)x0.0 +..\vbox(20.0+0.0)x0.0 ..\openout0=abc ..\penalty 0 ..\write1{write 1} @@ -4116,10 +4116,10 @@ l.1177 ... \1 0 30 \1 1 20 ..\write2{write 2} .\penalty 0 .\kern 10.0 -.\vbox(20.0+0.0)x0.0, yoko direction +.\vbox(20.0+0.0)x0.0 ..\closeout3 ..\glue(\splittopskip) 0.0 -..\vbox(20.0+0.0)x0.0, yoko direction +..\vbox(20.0+0.0)x0.0 ..\glue 0.0 plus 1.0fil ! OK. @@ -4129,9 +4129,9 @@ l.1177 ... \1 1 20 \1 2 30 -### yoko direction, internal vertical mode entered at line 1186 +### internal vertical mode entered at line 1186 prevdepth ignored -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 ### recent contributions: \glue 0.0 plus 1.0fil \kern 20.0 @@ -4144,9 +4144,9 @@ l.1186 ...0 \vfil \kern 20 pt \1 \penalty -1 \1 -### yoko direction, internal vertical mode entered at line 1186 +### internal vertical mode entered at line 1186 prevdepth ignored -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -4156,9 +4156,9 @@ l.1186 ...0 pt \1 \penalty -1 \1 -### yoko direction, internal vertical mode entered at line 1187 +### internal vertical mode entered at line 1187 prevdepth ignored -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 ### recent contributions: \glue 0.0 plus 1.0fill \kern 2.0 @@ -4171,12 +4171,12 @@ l.1187 ...1 \vfill \kern 2 pt \1 \penalty 10 \1 -### yoko direction, internal vertical mode entered at line 1187 +### internal vertical mode entered at line 1187 \glue 0.0 plus 1.0fill \kern 2.0 \penalty 10 prevdepth ignored -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -4186,7 +4186,7 @@ l.1187 ...2 pt \1 \penalty 10 \1 > \box0= -\vbox(12.0+0.0)x0.0, yoko direction +\vbox(12.0+0.0)x0.0 .\kern 5.0 .\penalty 0 .\kern 7.0 @@ -4199,12 +4199,12 @@ l.1192 ...box {} \penalty -10000 > \box255= -\vbox(0.0+0.0)x0.0, yoko direction +\vbox(0.0+0.0)x0.0 .\write1{} .\write2{} .\write3{} .\glue(\topskip) 0.0 -.\hbox(0.0+0.0)x0.0, yoko direction +.\hbox(0.0+0.0)x0.0 ! OK. <output> ...wbox 0 \showbox 255 @@ -4213,10 +4213,10 @@ l.1192 ...box {} \penalty -10000 -### yoko direction, internal vertical mode entered at line 1193 +### internal vertical mode entered at line 1193 \penalty 10000 prevdepth ignored -### yoko direction, vertical mode entered at line 0 +### vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -4285,20 +4285,145 @@ laywidowpenalties: {restoring \interlinepenalties=3 101\ETC.} {changing \box0=void} {into \box0= -\vbox(0.0+0.0)x0.0, yoko direction} +\vbox(0.0+0.0)x0.0} {restoring \box0=void} {restoring \displaywidowpenalties=0} {restoring \widowpenalties=0} {restoring \clubpenalties=0} {restoring \interlinepenalties=0} +Checking hyphenation of LR and RL segments: + +Overfull \hbox (15.0pt too wide) in paragraph at lines 1256--1256 + \trip MM1 + +\hbox(0.0+0.0)x0.0, glue set - 1.0 +.\glue 4.0 plus 2.0 minus 1.0 +.\trip M +.\trip M +.\discretionary +.\trip 1 +.\trip 7 (ligature |) +.\glue(\rightskip) 0.0 + + +Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 +\trip MM + +\hbox(0.0+0.0)x0.0 +.\trip M +.\trip M +.\glue(\rightskip) 0.0 + + +Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 +[]\trip MM1[] + +\hbox(0.0+0.0)x0.0 +.\beginL +.\trip M +.\trip M +.\discretionary +.\trip 1 +.\trip 7 (ligature |) +.\endL +.\glue(\rightskip) 0.0 + + +Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 +[]\trip MM[] + +\hbox(0.0+0.0)x0.0 +.\beginL +.\trip M +.\trip M +.\endL +.\glue(\rightskip) 0.0 + + +Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 +[]\trip MM1[] + +\hbox(0.0+0.0)x0.0 +.\beginL +.\trip M +.\trip M +.\discretionary +.\trip 1 +.\trip 7 (ligature |) +.\endL +.\glue(\rightskip) 0.0 + + +Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 +[]\trip MM[] + +\hbox(0.0+0.0)x0.0 +.\beginL +.\trip M +.\trip M +.\endL +.\glue(\rightskip) 0.0 + + +Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 +[]\trip MM1[] + +\hbox(0.0+0.0)x0.0 +.\beginL +.\trip M +.\trip M +.\discretionary +.\trip 1 +.\trip 7 (ligature |) +.\endL +.\glue(\rightskip) 0.0 + + +Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 +[]\trip MM[] + +\hbox(0.0+0.0)x0.0 +.\beginL +.\trip M +.\trip M +.\endL +.\glue(\rightskip) 0.0 + + +Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 +[]\trip MM1[] + +\hbox(0.0+0.0)x0.0 +.\beginR +.\trip M +.\trip M +.\discretionary +.\trip 1 +.\trip 7 (ligature |) +.\endR +.\glue(\rightskip) 0.0 + + +Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 +[]\trip MM[] + +\hbox(0.0+0.0)x0.0 +.\beginR +.\trip M +.\trip M +.\endR +.\penalty 10000 +.\glue(\parfillskip) 0.0 +.\glue(\rightskip) 0.0 + ) Here is how much of TeX's memory you used: - 18 strings out of 1692 - 140 string characters out of 8176 - 3329 words of memory out of 4500 + 19 strings out of 1692 + 145 string characters out of 8157 + 3330 words of memory out of 4500 463 multiletter control sequences out of 15000+0 3796 words of font info for 5 fonts, out of 20000 for 75 - 9 hyphenation exceptions out of 659 + 10 hyphenation exceptions out of 659 10i,15n,8p,137b,79s stack positions out of 200i,40n,60p,500b,600s Output written on etrip.dvi (3 pages, 220 bytes). diff --git a/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.tex index fa267b9fe65..60590e17c02 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.tex @@ -1,4 +1,4 @@ -%%; This is `eptrip.tex' for e-pTeX v3.1415926-2.6 as of Mar 01, 2013. +%%; This is `eptrip.tex' for e-pTeX v3.14159265-2.6 as of Jan 22, 2014. %%; %%; This is a diabolical test file for e-pTeX, an extension of TeX82. %%; It is not as diabolical as `trip.tex', Knuth's torture test for TeX. @@ -9,8 +9,8 @@ %%; ==>> wrong e-TeX input to produce errors and warnings. <<== %%; \catcode`\{=1\catcode`\}=2\catcode`\#=6 \let\bgroup={ \let\egroup=} -\def\etripdate {2013-03-01} -\def\texversion {3.1415926} +\def\etripdate {2014-01-22} +\def\texversion {3.14159265} \def\etripversion{2.6} % \message{This is the e-Trip test [\etripdate] for @@ -1244,6 +1244,20 @@ \endgroup % +% -- Check hyphenation of LR and RL segments +\typeout{Checking hyphenation of LR and RL segments:} +\begingroup + \setbox0=\vbox{\trip +% \language=5 + \lccode`M=`M \hyphenation{MM-MM} + \TeXXeTstate=1 + \hsize=0pt + \parfillskip=0pt + \noindent{} MMMM \beginL MMMM MMMM MMMM\endL{} \beginR MMMM\endR \par + } +\endgroup + +% \showboxbreadth=10\showboxdepth=10 \tracingonline=1\tracingoutput=1 \end diff --git a/Build/source/texk/web2c/eptexdir/eptriptest b/Build/source/texk/web2c/eptexdir/eptriptest index ed651194b3f..d951078955f 100755 --- a/Build/source/texk/web2c/eptexdir/eptriptest +++ b/Build/source/texk/web2c/eptexdir/eptriptest @@ -89,7 +89,7 @@ echo "*** e-TeX specific part of e-TRIP test for e-pTeX ***." diff $etestdir/etrip.pl etrip.pl || is_OK=false # get same filename in log -$LN_S $eptestdir/etrip.tex . +$LN_S $eptestdir/eptrip.tex etrip.tex ../eptex --progname=epinitex --ini <$etestdir/etrip2.in >eptripin.fot sed "$P_SED1" etrip.log > eptripin.log || exit 1 @@ -102,7 +102,7 @@ diff $etestdir/etrip.fot eptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $eptestdir/etrip.log eptrip.log +$DIFF $DIFFFLAGS $eptestdir/eptrip.log eptrip.log eval ../dvitype $dvitype_args etrip.dvi >eptrip.typ || exit 1 $DIFF $DIFFFLAGS $etestdir/etrip.typ eptrip.typ diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index 6469269f621..c86f2fe61b7 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,8 @@ +2014-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * etrip/etrip.{diffs,fot,log,tex,typ}, etrip/etripin.log: + Updated for e-TeX 3.14159265. + 2014-01-21 Peter Breitenlohner <peb@mppmu.mpg.de> * etexextra.h: Adapt to TeX Version 3.14159265. diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs index 4fcdab1cf93..16271f1944a 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs @@ -10,21 +10,21 @@ + mv trip.log ctripin.log + diff SRCDIR/triptrap/tripin.log ctripin.log 1c1 -< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 3c3 < (trip.tex --- > (./trip.tex 450,453c450,453 -< (preloaded format=trip 2008.3.15) +< (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.11.21) -> 1490 strings of total length 26208 +> (preloaded format=trip 2014.1.22) +> 1490 strings of total length 26227 > 479 memory locations dumped; current usage is 104&278 > 342 multiletter control sequences 461c461 @@ -35,11 +35,11 @@ + mv trip.log ctrip.log + diff SRCDIR/triptrap/trip.fot ctrip.fot 1,3c1,2 -< This is TeX, Version 3.1415926 (INITEX) +< This is TeX, Version 3.14159265 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -51,9 +51,9 @@ > Memory usage before: 434&431; after: 376&418; still untouched: 178 + diff SRCDIR/triptrap/trip.log ctrip.log 1c1 -< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (format=trip 2013.11.21) 21 NOV 2013 10:53 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 3c3 < (trip.tex ## --- @@ -174,7 +174,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1810 -> 261 string characters out of 7792 +> 261 string characters out of 7773 > 3821 words of memory out of 3999 > 373 multiletter control sequences out of 15000+0 7301c7305 @@ -189,9 +189,9 @@ --- > This is DVItype, Version 3.6 (TeX Live 2014) 9c9 -< ' TeX output 2008.03.15:0223' +< ' TeX output 2014.01.07:0959' --- -> ' TeX output 2013.11.21:1053' +> ' TeX output 2014.01.22:1137' 419c419 < 1121: down4 639342208 --- @@ -338,22 +338,22 @@ + mv etrip.log etripin.log + diff SRCDIR/etexdir/etrip/etripin.log etripin.log 1c1 -< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43 +< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25 --- -> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 + ./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.1415926-2.6 (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:43 +< 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.1415926-2.6 (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:53 +> This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:37 + 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 2013.11.21:1043' +< ' TeX output 2014.01.22:1125' --- -> ' TeX output 2013.11.21:1053' +> ' TeX output 2014.01.22:1137' + : -PASS: etexdir/etrip.test +PASS: etexdir/etriptest diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.fot b/Build/source/texk/web2c/etexdir/etrip/etrip.fot index fc78dbe4fe6..c1c8210f47b 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.fot +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.fot @@ -1,7 +1,7 @@ -This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) +This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) **entering extended mode (./etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6. +This is the e-Trip test [2014-01-22] for e-TeX v3.14159265-2.6. (You are using e-TeX version/revision 2.6) Missing character: There is no c in font nullfont! diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.log b/Build/source/texk/web2c/etexdir/etrip/etrip.log index 3b201f46436..b694b2ce46b 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.log +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.log @@ -1,8 +1,8 @@ -This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:43 +This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etrip 2014.1.22) 22 JAN 2014 11:25 entering extended mode **&etrip etrip (./etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6. +This is the e-Trip test [2014-01-22] for e-TeX v3.14159265-2.6. (You are using e-TeX version/revision 2.6) Missing character: There is no b in font nullfont! @@ -691,7 +691,7 @@ Completed box being shipped out [1] \openout1 = `etrip.out'. -Memory usage before: 52&183; after: 36&177; still untouched: 1673 +Memory usage before: 52&184; after: 36&178; still untouched: 1672 (./etrip.out) ( Warning: end of semi simple group (level 3) entered at line 433 of a dif ferent file @@ -2717,9 +2717,9 @@ since the result is out of range. Expr fraction rounding 3 OK [1] -Memory usage before: 53&321; after: 44&321; still untouched: 835 +Memory usage before: 53&322; after: 44&322; still untouched: 835 [1] -Memory usage before: 53&321; after: 44&321; still untouched: 835 +Memory usage before: 53&322; after: 44&322; still untouched: 835 Checking \mutoglue and \gluetomu: ! You can't use `\mutoglue' in vertical mode. l.905 \mutoglue @@ -4419,7 +4419,7 @@ Overfull \hbox (12.0pt too wide) in paragraph at lines 1256--1256 ) Here is how much of TeX's memory you used: 19 strings out of 1809 - 145 string characters out of 7761 + 145 string characters out of 7742 3164 words of memory out of 3999 409 multiletter control sequences out of 15000+0 3796 words of font info for 5 fonts, out of 20000 for 75 diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.tex b/Build/source/texk/web2c/etexdir/etrip/etrip.tex index 0f8238ecd65..1ab15f7a708 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.tex +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.tex @@ -1,4 +1,4 @@ -%%; This is `etrip.tex' for e-TeX v3.1415926-2.6 as of Nov 21, 2013. +%%; This is `etrip.tex' for e-TeX v3.14159265-2.6 as of Jan 22, 2014. %%; %%; 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. @@ -9,8 +9,8 @@ %%; ==>> wrong e-TeX input to produce errors and warnings. <<== %%; \catcode`\{=1\catcode`\}=2\catcode`\#=6 \let\bgroup={ \let\egroup=} -\def\etripdate {2013-11-21} -\def\texversion {3.1415926} +\def\etripdate {2014-01-22} +\def\texversion {3.14159265} \def\etripversion{2.6} % \message{This is the e-Trip test [\etripdate] for diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.typ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ index 81072959248..1d6d8716829 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.typ +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ @@ -6,7 +6,7 @@ Options selected: Resolution = 72.27000000 pixels per inch numerator/denominator=25400000/473628672 magnification=1000; 0.00001526 pixels per DVI unit -' TeX output 2013.11.21:1043' +' TeX output 2014.01.22:1125' 42: beginning of page 1.0.0.0.0.0.0.0.0.0 87: eop diff --git a/Build/source/texk/web2c/etexdir/etrip/etripin.log b/Build/source/texk/web2c/etexdir/etrip/etripin.log index e840a8657b8..af805ca4c67 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etripin.log +++ b/Build/source/texk/web2c/etexdir/etrip/etripin.log @@ -1,8 +1,8 @@ -This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43 +This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25 entering extended mode ***etrip (./etrip.tex -This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6. +This is the e-Trip test [2014-01-22] for e-TeX v3.14159265-2.6. (You are using e-TeX version/revision 2.6) e-IniTeX: Assigning category codes, tracing switches, other codes, definitions for e-VirTeX e-Trip test run, constants and registers, @@ -23,9 +23,9 @@ Proceed; I'll ignore the character I just read. enable e-TeX enhancements (TeXXeT), prepare saved items (not to be dumped), everyjob ...dumped. ) Beginning to dump on file etrip.fmt - (format=etrip 2013.11.21) -1491 strings of total length 26239 -280 memory locations dumped; current usage is 36&166 + (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 \font\nullfont=nullfont \font\trip=etrip diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 61916a5523b..cb7d54ebce1 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,15 @@ +2014-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * eptrip/etrip.{log,tex} (removed): Renamed ... + * eptrip/eptrip.{log,tex} (new): ... into these. + * euptriptest, am/euptex.am: Adapted to renaming etrip.{log,tex} + => eptrip.{log,tex} in ../eptexdir/eptrip/. + * eptrip/eptrip.{diffs,log}: Updated for e-upTeX 3.14159265. + +2014-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * triptrap/trip.diffs: Updated for TeX 3.14159265. + 2014-01-20 Peter Breitenlohner <peb@mppmu.mpg.de> TeX tuneup of 2014. diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am index 303ab25d000..6cb847d055e 100644 --- a/Build/source/texk/web2c/euptexdir/am/euptex.am +++ b/Build/source/texk/web2c/euptexdir/am/euptex.am @@ -97,8 +97,8 @@ endif EUPTEX ## ## eptexdir/eptriptest EXTRA_DIST += \ - eptexdir/eptrip/etrip.log \ - eptexdir/eptrip/etrip.tex \ + eptexdir/eptrip/eptrip.log \ + eptexdir/eptrip/eptrip.tex \ euptexdir/euptrip/euptrip.diffs \ euptexdir/euptrip/texmf.cnf euptrip.diffs: euptex$(EXEEXT) diff --git a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs index 73adbefc533..570e57a0d90 100644 --- a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs +++ b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs @@ -11,9 +11,9 @@ + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log cuptripin.log 1c1 -< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 +> 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 3,11c3 < (trip.tex < ! Bad character code (256). @@ -32,13 +32,13 @@ > ### horizontal mode entered at line 77 (language255:hyph > enmin1,63) 450,453c443,446 -< (preloaded format=trip 2008.3.15) +< (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.11.21) -> 1617 strings of total length 27814 +> (preloaded format=trip 2014.1.22) +> 1617 strings of total length 27833 > 489 memory locations dumped; current usage is 110&278 > 393 multiletter control sequences 461c454 @@ -50,11 +50,11 @@ + sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log + diff SRCDIR/triptrap/trip.fot cuptrip.fot 1,3c1,2 -< This is TeX, Version 3.1415926 (INITEX) +< This is TeX, Version 3.14159265 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) +> This is e-upTeX, Version 3.14159265-p3.4-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 @@ -66,9 +66,9 @@ > Memory usage before: 456&431; after: 394&418; still untouched: 483 + diff SRCDIR/triptrap/trip.log cuptrip.log 1c1 -< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (format=trip 2013.11.21) 21 NOV 2013 10:53 +> 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 3c3 < (trip.tex ## --- @@ -333,7 +333,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1683 -> 261 string characters out of 8186 +> 261 string characters out of 8167 > 4017 words of memory out of 4500 > 424 multiletter control sequences out of 15000+0 7301c7310 @@ -348,9 +348,9 @@ --- > This is DVItype, Version 3.6 (TeX Live 2014) 9c9 -< ' TeX output 2008.03.15:0223' +< ' TeX output 2014.01.07:0959' --- -> ' TeX output 2013.11.21:1053' +> ' TeX output 2014.01.22:1137' 419c419 < 1121: down4 639342208 --- @@ -368,7 +368,7 @@ + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log xuptripin.log 1,11c1,4 -< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 < **\input trip < (trip.tex < ! Bad character code (256). @@ -380,7 +380,7 @@ < I changed this one to zero. < --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 +> 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 > entering extended mode > ***\input trip > (./trip.tex @@ -397,13 +397,13 @@ > ### horizontal mode entered at line 77 (language255:hyph > enmin1,63) 450,453c438,441 -< (preloaded format=trip 2008.3.15) +< (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.11.21) -> 1617 strings of total length 27814 +> (preloaded format=trip 2014.1.22) +> 1617 strings of total length 27833 > 536 memory locations dumped; current usage is 157&278 > 468 multiletter control sequences 461c449 @@ -415,11 +415,11 @@ + sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log + diff SRCDIR/triptrap/trip.fot xuptrip.fot 1,3c1,3 -< This is TeX, Version 3.1415926 (INITEX) +< This is TeX, Version 3.14159265 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) +> This is e-upTeX, Version 3.14159265-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (preloaded format=euptex) > **entering extended mode > ## (./trip.tex 17c17 @@ -436,11 +436,11 @@ > ### bottom level + diff SRCDIR/triptrap/trip.log xuptrip.log 1,3c1,4 -< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (format=trip 2013.11.21) 21 NOV 2013 10:53 +> 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 > 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 8186 +> 261 string characters out of 8167 > 4017 words of memory out of 4500 > 499 multiletter control sequences out of 15000+0 7301,7302c7307,7308 @@ -786,9 +786,9 @@ --- > This is DVItype, Version 3.6 (TeX Live 2014) 9c9 -< ' TeX output 2008.03.15:0223' +< ' TeX output 2014.01.07:0959' --- -> ' TeX output 2013.11.21:1053' +> ' TeX output 2014.01.22:1137' 419c419 < 1121: down4 639342208 --- @@ -804,42 +804,34 @@ + ./pltotf SRCDIR/etexdir/etrip/etrip.pl etrip.tfm + ./tftopl ./etrip.tfm etrip.pl + diff SRCDIR/etexdir/etrip/etrip.pl etrip.pl -+ ln -s SRCDIR/eptexdir/eptrip/etrip.tex . ++ ln -s SRCDIR/eptexdir/eptrip/eptrip.tex etrip.tex + ./euptex --progname=eupinitex --ini + sed 's/, yoko direction//;s/yoko direction, //' etrip.log + diff SRCDIR/etexdir/etrip/etripin.log euptripin.log 1c1 -< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43 +< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (INITEX) 22 JAN 2014 11:25 --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 -5c5 -< This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6. ---- -> This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6. +> 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 -< 1491 strings of total length 26239 -< 280 memory locations dumped; current usage is 36&166 +< 1491 strings of total length 26258 +< 281 memory locations dumped; current usage is 36&167 < 408 multiletter control sequences --- -> 1618 strings of total length 27845 -> 283 memory locations dumped; current usage is 40&166 +> 1618 strings of total length 27864 +> 284 memory locations dumped; current usage is 40&167 > 468 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.1415926-2.6 (TeX Live 2014) ---- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) -4c4 -< This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-2.6. +< This is e-TeX, Version 3.14159265-2.6 (TeX Live 2014) (preloaded format=etex) --- -> This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6. -+ diff SRCDIR/eptexdir/eptrip/etrip.log euptrip.log +> This is e-upTeX, Version 3.14159265-p3.4-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.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:43 +< 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.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:53 +> 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 2210,2215d2209 < ! Bad character code (256). < l.676 \iffontchar\font 256 @@ -847,22 +839,22 @@ < A character number must be between 0 and 255, or KANJI code. < I changed this one to zero. < -4296,4297c4290,4291 -< 18 strings out of 1695 -< 140 string characters out of 8218 +4421,4422c4415,4416 +< 19 strings out of 1692 +< 145 string characters out of 8157 --- -> 18 strings out of 1682 -> 140 string characters out of 8155 -4299c4293 -< 460 multiletter control sequences out of 15000+0 +> 19 strings out of 1682 +> 145 string characters out of 8136 +4424c4418 +< 463 multiletter control sequences out of 15000+0 --- > 469 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 9c9 -< ' TeX output 2013.11.21:1043' +< ' TeX output 2014.01.22:1125' --- -> ' TeX output 2013.11.21:1053' +> ' TeX output 2014.01.22:1137' + : -PASS: euptexdir/euptrip.test +PASS: euptexdir/euptriptest diff --git a/Build/source/texk/web2c/euptexdir/euptriptest b/Build/source/texk/web2c/euptexdir/euptriptest index b755443084b..fbff0ce62a0 100755 --- a/Build/source/texk/web2c/euptexdir/euptriptest +++ b/Build/source/texk/web2c/euptexdir/euptriptest @@ -90,7 +90,7 @@ echo "*** e-TeX specific part of e-TRIP test for e-upTeX ***." diff $etestdir/etrip.pl etrip.pl || is_OK=false # get same filename in log -$LN_S $eptestdir/etrip.tex . +$LN_S $eptestdir/eptrip.tex etrip.tex ../euptex --progname=eupinitex --ini <$etestdir/etrip2.in >euptripin.fot sed "$P_SED1" etrip.log > euptripin.log || exit 1 @@ -103,7 +103,7 @@ diff $etestdir/etrip.fot euptrip.fot # We use $DIFF instead of `diff' only for those files where there # might actually be legitimate numerical differences. -$DIFF $DIFFFLAGS $eptestdir/etrip.log euptrip.log +$DIFF $DIFFFLAGS $eptestdir/eptrip.log euptrip.log eval ../dvitype $dvitype_args etrip.dvi >euptrip.typ || exit 1 $DIFF $DIFFFLAGS $etestdir/etrip.typ euptrip.typ diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 2811a8fcba1..8a962bba188 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ptrip/ptrip.diffs: Updated for pTeX 3.14159265. + 2014-01-20 Peter Breitenlohner <peb@mppmu.mpg.de> TeX tuneup of 2014. diff --git a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs index 7c79d5505dd..c7124de242f 100644 --- a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs +++ b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs @@ -11,9 +11,9 @@ + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log ptripin.log 1c1 -< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is pTeX, Version 3.1415926-p3.4 (utf8.euc) (TeX Live 2013) (INITEX) 9 APR 2013 11:43 +> This is pTeX, Version 3.14159265-p3.4 (utf8.euc) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 3c3 < (trip.tex --- @@ -28,13 +28,13 @@ > ### horizontal mode entered at line 77 (language255:hyph > enmin1,63) 450,453c451,454 -< (preloaded format=trip 2008.3.15) +< (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.4.9) -> 1451 strings of total length 25460 +> (preloaded format=trip 2014.1.22) +> 1451 strings of total length 25481 > 485 memory locations dumped; current usage is 106&278 > 377 multiletter control sequences 461c462 @@ -46,11 +46,11 @@ + sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log + diff SRCDIR/triptrap/trip.fot ptrip.fot 1,3c1,2 -< This is TeX, Version 3.1415926 (INITEX) +< This is TeX, Version 3.14159265 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is pTeX, Version 3.1415926-p3.4 (utf8.euc) (TeX Live 2013) +> This is pTeX, Version 3.14159265-p3.4 (utf8.euc) (TeX Live 2014) (preloaded format=ptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -62,9 +62,9 @@ > Memory usage before: 452&431; after: 390&418; still untouched: 241 + diff SRCDIR/triptrap/trip.log ptrip.log 1c1 -< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is pTeX, Version 3.1415926-p3.4 (utf8.euc) (TeX Live 2013) (format=trip 2013.4.9) 9 APR 2013 11:43 +> This is pTeX, Version 3.14159265-p3.4 (utf8.euc) (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 3c3 < (trip.tex ## --- @@ -271,7 +271,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1549 -> 261 string characters out of 14540 +> 261 string characters out of 14519 > 4259 words of memory out of 4500 > 408 multiletter control sequences out of 15000+0 7301c7312 @@ -284,11 +284,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2013) +> This is DVItype, Version 3.6 (TeX Live 2014) 9c9 -< ' TeX output 2008.03.15:0223' +< ' TeX output 2014.01.07:0959' --- -> ' TeX output 2013.04.09:1143' +> ' TeX output 2014.01.22:1137' 419c419 < 1121: down4 639342208 --- @@ -300,4 +300,4 @@ > 2535: y4 203921756 > 2540: y0 203921756 + : -PASS: ptexdir/ptrip.test +PASS: ptexdir/ptriptest diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs index a1c6c047fe1..704de4b46b1 100644 --- a/Build/source/texk/web2c/triptrap/trip.diffs +++ b/Build/source/texk/web2c/triptrap/trip.diffs @@ -8,19 +8,19 @@ + mv trip.log tripin.log + diff SRCDIR/triptrap/tripin.log tripin.log 1c1 -< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is TeX, Version 3.1415926 (TeX Live 2013) (INITEX) 9 APR 2013 11:27 +> This is TeX, Version 3.14159265 (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 3c3 < (trip.tex --- > (./trip.tex 450,451c450,451 -< (preloaded format=trip 2008.3.15) +< (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 --- -> (format=trip 2013.4.9) -> 1371 strings of total length 24585 +> (preloaded format=trip 2014.1.22) +> 1371 strings of total length 24606 461c461 < Hyphenation trie of length 273 has 9 ops out of 500 --- @@ -28,17 +28,17 @@ + ./tex --progname=tex + diff SRCDIR/triptrap/trip.fot trip.fot 1,3c1,2 -< This is TeX, Version 3.1415926 (INITEX) +< This is TeX, Version 3.14159265 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is TeX, Version 3.1415926 (TeX Live 2013) +> This is TeX, Version 3.14159265 (TeX Live 2014) (preloaded format=tex) > **(./trip.tex ## + diff SRCDIR/triptrap/trip.log trip.log 1c1 -< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is TeX, Version 3.1415926 (TeX Live 2013) (format=trip 2013.4.9) 9 APR 2013 11:27 +> This is TeX, Version 3.14159265 (TeX Live 2014) (preloaded format=trip 2014.1.22) 22 JAN 2014 11:37 3c3 < (trip.tex ## --- @@ -93,7 +93,7 @@ < 253 string characters out of 8354 --- > 44 strings out of 1629 -> 261 string characters out of 15415 +> 261 string characters out of 15394 7299c7303 < 372 multiletter control sequences out of 2100 --- @@ -108,11 +108,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2013) +> This is DVItype, Version 3.6 (TeX Live 2014) 9c9 -< ' TeX output 2008.03.15:0223' +< ' TeX output 2014.01.07:0959' --- -> ' TeX output 2013.04.09:1127' +> ' TeX output 2014.01.22:1137' 419c419 < 1121: down4 639342208 --- @@ -123,5 +123,23 @@ --- > 2535: y4 203921756 > 2540: y0 203921756 ++ for f in tripin.log trip.fot trip.log trip.typ ++ sed SRCDIR/triptrap/tripin.log -f filter ++ sed tripin.log -f filter ++ diff a/tripin.log b/tripin.log ++ for f in tripin.log trip.fot trip.log trip.typ ++ sed SRCDIR/triptrap/trip.fot -f filter ++ sed trip.fot -f filter ++ diff a/trip.fot b/trip.fot ++ for f in tripin.log trip.fot trip.log trip.typ ++ sed SRCDIR/triptrap/trip.log -f filter ++ sed trip.log -f filter ++ diff a/trip.log b/trip.log ++ for f in tripin.log trip.fot trip.log trip.typ ++ sed SRCDIR/triptrap/trip.typ -f filter ++ sed trip.typ -f filter ++ diff a/trip.typ b/trip.typ + : -PASS: trip.test ++ echo '>>> All differences are acceptable.' +>>> All differences are acceptable. +PASS: triptest diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index d455c77684e..7c72e468bbd 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,7 @@ +2014-01-22 Peter Breitenlohner <peb@mppmu.mpg.de> + + * uptrip/uptrip.diffs: Updated for upTeX 3.14159265. + 2014-01-20 Peter Breitenlohner <peb@mppmu.mpg.de> TeX tuneup of 2014. diff --git a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs index 0c9054689ab..60301083422 100644 --- a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs +++ b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs @@ -11,9 +11,9 @@ + sed 's/, yoko direction//;s/yoko direction, //' trip.log + diff SRCDIR/triptrap/tripin.log uptripin.log 1c1 -< This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09 --- -> This is upTeX, Version 3.1415926-p3.4-u1.11 (utf8.uptex) (TeX Live 2013) (INITEX) 9 APR 2013 11:43 +> This is upTeX, Version 3.14159265-p3.4-u1.11 (utf8.uptex) (TeX Live 2014) (INITEX) 22 JAN 2014 11:37 3,11c3 < (trip.tex < ! Bad character code (256). @@ -32,13 +32,13 @@ > ### horizontal mode entered at line 77 (language255:hyph > enmin1,63) 450,453c443,446 -< (preloaded format=trip 2008.3.15) +< (preloaded format=trip 2014.1.7) < 1326 strings of total length 23646 < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.4.9) -> 1461 strings of total length 25481 +> (preloaded format=trip 2014.1.22) +> 1461 strings of total length 25502 > 485 memory locations dumped; current usage is 106&278 > 383 multiletter control sequences 461c454 @@ -50,11 +50,11 @@ + sed 's/, yoko direction//;s/yoko direction, //;s/yoko(math) direction, //' trip.log + diff SRCDIR/triptrap/trip.fot uptrip.fot 1,3c1,2 -< This is TeX, Version 3.1415926 (INITEX) +< This is TeX, Version 3.14159265 (INITEX) < ** &trip trip < (trip.tex ## --- -> This is upTeX, Version 3.1415926-p3.4-u1.11 (utf8.uptex) (TeX Live 2013) +> This is upTeX, Version 3.14159265-p3.4-u1.11 (utf8.uptex) (TeX Live 2014) (preloaded format=uptex) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -66,9 +66,9 @@ > Memory usage before: 452&431; after: 390&418; still untouched: 241 + diff SRCDIR/triptrap/trip.log uptrip.log 1c1 -< This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 +< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59 --- -> This is upTeX, Version 3.1415926-p3.4-u1.11 (utf8.uptex) (TeX Live 2013) (format=trip 2013.4.9) 9 APR 2013 11:43 +> 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 3c3 < (trip.tex ## --- @@ -305,7 +305,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1539 -> 261 string characters out of 14519 +> 261 string characters out of 14498 > 4259 words of memory out of 4500 > 414 multiletter control sequences out of 15000+0 7301c7312 @@ -318,11 +318,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2013) +> This is DVItype, Version 3.6 (TeX Live 2014) 9c9 -< ' TeX output 2008.03.15:0223' +< ' TeX output 2014.01.07:0959' --- -> ' TeX output 2013.04.09:1143' +> ' TeX output 2014.01.22:1137' 419c419 < 1121: down4 639342208 --- @@ -334,4 +334,4 @@ > 2535: y4 203921756 > 2540: y0 203921756 + : -PASS: uptexdir/uptrip.test +PASS: uptexdir/uptriptest |