From e8842c31c15e613f8cb08a582bdbdf889ce78dce Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 21 Nov 2013 10:44:15 +0000 Subject: e-TeX: Fix hyphenation of LR and RL text and adapt e-(u)pTeX git-svn-id: svn://tug.org/texlive/trunk@32197 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/eptexdir/ChangeLog | 5 + .../source/texk/web2c/eptexdir/eptrip/eptrip.diffs | 84 +++-- Build/source/texk/web2c/eptexdir/eptrip/etrip.log | 352 ++++++++++----------- Build/source/texk/web2c/etexdir/ChangeLog | 8 + Build/source/texk/web2c/etexdir/etex.ch | 28 +- Build/source/texk/web2c/etexdir/etrip/etrip.diffs | 32 +- Build/source/texk/web2c/etexdir/etrip/etrip.fot | 4 +- Build/source/texk/web2c/etexdir/etrip/etrip.log | 135 +++++++- Build/source/texk/web2c/etexdir/etrip/etrip.tex | 18 +- Build/source/texk/web2c/etexdir/etrip/etrip.typ | 4 +- Build/source/texk/web2c/etexdir/etrip/etripin.log | 8 +- Build/source/texk/web2c/euptexdir/ChangeLog | 4 + .../texk/web2c/euptexdir/euptrip/euptrip.diffs | 80 ++--- Build/source/texk/web2c/ptexdir/ChangeLog | 4 + Build/source/texk/web2c/ptexdir/ptex-base.ch | 10 +- 15 files changed, 488 insertions(+), 288 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 718384997ac..60fd4c07286 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,8 @@ +2013-11-21 Peter Breitenlohner + + * eptrip/eptrip.diffs, eptrip/etrip.log: Update for etrip.tex + Version 2.6 [2013-11-21]. + 2013-08-12 TANAKA Takuji * eptex.defines: Allow file names with 0x5c in (e)pTeX on Windows. diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs index 8b9883f3698..83b488bba75 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 --- -> This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) (INITEX) 9 APR 2013 12:22 +> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 3c3 < (trip.tex --- @@ -33,8 +33,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.4.9) -> 1604 strings of total length 27751 +> (format=trip 2013.11.21) +> 1607 strings of total length 27793 > 489 memory locations dumped; current usage is 110&278 > 387 multiletter control sequences 461c462 @@ -50,7 +50,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) +> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -64,7 +64,7 @@ 1c1 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 --- -> This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) (format=trip 2013.4.9) 9 APR 2013 12:22 +> 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 3c3 < (trip.tex ## --- @@ -298,8 +298,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1696 -> 261 string characters out of 8249 +> 44 strings out of 1693 +> 261 string characters out of 8207 > 4017 words of memory out of 4500 > 418 multiletter control sequences out of 15000+0 7301c7310 @@ -312,11 +312,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 2013.04.09:1222' +> ' TeX output 2013.11.21:1053' 419c419 < 1121: down4 639342208 --- @@ -338,7 +338,7 @@ < **\input trip < (trip.tex --- -> This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) (INITEX) 9 APR 2013 12:22 +> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 > entering extended mode > ***\input trip > (./trip.tex @@ -364,10 +364,10 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.4.9) -> 1604 strings of total length 27751 +> (format=trip 2013.11.21) +> 1607 strings of total length 27793 > 536 memory locations dumped; current usage is 157&278 -> 459 multiletter control sequences +> 462 multiletter control sequences 461c457 < Hyphenation trie of length 273 has 9 ops out of 500 --- @@ -381,7 +381,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) +> This is e-pTeX, Version 3.1415926-p3.4-130605-2.6 (utf8.euc) (TeX Live 2014) > **entering extended mode > ## (./trip.tex 17c17 @@ -402,7 +402,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) (format=trip 2013.4.9) 9 APR 2013 12:22 +> 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 > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex @@ -700,10 +700,10 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1696 -> 261 string characters out of 8249 +> 44 strings out of 1693 +> 261 string characters out of 8207 > 4017 words of memory out of 4500 -> 490 multiletter control sequences out of 15000+0 +> 493 multiletter control sequences out of 15000+0 7301,7302c7307,7308 < 2 hyphenation exceptions out of 307 < 7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s @@ -716,11 +716,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 2013.04.09:1222' +> ' TeX output 2013.11.21:1053' 419c419 < 1121: down4 639342208 --- @@ -741,37 +741,53 @@ + 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 2013) (INITEX) 1 MAR 2013 13:22 +< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43 --- -> This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) (INITEX) 9 APR 2013 12:22 -26,29c26,29 -< (format=etrip 2013.3.1) -< 1491 strings of total length 26237 +> 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. +27,29c27,29 +< 1491 strings of total length 26239 < 280 memory locations dumped; current usage is 36&166 < 408 multiletter control sequences --- -> (format=etrip 2013.4.9) -> 1605 strings of total length 27782 +> 1608 strings of total length 27824 > 283 memory locations dumped; current usage is 40&166 -> 459 multiletter control sequences +> 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 2013) +< 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-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) +> This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6. + diff SRCDIR/eptexdir/eptrip/etrip.log eptrip.log 1c1 -< This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) (format=etrip 2013.4.9) 9 APR 2013 11:49 +< 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.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) (format=etrip 2013.4.9) 9 APR 2013 12:22 +> 463 multiletter control sequences out of 15000+0 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi + diff SRCDIR/etexdir/etrip/etrip.typ eptrip.typ 9c9 -< ' TeX output 2013.03.01:1322' +< ' TeX output 2013.11.21:1043' --- -> ' TeX output 2013.04.09:1222' +> ' TeX output 2013.11.21:1053' + : PASS: eptexdir/eptrip.test diff --git a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log index 35560ff7e7d..7f0eebbe9a7 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log +++ b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log @@ -1,4 +1,4 @@ -This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) (format=etrip 2013.4.9) 9 APR 2013 11:49 +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 entering extended mode **&etrip etrip (./etrip.tex e-IniTeX: e-Trip format loaded. @@ -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 +\vbox(30.00002+0.0)x0.0, yoko direction .\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 +\vbox(0.0+0.0)x0.0, yoko direction .\special{\1\2} ! OK. @@ -684,7 +684,7 @@ 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 +\vbox(0.0+0.0)x0.0, yoko direction .\openout1=etrip.out .\write1{\unexpanded \expandafter {\1}} .\closeout1 @@ -960,7 +960,7 @@ Missing character: There is no e in font etrip! {false} {\showlists} -### restricted horizontal mode entered at line 470 +### yoko direction, 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 -### vertical mode entered at line 0 +### yoko direction, 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 []} +\hbox(8.0+2.0)x9.0, yoko direction []} {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 +\vbox(188.0+0.0)x10.0, yoko direction .\mark{0-1} .\marks1{1-1} .\glue 1.0 -.\vbox(9.0+0.0)x0.0 +.\vbox(9.0+0.0)x0.0, yoko direction .\mark{0-2} .\marks3{} .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x0.0 +.\hbox(0.0+0.0)x0.0, yoko direction .\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 +.\vbox(19.0+0.0)x0.0, yoko direction .\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 +.\vbox(30.0+0.0)x0.0, yoko direction .\glue 0.0 plus 1.0fil .\penalty 0 .\glue 40.0 .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x10.0 +.\hbox(0.0+0.0)x10.0, yoko direction ! 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 +\vbox(17.0+0.0)x0.0, glue set 2.0fil, yoko direction .\mark{0-1} .\marks1{1-1} .\glue 1.0 -.\vbox(9.0+0.0)x0.0 +.\vbox(9.0+0.0)x0.0, yoko direction .\mark{0-2} .\marks3{} .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x0.0 +.\hbox(0.0+0.0)x0.0, yoko direction .\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 +\vbox(132.0+0.0)x10.0, yoko direction .\mark{0-3} .\glue(\splittopskip) 0.0 -.\vbox(19.0+0.0)x0.0 +.\vbox(19.0+0.0)x0.0, yoko direction .\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 +.\vbox(30.0+0.0)x0.0, yoko direction .\glue 0.0 plus 1.0fil .\penalty 0 .\glue 40.0 .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x10.0 +.\hbox(0.0+0.0)x10.0, yoko direction ! 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 +\vbox(27.0+0.0)x0.0, glue set 5.0fil, yoko direction .\mark{0-3} .\glue(\splittopskip) 0.0 -.\vbox(19.0+0.0)x0.0 +.\vbox(19.0+0.0)x0.0, yoko direction .\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 +\vbox(70.0+0.0)x10.0, yoko direction .\glue(\splittopskip) 0.0 -.\vbox(30.0+0.0)x0.0 +.\vbox(30.0+0.0)x0.0, yoko direction .\glue 0.0 plus 1.0fil .\penalty 0 .\glue 40.0 .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x10.0 +.\hbox(0.0+0.0)x10.0, yoko direction ! 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 +\vbox(37.0+0.0)x0.0, glue set 7.0fil, yoko direction .\glue(\splittopskip) 0.0 -.\vbox(30.0+0.0)x0.0 +.\vbox(30.0+0.0)x0.0, yoko direction .\glue 0.0 plus 1.0fil ! OK. @@ -1172,9 +1172,9 @@ l.499 \1 \showbox1 \showbox0 > \box0= -\vbox(0.0+0.0)x10.0 +\vbox(0.0+0.0)x10.0, yoko direction .\glue(\splittopskip) 0.0 -.\hbox(0.0+0.0)x10.0 +.\hbox(0.0+0.0)x10.0, yoko direction ! 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 +\vbox(35.0+0.0)x0.0, glue set 21.0fil, yoko direction .\mark{0-1} .\marks1{1-1} .\glue(\topskip) 0.0 -.\vbox(9.0+0.0)x0.0 +.\vbox(9.0+0.0)x0.0, yoko direction .\mark{0-2} .\marks3{} .\glue(\baselineskip) 0.0 -.\hbox(0.0+0.0)x0.0 +.\hbox(0.0+0.0)x0.0, yoko direction .\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 +\vbox(35.0+0.0)x0.0, glue set 13.0fil, yoko direction .\mark{0-3} .\glue(\topskip) 0.0 -.\vbox(19.0+0.0)x0.0 +.\vbox(19.0+0.0)x0.0, yoko direction .\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 +\vbox(35.0+0.0)x0.0, glue set 5.0fil, yoko direction .\glue(\topskip) 0.0 -.\vbox(30.0+0.0)x0.0 +.\vbox(30.0+0.0)x0.0, yoko direction .\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 +\vbox(35.0+0.0)x10.0, glue set 35.0fil, yoko direction .\glue(\topskip) 0.0 -.\hbox(0.0+0.0)x10.0 +.\hbox(0.0+0.0)x10.0, yoko direction .\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 +\vbox(35.0+0.0)x0.0, glue set 35.0fil, yoko direction .\glue(\topskip) 0.0 -.\hbox(0.0+0.0)x0.0 +.\hbox(0.0+0.0)x0.0, yoko direction .\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 +\vbox(35.0+0.0)x0.0, glue set 35.0fil, yoko direction .\glue(\topskip) 0.0 -.\hbox(0.0+0.0)x0.0 +.\hbox(0.0+0.0)x0.0, yoko direction .\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. -### math mode entered at line 524 +### yoko(math) direction, 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 -### math mode entered at line 521 +### yoko(math) direction, 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 -### math mode entered at line 517 +### yoko(math) direction, 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 -### math mode entered at line 516 +### yoko(math) direction, math mode entered at line 516 \left"161361 \mathord .\fam1 p -### math mode entered at line 515 -### restricted horizontal mode entered at line 514 +### yoko(math) direction, math mode entered at line 515 +### yoko direction, restricted horizontal mode entered at line 514 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1467,7 +1467,7 @@ l.525 ... \over r\showlists -### math mode entered at line 521 +### yoko(math) direction, 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 -### math mode entered at line 517 +### yoko(math) direction, 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 -### math mode entered at line 516 +### yoko(math) direction, math mode entered at line 516 \left"161361 \mathord .\fam1 p -### math mode entered at line 515 -### restricted horizontal mode entered at line 514 +### yoko(math) direction, math mode entered at line 515 +### yoko direction, restricted horizontal mode entered at line 514 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1514,7 +1514,7 @@ l.526 ... \right]\showlists -### math mode entered at line 517 +### yoko(math) direction, math mode entered at line 517 \mathord .\fam1 r \mathinner @@ -1547,14 +1547,14 @@ this will be denominator of: \\left"161361 \\mathord \.\fam1 q -### math mode entered at line 516 +### yoko(math) direction, math mode entered at line 516 \left"161361 \mathord .\fam1 p -### math mode entered at line 515 -### restricted horizontal mode entered at line 514 +### yoko(math) direction, math mode entered at line 515 +### yoko direction, restricted horizontal mode entered at line 514 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1562,7 +1562,7 @@ l.527 ... \right]\showlists -### math mode entered at line 516 +### yoko(math) direction, 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 -### math mode entered at line 515 -### restricted horizontal mode entered at line 514 +### yoko(math) direction, math mode entered at line 515 +### yoko direction, restricted horizontal mode entered at line 514 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1610,7 +1610,7 @@ l.528 \right]\showlists -### math mode entered at line 515 +### yoko(math) direction, math mode entered at line 515 \mathinner .\left"161361 .\mathord @@ -1649,9 +1649,9 @@ l.528 \right]\showlists ../.\right"162362 ..\right"162362 .\right"162362 -### restricted horizontal mode entered at line 514 +### yoko direction, restricted horizontal mode entered at line 514 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1659,7 +1659,7 @@ l.529 \right]\showlists -### restricted horizontal mode entered at line 514 +### yoko direction, 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 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1870,7 +1870,7 @@ l.530 $\showlists -### restricted horizontal mode entered at line 532 +### yoko direction, 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 +.\hbox(0.0+0.0)x0.0, shifted -16.5, yoko direction .\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 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1898,12 +1898,12 @@ l.534 ...box{}\right]$\showlists } -### restricted horizontal mode entered at line 535 +### yoko direction, 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 +.\hbox(0.0+0.0)x0.0, shifted 3.0, yoko direction .\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 -### vertical mode entered at line 0 +### yoko direction, 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 +.\hbox(0.0+0.0)x0.0, yoko direction .\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 +\vbox(0.0+0.0)x10.0, yoko direction .\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 +..\hbox(0.0+0.0)x0.0, yoko direction ..\kern 3.0 ..\kern 0.0 ..\endR @@ -3210,7 +3210,7 @@ l.1046 \showbox32100 > \box32101= -\hbox(0.0+0.0)x3.0 +\hbox(0.0+0.0)x3.0, yoko direction ! 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 +\vbox(0.0+0.0)x96.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x96.0, glue set 31.0fill, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x96.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x96.0, glue set - 0.25, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x96.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x96.0, glue set - 0.5, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x98.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x98.0, glue set 34.0fill, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x98.0, yoko direction .\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 +\hbox(0.0+0.0)x98.0, glue set - 0.125, yoko direction .\glue(\leftskip) 0.0 plus -1.0fill -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x98.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x98.0, glue set - 0.25, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x100.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x100.0, glue set 35.0fill, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x100.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x100.0, glue set 35.0fill, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x100.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x100.0, glue set 35.0fill, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x110.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x110.0, glue set 45.0fill, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 .\glue 0.0 plus 1.0fil -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x110.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x110.0, glue set 0.125, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x110.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x110.0, glue set 0.25, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x120.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x120.0, glue set 55.0fill, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x120.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x120.0, glue set 0.25, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x120.0, yoko direction .\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 -.\hbox(0.0+0.0)x30.0 +\hbox(0.0+0.0)x120.0, glue set 0.5, yoko direction +.\hbox(0.0+0.0)x30.0, yoko direction .\glue 5.0 plus 20.0 minus 4.0 -.\hbox(0.0+0.0)x30.0 +.\hbox(0.0+0.0)x30.0, yoko direction .\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 +\vbox(0.0+0.0)x0.0, yoko direction .\hbox(0.0+0.0)x0.0 ..\mathon ..\mathoff @@ -4042,17 +4042,17 @@ l.1149 \showbox27 > \box0= -\vbox(40.0+0.0)x0.0 -.\vbox(20.0+0.0)x0.0 -..\vbox(20.0+0.0)x0.0 +\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 ..\openout0=abc ..\penalty 0 ..\write1{write 1} -.\vbox(20.0+0.0)x0.0 +.\vbox(20.0+0.0)x0.0, yoko direction ..\write2{write 2} ..\closeout3 ..\glue(\splittopskip) 0.0 -..\vbox(20.0+0.0)x0.0 +..\vbox(20.0+0.0)x0.0, yoko direction ..\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 -.\vbox(30.0+0.0)x0.0 -..\vbox(20.0+0.0)x0.0 +\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 ..\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 +.\vbox(20.0+0.0)x0.0, yoko direction ..\closeout3 ..\glue(\splittopskip) 0.0 -..\vbox(20.0+0.0)x0.0 +..\vbox(20.0+0.0)x0.0, yoko direction ..\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 -.\vbox(20.0+0.0)x0.0 -..\vbox(20.0+0.0)x0.0 +\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 ..\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 +.\vbox(20.0+0.0)x0.0, yoko direction ..\write2{write 2} ..\closeout3 ..\glue(\splittopskip) 0.0 -..\vbox(20.0+0.0)x0.0 +..\vbox(20.0+0.0)x0.0, yoko direction ..\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 -.\vbox(30.0+0.0)x0.0 -..\vbox(20.0+0.0)x0.0 +\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 ..\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 +.\vbox(20.0+0.0)x0.0, yoko direction ..\closeout3 ..\glue(\splittopskip) 0.0 -..\vbox(20.0+0.0)x0.0 +..\vbox(20.0+0.0)x0.0, yoko direction ..\glue 0.0 plus 1.0fil ! OK. @@ -4129,9 +4129,9 @@ l.1177 ... \1 1 20 \1 2 30 -### internal vertical mode entered at line 1186 +### yoko direction, internal vertical mode entered at line 1186 prevdepth ignored -### vertical mode entered at line 0 +### yoko direction, 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 -### internal vertical mode entered at line 1186 +### yoko direction, internal vertical mode entered at line 1186 prevdepth ignored -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -4156,9 +4156,9 @@ l.1186 ...0 pt \1 \penalty -1 \1 -### internal vertical mode entered at line 1187 +### yoko direction, internal vertical mode entered at line 1187 prevdepth ignored -### vertical mode entered at line 0 +### yoko direction, 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 -### internal vertical mode entered at line 1187 +### yoko direction, internal vertical mode entered at line 1187 \glue 0.0 plus 1.0fill \kern 2.0 \penalty 10 prevdepth ignored -### vertical mode entered at line 0 +### yoko direction, 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 +\vbox(12.0+0.0)x0.0, yoko direction .\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 +\vbox(0.0+0.0)x0.0, yoko direction .\write1{} .\write2{} .\write3{} .\glue(\topskip) 0.0 -.\hbox(0.0+0.0)x0.0 +.\hbox(0.0+0.0)x0.0, yoko direction ! OK. ...wbox 0 \showbox 255 @@ -4213,10 +4213,10 @@ l.1192 ...box {} \penalty -10000 -### internal vertical mode entered at line 1193 +### yoko direction, internal vertical mode entered at line 1193 \penalty 10000 prevdepth ignored -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -4285,7 +4285,7 @@ laywidowpenalties: {restoring \interlinepenalties=3 101\ETC.} {changing \box0=void} {into \box0= -\vbox(0.0+0.0)x0.0} +\vbox(0.0+0.0)x0.0, yoko direction} {restoring \box0=void} {restoring \displaywidowpenalties=0} {restoring \widowpenalties=0} @@ -4293,10 +4293,10 @@ laywidowpenalties: {restoring \interlinepenalties=0} ) Here is how much of TeX's memory you used: - 18 strings out of 1695 - 140 string characters out of 8218 + 18 strings out of 1692 + 140 string characters out of 8176 3329 words of memory out of 4500 - 460 multiletter control sequences out of 15000+0 + 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 10i,15n,8p,137b,79s stack positions out of 200i,40n,60p,500b,600s diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index 07cab170b60..6e1a16729ab 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,11 @@ +2013-11-21 Peter Breitenlohner + + * etex.ch: Enable hyphenation of text between \beginL and \endL or + between \beginR and \endR. + * etrip/etrip.diffs, etrip/etrip.fot, etrip/etrip.log, + etrip/etrip.tex, etrip/etrip.typ, etrip/etripin.log: + Version 2.6 [2013-11-21] for TL 2014. + 2013-04-09 Peter Breitenlohner * etrip/etrip.diffs, etrip/etrip.fot, etrip/etrip.typ, diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch index 2756b047eb0..858b13e5ee8 100644 --- a/Build/source/texk/web2c/etexdir/etex.ch +++ b/Build/source/texk/web2c/etexdir/etex.ch @@ -103,7 +103,10 @@ % better tracing of font definitions, reported by % Bruno Le Floch , Jul 2012. % Version 2.6 development was started in Mar 2013; released in ??? 201?. -% better handling of right-to-left text. +% enable hyphenation of text between \beginL and \endL or +% between \beginR and \endR, problem reported by +% Vafa Khalighi , Nov 2013. +% better handling of right-to-left text -- to be done. % Although considerable effort has been expended to make the e-TeX program % correct and reliable, no warranty is implied; the author disclaims any @@ -1912,7 +1915,7 @@ if do_last_line_fit then @x [39] m.866 l.17064 - e-TeX TeXXeT math_node: begin auto_breaking:=(subtype(cur_p)=after); kern_break; @y -math_node: begin if subtype(cur_p); else pen:=pen+widow_penalty; @z %--------------------------------------- +@x [40] m.891 l.17455 - e-TeX TeXXeT +implicit kern nodes, and $p_m$ is a glue or penalty or insertion or adjust +@y +implicit kern or text direction nodes, and $p_m$ is a glue or penalty or +insertion or adjust +@z +%--------------------------------------- @x [40] m.891 l.17494 - e-TeX hyph_codes cur_lang:=init_cur_lang; l_hyf:=init_l_hyf; r_hyf:=init_r_hyf; @y @@ -2011,6 +2021,13 @@ cur_lang:=init_cur_lang; l_hyf:=init_l_hyf; r_hyf:=init_r_hyf; set_hyph_index; @z %--------------------------------------- +@x [40] m.896 l.17557 - e-TeX TeXXeT + else if (type(s)=kern_node)and(subtype(s)=normal) then goto continue +@y + else if (type(s)=kern_node)and(subtype(s)=normal) then goto continue + else if (type(s)=math_node)and(subtype(s)>=L_code) then goto continue +@z +%--------------------------------------- @x [40] m.896 l.17563 - e-TeX hyph_codes if lc_code(c)<>0 then if (lc_code(c)=c)or(uc_hyph>0) then goto done2 @@ -2042,6 +2059,13 @@ set_hyph_index; incr(j); hu[j]:=c; hc[j]:=hc[0];@/ @z %--------------------------------------- +@x [40] m.899 l.17623 - e-TeX TeXXeT + othercases goto done1 +@y + math_node: if subtype(s)>=L_code then goto done4@+else goto done1; + othercases goto done1 +@z +%--------------------------------------- @x [42] m.934 l.18245 new_hyph_exceptions - e-TeX hyph_codes label reswitch, exit, found, not_found; @y diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs index 7467f35974c..4fcdab1cf93 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs @@ -12,7 +12,7 @@ 1c1 < This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 --- -> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (INITEX) 9 APR 2013 11:37 +> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 3c3 < (trip.tex --- @@ -23,8 +23,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.4.9) -> 1490 strings of total length 26206 +> (format=trip 2013.11.21) +> 1490 strings of total length 26208 > 479 memory locations dumped; current usage is 104&278 > 342 multiletter control sequences 461c461 @@ -39,7 +39,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) +> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -53,7 +53,7 @@ 1c1 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 --- -> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (format=trip 2013.4.9) 9 APR 2013 11:37 +> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (format=trip 2013.11.21) 21 NOV 2013 10:53 3c3 < (trip.tex ## --- @@ -174,7 +174,7 @@ < 372 multiletter control sequences out of 2100 --- > 44 strings out of 1810 -> 261 string characters out of 7794 +> 261 string characters out of 7792 > 3821 words of memory out of 3999 > 373 multiletter control sequences out of 15000+0 7301c7305 @@ -187,11 +187,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 2013.04.09:1137' +> ' TeX output 2013.11.21:1053' 419c419 < 1121: down4 639342208 --- @@ -338,26 +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 2013) (INITEX) 1 MAR 2013 13:22 +< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43 --- -> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2013) (INITEX) 9 APR 2013 11:37 -26c26 -< (format=etrip 2013.3.1) ---- -> (format=etrip 2013.4.9) +> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:53 + ./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 2013) (format=etrip 2013.3.1) 1 MAR 2013 13:22 +< 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.1415926-2.6 (TeX Live 2013) (format=etrip 2013.4.9) 9 APR 2013 11:37 +> This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:53 + 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.03.01:1322' +< ' TeX output 2013.11.21:1043' --- -> ' TeX output 2013.04.09:1137' +> ' TeX output 2013.11.21:1053' + : PASS: etexdir/etrip.test diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.fot b/Build/source/texk/web2c/etexdir/etrip/etrip.fot index d009aa9a256..fc78dbe4fe6 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 2013) +This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) **entering extended mode (./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 [2013-11-21] for e-TeX v3.1415926-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 01512d907cc..3b201f46436 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 2013) (format=etrip 2013.3.1) 1 MAR 2013 13:22 +This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (format=etrip 2013.11.21) 21 NOV 2013 10:43 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 [2013-11-21] for e-TeX v3.1415926-2.6. (You are using e-TeX version/revision 2.6) Missing character: There is no b in font nullfont! @@ -4291,14 +4291,139 @@ laywidowpenalties: {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 1809 - 140 string characters out of 7763 + 19 strings out of 1809 + 145 string characters out of 7761 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 - 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/etexdir/etrip/etrip.tex b/Build/source/texk/web2c/etexdir/etrip/etrip.tex index 87287072028..0f8238ecd65 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 Mar 01, 2013. +%%; This is `etrip.tex' for e-TeX v3.1415926-2.6 as of Nov 21, 2013. %%; %%; 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,7 +9,7 @@ %%; ==>> 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\etripdate {2013-11-21} \def\texversion {3.1415926} \def\etripversion{2.6} % @@ -1243,6 +1243,20 @@ 507 1107 2207 1507 1007 2007 \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 diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.typ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ index f2409268a7a..81072959248 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.typ +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ @@ -1,4 +1,4 @@ -This is DVItype, Version 3.6 (TeX Live 2013) +This is DVItype, Version 3.6 (TeX Live 2014) Options selected: Starting page = *.*.*.*.*.*.*.*.*.* Maximum number of pages = 1000000 @@ -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.03.01:1322' +' TeX output 2013.11.21:1043' 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 0210bdc4540..e840a8657b8 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 2013) (INITEX) 1 MAR 2013 13:22 +This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43 entering extended mode ***etrip (./etrip.tex -This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6. +This is the e-Trip test [2013-11-21] for e-TeX v3.1415926-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,8 +23,8 @@ 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.3.1) -1491 strings of total length 26237 + (format=etrip 2013.11.21) +1491 strings of total length 26239 280 memory locations dumped; current usage is 36&166 408 multiletter control sequences \font\nullfont=nullfont diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 6de187d01f1..ea8e31ca6d1 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2013-11-21 Peter Breitenlohner + + * euptrip/euptrip.diffs: For etrip.tex Version 2.6 [2013-11-21]. + 2013-08-12 TANAKA Takuji * euptex.defines: Allow file names with 0x5c in (e)pTeX on Windows. diff --git a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs index fe9469d089f..73adbefc533 100644 --- a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs +++ b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-110825-2.6 (utf8.uptex) (TeX Live 2013) (INITEX) 9 APR 2013 12:23 +> 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 3,11c3 < (trip.tex < ! Bad character code (256). @@ -37,8 +37,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.4.9) -> 1614 strings of total length 27772 +> (format=trip 2013.11.21) +> 1617 strings of total length 27814 > 489 memory locations dumped; current usage is 110&278 > 393 multiletter control sequences 461c454 @@ -54,7 +54,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-110825-2.6 (utf8.uptex) (TeX Live 2013) +> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 @@ -68,7 +68,7 @@ 1c1 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-110825-2.6 (utf8.uptex) (TeX Live 2013) (format=trip 2013.4.9) 9 APR 2013 12:23 +> 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 3c3 < (trip.tex ## --- @@ -332,8 +332,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1686 -> 261 string characters out of 8228 +> 44 strings out of 1683 +> 261 string characters out of 8186 > 4017 words of memory out of 4500 > 424 multiletter control sequences out of 15000+0 7301c7310 @@ -346,11 +346,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 2013.04.09:1223' +> ' TeX output 2013.11.21:1053' 419c419 < 1121: down4 639342208 --- @@ -380,7 +380,7 @@ < I changed this one to zero. < --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-110825-2.6 (utf8.uptex) (TeX Live 2013) (INITEX) 9 APR 2013 12:23 +> 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 > entering extended mode > ***\input trip > (./trip.tex @@ -402,10 +402,10 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2013.4.9) -> 1614 strings of total length 27772 +> (format=trip 2013.11.21) +> 1617 strings of total length 27814 > 536 memory locations dumped; current usage is 157&278 -> 465 multiletter control sequences +> 468 multiletter control sequences 461c449 < Hyphenation trie of length 273 has 9 ops out of 500 --- @@ -419,7 +419,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-110825-2.6 (utf8.uptex) (TeX Live 2013) +> This is e-upTeX, Version 3.1415926-p3.4-u1.11-130605-2.6 (utf8.uptex) (TeX Live 2014) > **entering extended mode > ## (./trip.tex 17c17 @@ -440,7 +440,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-110825-2.6 (utf8.uptex) (TeX Live 2013) (format=trip 2013.4.9) 9 APR 2013 12:23 +> 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 > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex @@ -768,10 +768,10 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1686 -> 261 string characters out of 8228 +> 44 strings out of 1683 +> 261 string characters out of 8186 > 4017 words of memory out of 4500 -> 496 multiletter control sequences out of 15000+0 +> 499 multiletter control sequences out of 15000+0 7301,7302c7307,7308 < 2 hyphenation exceptions out of 307 < 7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s @@ -784,11 +784,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 2013.04.09:1223' +> ' TeX output 2013.11.21:1053' 419c419 < 1121: down4 639342208 --- @@ -809,31 +809,37 @@ + 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 2013) (INITEX) 1 MAR 2013 13:22 +< This is e-TeX, Version 3.1415926-2.6 (TeX Live 2014) (INITEX) 21 NOV 2013 10:43 --- -> This is e-upTeX, Version 3.1415926-p3.4-u1.11-110825-2.6 (utf8.uptex) (TeX Live 2013) (INITEX) 9 APR 2013 12:23 -26,29c26,29 -< (format=etrip 2013.3.1) -< 1491 strings of total length 26237 +> 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. +27,29c27,29 +< 1491 strings of total length 26239 < 280 memory locations dumped; current usage is 36&166 < 408 multiletter control sequences --- -> (format=etrip 2013.4.9) -> 1615 strings of total length 27803 +> 1618 strings of total length 27845 > 283 memory locations dumped; current usage is 40&166 -> 465 multiletter control sequences +> 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 2013) +< 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-upTeX, Version 3.1415926-p3.4-u1.11-110825-2.6 (utf8.uptex) (TeX Live 2013) +> This is the e-Trip test [2013-03-01] for e-TeX v3.1415926-2.6. + diff SRCDIR/eptexdir/eptrip/etrip.log euptrip.log 1c1 -< This is e-pTeX, Version 3.1415926-p3.4-110825-2.6 (utf8.euc) (TeX Live 2013) (format=etrip 2013.4.9) 9 APR 2013 11:49 +< 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-upTeX, Version 3.1415926-p3.4-u1.11-110825-2.6 (utf8.uptex) (TeX Live 2013) (format=etrip 2013.4.9) 9 APR 2013 12:23 +> 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 2210,2215d2209 < ! Bad character code (256). < l.676 \iffontchar\font 256 @@ -845,18 +851,18 @@ < 18 strings out of 1695 < 140 string characters out of 8218 --- -> 18 strings out of 1685 -> 140 string characters out of 8197 +> 18 strings out of 1682 +> 140 string characters out of 8155 4299c4293 < 460 multiletter control sequences out of 15000+0 --- -> 466 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.03.01:1322' +< ' TeX output 2013.11.21:1043' --- -> ' TeX output 2013.04.09:1223' +> ' TeX output 2013.11.21:1053' + : PASS: euptexdir/euptrip.test diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index 30d0a5ec999..c8eeb015152 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2013-11-18 Peter Breitenlohner + + * ptex-base.ch: Simplify a few change sets. + 2013-08-12 TANAKA Takuji * kanji.h, ptex-base.ch, ptex.defines: Allow file names with 0x5c in diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index fabc9971fb1..9077c77147c 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -4246,18 +4246,16 @@ loop@+ begin if is_char_node(s) then @x [44.968] l.19535 - pTeX: dir_node hlist_node,vlist_node,rule_node:@; @y - hlist_node,vlist_node,dir_node,rule_node: - @; + dir_node, + hlist_node,vlist_node,rule_node:@@;@/ - cur_height:=cur_height+prev_dp+height(p); prev_dp:=depth(p); @y -hlist_node,vlist_node,dir_node,rule_node: begin@t@>@;@/ - cur_height:=cur_height+prev_dp+height(p); prev_dp:=depth(p); +dir_node, +hlist_node,vlist_node,rule_node: begin@t@>@;@/ @z @x [44.977] l.19710 - pTeX: free box node -- cgit v1.2.3