diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-05-11 12:44:13 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-05-11 12:44:13 +0000 |
| commit | e4730f6631fecaccd8e56dbd8e0871149becbed9 (patch) | |
| tree | 339bb8f8ff0aa2ddb950c1d45dd3bb3d670da5d3 | |
| parent | 7a021388f71097e23e9730779a653ba271517735 (diff) | |
e-TeX 2.4, pTeX 3.3, triptrap diffs
git-svn-id: svn://tug.org/texlive/trunk@26302 c570f23f-e606-0410-a88d-b1316a301751
22 files changed, 2116 insertions, 436 deletions
diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog index 0962b67bc9b..35c9af5d463 100644 --- a/Build/source/texk/web2c/eptexdir/ChangeLog +++ b/Build/source/texk/web2c/eptexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * eptex.ech (eTeX_version_string): Version 2.4. + * eptrip/eptrip.{diffs,log,tex}: Adapted. + 2012-04-17 Peter Breitenlohner <peb@mppmu.mpg.de> * eptex.ech (just_copy): Bug fix, copy the additional pTeX word. diff --git a/Build/source/texk/web2c/eptexdir/eptex.ech b/Build/source/texk/web2c/eptexdir/eptex.ech index 0f29c2f97da..15225c7b43a 100644 --- a/Build/source/texk/web2c/eptexdir/eptex.ech +++ b/Build/source/texk/web2c/eptexdir/eptex.ech @@ -9,9 +9,9 @@ @z @x [1.2] l.190 - epTeX: -@d eTeX_version_string=='-2.3' {current \eTeX\ version} +@d eTeX_version_string=='-2.4' {current \eTeX\ version} @y -@d eTeX_version_string=='-2.3' {current \eTeX\ version} +@d eTeX_version_string=='-2.4' {current \eTeX\ version} @# @d epTeX_version_string=='-110825' @z diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs Binary files differindex 87e97a7b5ce..d6ba634580f 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs +++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs diff --git a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log index fc5402bece9..bd22f374330 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log +++ b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log @@ -1,9 +1,9 @@ -This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46 +This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=etrip 2012.5.11) 11 MAY 2012 14:10 entering extended mode **&etrip etrip -(etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2011-04-07] for e-TeX v3.1415926-2.3. -(You are using e-TeX version/revision 2.3) +(./etrip.tex e-IniTeX: e-Trip format loaded. +This is the e-Trip test [2012-05-11] for e-TeX v3.1415926-2.4. +(You are using e-TeX version/revision 2.4) Missing character: There is no b in font nullfont! Missing character: There is no c 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 +\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 @@ -638,7 +638,7 @@ l.404 ...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. @@ -663,13 +663,15 @@ l.409 ...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 -Memory usage before: 50&182; after: 36&176; still untouched: 680 -(etrip.out) ( +\openout1 = `etrip.out'. + +Memory usage before: 57&183; after: 40&177; still untouched: 2171 +(./etrip.out) ( Warning: end of semi simple group (level 3) entered at line 431 of a dif ferent file Warning: end of \iftrue entered on line 431 of a different file @@ -746,7 +748,7 @@ l.444 } % end of outer \scantokens ! Incomplete \iffalse; all text was ignored after line 9. <inserted text> - \fi + l.6 } l.444 } @@ -761,7 +763,7 @@ Warning: end of file when \ifnum entered on line 6 is incomplete l.9 \fi l.444 } - % end of outer \scantokens) (etrip.out + % end of outer \scantokens) (./etrip.out ! Undefined control sequence. \endgroup ->\9\9 @@ -792,7 +794,7 @@ Runaway definition? ->\begingroup ! File ended while scanning definition of \1. <inserted text> - } + l.453 ...scantokens{\begingroup} % <== error I suspect you have forgotten a `}', causing me @@ -937,7 +939,7 @@ Missing character: There is no e in font etrip! {false} {\showlists} -### restricted horizontal mode entered at line 468 +### yoko direction, restricted horizontal mode entered at line 468 \trip r \trip r (ligature up) \trip b @@ -948,7 +950,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. @@ -960,7 +962,7 @@ l.468 ...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} @@ -975,15 +977,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 @@ -991,61 +993,61 @@ 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.491 \1 \showbox0 \let\5=\3 \def\3#1{\showtokens\expandaft... > 0-1. -<recently read> } - +<recently read> + ... l.493 \1 \showbox1 \showbox0 \let\3=\5 > 0-2. -<recently read> } - +<recently read> + ... l.493 \1 \showbox1 \showbox0 \let\3=\5 > 1-1. -<recently read> } - +<recently read> + ... l.493 \1 \showbox1 \showbox0 \let\3=\5 > 1-1. -<recently read> } - +<recently read> + ... l.493 \1 \showbox1 \showbox0 \let\3=\5 > . -<recently read> } - +<recently read> + ... l.493 \1 \showbox1 \showbox0 \let\3=\5 > . -<recently read> } - +<recently read> + ... l.493 \1 \showbox1 \showbox0 \let\3=\5 @@ -1059,15 +1061,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 @@ -1076,21 +1078,21 @@ l.493 \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.493 \1 \showbox1 \showbox0 @@ -1105,10 +1107,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 @@ -1117,14 +1119,14 @@ l.495 \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.495 \1 \showbox1 \showbox0 @@ -1139,9 +1141,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. @@ -1149,9 +1151,9 @@ l.497 \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.497 \1 \showbox1 \showbox0 @@ -1180,15 +1182,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 @@ -1210,10 +1212,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 @@ -1235,9 +1237,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. @@ -1258,9 +1260,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{} @@ -1284,9 +1286,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{} @@ -1310,9 +1312,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. @@ -1324,7 +1326,7 @@ l.502 ...x{}\vfil\penalty-10000 Checking \middle: ! Missing $ inserted. <inserted text> - $ + ... l.511 \setbox0=\vbox{\middle \par \right \par} % <== 8 errors @@ -1352,7 +1354,7 @@ I'm ignoring a \middle that had no matching \left. ! Missing $ inserted. <inserted text> - $ + ... l.511 ...box0=\vbox{\middle \par \right \par} % <== 8 errors @@ -1361,7 +1363,7 @@ you left one out. Proceed, with fingers crossed. ! Missing $ inserted. <inserted text> - $ + ... l.511 ...box{\middle \par \right \par} % <== 8 errors @@ -1389,7 +1391,7 @@ I'm ignoring a \right that had no matching \left. ! Missing $ inserted. <inserted text> - $ + ... l.511 ...middle \par \right \par } % <== 8 errors @@ -1397,7 +1399,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 522 +### yoko(math) direction, math mode entered at line 522 \mathord .\fam1 r this will be denominator of: @@ -1411,7 +1413,7 @@ this will be denominator of: \\middle"142342 \\mathord \.\fam1 q -### math mode entered at line 519 +### yoko(math) direction, math mode entered at line 519 \left"161361 \mathord .\fam1 p @@ -1421,7 +1423,7 @@ this will be denominator of: \middle"142342 \mathord .\fam1 q -### math mode entered at line 515 +### yoko(math) direction, math mode entered at line 515 \mathord .\fam1 r this will be denominator of: @@ -1429,14 +1431,14 @@ this will be denominator of: \\left"161361 \\mathord \.\fam1 q -### math mode entered at line 514 +### yoko(math) direction, math mode entered at line 514 \left"161361 \mathord .\fam1 p -### math mode entered at line 513 -### restricted horizontal mode entered at line 512 +### yoko(math) direction, math mode entered at line 513 +### yoko direction, restricted horizontal mode entered at line 512 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1444,7 +1446,7 @@ l.523 ... \over r\showlists -### math mode entered at line 519 +### yoko(math) direction, math mode entered at line 519 \left"161361 \mathord .\fam1 p @@ -1468,7 +1470,7 @@ l.523 ... \over r\showlists ./\mathord ./.\fam1 r .\right"162362 -### math mode entered at line 515 +### yoko(math) direction, math mode entered at line 515 \mathord .\fam1 r this will be denominator of: @@ -1476,14 +1478,14 @@ this will be denominator of: \\left"161361 \\mathord \.\fam1 q -### math mode entered at line 514 +### yoko(math) direction, math mode entered at line 514 \left"161361 \mathord .\fam1 p -### math mode entered at line 513 -### restricted horizontal mode entered at line 512 +### yoko(math) direction, math mode entered at line 513 +### yoko direction, restricted horizontal mode entered at line 512 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1491,7 +1493,7 @@ l.524 ... \right]\showlists -### math mode entered at line 515 +### yoko(math) direction, math mode entered at line 515 \mathord .\fam1 r \mathinner @@ -1524,14 +1526,14 @@ this will be denominator of: \\left"161361 \\mathord \.\fam1 q -### math mode entered at line 514 +### yoko(math) direction, math mode entered at line 514 \left"161361 \mathord .\fam1 p -### math mode entered at line 513 -### restricted horizontal mode entered at line 512 +### yoko(math) direction, math mode entered at line 513 +### yoko direction, restricted horizontal mode entered at line 512 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1539,7 +1541,7 @@ l.525 ... \right]\showlists -### math mode entered at line 514 +### yoko(math) direction, math mode entered at line 514 \left"161361 \mathord .\fam1 p @@ -1576,10 +1578,10 @@ l.525 ... \right]\showlists ./..\right"162362 ./.\right"162362 .\right"162362 -### math mode entered at line 513 -### restricted horizontal mode entered at line 512 +### yoko(math) direction, math mode entered at line 513 +### yoko direction, restricted horizontal mode entered at line 512 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1587,7 +1589,7 @@ l.526 \right]\showlists -### math mode entered at line 513 +### yoko(math) direction, math mode entered at line 513 \mathinner .\left"161361 .\mathord @@ -1626,9 +1628,9 @@ l.526 \right]\showlists ../.\right"162362 ..\right"162362 .\right"162362 -### restricted horizontal mode entered at line 512 +### yoko direction, restricted horizontal mode entered at line 512 spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1636,7 +1638,7 @@ l.527 \right]\showlists -### restricted horizontal mode entered at line 512 +### yoko direction, restricted horizontal mode entered at line 512 \mathon \hbox(30.99977+16.99977)x80.99994 .\hbox(14.00002+2.0)x6.00002, shifted -0.99998 @@ -1839,7 +1841,7 @@ l.527 \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. @@ -1847,7 +1849,7 @@ l.528 $\showlists -### restricted horizontal mode entered at line 530 +### yoko direction, restricted horizontal mode entered at line 530 \mathon \hbox(17.0+3.00002)x19.00002 .\hbox(14.00002+2.0)x6.00002, shifted -0.99998 @@ -1855,7 +1857,7 @@ l.528 $\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 ^^@ @@ -1867,7 +1869,7 @@ l.528 $\showlists ...\trip B \mathoff spacefactor 1000 -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -1875,12 +1877,12 @@ l.532 ...box{}\right]$\showlists } -### restricted horizontal mode entered at line 533 +### yoko direction, restricted horizontal mode entered at line 533 \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 @@ -1899,7 +1901,7 @@ l.532 ...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. @@ -1918,7 +1920,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 @@ -1942,7 +1944,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 @@ -1969,7 +1971,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 @@ -2181,13 +2183,13 @@ look up `weird error' in the index to The TeXbook.) ! Bad character code (-1). l.673 ...ffontchar\textfont2 -1 \else \fi % <== bad charac... -A character number must be between 0 and 255. +A character number must be between 0 and 255, or KANJI code. I changed this one to zero. ! Bad character code (256). l.674 \iffontchar\font 256 \else \fi % <== bad character... -A character number must be between 0 and 255. +A character number must be between 0 and 255, or KANJI code. I changed this one to zero. ! You can't use `\fontcharwd' in vertical mode. @@ -2345,8 +2347,8 @@ Continue and I'll use the largest value I can. {changing \dimen45=0.0pt} {into \dimen45=16383.99998pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.778 ...5=\dimexpr1sp*\skip44\9 I can't evaluate this expression, @@ -2367,8 +2369,8 @@ Continue and I'll use the largest value I can. {changing \dimen45=0.0pt} {into \dimen45=16383.99998pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.780 ...5=\dimexpr1sp*\skip44\9 I can't evaluate this expression, @@ -2377,8 +2379,8 @@ since the result is out of range. {changing \dimen45=16383.99998pt} {into \dimen45=0.0pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.781 ...4=\numexpr"7FFFFFFE+2\9 \dimen44=\dimexpr"3FFFFFF... I can't evaluate this expression, @@ -2387,8 +2389,8 @@ since the result is out of range. {changing \count44=2147450880} {into \count44=0} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.781 ...imexpr"3FFFFFFEsp+2sp\9 I can't evaluate this expression, @@ -2397,8 +2399,8 @@ since the result is out of range. {changing \dimen44=-16384.0pt} {into \dimen44=0.0pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.782 ...=\numexpr-"7FFFFFFE-2\9 \dimen44=\dimexpr-"3FFFFFF... I can't evaluate this expression, @@ -2406,8 +2408,8 @@ since the result is out of range. {reassigning \count44=0} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.782 ...mexpr-"3FFFFFFEsp-2sp\9 I can't evaluate this expression, @@ -2415,8 +2417,8 @@ since the result is out of range. {reassigning \dimen44=0.0pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.783 ...=\numexpr"10000*"8000\9 \dimen44=\dimexpr"8000sp*"... I can't evaluate this expression, @@ -2424,8 +2426,8 @@ since the result is out of range. {reassigning \count44=0} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.783 ...\dimexpr"8000sp*"8000\9 I can't evaluate this expression, @@ -2433,8 +2435,8 @@ since the result is out of range. {reassigning \dimen44=0.0pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.784 ...\numexpr"10000*-"8000\9 \dimen44=\dimexpr"8000sp*-"... I can't evaluate this expression, @@ -2442,8 +2444,8 @@ since the result is out of range. {reassigning \count44=0} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.784 ...dimexpr"8000sp*-"8000\9 I can't evaluate this expression, @@ -2451,8 +2453,8 @@ since the result is out of range. {reassigning \dimen44=0.0pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.785 ...\numexpr-"10000*"8000\9 \dimen44=\dimexpr-"8000sp*"... I can't evaluate this expression, @@ -2460,8 +2462,8 @@ since the result is out of range. {reassigning \count44=0} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.785 ...dimexpr-"8000sp*"8000\9 I can't evaluate this expression, @@ -2469,8 +2471,8 @@ since the result is out of range. {reassigning \dimen44=0.0pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.786 ...numexpr-"10000*-"8000\9 \dimen44=\dimexpr-"8000sp*-"... I can't evaluate this expression, @@ -2478,8 +2480,8 @@ since the result is out of range. {reassigning \count44=0} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.786 ...imexpr-"8000sp*-"8000\9 I can't evaluate this expression, @@ -2487,8 +2489,8 @@ since the result is out of range. {reassigning \dimen44=0.0pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.787 \count44=\numexpr0/0\9 \dimen44=\dimexpr... I can't evaluate this expression, @@ -2496,8 +2498,8 @@ since the result is out of range. {reassigning \count44=0} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.787 ...dimen44=\dimexpr0pt/0\9 I can't evaluate this expression, @@ -2505,8 +2507,8 @@ since the result is out of range. {reassigning \dimen44=0.0pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.788 \count44=\numexpr1/0\9 \dimen44=\dimexpr... I can't evaluate this expression, @@ -2514,8 +2516,8 @@ since the result is out of range. {reassigning \count44=0} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.788 ...dimen44=\dimexpr1pt/0\9 I can't evaluate this expression, @@ -2523,8 +2525,8 @@ since the result is out of range. {reassigning \dimen44=0.0pt} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.789 ...\count44=\numexpr-1/0\9 \dimen44=\dimexpr-... I can't evaluate this expression, @@ -2532,8 +2534,8 @@ since the result is out of range. {reassigning \count44=0} ! Arithmetic overflow. -<recently read> \9 - +<recently read> + l.789 ...imen44=\dimexpr-1pt/0\9 I can't evaluate this expression, @@ -2569,8 +2571,8 @@ Expr quotient rounding 2 OK Expr quotient rounding 3 OK Expr quotient rounding 4 OK ! Incompatible glue units. -<recently read> \9 - +<recently read> + ... l.829 \15{32}{5}{6} % <== three mu_error's (! Incompatibl... @@ -2585,8 +2587,8 @@ l.829 \15{32}{5}{6} I'm going to assume that 1mu=1pt when they're mixed. ! Incompatible glue units. -<recently read> \relax - +<recently read> + ... l.829 \15{32}{5}{6} % <== three mu_error's (! Incompatibl... @@ -2594,8 +2596,8 @@ I'm going to assume that 1mu=1pt when they're mixed. Expr quotient rounding 5 OK ! Incompatible glue units. -<recently read> \9 - +<recently read> + ... l.830 \16{33}{5}{7} % <== three mu_error's (! Incompatibl... @@ -2610,8 +2612,8 @@ l.830 \16{33}{5}{7} I'm going to assume that 1mu=1pt when they're mixed. ! Incompatible glue units. -<recently read> \relax - +<recently read> + ... l.830 \16{33}{5}{7} % <== three mu_error's (! Incompatibl... @@ -2619,8 +2621,8 @@ I'm going to assume that 1mu=1pt when they're mixed. Expr quotient rounding 6 OK ! Incompatible glue units. -<recently read> \9 - +<recently read> + ... l.831 \17{25}{4}{6} % <== three mu_error's (! Incompatibl... @@ -2635,8 +2637,8 @@ l.831 \17{25}{4}{6} I'm going to assume that 1mu=1pt when they're mixed. ! Incompatible glue units. -<recently read> \relax - +<recently read> + ... l.831 \17{25}{4}{6} % <== three mu_error's (! Incompatibl... @@ -2644,8 +2646,8 @@ I'm going to assume that 1mu=1pt when they're mixed. Expr quotient rounding 7 OK ! Incompatible glue units. -<recently read> \9 - +<recently read> + ... l.832 \18{26}{4}{7} % <== three mu_error's (! Incompatibl... @@ -2660,8 +2662,8 @@ l.832 \18{26}{4}{7} I'm going to assume that 1mu=1pt when they're mixed. ! Incompatible glue units. -<recently read> \relax - +<recently read> + ... l.832 \18{26}{4}{7} % <== three mu_error's (! Incompatibl... @@ -2681,8 +2683,8 @@ I can't evaluate this expression, since the result is out of range. ! Arithmetic overflow. -<inserted text> \relax - +<inserted text> + <to be read again> \else \1...expr (#3sp)*(#4)/(#5)\else @@ -2694,9 +2696,9 @@ since the result is out of range. Expr fraction rounding 3 OK [1] -Memory usage before: 51&320; after: 44&320; still untouched: 680 +Memory usage before: 58&321; after: 48&321; still untouched: 1171 [1] -Memory usage before: 51&320; after: 44&320; still untouched: 680 +Memory usage before: 58&321; after: 48&321; still untouched: 1171 Checking \mutoglue and \gluetomu: ! You can't use `\mutoglue' in vertical mode. l.903 \mutoglue @@ -3187,7 +3189,7 @@ l.1044 \showbox32100 > \box32101= -\hbox(0.0+0.0)x3.0 +\hbox(0.0+0.0)x3.0, yoko direction ! OK. l.1045 \showbox32101 @@ -3240,7 +3242,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 [] @@ -3252,10 +3254,10 @@ l.1079 \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 @@ -3283,7 +3285,7 @@ l.1079 \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 [] @@ -3295,10 +3297,10 @@ l.1080 \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 @@ -3326,7 +3328,7 @@ l.1080 \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 [] @@ -3338,10 +3340,10 @@ l.1081 \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 @@ -3377,7 +3379,7 @@ l.1081 \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 [] @@ -3395,8 +3397,8 @@ l.1085 ... \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 @@ -3424,7 +3426,7 @@ l.1085 ... \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 [] @@ -3436,11 +3438,11 @@ l.1087 \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 @@ -3468,7 +3470,7 @@ l.1087 \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 [] @@ -3480,10 +3482,10 @@ l.1089 \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 @@ -3511,7 +3513,7 @@ l.1089 \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 [] @@ -3523,10 +3525,10 @@ l.1091 \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 @@ -3554,7 +3556,7 @@ l.1091 \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 [] @@ -3566,10 +3568,10 @@ l.1092 \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 @@ -3597,7 +3599,7 @@ l.1092 \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 [] @@ -3609,10 +3611,10 @@ l.1093 \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 @@ -3640,7 +3642,7 @@ l.1093 \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 [] @@ -3652,11 +3654,11 @@ l.1097 ... \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 @@ -3684,7 +3686,7 @@ l.1097 ... \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 [] @@ -3696,10 +3698,10 @@ l.1099 \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 @@ -3727,7 +3729,7 @@ l.1099 \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 [] @@ -3739,10 +3741,10 @@ l.1100 \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 @@ -3770,7 +3772,7 @@ l.1100 \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 [] @@ -3782,10 +3784,10 @@ l.1102 \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 @@ -3813,7 +3815,7 @@ l.1102 \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 [] @@ -3825,10 +3827,10 @@ l.1103 \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 @@ -3856,7 +3858,7 @@ l.1103 \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 [] @@ -3868,10 +3870,10 @@ l.1104 \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 @@ -3981,7 +3983,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 1138--1138 Checking \savingvdiscards, \pagediscards, and \splitdiscards: ! Missing $ inserted. <inserted text> - $ + ... l.1146 ...oindent$\splitdiscards \noindent$\pagediscards} @@ -3990,7 +3992,7 @@ you left one out. Proceed, with fingers crossed. ! Missing $ inserted. <inserted text> - $ + ... l.1146 ...noindent$\pagediscards } @@ -3998,7 +4000,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 @@ -4019,17 +4021,17 @@ l.1147 \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. @@ -4039,18 +4041,18 @@ l.1175 \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. @@ -4060,20 +4062,20 @@ l.1175 \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. @@ -4083,9 +4085,9 @@ l.1175 ... \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} @@ -4093,10 +4095,10 @@ l.1175 ... \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. @@ -4106,9 +4108,9 @@ l.1175 ... \1 1 20 \1 2 30 -### internal vertical mode entered at line 1184 +### yoko direction, internal vertical mode entered at line 1184 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 @@ -4121,9 +4123,9 @@ l.1184 ...0 \vfil \kern 20 pt \1 \penalty -1 \1 -### internal vertical mode entered at line 1184 +### yoko direction, internal vertical mode entered at line 1184 prevdepth ignored -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -4133,9 +4135,9 @@ l.1184 ...0 pt \1 \penalty -1 \1 -### internal vertical mode entered at line 1185 +### yoko direction, internal vertical mode entered at line 1185 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 @@ -4148,12 +4150,12 @@ l.1185 ...1 \vfill \kern 2 pt \1 \penalty 10 \1 -### internal vertical mode entered at line 1185 +### yoko direction, internal vertical mode entered at line 1185 \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. @@ -4163,7 +4165,7 @@ l.1185 ...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 @@ -4176,12 +4178,12 @@ l.1190 ...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. <output> ...wbox 0 \showbox 255 @@ -4190,10 +4192,10 @@ l.1190 ...box {} \penalty -10000 -### internal vertical mode entered at line 1191 +### yoko direction, internal vertical mode entered at line 1191 \penalty 10000 prevdepth ignored -### vertical mode entered at line 0 +### yoko direction, vertical mode entered at line 0 prevdepth 0.0 ! OK. @@ -4262,7 +4264,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} @@ -4270,12 +4272,12 @@ laywidowpenalties: {restoring \interlinepenalties=0} ) Here is how much of TeX's memory you used: - 22 strings out of 1665 - 132 string characters out of 8410 - 2661 words of memory out of 3000 - 408 multiletter control sequences out of 2100 + 18 strings out of 1696 + 140 string characters out of 8256 + 3329 words of memory out of 4500 + 460 multiletter control sequences out of 15000+0 2286 words of font info for 3 fonts, out of 20000 for 75 - 10 hyphenation exceptions out of 307 + 9 hyphenation exceptions out of 659 10i,15n,8p,137b,78s 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/etrip.tex index 50d83a56604..11ec9fc289b 100644 --- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex +++ b/Build/source/texk/web2c/eptexdir/eptrip/etrip.tex @@ -1,4 +1,4 @@ -%%; This is `eptrip.tex' for e-pTeX v3.1415926-2.3 as of April 7, 2011. +%%; This is `eptrip.tex' for e-pTeX v3.1415926-2.4 as of May 11, 2012. %%; %%; 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,9 +9,9 @@ %%; ==>> wrong e-TeX input to produce errors and warnings. <<== %%; \catcode`\{=1\catcode`\}=2\catcode`\#=6 \let\bgroup={ \let\egroup=} -\def\etripdate {2011-04-07} +\def\etripdate {2012-05-11} \def\texversion {3.1415926} -\def\etripversion{2.3} +\def\etripversion{2.4} % \message{This is the e-Trip test [\etripdate] for e-TeX v\texversion-\etripversion.} diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog index 2da4c04c04c..d7f5267f019 100644 --- a/Build/source/texk/web2c/etexdir/ChangeLog +++ b/Build/source/texk/web2c/etexdir/ChangeLog @@ -1,3 +1,9 @@ +2012-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * etex.ch: Version 2.4, dated May 11, 2012. + * etrip/etrip.tex, etrip/etripin.log, etrip/etrip.log, + etrip/etrip.fot, etrip/etrip.typ, etrip/etrip.diffs: Adapted. + 2012-04-11 Peter Breitenlohner <peb@mppmu.mpg.de> * etex.ch: Fixed a typo in TeX text. diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch index 7bb480e215e..3974121ce84 100644 --- a/Build/source/texk/web2c/etexdir/etex.ch +++ b/Build/source/texk/web2c/etexdir/etex.ch @@ -98,6 +98,7 @@ % some rearrangements to reduce interferences between % e-TeX and pTeX, in part suggested by Hironori Kitagawa % <h_kitagawa2001@@yahoo.co.jp>, Mar 2011. +% Version 2.4 fixed an uninitialized line number bug, released in May 2012. % Although considerable effort has been expended to make the e-TeX program % correct and reliable, no warranty is implied; the author disclaims any @@ -183,8 +184,8 @@ known as `\eTeX'. @d banner=='This is TeX, Version 3.1415926' {printed when \TeX\ starts} @y @d eTeX_version=2 { \.{\\eTeXversion} } -@d eTeX_revision==".3" { \.{\\eTeXrevision} } -@d eTeX_version_string=='-2.3' {current \eTeX\ version} +@d eTeX_revision==".4" { \.{\\eTeXrevision} } +@d eTeX_version_string=='-2.4' {current \eTeX\ version} @# @d eTeX_banner=='This is e-TeX, Version 3.1415926',eTeX_version_string {printed when \eTeX\ starts} diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.diffs b/Build/source/texk/web2c/etexdir/etrip/etrip.diffs index 44b152a91e3..e14c153b000 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.3 (TeX Live 2011) (INITEX) 15 APR 2011 13:04 +> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX) 11 MAY 2012 13:57 3c3 < (trip.tex --- @@ -23,8 +23,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2011.4.15) -> 1489 strings of total length 26179 +> (format=trip 2012.5.11) +> 1490 strings of total length 26207 > 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.3 (TeX Live 2011) +> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) > **(./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.3 (TeX Live 2011) (format=trip 2011.4.15) 15 APR 2011 13:04 +> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (format=trip 2012.5.11) 11 MAY 2012 13:57 3c3 < (trip.tex ## --- @@ -173,8 +173,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1811 -> 261 string characters out of 7821 +> 44 strings out of 1810 +> 261 string characters out of 7793 > 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 2011) +> This is DVItype, Version 3.6 (TeX Live 2012) 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2011.04.15:1304' +> ' TeX output 2012.05.11:1357' 419c419 < 1121: down4 639342208 --- @@ -338,40 +338,22 @@ + mv etrip.log etripin.log + diff SRCDIR/etexdir/etrip/etripin.log etripin.log 1c1 -< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 11:46 +< This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX) 11 MAY 2012 13:47 --- -> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (INITEX) 15 APR 2011 13:04 -26,27c26,27 -< (format=etrip 2011.4.7) -< 1490 strings of total length 26209 ---- -> (format=etrip 2011.4.15) -> 1490 strings of total length 26210 +> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX) 11 MAY 2012 13:57 + ./etex --progname=etex + diff SRCDIR/etexdir/etrip/etrip.fot etrip.fot -1c1 -< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) ---- -> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) + diff SRCDIR/etexdir/etrip/etrip.log etrip.log 1c1 -< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46 ---- -> This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011) (format=etrip 2011.4.15) 15 APR 2011 13:04 -4276c4276 -< 140 string characters out of 7791 +< This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (format=etrip 2012.5.11) 11 MAY 2012 13:47 --- -> 140 string characters out of 7790 +> This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (format=etrip 2012.5.11) 11 MAY 2012 13:57 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi + diff SRCDIR/etexdir/etrip/etrip.typ etrip.typ -1c1 -< This is DVItype, Version 3.6 ---- -> This is DVItype, Version 3.6 (TeX Live 2011) 9c9 -< ' TeX output 2011.04.07:1213' +< ' TeX output 2012.05.11:1347' --- -> ' TeX output 2011.04.15:1304' +> ' TeX output 2012.05.11:1357' + : 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 a4f0b9fa4d3..6aa000a3cee 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.fot +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.fot @@ -1,8 +1,8 @@ -This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) +This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) **entering extended mode (./etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2011-04-07] for e-TeX v3.1415926-2.3. -(You are using e-TeX version/revision 2.3) +This is the e-Trip test [2012-05-11] for e-TeX v3.1415926-2.4. +(You are using e-TeX version/revision 2.4) 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 60479be6820..209b0197b5a 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etrip.log +++ b/Build/source/texk/web2c/etexdir/etrip/etrip.log @@ -1,9 +1,9 @@ -This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46 +This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (format=etrip 2012.5.11) 11 MAY 2012 13:47 entering extended mode **&etrip etrip (./etrip.tex e-IniTeX: e-Trip format loaded. -This is the e-Trip test [2011-04-07] for e-TeX v3.1415926-2.3. -(You are using e-TeX version/revision 2.3) +This is the e-Trip test [2012-05-11] for e-TeX v3.1415926-2.4. +(You are using e-TeX version/revision 2.4) Missing character: There is no b in font nullfont! Missing character: There is no c in font nullfont! @@ -4272,8 +4272,8 @@ laywidowpenalties: {restoring \interlinepenalties=0} ) Here is how much of TeX's memory you used: - 18 strings out of 1810 - 140 string characters out of 7791 + 18 strings out of 1809 + 140 string characters out of 7762 3164 words of memory out of 3999 409 multiletter control sequences out of 15000+0 2286 words of font info for 3 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 3bc4bd27bf4..0b9c794f011 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.3 as of April 7, 2011. +%%; This is `etrip.tex' for e-TeX v3.1415926-2.4 as of May 11, 2012. %%; %%; 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,9 +9,9 @@ %%; ==>> wrong e-TeX input to produce errors and warnings. <<== %%; \catcode`\{=1\catcode`\}=2\catcode`\#=6 \let\bgroup={ \let\egroup=} -\def\etripdate {2011-04-07} +\def\etripdate {2012-05-11} \def\texversion {3.1415926} -\def\etripversion{2.3} +\def\etripversion{2.4} % \message{This is the e-Trip test [\etripdate] for e-TeX v\texversion-\etripversion.} diff --git a/Build/source/texk/web2c/etexdir/etrip/etrip.typ b/Build/source/texk/web2c/etexdir/etrip/etrip.typ index 78a8668c6df..d65d7d9adc7 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 +This is DVItype, Version 3.6 (TeX Live 2012) 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 2011.04.07:1213' +' TeX output 2012.05.11:1347' 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 93e9ca0ecb1..b76c0b7fde6 100644 --- a/Build/source/texk/web2c/etexdir/etrip/etripin.log +++ b/Build/source/texk/web2c/etexdir/etrip/etripin.log @@ -1,9 +1,9 @@ -This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 11:46 +This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX) 11 MAY 2012 13:47 entering extended mode ***etrip (./etrip.tex -This is the e-Trip test [2011-04-07] for e-TeX v3.1415926-2.3. -(You are using e-TeX version/revision 2.3) +This is the e-Trip test [2012-05-11] for e-TeX v3.1415926-2.4. +(You are using e-TeX version/revision 2.4) e-IniTeX: Assigning category codes, tracing switches, other codes, definitions for e-VirTeX e-Trip test run, constants and registers, fonts, some math characters, some math parameters, hyphenation, @@ -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 2011.4.7) -1490 strings of total length 26209 + (format=etrip 2012.5.11) +1491 strings of total length 26238 280 memory locations dumped; current usage is 36&166 408 multiletter control sequences \font\nullfont=nullfont diff --git a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs index 8bac63f047f..1c589187d43 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.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 +> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (INITEX) 11 MAY 2012 14:17 3,11c3 < (trip.tex < ! Bad character code (256). @@ -26,6 +26,12 @@ < --- > (./trip.tex +47,48c39,40 +< <recently read> \font +< +--- +> <recently read> +> 91c83,84 < ### horizontal mode entered at line 77 (language255:hyphenmin1,63) --- @@ -37,8 +43,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2012.1.16) -> 1612 strings of total length 27706 +> (format=trip 2012.5.11) +> 1613 strings of total length 27734 > 489 memory locations dumped; current usage is 110&278 > 393 multiletter control sequences 461c454 @@ -54,12 +60,26 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) +> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 --- > Memory usage before: 194&313; after: 118&278; still untouched: 2109 +28c27 +< } +--- +> +43,44c42,43 +< <recently read> end +< +--- +> <recently read> +> +70c69 +< }endwrite +--- +> 75c74 < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- @@ -68,7 +88,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.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (format=trip 2012.1.16) 16 JAN 2012 15:14 +> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (format=trip 2012.5.11) 11 MAY 2012 14:17 3c3 < (trip.tex ## --- @@ -110,6 +130,12 @@ --- > \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost > 3 +494,495c498,499 +< <recently read> \showlists +< +--- +> <recently read> +> 642c646 < Memory usage before: 747&484; after: 581&481; still untouched: 1492 --- @@ -139,6 +165,12 @@ --- > \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost > 3 +723,724c728,729 +< <recently read> \showlists +< +--- +> <recently read> +> 815c820 < Memory usage before: 475&470; after: 290&466; still untouched: 1473 --- @@ -148,6 +180,12 @@ --- > ### internal vertical mode entered at line 150 (\output > routine) +832,833c838,839 +< <recently read> \showlists +< +--- +> <recently read> +> 915c921 < Memory usage before: 218&459; after: 149&458; still untouched: 1473 --- @@ -157,6 +195,12 @@ --- > ### internal vertical mode entered at line 150 (\output > routine) +928,929c935,936 +< <recently read> \showlists +< +--- +> <recently read> +> 1070c1077 < Memory usage before: 118&328; after: 102&328; still untouched: 1473 --- @@ -171,6 +215,12 @@ < Memory usage before: 990&376; after: 584&370; still untouched: 735 --- > Memory usage before: 1490&375; after: 842&369; still untouched: 1970 +1809,1810c1817,1818 +< <recently read> $ +< +--- +> <recently read> +> 1954c1962 < (tripos.tex --- @@ -189,10 +239,32 @@ < Memory usage before: 950&531; after: 546&448; still untouched: 706 --- > Memory usage before: 1458&530; after: 808&447; still untouched: 1941 +2256,2257c2264,2265 +< <recently read> \font +< +--- +> <recently read> +> 2397c2405 < ! Improper alphabetic constant. --- > ! Improper alphabetic or KANJI constant. +2455c2463 +< \endgroup +--- +> +2468,2469c2476,2477 +< <recently read> \halign +< +--- +> <recently read> +> +2497,2498c2505,2506 +< <recently read> = +< +--- +> <recently read> +> 2533c2541 < \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil --- @@ -201,10 +273,28 @@ < Memory usage before: 339&413; after: 236&405; still untouched: 706 --- > Memory usage before: 493&411; after: 327&403; still untouched: 1941 +2587,2588c2595,2596 +< <recently read> \eqno +< +--- +> <recently read> +> +2695,2696c2703,2704 +< <recently read> $ +< +--- +> <recently read> +> 2830c2838 < Since I expected to read a number between 0 and 15, --- > Since I expected to read a number between 0 and 255, +2904,2905c2912,2913 +< <recently read> \displaylimits +< +--- +> <recently read> +> 3051c3059 < \insert0, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 --- @@ -215,10 +305,20 @@ > .\fam0 È 3143a3152 > ....\displace 0.0 +3207c3216 +< } +--- +> 3235c3244 < ! \textfont 0 is undefined (character ^^c8). --- > ! \textfont 0 is undefined (character È). +3297,3298c3306,3307 +< <recently read> \! +< +--- +> <recently read> +> 3326c3335 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil --- @@ -233,10 +333,26 @@ < Memory usage before: 2170&521; after: 1181&459; still untouched: 175 --- > Memory usage before: 3263&519; after: 1743&457; still untouched: 483 +3778c3788 +< \inaccessible +--- +> +3810c3820 +< \right . +--- +> +3825c3835 +< \right . +--- +> 3864c3874 < \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil --- > \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil +3938c3948 +< }\endwrite +--- +> 3951c3961 < Memory usage before: 640&415; after: 397&410; still untouched: 175 --- @@ -269,6 +385,24 @@ < Memory usage before: 651&432; after: 417&418; still untouched: 175 --- > Memory usage before: 992&431; after: 598&417; still untouched: 483 +4549,4550c4559,4560 +< <argument> ## +< +--- +> <argument> +> +4679,4680c4689,4690 +< <template> \A +< \endtemplate +--- +> <template> +> +4689,4690c4699,4700 +< <recently read> } +< +--- +> <recently read> +> 4742c4752,4753 < \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil --- @@ -287,26 +421,250 @@ < Since I expected to read a number between 0 and 15, < I changed this one to zero. < -5700c5703 +4901c4904 +< \inaccessible +--- +> +4996c4999 +< } +--- +> +5089c5092 +< \fi +--- +> +5102c5105 +< \cr } +--- +> +5115,5116c5118,5119 +< <inserted text> \cr +< } +--- +> <inserted text> +> +5171c5174 +< } +--- +> +5200c5203 +< } +--- +> +5220c5223 +< \par +--- +> +5232c5235 +< \par +--- +> +5250c5253 +< \par +--- +> +5266c5269 +< \par +--- +> +5330c5333 +< $ +--- +> +5384c5387 +< $ +--- +> +5395c5398 +< } +--- +> +5432c5435 +< } +--- +> +5530,5531c5533,5534 +< <recently read> \enorm +< +--- +> <recently read> +> +5654,5655c5657,5658 +< <recently read> \accent +< +--- +> <recently read> +> +5674c5677 +< $ +--- +> +5685c5688 +< } +--- +> +5700,5702c5703,5705 < ! \textfont 0 is undefined (character ^^c8). +< <recently read> $ +< --- > ! \textfont 0 is undefined (character È). +> <recently read> +> +5848,5849c5851,5852 +< <recently read> \trip +< +--- +> <recently read> +> +5856,5857c5859,5860 +< <recently read> \trip +< +--- +> <recently read> +> +5911,5912c5914,5915 +< <recently read> \foo +< +--- +> <recently read> +> +5915,5916c5918,5919 +< <template> \endtemplate +< +--- +> <template> +> +5938,5939c5941,5942 +< <template> }\endtemplate +< +--- +> <template> +> +5959c5962 +< } +--- +> +5973c5976 +< \cr +--- +> +5985c5988 +< { +--- +> +6109c6112 +< } +--- +> +6152c6155 +< } +--- +> +6283,6284c6286,6287 +< <template> \cr +< +--- +> <template> +> +6297,6298c6300,6301 +< <template> & +< \ifnum 0=`{\fi \endtemplate +--- +> <template> +> +6342,6343c6345,6346 +< <recently read> \err +< +--- +> <recently read> +> +6346,6347c6349,6350 +< <template> \endtemplate +< +--- +> <template> +> 6380c6383 < (tripos.tex --- > (./tripos.tex +6403,6404c6406,6407 +< <recently read> \input +< +--- +> <recently read> +> 6501c6504 < l.429 ...^^M=13 \def^^M{\relax}# --- > l.429 ...^^M=13 \defqqM{\relax}# +6541c6544 +< \par +--- +> +6544,6545c6547,6548 +< <inserted text> } +< \endwrite +--- +> <inserted text> +> +6561,6562c6564,6565 +< <inserted text> } +< \endwrite +--- +> <inserted text> +> +6581,6582c6584,6585 +< <recently read> } +< +--- +> <recently read> +> 6595c6598 < Memory usage before: 819&428; after: 720&426; still untouched: 175 --- > Memory usage before: 1220&428; after: 1070&426; still untouched: 483 +6700,6701c6703,6704 +< <recently read> |undefined +< +--- +> <recently read> +> +6775c6778 +< } +--- +> +6800c6803 +< } +--- +> +6815c6818 +< } +--- +> +6830c6833 +< } +--- +> 7155c7158 < Memory usage before: 895&439; after: 290&420; still untouched: 175 --- > Memory usage before: 1336&439; after: 392&420; still untouched: 483 +7182c7185 +< } +--- +> +7218,7219c7221,7222 +< <recently read> end +< +--- +> <recently read> +> +7279c7282 +< }endwrite +--- +> 7288c7291 < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- @@ -317,8 +675,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1688 -> 261 string characters out of 8294 +> 44 strings out of 1687 +> 261 string characters out of 8266 > 4017 words of memory out of 4500 > 424 multiletter control sequences out of 15000+0 7301c7304 @@ -331,11 +689,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2012/dev) +> This is DVItype, Version 3.6 (TeX Live 2012) 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2012.01.16:1514' +> ' TeX output 2012.05.11:1417' 419c419 < 1121: down4 639342208 --- @@ -365,7 +723,7 @@ < I changed this one to zero. < --- -> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 +> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (INITEX) 11 MAY 2012 14:17 > entering extended mode > ***\input trip > (./trip.tex @@ -376,6 +734,12 @@ < A register number must be between 0 and 255. < I changed this one to zero. < +47,48c34,35 +< <recently read> \font +< +--- +> <recently read> +> 91c78,79 < ### horizontal mode entered at line 77 (language255:hyphenmin1,63) --- @@ -387,8 +751,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2012.1.16) -> 1612 strings of total length 27706 +> (format=trip 2012.5.11) +> 1613 strings of total length 27734 > 536 memory locations dumped; current usage is 157&278 > 465 multiletter control sequences 461c449 @@ -404,13 +768,27 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) +> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) > **entering extended mode > ## (./trip.tex 17c17 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 --- > Memory usage before: 194&313; after: 118&278; still untouched: 2109 +28c28 +< } +--- +> +43,44c43,44 +< <recently read> end +< +--- +> <recently read> +> +70c70 +< }endwrite +--- +> 75c75 < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- @@ -425,7 +803,7 @@ < ** &trip trip < (trip.tex ## --- -> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (format=trip 2012.1.16) 16 JAN 2012 15:14 +> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (format=trip 2012.5.11) 11 MAY 2012 14:17 > entering extended mode > **&trip \toksdef\tokens=0 \input trip > (./trip.tex @@ -466,6 +844,12 @@ --- > \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost > 3 +494,495c499,500 +< <recently read> \showlists +< +--- +> <recently read> +> 642c647 < Memory usage before: 747&484; after: 581&481; still untouched: 1492 --- @@ -495,6 +879,12 @@ --- > \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost > 3 +723,724c729,730 +< <recently read> \showlists +< +--- +> <recently read> +> 815c821 < Memory usage before: 475&470; after: 290&466; still untouched: 1473 --- @@ -504,6 +894,12 @@ --- > ### internal vertical mode entered at line 150 (\output > routine) +832,833c839,840 +< <recently read> \showlists +< +--- +> <recently read> +> 915c922 < Memory usage before: 218&459; after: 149&458; still untouched: 1473 --- @@ -513,6 +909,12 @@ --- > ### internal vertical mode entered at line 150 (\output > routine) +928,929c936,937 +< <recently read> \showlists +< +--- +> <recently read> +> 1070c1078 < Memory usage before: 118&328; after: 102&328; still untouched: 1473 --- @@ -531,6 +933,12 @@ < {restoring \fam=-1} 1779d1786 < {restoring \displayindent=0.0pt} +1809,1810c1816,1817 +< <recently read> $ +< +--- +> <recently read> +> 1833d1839 < {restoring \fam=-1} 1954c1960 @@ -559,10 +967,32 @@ < Memory usage before: 950&531; after: 546&448; still untouched: 706 --- > Memory usage before: 1458&530; after: 808&447; still untouched: 1941 +2256,2257c2262,2263 +< <recently read> \font +< +--- +> <recently read> +> 2397c2403 < ! Improper alphabetic constant. --- > ! Improper alphabetic or KANJI constant. +2455c2461 +< \endgroup +--- +> +2468,2469c2474,2475 +< <recently read> \halign +< +--- +> <recently read> +> +2497,2498c2503,2504 +< <recently read> = +< +--- +> <recently read> +> 2533c2539 < \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil --- @@ -576,12 +1006,30 @@ < Memory usage before: 339&413; after: 236&405; still untouched: 706 --- > Memory usage before: 493&411; after: 327&403; still untouched: 1941 +2587,2588c2594,2595 +< <recently read> \eqno +< +--- +> <recently read> +> +2695,2696c2702,2703 +< <recently read> $ +< +--- +> <recently read> +> 2830c2837 < Since I expected to read a number between 0 and 15, --- > Since I expected to read a number between 0 and 255, 2835d2841 < {restoring current font=\ip} +2904,2905c2910,2911 +< <recently read> \displaylimits +< +--- +> <recently read> +> 3051c3057 < \insert0, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 --- @@ -592,12 +1040,22 @@ > .\fam0 È 3143a3150 > ....\displace 0.0 +3207c3214 +< } +--- +> 3223d3229 < {restoring \fam=-1} 3235c3241 < ! \textfont 0 is undefined (character ^^c8). --- > ! \textfont 0 is undefined (character È). +3297,3298c3303,3304 +< <recently read> \! +< +--- +> <recently read> +> 3326c3332 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil --- @@ -622,6 +1080,18 @@ > Memory usage before: 3263&519; after: 1743&457; still untouched: 483 3766d3772 < {restoring \fam=-1} +3778c3784 +< \inaccessible +--- +> +3810c3816 +< \right . +--- +> +3825c3831 +< \right . +--- +> 3839d3844 < {restoring \fam=-1} 3864c3869 @@ -640,6 +1110,10 @@ < ....\hbox(7.0+1.0)x5.0, shifted 47.5 --- > ....\hbox(7.0+1.0)x5.0, shifted 47.5, display +3938c3943 +< }\endwrite +--- +> 3951c3956 < Memory usage before: 640&415; after: 397&410; still untouched: 175 --- @@ -682,6 +1156,24 @@ < Memory usage before: 651&432; after: 417&418; still untouched: 175 --- > Memory usage before: 992&431; after: 598&417; still untouched: 483 +4549,4550c4553,4554 +< <argument> ## +< +--- +> <argument> +> +4679,4680c4683,4684 +< <template> \A +< \endtemplate +--- +> <template> +> +4689,4690c4693,4694 +< <recently read> } +< +--- +> <recently read> +> 4742c4746,4747 < \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil --- @@ -704,26 +1196,250 @@ < Since I expected to read a number between 0 and 15, < I changed this one to zero. < -5700c5697 +4901c4898 +< \inaccessible +--- +> +4996c4993 +< } +--- +> +5089c5086 +< \fi +--- +> +5102c5099 +< \cr } +--- +> +5115,5116c5112,5113 +< <inserted text> \cr +< } +--- +> <inserted text> +> +5171c5168 +< } +--- +> +5200c5197 +< } +--- +> +5220c5217 +< \par +--- +> +5232c5229 +< \par +--- +> +5250c5247 +< \par +--- +> +5266c5263 +< \par +--- +> +5330c5327 +< $ +--- +> +5384c5381 +< $ +--- +> +5395c5392 +< } +--- +> +5432c5429 +< } +--- +> +5530,5531c5527,5528 +< <recently read> \enorm +< +--- +> <recently read> +> +5654,5655c5651,5652 +< <recently read> \accent +< +--- +> <recently read> +> +5674c5671 +< $ +--- +> +5685c5682 +< } +--- +> +5700,5702c5697,5699 < ! \textfont 0 is undefined (character ^^c8). +< <recently read> $ +< --- > ! \textfont 0 is undefined (character È). +> <recently read> +> +5848,5849c5845,5846 +< <recently read> \trip +< +--- +> <recently read> +> +5856,5857c5853,5854 +< <recently read> \trip +< +--- +> <recently read> +> +5911,5912c5908,5909 +< <recently read> \foo +< +--- +> <recently read> +> +5915,5916c5912,5913 +< <template> \endtemplate +< +--- +> <template> +> +5938,5939c5935,5936 +< <template> }\endtemplate +< +--- +> <template> +> +5959c5956 +< } +--- +> +5973c5970 +< \cr +--- +> +5985c5982 +< { +--- +> +6109c6106 +< } +--- +> +6152c6149 +< } +--- +> +6283,6284c6280,6281 +< <template> \cr +< +--- +> <template> +> +6297,6298c6294,6295 +< <template> & +< \ifnum 0=`{\fi \endtemplate +--- +> <template> +> +6342,6343c6339,6340 +< <recently read> \err +< +--- +> <recently read> +> +6346,6347c6343,6344 +< <template> \endtemplate +< +--- +> <template> +> 6380c6377 < (tripos.tex --- > (./tripos.tex +6403,6404c6400,6401 +< <recently read> \input +< +--- +> <recently read> +> 6501c6498 < l.429 ...^^M=13 \def^^M{\relax}# --- > l.429 ...^^M=13 \defqqM{\relax}# +6541c6538 +< \par +--- +> +6544,6545c6541,6542 +< <inserted text> } +< \endwrite +--- +> <inserted text> +> +6561,6562c6558,6559 +< <inserted text> } +< \endwrite +--- +> <inserted text> +> +6581,6582c6578,6579 +< <recently read> } +< +--- +> <recently read> +> 6595c6592 < Memory usage before: 819&428; after: 720&426; still untouched: 175 --- > Memory usage before: 1220&428; after: 1070&426; still untouched: 483 +6700,6701c6697,6698 +< <recently read> |undefined +< +--- +> <recently read> +> +6775c6772 +< } +--- +> +6800c6797 +< } +--- +> +6815c6812 +< } +--- +> +6830c6827 +< } +--- +> 7155c7152 < Memory usage before: 895&439; after: 290&420; still untouched: 175 --- > Memory usage before: 1336&439; after: 392&420; still untouched: 483 +7182c7179 +< } +--- +> +7218,7219c7215,7216 +< <recently read> end +< +--- +> <recently read> +> +7279c7276 +< }endwrite +--- +> 7288c7285 < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- @@ -738,8 +1454,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1688 -> 261 string characters out of 8294 +> 44 strings out of 1687 +> 261 string characters out of 8266 > 4017 words of memory out of 4500 > 496 multiletter control sequences out of 15000+0 7301,7302c7301,7302 @@ -754,11 +1470,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2012/dev) +> This is DVItype, Version 3.6 (TeX Live 2012) 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2012.01.16:1514' +> ' TeX output 2012.05.11:1417' 419c419 < 1121: down4 639342208 --- @@ -779,89 +1495,688 @@ + 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.3 (TeX Live 2011/dev) (INITEX) 7 APR 2011 11:46 +< This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX) 11 MAY 2012 13:47 --- -> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 -26,29c26,29 -< (format=etrip 2011.4.7) -< 1490 strings of total length 26209 +> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (INITEX) 11 MAY 2012 14:17 +27,29c27,29 +< 1491 strings of total length 26238 < 280 memory locations dumped; current usage is 36&166 < 408 multiletter control sequences --- -> (format=etrip 2012.1.16) -> 1613 strings of total length 27737 +> 1614 strings of total length 27765 > 283 memory locations dumped; current usage is 40&166 > 465 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.3 (TeX Live 2011/dev) +< This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) --- -> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) +> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) + diff SRCDIR/eptexdir/eptrip/etrip.log euptrip.log 1c1 -< This is e-TeX, Version 3.1415926-2.3 (TeX Live 2011/dev) (format=etrip 2011.4.7) 7 APR 2011 11:46 +< This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=etrip 2012.5.11) 11 MAY 2012 14:10 --- -> This is e-upTeX, Version 3.1415926-p3.2-u1.00-110825-2.3 (utf8.uptex) (TeX Live 2012/dev) (format=etrip 2012.1.16) 16 JAN 2012 15:14 -4c4 -< (etrip.tex e-IniTeX: e-Trip format loaded. +> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (format=etrip 2012.5.11) 11 MAY 2012 14:17 +203c203 +< \vbox(30.00002+0.0)x0.0, yoko direction --- -> (./etrip.tex e-IniTeX: e-Trip format loaded. -671,672c671,674 -< Memory usage before: 50&182; after: 36&176; still untouched: 680 -< (etrip.out) ( +> \vbox(30.00002+0.0)x0.0 +641c641 +< \vbox(0.0+0.0)x0.0, yoko direction --- -> \openout1 = `etrip.out'. -> -> Memory usage before: 57&183; after: 40&177; still untouched: 2171 -> (./etrip.out) ( -764c766 -< % end of outer \scantokens) (etrip.out +> \vbox(0.0+0.0)x0.0 +666c666 +< \vbox(0.0+0.0)x0.0, yoko direction --- -> % end of outer \scantokens) (./etrip.out -2184,2190c2186 -< A character number must be between 0 and 255. -< I changed this one to zero. -< -< ! Bad character code (256). -< l.674 \iffontchar\font 256 -< \else \fi % <== bad character... -< A character number must be between 0 and 255. +> \vbox(0.0+0.0)x0.0 +942c942 +< ### yoko direction, restricted horizontal mode entered at line 468 --- -> A character number must be between 0 and 255, or KANJI code. -2697c2693 -< Memory usage before: 51&320; after: 44&320; still untouched: 680 +> ### restricted horizontal mode entered at line 468 +953c953 +< ### yoko direction, vertical mode entered at line 0 --- -> Memory usage before: 58&321; after: 48&321; still untouched: 1171 -2699c2695 -< Memory usage before: 51&320; after: 44&320; still untouched: 680 +> ### vertical mode entered at line 0 +965c965 +< \hbox(8.0+2.0)x9.0, yoko direction []} --- -> Memory usage before: 58&321; after: 48&321; still untouched: 1171 -4273,4276c4269,4272 -< 22 strings out of 1665 -< 132 string characters out of 8410 -< 2661 words of memory out of 3000 -< 408 multiletter control sequences out of 2100 +> \hbox(8.0+2.0)x9.0 []} +980c980 +< \vbox(188.0+0.0)x10.0, yoko direction --- -> 18 strings out of 1687 -> 140 string characters out of 8263 -> 3329 words of memory out of 4500 -> 466 multiletter control sequences out of 15000+0 -4278c4274 -< 10 hyphenation exceptions out of 307 +> \vbox(188.0+0.0)x10.0 +984c984 +< .\vbox(9.0+0.0)x0.0, yoko direction +--- +> .\vbox(9.0+0.0)x0.0 +988c988 +< .\hbox(0.0+0.0)x0.0, yoko direction +--- +> .\hbox(0.0+0.0)x0.0 +996c996 +< .\vbox(19.0+0.0)x0.0, yoko direction +--- +> .\vbox(19.0+0.0)x0.0 +1002c1002 +< .\vbox(30.0+0.0)x0.0, yoko direction +--- +> .\vbox(30.0+0.0)x0.0 +1007c1007 +< .\hbox(0.0+0.0)x10.0, yoko direction +--- +> .\hbox(0.0+0.0)x10.0 +1064c1064 +< \vbox(17.0+0.0)x0.0, glue set 2.0fil, yoko direction +--- +> \vbox(17.0+0.0)x0.0, glue set 2.0fil +1068c1068 +< .\vbox(9.0+0.0)x0.0, yoko direction +--- +> .\vbox(9.0+0.0)x0.0 +1072c1072 +< .\hbox(0.0+0.0)x0.0, yoko direction +--- +> .\hbox(0.0+0.0)x0.0 +1081c1081 +< \vbox(132.0+0.0)x10.0, yoko direction +--- +> \vbox(132.0+0.0)x10.0 +1084c1084 +< .\vbox(19.0+0.0)x0.0, yoko direction --- -> 9 hyphenation exceptions out of 659 +> .\vbox(19.0+0.0)x0.0 +1090c1090 +< .\vbox(30.0+0.0)x0.0, yoko direction +--- +> .\vbox(30.0+0.0)x0.0 +1095c1095 +< .\hbox(0.0+0.0)x10.0, yoko direction +--- +> .\hbox(0.0+0.0)x10.0 +1110c1110 +< \vbox(27.0+0.0)x0.0, glue set 5.0fil, yoko direction +--- +> \vbox(27.0+0.0)x0.0, glue set 5.0fil +1113c1113 +< .\vbox(19.0+0.0)x0.0, yoko direction +--- +> .\vbox(19.0+0.0)x0.0 +1122c1122 +< \vbox(70.0+0.0)x10.0, yoko direction +--- +> \vbox(70.0+0.0)x10.0 +1124c1124 +< .\vbox(30.0+0.0)x0.0, yoko direction +--- +> .\vbox(30.0+0.0)x0.0 +1129c1129 +< .\hbox(0.0+0.0)x10.0, yoko direction +--- +> .\hbox(0.0+0.0)x10.0 +1144c1144 +< \vbox(37.0+0.0)x0.0, glue set 7.0fil, yoko direction +--- +> \vbox(37.0+0.0)x0.0, glue set 7.0fil +1146c1146 +< .\vbox(30.0+0.0)x0.0, yoko direction +--- +> .\vbox(30.0+0.0)x0.0 +1154c1154 +< \vbox(0.0+0.0)x10.0, yoko direction +--- +> \vbox(0.0+0.0)x10.0 +1156c1156 +< .\hbox(0.0+0.0)x10.0, yoko direction +--- +> .\hbox(0.0+0.0)x10.0 +1185c1185 +< \vbox(35.0+0.0)x0.0, glue set 21.0fil, yoko direction +--- +> \vbox(35.0+0.0)x0.0, glue set 21.0fil +1189c1189 +< .\vbox(9.0+0.0)x0.0, yoko direction +--- +> .\vbox(9.0+0.0)x0.0 +1193c1193 +< .\hbox(0.0+0.0)x0.0, yoko direction +--- +> .\hbox(0.0+0.0)x0.0 +1215c1215 +< \vbox(35.0+0.0)x0.0, glue set 13.0fil, yoko direction +--- +> \vbox(35.0+0.0)x0.0, glue set 13.0fil +1218c1218 +< .\vbox(19.0+0.0)x0.0, yoko direction +--- +> .\vbox(19.0+0.0)x0.0 +1240c1240 +< \vbox(35.0+0.0)x0.0, glue set 5.0fil, yoko direction +--- +> \vbox(35.0+0.0)x0.0, glue set 5.0fil +1242c1242 +< .\vbox(30.0+0.0)x0.0, yoko direction +--- +> .\vbox(30.0+0.0)x0.0 +1263c1263 +< \vbox(35.0+0.0)x10.0, glue set 35.0fil, yoko direction +--- +> \vbox(35.0+0.0)x10.0, glue set 35.0fil +1265c1265 +< .\hbox(0.0+0.0)x10.0, yoko direction +--- +> .\hbox(0.0+0.0)x10.0 +1289c1289 +< \vbox(35.0+0.0)x0.0, glue set 35.0fil, yoko direction +--- +> \vbox(35.0+0.0)x0.0, glue set 35.0fil +1291c1291 +< .\hbox(0.0+0.0)x0.0, yoko direction +--- +> .\hbox(0.0+0.0)x0.0 +1315c1315 +< \vbox(35.0+0.0)x0.0, glue set 35.0fil, yoko direction +--- +> \vbox(35.0+0.0)x0.0, glue set 35.0fil +1317c1317 +< .\hbox(0.0+0.0)x0.0, yoko direction +--- +> .\hbox(0.0+0.0)x0.0 +1402c1402 +< ### yoko(math) direction, math mode entered at line 522 +--- +> ### math mode entered at line 522 +1416c1416 +< ### yoko(math) direction, math mode entered at line 519 +--- +> ### math mode entered at line 519 +1426c1426 +< ### yoko(math) direction, math mode entered at line 515 +--- +> ### math mode entered at line 515 +1434c1434 +< ### yoko(math) direction, math mode entered at line 514 +--- +> ### math mode entered at line 514 +1438,1439c1438,1439 +< ### yoko(math) direction, math mode entered at line 513 +< ### yoko direction, restricted horizontal mode entered at line 512 +--- +> ### math mode entered at line 513 +> ### restricted horizontal mode entered at line 512 +1441c1441 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +1449c1449 +< ### yoko(math) direction, math mode entered at line 519 +--- +> ### math mode entered at line 519 +1473c1473 +< ### yoko(math) direction, math mode entered at line 515 +--- +> ### math mode entered at line 515 +1481c1481 +< ### yoko(math) direction, math mode entered at line 514 +--- +> ### math mode entered at line 514 +1485,1486c1485,1486 +< ### yoko(math) direction, math mode entered at line 513 +< ### yoko direction, restricted horizontal mode entered at line 512 +--- +> ### math mode entered at line 513 +> ### restricted horizontal mode entered at line 512 +1488c1488 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +1496c1496 +< ### yoko(math) direction, math mode entered at line 515 +--- +> ### math mode entered at line 515 +1529c1529 +< ### yoko(math) direction, math mode entered at line 514 +--- +> ### math mode entered at line 514 +1533,1534c1533,1534 +< ### yoko(math) direction, math mode entered at line 513 +< ### yoko direction, restricted horizontal mode entered at line 512 +--- +> ### math mode entered at line 513 +> ### restricted horizontal mode entered at line 512 +1536c1536 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +1544c1544 +< ### yoko(math) direction, math mode entered at line 514 +--- +> ### math mode entered at line 514 +1581,1582c1581,1582 +< ### yoko(math) direction, math mode entered at line 513 +< ### yoko direction, restricted horizontal mode entered at line 512 +--- +> ### math mode entered at line 513 +> ### restricted horizontal mode entered at line 512 +1584c1584 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +1592c1592 +< ### yoko(math) direction, math mode entered at line 513 +--- +> ### math mode entered at line 513 +1631c1631 +< ### yoko direction, restricted horizontal mode entered at line 512 +--- +> ### restricted horizontal mode entered at line 512 +1633c1633 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +1641c1641 +< ### yoko direction, restricted horizontal mode entered at line 512 +--- +> ### restricted horizontal mode entered at line 512 +1844c1844 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +1852c1852 +< ### yoko direction, restricted horizontal mode entered at line 530 +--- +> ### restricted horizontal mode entered at line 530 +1860c1860 +< .\hbox(0.0+0.0)x0.0, shifted -16.5, yoko direction +--- +> .\hbox(0.0+0.0)x0.0, shifted -16.5 +1872c1872 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +1880c1880 +< ### yoko direction, restricted horizontal mode entered at line 533 +--- +> ### restricted horizontal mode entered at line 533 +1885c1885 +< .\hbox(0.0+0.0)x0.0, shifted 3.0, yoko direction +--- +> .\hbox(0.0+0.0)x0.0, shifted 3.0 +1904c1904 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +1923c1923 +< .\hbox(0.0+0.0)x0.0, yoko direction +--- +> .\hbox(0.0+0.0)x0.0 +1947c1947 +< \vbox(0.0+0.0)x10.0, yoko direction +--- +> \vbox(0.0+0.0)x10.0 +1974c1974 +< ..\hbox(0.0+0.0)x0.0, yoko direction +--- +> ..\hbox(0.0+0.0)x0.0 +2189,2194d2188 +< ! Bad character code (256). +< l.674 \iffontchar\font 256 +< \else \fi % <== bad character... +< A character number must be between 0 and 255, or KANJI code. +< I changed this one to zero. +< +3192c3186 +< \hbox(0.0+0.0)x3.0, yoko direction +--- +> \hbox(0.0+0.0)x3.0 +3245c3239 +< \vbox(0.0+0.0)x96.0, yoko direction +--- +> \vbox(0.0+0.0)x96.0 +3257,3258c3251,3252 +< \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 +3260c3254 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3288c3282 +< \vbox(0.0+0.0)x96.0, yoko direction +--- +> \vbox(0.0+0.0)x96.0 +3300,3301c3294,3295 +< \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 +3303c3297 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3331c3325 +< \vbox(0.0+0.0)x96.0, yoko direction +--- +> \vbox(0.0+0.0)x96.0 +3343,3344c3337,3338 +< \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 +3346c3340 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3382c3376 +< \vbox(0.0+0.0)x98.0, yoko direction +--- +> \vbox(0.0+0.0)x98.0 +3400,3401c3394,3395 +< \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 +3429c3423 +< \vbox(0.0+0.0)x98.0, yoko direction +--- +> \vbox(0.0+0.0)x98.0 +3441c3435 +< \hbox(0.0+0.0)x98.0, glue set - 0.125, yoko direction +--- +> \hbox(0.0+0.0)x98.0, glue set - 0.125 +3443c3437 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3445c3439 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3473c3467 +< \vbox(0.0+0.0)x98.0, yoko direction +--- +> \vbox(0.0+0.0)x98.0 +3485,3486c3479,3480 +< \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 +3488c3482 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3516c3510 +< \vbox(0.0+0.0)x100.0, yoko direction +--- +> \vbox(0.0+0.0)x100.0 +3528,3529c3522,3523 +< \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 +3531c3525 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3559c3553 +< \vbox(0.0+0.0)x100.0, yoko direction +--- +> \vbox(0.0+0.0)x100.0 +3571,3572c3565,3566 +< \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 +3574c3568 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3602c3596 +< \vbox(0.0+0.0)x100.0, yoko direction +--- +> \vbox(0.0+0.0)x100.0 +3614,3615c3608,3609 +< \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 +3617c3611 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3645c3639 +< \vbox(0.0+0.0)x110.0, yoko direction +--- +> \vbox(0.0+0.0)x110.0 +3657,3658c3651,3652 +< \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 +3661c3655 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3689c3683 +< \vbox(0.0+0.0)x110.0, yoko direction +--- +> \vbox(0.0+0.0)x110.0 +3701,3702c3695,3696 +< \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 +3704c3698 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3732c3726 +< \vbox(0.0+0.0)x110.0, yoko direction +--- +> \vbox(0.0+0.0)x110.0 +3744,3745c3738,3739 +< \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 +3747c3741 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3775c3769 +< \vbox(0.0+0.0)x120.0, yoko direction +--- +> \vbox(0.0+0.0)x120.0 +3787,3788c3781,3782 +< \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 +3790c3784 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3818c3812 +< \vbox(0.0+0.0)x120.0, yoko direction +--- +> \vbox(0.0+0.0)x120.0 +3830,3831c3824,3825 +< \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 +3833c3827 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +3861c3855 +< \vbox(0.0+0.0)x120.0, yoko direction +--- +> \vbox(0.0+0.0)x120.0 +3873,3874c3867,3868 +< \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 +3876c3870 +< .\hbox(0.0+0.0)x30.0, yoko direction +--- +> .\hbox(0.0+0.0)x30.0 +4003c3997 +< \vbox(0.0+0.0)x0.0, yoko direction +--- +> \vbox(0.0+0.0)x0.0 +4024,4026c4018,4020 +< \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 +4030c4024 +< .\vbox(20.0+0.0)x0.0, yoko direction +--- +> .\vbox(20.0+0.0)x0.0 +4034c4028 +< ..\vbox(20.0+0.0)x0.0, yoko direction +--- +> ..\vbox(20.0+0.0)x0.0 +4044,4046c4038,4040 +< \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 +4052c4046 +< .\vbox(20.0+0.0)x0.0, yoko direction +--- +> .\vbox(20.0+0.0)x0.0 +4055c4049 +< ..\vbox(20.0+0.0)x0.0, yoko direction +--- +> ..\vbox(20.0+0.0)x0.0 +4065,4067c4059,4061 +< \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 +4074c4068 +< .\vbox(20.0+0.0)x0.0, yoko direction +--- +> .\vbox(20.0+0.0)x0.0 +4078c4072 +< ..\vbox(20.0+0.0)x0.0, yoko direction +--- +> ..\vbox(20.0+0.0)x0.0 +4088,4090c4082,4084 +< \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 +4098c4092 +< .\vbox(20.0+0.0)x0.0, yoko direction +--- +> .\vbox(20.0+0.0)x0.0 +4101c4095 +< ..\vbox(20.0+0.0)x0.0, yoko direction +--- +> ..\vbox(20.0+0.0)x0.0 +4111c4105 +< ### yoko direction, internal vertical mode entered at line 1184 +--- +> ### internal vertical mode entered at line 1184 +4113c4107 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +4126c4120 +< ### yoko direction, internal vertical mode entered at line 1184 +--- +> ### internal vertical mode entered at line 1184 +4128c4122 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +4138c4132 +< ### yoko direction, internal vertical mode entered at line 1185 +--- +> ### internal vertical mode entered at line 1185 +4140c4134 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +4153c4147 +< ### yoko direction, internal vertical mode entered at line 1185 +--- +> ### internal vertical mode entered at line 1185 +4158c4152 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +4168c4162 +< \vbox(12.0+0.0)x0.0, yoko direction +--- +> \vbox(12.0+0.0)x0.0 +4181c4175 +< \vbox(0.0+0.0)x0.0, yoko direction +--- +> \vbox(0.0+0.0)x0.0 +4186c4180 +< .\hbox(0.0+0.0)x0.0, yoko direction +--- +> .\hbox(0.0+0.0)x0.0 +4195c4189 +< ### yoko direction, internal vertical mode entered at line 1191 +--- +> ### internal vertical mode entered at line 1191 +4198c4192 +< ### yoko direction, vertical mode entered at line 0 +--- +> ### vertical mode entered at line 0 +4267c4261 +< \vbox(0.0+0.0)x0.0, yoko direction} +--- +> \vbox(0.0+0.0)x0.0} +4275,4276c4269,4270 +< 18 strings out of 1696 +< 140 string characters out of 8256 +--- +> 18 strings out of 1686 +> 140 string characters out of 8235 +4278c4272 +< 460 multiletter control sequences out of 15000+0 +--- +> 466 multiletter control sequences out of 15000+0 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi + diff SRCDIR/etexdir/etrip/etrip.typ euptrip.typ -1c1 -< This is DVItype, Version 3.6 ---- -> This is DVItype, Version 3.6 (TeX Live 2012/dev) 9c9 -< ' TeX output 2011.04.07:1213' +< ' TeX output 2012.05.11:1347' --- -> ' TeX output 2012.01.16:1514' +> ' TeX output 2012.05.11:1417' + : PASS: euptexdir/euptrip.test diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog index 016109e2757..bee0ed4b5f8 100644 --- a/Build/source/texk/web2c/pdftexdir/ChangeLog +++ b/Build/source/texk/web2c/pdftexdir/ChangeLog @@ -1,3 +1,7 @@ +2012-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * pdftex.web: Adapted to e-TeX Version 2.4. + 2012-04-15 Karl Berry <karl@tug.org> * pdftex.web (pdftex_revision, pdftex_version_string) diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web index 9620180d691..956514c239f 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftex.web +++ b/Build/source/texk/web2c/pdftexdir/pdftex.web @@ -109,6 +109,7 @@ % some rearrangements to reduce interferences between % e-TeX and pTeX, in part suggested by Hironori Kitagawa % <h_kitagawa2001@@yahoo.co.jp>, Mar 2011. +% Version 2.4 fixed an uninitialized line number bug, released in May 2012. % Although considerable effort has been expended to make the e-TeX program % correct and reliable, no warranty is implied; the author disclaims any @@ -289,8 +290,8 @@ helping to determine whether a particular implementation deserves to be known as `\eTeX'. @d eTeX_version=2 { \.{\\eTeXversion} } -@d eTeX_revision==".3" { \.{\\eTeXrevision} } -@d eTeX_version_string=='-2.3' {current \eTeX\ version} +@d eTeX_revision==".4" { \.{\\eTeXrevision} } +@d eTeX_version_string=='-2.4' {current \eTeX\ version} @# @d eTeX_banner=='This is e-TeX, Version 3.1415926',eTeX_version_string {printed when \eTeX\ starts} diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index b1aa74771b8..f0e5ae72017 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,8 @@ +2012-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ptex-base.ch (pTeX_version_string): Version 3.3. + * ptrip/ptrip.diffs: Adapted. + 2012-03-11 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * ptex-base.ch: remove unnecessary and seemingly wrong changes diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch index e86cba18dfd..a72f3b362d8 100644 --- a/Build/source/texk/web2c/ptexdir/ptex-base.ch +++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch @@ -47,12 +47,13 @@ % (19/01/2011) PB Let \lastkern etc act through disp node. % (15/04/2011) PB pTeX p3.2 Add \ifdbox and \ifddir % (2011-08-18) PB Bug fix by Hironori Kitagawa. +% (2012-05-11) PB pTeX p3.3 % @x [1.2] l.200 - pTeX: @d banner==TeX_banner @d banner_k==TeX_banner_k @y -@d pTeX_version_string=='-p3.2' {current p\TeX\ version} +@d pTeX_version_string=='-p3.3' {current p\TeX\ version} @# @d pTeX_banner=='This is pTeX, Version 3.1415926',pTeX_version_string @d pTeX_banner_k==pTeX_banner diff --git a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs Binary files differindex 24e5e68344b..660b7af325e 100644 --- a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs +++ b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs diff --git a/Build/source/texk/web2c/triptrap/mftrap.diffs b/Build/source/texk/web2c/triptrap/mftrap.diffs index eabce33a605..6290bc7699e 100644 --- a/Build/source/texk/web2c/triptrap/mftrap.diffs +++ b/Build/source/texk/web2c/triptrap/mftrap.diffs @@ -7,17 +7,17 @@ 1c1 < This is METAFONT, Version 2.718281 (INIMF) 15 MAR 2008 02:23 --- -> This is METAFONT, Version 2.718281 (TeX Live 2011) (INIMF) 15 APR 2011 13:04 +> This is METAFONT, Version 2.718281 (TeX Live 2012) (INIMF) 11 MAY 2012 13:42 150c150 < String usage 26&83 (891&11438 still untouched) --- -> String usage 30&98 (6387&79485 still untouched) +> String usage 30&98 (6386&79458 still untouched) 176,177c176,177 < (preloaded base=trap 2008.3.15) < 1117 strings of total length 20614 --- -> (base=trap 2011.4.15) -> 1122 strings of total length 20566 +> (base=trap 2012.5.11) +> 1123 strings of total length 20593 + ./mf --progname=inimf + mv trap.log mftrap.log + mv trap.tfm mftrap.tfm @@ -27,31 +27,31 @@ < ** &trap trap < (trap.mf --- -> This is METAFONT, Version 2.718281 (TeX Live 2011) (INIMF) +> This is METAFONT, Version 2.718281 (TeX Live 2012) (INIMF) > **(trap.mf 39c38 < String usage 41&161 (815&7634 still untouched) --- -> String usage 50&202 (6301&75641 still untouched) +> String usage 50&202 (6300&75614 still untouched) + diff SRCDIR/triptrap/mftrap.log mftrap.log 1c1 < This is METAFONT, Version 2.718281 (preloaded base=trap 2008.3.15) 15 MAR 2008 02:23 --- -> This is METAFONT, Version 2.718281 (TeX Live 2011) (base=trap 2011.4.15) 15 APR 2011 13:04 +> This is METAFONT, Version 2.718281 (TeX Live 2012) (base=trap 2012.5.11) 11 MAY 2012 13:42 1825c1825 < String usage 24&92 (858&11309 still untouched) --- -> String usage 30&119 (6347&79309 still untouched) +> String usage 30&119 (6346&79282 still untouched) 4235c4235 < String usage 41&161 (815&7634 still untouched) --- -> String usage 50&202 (6301&75641 still untouched) +> String usage 50&202 (6300&75614 still untouched) 4251,4252c4251,4252 < 68 strings out of 883 < 3752 string characters out of 11386 --- -> 77 strings out of 6378 -> 3793 string characters out of 79434 +> 77 strings out of 6377 +> 3793 string characters out of 79407 4254,4255c4254,4255 < 289 symbolic tokens out of 2100 < 8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b @@ -69,10 +69,10 @@ 1c1 < This is GFtype, Version 3.1 --- -> This is GFtype, Version 3.1 (TeX Live 2011) +> This is GFtype, Version 3.1 (TeX Live 2012) 3c3 < ' METAFONT output 2008.03.15:0223' --- -> ' METAFONT output 2011.04.15:1304' +> ' METAFONT output 2012.05.11:1342' + exit 0 PASS: trap.test diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs index 52d10c9c2a0..ae20e05b7c2 100644 --- a/Build/source/texk/web2c/triptrap/trip.diffs +++ b/Build/source/texk/web2c/triptrap/trip.diffs @@ -10,7 +10,7 @@ 1c1 < This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 --- -> This is TeX, Version 3.1415926 (TeX Live 2011) (INITEX) 15 APR 2011 13:03 +> This is TeX, Version 3.1415926 (TeX Live 2012) (INITEX) 11 MAY 2012 13:42 3c3 < (trip.tex --- @@ -19,8 +19,8 @@ < (preloaded format=trip 2008.3.15) < 1326 strings of total length 23646 --- -> (format=trip 2011.4.15) -> 1370 strings of total length 24558 +> (format=trip 2012.5.11) +> 1371 strings of total length 24586 461c461 < Hyphenation trie of length 273 has 9 ops out of 500 --- @@ -32,13 +32,13 @@ < ** &trip trip < (trip.tex ## --- -> This is TeX, Version 3.1415926 (TeX Live 2011) +> This is TeX, Version 3.1415926 (TeX Live 2012) > **(./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.1415926 (TeX Live 2011) (format=trip 2011.4.15) 15 APR 2011 13:03 +> This is TeX, Version 3.1415926 (TeX Live 2012) (format=trip 2012.5.11) 11 MAY 2012 13:42 3c3 < (trip.tex ## --- @@ -92,8 +92,8 @@ < 47 strings out of 1674 < 253 string characters out of 8354 --- -> 44 strings out of 1630 -> 261 string characters out of 15442 +> 44 strings out of 1629 +> 261 string characters out of 15414 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 2011) +> This is DVItype, Version 3.6 (TeX Live 2012) 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2011.04.15:1303' +> ' TeX output 2012.05.11:1342' 419c419 < 1121: down4 639342208 --- diff --git a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs index 0e1f646b563..0eeba883388 100644 --- a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs +++ b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs @@ -13,7 +13,7 @@ 1c1 < This is TeX, Version 3.1415926 (INITEX) 15 MAR 2008 02:23 --- -> This is upTeX, Version 3.1415926-p3.2-u1.10 (utf8.uptex) (TeX Live 2012/dev) (INITEX) 16 JAN 2012 15:14 +> This is upTeX, Version 3.1415926-p3.3-u1.10 (utf8.uptex) (TeX Live 2012) (INITEX) 11 MAY 2012 14:17 3,11c3 < (trip.tex < ! Bad character code (256). @@ -26,6 +26,12 @@ < --- > (./trip.tex +47,48c39,40 +< <recently read> \font +< +--- +> <recently read> +> 91c83,84 < ### horizontal mode entered at line 77 (language255:hyphenmin1,63) --- @@ -37,8 +43,8 @@ < 471 memory locations dumped; current usage is 96&278 < 341 multiletter control sequences --- -> (format=trip 2012.1.16) -> 1460 strings of total length 25454 +> (format=trip 2012.5.11) +> 1461 strings of total length 25482 > 485 memory locations dumped; current usage is 106&278 > 383 multiletter control sequences 461c454 @@ -54,12 +60,26 @@ < ** &trip trip < (trip.tex ## --- -> This is upTeX, Version 3.1415926-p3.2-u1.10 (utf8.uptex) (TeX Live 2012/dev) +> This is upTeX, Version 3.1415926-p3.3-u1.10 (utf8.uptex) (TeX Live 2012) > **(./trip.tex ## 17c16 < Memory usage before: 159&313; after: 102&278; still untouched: 1613 --- > Memory usage before: 190&313; after: 114&278; still untouched: 3113 +28c27 +< } +--- +> +43,44c42,43 +< <recently read> end +< +--- +> <recently read> +> +70c69 +< }endwrite +--- +> 75c74 < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- @@ -68,7 +88,7 @@ 1c1 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15) 15 MAR 2008 02:23 --- -> This is upTeX, Version 3.1415926-p3.2-u1.10 (utf8.uptex) (TeX Live 2012/dev) (format=trip 2012.1.16) 16 JAN 2012 15:14 +> This is upTeX, Version 3.1415926-p3.3-u1.10 (utf8.uptex) (TeX Live 2012) (format=trip 2012.5.11) 11 MAY 2012 14:17 3c3 < (trip.tex ## --- @@ -110,6 +130,12 @@ --- > \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost > 3 +494,495c498,499 +< <recently read> \showlists +< +--- +> <recently read> +> 642c646 < Memory usage before: 747&484; after: 581&481; still untouched: 1492 --- @@ -139,6 +165,12 @@ --- > \insert200Y, natural size 10000.0; split(1.0 plus 43.0,-1.0); float cost > 3 +723,724c728,729 +< <recently read> \showlists +< +--- +> <recently read> +> 815c820 < Memory usage before: 475&470; after: 290&466; still untouched: 1473 --- @@ -148,6 +180,12 @@ --- > ### internal vertical mode entered at line 150 (\output > routine) +832,833c838,839 +< <recently read> \showlists +< +--- +> <recently read> +> 915c921 < Memory usage before: 218&459; after: 149&458; still untouched: 1473 --- @@ -157,6 +195,12 @@ --- > ### internal vertical mode entered at line 150 (\output > routine) +928,929c935,936 +< <recently read> \showlists +< +--- +> <recently read> +> 1070c1077 < Memory usage before: 118&328; after: 102&328; still untouched: 1473 --- @@ -171,6 +215,12 @@ < Memory usage before: 990&376; after: 584&370; still untouched: 735 --- > Memory usage before: 1486&375; after: 838&369; still untouched: 1974 +1809,1810c1817,1818 +< <recently read> $ +< +--- +> <recently read> +> 1954c1962 < (tripos.tex --- @@ -189,10 +239,32 @@ < Memory usage before: 950&531; after: 546&448; still untouched: 706 --- > Memory usage before: 1454&530; after: 804&447; still untouched: 1945 +2256,2257c2264,2265 +< <recently read> \font +< +--- +> <recently read> +> 2397c2405 < ! Improper alphabetic constant. --- > ! Improper alphabetic or KANJI constant. +2455c2463 +< \endgroup +--- +> +2468,2469c2476,2477 +< <recently read> \halign +< +--- +> <recently read> +> +2497,2498c2505,2506 +< <recently read> = +< +--- +> <recently read> +> 2533c2541 < \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil --- @@ -201,6 +273,24 @@ < Memory usage before: 339&413; after: 236&405; still untouched: 706 --- > Memory usage before: 489&411; after: 323&403; still untouched: 1945 +2587,2588c2595,2596 +< <recently read> \eqno +< +--- +> <recently read> +> +2695,2696c2703,2704 +< <recently read> $ +< +--- +> <recently read> +> +2904,2905c2912,2913 +< <recently read> \displaylimits +< +--- +> <recently read> +> 3051c3059 < \insert0, natural size 0.0; split(1.0 plus 43.0,-2.0); float cost 100 --- @@ -211,10 +301,20 @@ > .\fam0 È 3143a3152 > ....\displace 0.0 +3207c3216 +< } +--- +> 3235c3244 < ! \textfont 0 is undefined (character ^^c8). --- > ! \textfont 0 is undefined (character È). +3297,3298c3306,3307 +< <recently read> \! +< +--- +> <recently read> +> 3326c3335 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil --- @@ -229,10 +329,26 @@ < Memory usage before: 2170&521; after: 1181&459; still untouched: 175 --- > Memory usage before: 3259&519; after: 1739&457; still untouched: 241 +3778c3788 +< \inaccessible +--- +> +3810c3820 +< \right . +--- +> +3825c3835 +< \right . +--- +> 3864c3874 < \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil --- > \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil +3938c3948 +< }\endwrite +--- +> 3951c3961 < Memory usage before: 640&415; after: 397&410; still untouched: 175 --- @@ -265,6 +381,24 @@ < Memory usage before: 651&432; after: 417&418; still untouched: 175 --- > Memory usage before: 988&431; after: 594&417; still untouched: 241 +4549,4550c4559,4560 +< <argument> ## +< +--- +> <argument> +> +4679,4680c4689,4690 +< <template> \A +< \endtemplate +--- +> <template> +> +4689,4690c4699,4700 +< <recently read> } +< +--- +> <recently read> +> 4742c4752,4753 < \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil --- @@ -274,26 +408,250 @@ < Memory usage before: 776&458; after: 464&452; still untouched: 175 --- > Memory usage before: 1170&457; after: 672&451; still untouched: 241 -5700c5711 +4901c4912 +< \inaccessible +--- +> +4996c5007 +< } +--- +> +5089c5100 +< \fi +--- +> +5102c5113 +< \cr } +--- +> +5115,5116c5126,5127 +< <inserted text> \cr +< } +--- +> <inserted text> +> +5171c5182 +< } +--- +> +5200c5211 +< } +--- +> +5220c5231 +< \par +--- +> +5232c5243 +< \par +--- +> +5250c5261 +< \par +--- +> +5266c5277 +< \par +--- +> +5330c5341 +< $ +--- +> +5384c5395 +< $ +--- +> +5395c5406 +< } +--- +> +5432c5443 +< } +--- +> +5530,5531c5541,5542 +< <recently read> \enorm +< +--- +> <recently read> +> +5654,5655c5665,5666 +< <recently read> \accent +< +--- +> <recently read> +> +5674c5685 +< $ +--- +> +5685c5696 +< } +--- +> +5700,5702c5711,5713 < ! \textfont 0 is undefined (character ^^c8). +< <recently read> $ +< --- > ! \textfont 0 is undefined (character È). +> <recently read> +> +5848,5849c5859,5860 +< <recently read> \trip +< +--- +> <recently read> +> +5856,5857c5867,5868 +< <recently read> \trip +< +--- +> <recently read> +> +5911,5912c5922,5923 +< <recently read> \foo +< +--- +> <recently read> +> +5915,5916c5926,5927 +< <template> \endtemplate +< +--- +> <template> +> +5938,5939c5949,5950 +< <template> }\endtemplate +< +--- +> <template> +> +5959c5970 +< } +--- +> +5973c5984 +< \cr +--- +> +5985c5996 +< { +--- +> +6109c6120 +< } +--- +> +6152c6163 +< } +--- +> +6283,6284c6294,6295 +< <template> \cr +< +--- +> <template> +> +6297,6298c6308,6309 +< <template> & +< \ifnum 0=`{\fi \endtemplate +--- +> <template> +> +6342,6343c6353,6354 +< <recently read> \err +< +--- +> <recently read> +> +6346,6347c6357,6358 +< <template> \endtemplate +< +--- +> <template> +> 6380c6391 < (tripos.tex --- > (./tripos.tex +6403,6404c6414,6415 +< <recently read> \input +< +--- +> <recently read> +> 6501c6512 < l.429 ...^^M=13 \def^^M{\relax}# --- > l.429 ...^^M=13 \defqqM{\relax}# +6541c6552 +< \par +--- +> +6544,6545c6555,6556 +< <inserted text> } +< \endwrite +--- +> <inserted text> +> +6561,6562c6572,6573 +< <inserted text> } +< \endwrite +--- +> <inserted text> +> +6581,6582c6592,6593 +< <recently read> } +< +--- +> <recently read> +> 6595c6606 < Memory usage before: 819&428; after: 720&426; still untouched: 175 --- > Memory usage before: 1216&428; after: 1066&426; still untouched: 241 +6700,6701c6711,6712 +< <recently read> |undefined +< +--- +> <recently read> +> +6775c6786 +< } +--- +> +6800c6811 +< } +--- +> +6815c6826 +< } +--- +> +6830c6841 +< } +--- +> 7155c7166 < Memory usage before: 895&439; after: 290&420; still untouched: 175 --- > Memory usage before: 1332&439; after: 388&420; still untouched: 241 +7182c7193 +< } +--- +> +7218,7219c7229,7230 +< <recently read> end +< +--- +> <recently read> +> +7279c7290 +< }endwrite +--- +> 7288c7299 < Memory usage before: 334&431; after: 292&418; still untouched: 175 --- @@ -304,8 +662,8 @@ < 2825 words of memory out of 3000 < 372 multiletter control sequences out of 2100 --- -> 44 strings out of 1540 -> 261 string characters out of 14546 +> 44 strings out of 1539 +> 261 string characters out of 14518 > 4259 words of memory out of 4500 > 414 multiletter control sequences out of 15000+0 7301c7312 @@ -318,11 +676,11 @@ 1c1 < This is DVItype, Version 3.6 --- -> This is DVItype, Version 3.6 (TeX Live 2012/dev) +> This is DVItype, Version 3.6 (TeX Live 2012) 9c9 < ' TeX output 2008.03.15:0223' --- -> ' TeX output 2012.01.16:1514' +> ' TeX output 2012.05.11:1417' 419c419 < 1121: down4 639342208 --- |