(e-)(u)pTeX: Restore the 'unnecessary and seemingly wrong' changes

they are required to show the error context (revert r25602)
Update (e)(u)ptrip.diffs

git-svn-id: svn://tug.org/texlive/trunk@26311 c570f23f-e606-0410-a88d-b1316a301751

11 files changed, 346 insertions, 3714 deletions

diff --git a/Build/source/texk/web2c/eptexdir/ChangeLog b/Build/source/texk/web2c/eptexdir/ChangeLog
index 35c9af5d463..a0744583582 100644
--- a/Build/source/texk/web2c/eptexdir/ChangeLog
+++ b/Build/source/texk/web2c/eptexdir/ChangeLog
@@ -1,7 +1,11 @@
+2012-05-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* eptrip/eptrip.diffs, eptrip/etrip.log: Updated.
+
 2012-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* eptex.ech (eTeX_version_string): Version 2.4.
-	* eptrip/eptrip.{diffs,log,tex}: Adapted.
+	* eptrip/eptrip.diffs, eptrip/etrip.{log,tex}: Adapted.
 
 2012-04-17  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs
index d6ba634580f..b957d969d45 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs
+++ b/Build/source/texk/web2c/eptexdir/eptrip/eptrip.diffs
@@ -13,7 +13,7 @@
 1c1
 < This is TeX, Version 3.1415926 (INITEX)  15 MAR 2008 02:23
 ---
-> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (INITEX)  11 MAY 2012 14:12
+> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (INITEX)  12 MAY 2012 14:18
 3c3
 < (trip.tex
 ---
@@ -22,12 +22,6 @@
 < A character number must be between 0 and 255.
 ---
 > A character number must be between 0 and 255, or KANJI code.
-47,48c47,48
-< <recently read> \font 
-<                       
----
-> <recently read> 
->                 
 91c91,92
 < ### horizontal mode entered at line 77 (language255:hyphenmin1,63)
 ---
@@ -39,7 +33,7 @@
 < 471 memory locations dumped; current usage is 96&278
 < 341 multiletter control sequences
 ---
->  (format=trip 2012.5.11)
+>  (format=trip 2012.5.12)
 > 1603 strings of total length 27713
 > 489 memory locations dumped; current usage is 110&278
 > 387 multiletter control sequences
@@ -62,20 +56,6 @@
 < 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
 ---
@@ -84,7 +64,7 @@
 1c1
 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15)  15 MAR 2008 02:23
 ---
-> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=trip 2012.5.11)  11 MAY 2012 14:12
+> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=trip 2012.5.12)  12 MAY 2012 14:18
 3c3
 < (trip.tex ##
 ---
@@ -122,12 +102,6 @@
 ---
 > \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
 ---
@@ -153,12 +127,6 @@
 ---
 > \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
 ---
@@ -168,12 +136,6 @@
 ---
 > ### 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
 ---
@@ -183,12 +145,6 @@
 ---
 > ### 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
 ---
@@ -203,12 +159,6 @@
 < 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
 ---
@@ -221,32 +171,10 @@
 < 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
 ---
@@ -255,28 +183,10 @@
 < 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
 ---
@@ -287,20 +197,10 @@
 > .\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
 ---
@@ -311,26 +211,10 @@
 < 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
 ---
@@ -351,24 +235,6 @@
 < 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
 ---
@@ -387,250 +253,26 @@
 < Since I expected to read a number between 0 and 15,
 < I changed this one to zero.
 < 
-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
+5700c5703
 < ! \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
 ---
@@ -659,7 +301,7 @@
 9c9
 < ' TeX output 2008.03.15:0223'
 ---
-> ' TeX output 2012.05.11:1412'
+> ' TeX output 2012.05.12:1418'
 419c419
 < 1121: down4 639342208 
 ---
@@ -681,7 +323,7 @@
 < **\input trip
 < (trip.tex
 ---
-> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (INITEX)  11 MAY 2012 14:12
+> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (INITEX)  12 MAY 2012 14:18
 > entering extended mode
 > ***\input trip
 > (./trip.tex
@@ -696,12 +338,6 @@
 < A register number must be between 0 and 255.
 < I changed this one to zero.
 < 
-47,48c42,43
-< <recently read> \font 
-<                       
----
-> <recently read> 
->                 
 91c86,87
 < ### horizontal mode entered at line 77 (language255:hyphenmin1,63)
 ---
@@ -713,7 +349,7 @@
 < 471 memory locations dumped; current usage is 96&278
 < 341 multiletter control sequences
 ---
->  (format=trip 2012.5.11)
+>  (format=trip 2012.5.12)
 > 1603 strings of total length 27713
 > 536 memory locations dumped; current usage is 157&278
 > 459 multiletter control sequences
@@ -737,20 +373,6 @@
 < 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
 ---
@@ -765,7 +387,7 @@
 < ** &trip  trip
 < (trip.tex ##
 ---
-> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=trip 2012.5.11)  11 MAY 2012 14:12
+> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=trip 2012.5.12)  12 MAY 2012 14:18
 > entering extended mode
 > **&trip \toksdef\tokens=0 \input trip
 >  (./trip.tex
@@ -802,12 +424,6 @@
 ---
 > \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
 ---
@@ -833,12 +449,6 @@
 ---
 > \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
 ---
@@ -848,12 +458,6 @@
 ---
 > ### 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
 ---
@@ -863,12 +467,6 @@
 ---
 > ### 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
 ---
@@ -887,12 +485,6 @@
 < {restoring \fam=-1}
 1779d1786
 < {restoring \displayindent=0.0pt}
-1809,1810c1816,1817
-< <recently read> $
-<                  
----
-> <recently read> 
->                 
 1833d1839
 < {restoring \fam=-1}
 1954c1960
@@ -915,32 +507,10 @@
 < 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
 ---
@@ -954,30 +524,12 @@
 < 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
 ---
@@ -988,22 +540,12 @@
 > .\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
 ---
@@ -1024,18 +566,6 @@
 > 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
@@ -1054,10 +584,6 @@
 < ....\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
 ---
@@ -1088,24 +614,6 @@
 < 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
 ---
@@ -1128,250 +636,26 @@
 < Since I expected to read a number between 0 and 15,
 < I changed this one to zero.
 < 
-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
+5700c5697
 < ! \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
 ---
@@ -1406,7 +690,7 @@
 9c9
 < ' TeX output 2008.03.15:0223'
 ---
-> ' TeX output 2012.05.11:1412'
+> ' TeX output 2012.05.12:1418'
 419c419
 < 1121: down4 639342208 
 ---
@@ -1429,12 +713,14 @@
 1c1
 < This is e-TeX, Version 3.1415926-2.4 (TeX Live 2012) (INITEX)  11 MAY 2012 13:47
 ---
-> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (INITEX)  11 MAY 2012 14:12
-27,29c27,29
+> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (INITEX)  12 MAY 2012 14:18
+26,29c26,29
+<  (format=etrip 2012.5.11)
 < 1491 strings of total length 26238
 < 280 memory locations dumped; current usage is 36&166
 < 408 multiletter control sequences
 ---
+>  (format=etrip 2012.5.12)
 > 1604 strings of total length 27744
 > 283 memory locations dumped; current usage is 40&166
 > 459 multiletter control sequences
@@ -1447,651 +733,15 @@
 > This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012)
 + diff SRCDIR/eptexdir/eptrip/etrip.log eptrip.log
 1c1
-< 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-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=etrip 2012.5.11)  11 MAY 2012 14:12
-203c203
-< \vbox(30.00002+0.0)x0.0, yoko direction
----
-> \vbox(30.00002+0.0)x0.0
-641c641
-< \vbox(0.0+0.0)x0.0, yoko direction
----
-> \vbox(0.0+0.0)x0.0
-666c666
-< \vbox(0.0+0.0)x0.0, yoko direction
----
-> \vbox(0.0+0.0)x0.0
-942c942
-< ### yoko direction, restricted horizontal mode entered at line 468
----
-> ### restricted horizontal mode entered at line 468
-953c953
-< ### yoko direction, vertical mode entered at line 0
----
-> ### vertical mode entered at line 0
-965c965
-< \hbox(8.0+2.0)x9.0, yoko direction []}
----
-> \hbox(8.0+2.0)x9.0 []}
-980c980
-< \vbox(188.0+0.0)x10.0, yoko direction
----
-> \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
----
-> .\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
+< This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=etrip 2012.5.12)  12 MAY 2012 14:12
 ---
-> .\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
-3192c3192
-< \hbox(0.0+0.0)x3.0, yoko direction
----
-> \hbox(0.0+0.0)x3.0
-3245c3245
-< \vbox(0.0+0.0)x96.0, yoko direction
----
-> \vbox(0.0+0.0)x96.0
-3257,3258c3257,3258
-< \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
-3260c3260
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3288c3288
-< \vbox(0.0+0.0)x96.0, yoko direction
----
-> \vbox(0.0+0.0)x96.0
-3300,3301c3300,3301
-< \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
-3303c3303
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3331c3331
-< \vbox(0.0+0.0)x96.0, yoko direction
----
-> \vbox(0.0+0.0)x96.0
-3343,3344c3343,3344
-< \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
-3346c3346
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3382c3382
-< \vbox(0.0+0.0)x98.0, yoko direction
----
-> \vbox(0.0+0.0)x98.0
-3400,3401c3400,3401
-< \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
-3429c3429
-< \vbox(0.0+0.0)x98.0, yoko direction
----
-> \vbox(0.0+0.0)x98.0
-3441c3441
-< \hbox(0.0+0.0)x98.0, glue set - 0.125, yoko direction
----
-> \hbox(0.0+0.0)x98.0, glue set - 0.125
-3443c3443
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3445c3445
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3473c3473
-< \vbox(0.0+0.0)x98.0, yoko direction
----
-> \vbox(0.0+0.0)x98.0
-3485,3486c3485,3486
-< \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
-3488c3488
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3516c3516
-< \vbox(0.0+0.0)x100.0, yoko direction
----
-> \vbox(0.0+0.0)x100.0
-3528,3529c3528,3529
-< \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
-3531c3531
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3559c3559
-< \vbox(0.0+0.0)x100.0, yoko direction
----
-> \vbox(0.0+0.0)x100.0
-3571,3572c3571,3572
-< \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
-3574c3574
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3602c3602
-< \vbox(0.0+0.0)x100.0, yoko direction
----
-> \vbox(0.0+0.0)x100.0
-3614,3615c3614,3615
-< \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
-3617c3617
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3645c3645
-< \vbox(0.0+0.0)x110.0, yoko direction
----
-> \vbox(0.0+0.0)x110.0
-3657,3658c3657,3658
-< \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
-3661c3661
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3689c3689
-< \vbox(0.0+0.0)x110.0, yoko direction
----
-> \vbox(0.0+0.0)x110.0
-3701,3702c3701,3702
-< \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
-3704c3704
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3732c3732
-< \vbox(0.0+0.0)x110.0, yoko direction
----
-> \vbox(0.0+0.0)x110.0
-3744,3745c3744,3745
-< \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
-3747c3747
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3775c3775
-< \vbox(0.0+0.0)x120.0, yoko direction
----
-> \vbox(0.0+0.0)x120.0
-3787,3788c3787,3788
-< \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
-3790c3790
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3818c3818
-< \vbox(0.0+0.0)x120.0, yoko direction
----
-> \vbox(0.0+0.0)x120.0
-3830,3831c3830,3831
-< \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
-3833c3833
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-3861c3861
-< \vbox(0.0+0.0)x120.0, yoko direction
----
-> \vbox(0.0+0.0)x120.0
-3873,3874c3873,3874
-< \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
-3876c3876
-< .\hbox(0.0+0.0)x30.0, yoko direction
----
-> .\hbox(0.0+0.0)x30.0
-4003c4003
-< \vbox(0.0+0.0)x0.0, yoko direction
----
-> \vbox(0.0+0.0)x0.0
-4024,4026c4024,4026
-< \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
-4030c4030
-< .\vbox(20.0+0.0)x0.0, yoko direction
----
-> .\vbox(20.0+0.0)x0.0
-4034c4034
-< ..\vbox(20.0+0.0)x0.0, yoko direction
----
-> ..\vbox(20.0+0.0)x0.0
-4044,4046c4044,4046
-< \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
-4052c4052
-< .\vbox(20.0+0.0)x0.0, yoko direction
----
-> .\vbox(20.0+0.0)x0.0
-4055c4055
-< ..\vbox(20.0+0.0)x0.0, yoko direction
----
-> ..\vbox(20.0+0.0)x0.0
-4065,4067c4065,4067
-< \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
-4074c4074
-< .\vbox(20.0+0.0)x0.0, yoko direction
----
-> .\vbox(20.0+0.0)x0.0
-4078c4078
-< ..\vbox(20.0+0.0)x0.0, yoko direction
----
-> ..\vbox(20.0+0.0)x0.0
-4088,4090c4088,4090
-< \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
-4098c4098
-< .\vbox(20.0+0.0)x0.0, yoko direction
----
-> .\vbox(20.0+0.0)x0.0
-4101c4101
-< ..\vbox(20.0+0.0)x0.0, yoko direction
----
-> ..\vbox(20.0+0.0)x0.0
-4111c4111
-< ### yoko direction, internal vertical mode entered at line 1184
----
-> ### internal vertical mode entered at line 1184
-4113c4113
-< ### yoko direction, vertical mode entered at line 0
----
-> ### vertical mode entered at line 0
-4126c4126
-< ### yoko direction, internal vertical mode entered at line 1184
----
-> ### internal vertical mode entered at line 1184
-4128c4128
-< ### yoko direction, vertical mode entered at line 0
----
-> ### vertical mode entered at line 0
-4138c4138
-< ### yoko direction, internal vertical mode entered at line 1185
----
-> ### internal vertical mode entered at line 1185
-4140c4140
-< ### yoko direction, vertical mode entered at line 0
----
-> ### vertical mode entered at line 0
-4153c4153
-< ### yoko direction, internal vertical mode entered at line 1185
----
-> ### internal vertical mode entered at line 1185
-4158c4158
-< ### yoko direction, vertical mode entered at line 0
----
-> ### vertical mode entered at line 0
-4168c4168
-< \vbox(12.0+0.0)x0.0, yoko direction
----
-> \vbox(12.0+0.0)x0.0
-4181c4181
-< \vbox(0.0+0.0)x0.0, yoko direction
----
-> \vbox(0.0+0.0)x0.0
-4186c4186
-< .\hbox(0.0+0.0)x0.0, yoko direction
----
-> .\hbox(0.0+0.0)x0.0
-4195c4195
-< ### yoko direction, internal vertical mode entered at line 1191
----
-> ### internal vertical mode entered at line 1191
-4198c4198
-< ### yoko direction, vertical mode entered at line 0
----
-> ### vertical mode entered at line 0
-4267c4267
-< \vbox(0.0+0.0)x0.0, yoko direction}
----
-> \vbox(0.0+0.0)x0.0}
+> This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=etrip 2012.5.12)  12 MAY 2012 14:18
 + eval ./dvitype -output-level=2 -dpi=72.27 '-page-start='\''*.*.*.*.*.*.*.*.*.*'\''' etrip.dvi
 ++ ./dvitype -output-level=2 -dpi=72.27 '-page-start=*.*.*.*.*.*.*.*.*.*' etrip.dvi
 + diff SRCDIR/etexdir/etrip/etrip.typ eptrip.typ
 9c9
 < ' TeX output 2012.05.11:1347'
 ---
-> ' TeX output 2012.05.11:1412'
+> ' TeX output 2012.05.12:1418'
 + :
 PASS: eptexdir/eptrip.test
diff --git a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log
index bd22f374330..f0b80a0fab6 100644
--- a/Build/source/texk/web2c/eptexdir/eptrip/etrip.log
+++ b/Build/source/texk/web2c/eptexdir/eptrip/etrip.log
@@ -1,4 +1,4 @@
-This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=etrip 2012.5.11)  11 MAY 2012 14:10
+This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=etrip 2012.5.12)  12 MAY 2012 14:12
 entering extended mode
 **&etrip etrip
 (./etrip.tex e-IniTeX: e-Trip format loaded.
@@ -200,7 +200,7 @@ Overfull \hbox (3.0pt too wide) in paragraph at lines 205--211
 .\glue(\rightskip) 0.0
 
 > \box0=
-\vbox(30.00002+0.0)x0.0, yoko direction
+\vbox(30.00002+0.0)x0.0
 .\hbox(17.0+3.00002)x0.0
 ..\hbox(0.0+0.0)x0.0
 ..\trip a
@@ -638,7 +638,7 @@ l.404 ...cted\def\1{\2}} \show\1
 
 \1->\2
 > \box0=
-\vbox(0.0+0.0)x0.0, yoko direction
+\vbox(0.0+0.0)x0.0
 .\special{\1\2}
 
 ! OK.
@@ -663,7 +663,7 @@ 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, yoko direction
+\vbox(0.0+0.0)x0.0
 .\openout1=etrip.out
 .\write1{\unexpanded \expandafter {\1}}
 .\closeout1
@@ -748,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         }
@@ -794,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
@@ -939,7 +939,7 @@ Missing character: There is no e in font etrip!
 {false}
 {\showlists}
 
-### yoko direction, restricted horizontal mode entered at line 468
+### restricted horizontal mode entered at line 468
 \trip r
 \trip r (ligature up)
 \trip b
@@ -950,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
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -962,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, yoko direction []}
+\hbox(8.0+2.0)x9.0 []}
 {vertical mode: blank space  }
 {end-group character }}
 {restoring \box25=void}
@@ -977,15 +977,15 @@ Current marks:
  \splitfirstmarks 3=.
  \splitbotmarks 3=.
 > \box0=
-\vbox(188.0+0.0)x10.0, yoko direction
+\vbox(188.0+0.0)x10.0
 .\mark{0-1}
 .\marks1{1-1}
 .\glue 1.0
-.\vbox(9.0+0.0)x0.0, yoko direction
+.\vbox(9.0+0.0)x0.0
 .\mark{0-2}
 .\marks3{}
 .\glue(\baselineskip) 0.0
-.\hbox(0.0+0.0)x0.0, yoko direction
+.\hbox(0.0+0.0)x0.0
 .\glue 5.0
 .\glue 0.0 plus 1.0fil
 .\penalty 0
@@ -993,61 +993,61 @@ Current marks:
 .\mark{0-3}
 .\glue 1.0
 .\glue(\lineskip) 0.0
-.\vbox(19.0+0.0)x0.0, yoko direction
+.\vbox(19.0+0.0)x0.0
 .\marks3{3-3}
 .\glue 3.0 plus 1.0fil
 .\penalty 0
 .\glue 40.0
 .\glue(\lineskip) 0.0
-.\vbox(30.0+0.0)x0.0, yoko direction
+.\vbox(30.0+0.0)x0.0
 .\glue 0.0 plus 1.0fil
 .\penalty 0
 .\glue 40.0
 .\glue(\baselineskip) 0.0
-.\hbox(0.0+0.0)x10.0, yoko direction
+.\hbox(0.0+0.0)x10.0
 
 ! OK.
 l.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
@@ -1061,15 +1061,15 @@ Current marks:
  \splitfirstmarks 3=.
  \splitbotmarks 3=.
 > \box1=
-\vbox(17.0+0.0)x0.0, glue set 2.0fil, yoko direction
+\vbox(17.0+0.0)x0.0, glue set 2.0fil
 .\mark{0-1}
 .\marks1{1-1}
 .\glue 1.0
-.\vbox(9.0+0.0)x0.0, yoko direction
+.\vbox(9.0+0.0)x0.0
 .\mark{0-2}
 .\marks3{}
 .\glue(\baselineskip) 0.0
-.\hbox(0.0+0.0)x0.0, yoko direction
+.\hbox(0.0+0.0)x0.0
 .\glue 5.0
 .\glue 0.0 plus 1.0fil
 
@@ -1078,21 +1078,21 @@ l.493   \1 \showbox1
                      \showbox0 \let\3=\5
 
 > \box0=
-\vbox(132.0+0.0)x10.0, yoko direction
+\vbox(132.0+0.0)x10.0
 .\mark{0-3}
 .\glue(\splittopskip) 0.0
-.\vbox(19.0+0.0)x0.0, yoko direction
+.\vbox(19.0+0.0)x0.0
 .\marks3{3-3}
 .\glue 3.0 plus 1.0fil
 .\penalty 0
 .\glue 40.0
 .\glue(\lineskip) 0.0
-.\vbox(30.0+0.0)x0.0, yoko direction
+.\vbox(30.0+0.0)x0.0
 .\glue 0.0 plus 1.0fil
 .\penalty 0
 .\glue 40.0
 .\glue(\baselineskip) 0.0
-.\hbox(0.0+0.0)x10.0, yoko direction
+.\hbox(0.0+0.0)x10.0
 
 ! OK.
 l.493   \1 \showbox1 \showbox0 
@@ -1107,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, yoko direction
+\vbox(27.0+0.0)x0.0, glue set 5.0fil
 .\mark{0-3}
 .\glue(\splittopskip) 0.0
-.\vbox(19.0+0.0)x0.0, yoko direction
+.\vbox(19.0+0.0)x0.0
 .\marks3{3-3}
 .\glue 3.0 plus 1.0fil
 
@@ -1119,14 +1119,14 @@ l.495   \1 \showbox1
                      \showbox0
 
 > \box0=
-\vbox(70.0+0.0)x10.0, yoko direction
+\vbox(70.0+0.0)x10.0
 .\glue(\splittopskip) 0.0
-.\vbox(30.0+0.0)x0.0, yoko direction
+.\vbox(30.0+0.0)x0.0
 .\glue 0.0 plus 1.0fil
 .\penalty 0
 .\glue 40.0
 .\glue(\baselineskip) 0.0
-.\hbox(0.0+0.0)x10.0, yoko direction
+.\hbox(0.0+0.0)x10.0
 
 ! OK.
 l.495   \1 \showbox1 \showbox0
@@ -1141,9 +1141,9 @@ Current marks:
  \splitfirstmarks 3=.
  \splitbotmarks 3=.
 > \box1=
-\vbox(37.0+0.0)x0.0, glue set 7.0fil, yoko direction
+\vbox(37.0+0.0)x0.0, glue set 7.0fil
 .\glue(\splittopskip) 0.0
-.\vbox(30.0+0.0)x0.0, yoko direction
+.\vbox(30.0+0.0)x0.0
 .\glue 0.0 plus 1.0fil
 
 ! OK.
@@ -1151,9 +1151,9 @@ l.497   \1 \showbox1
                      \showbox0
 
 > \box0=
-\vbox(0.0+0.0)x10.0, yoko direction
+\vbox(0.0+0.0)x10.0
 .\glue(\splittopskip) 0.0
-.\hbox(0.0+0.0)x10.0, yoko direction
+.\hbox(0.0+0.0)x10.0
 
 ! OK.
 l.497   \1 \showbox1 \showbox0
@@ -1182,15 +1182,15 @@ Current marks:
  \firstmarks 3=.
  \botmarks 3=.
 > \box255=
-\vbox(35.0+0.0)x0.0, glue set 21.0fil, yoko direction
+\vbox(35.0+0.0)x0.0, glue set 21.0fil
 .\mark{0-1}
 .\marks1{1-1}
 .\glue(\topskip) 0.0
-.\vbox(9.0+0.0)x0.0, yoko direction
+.\vbox(9.0+0.0)x0.0
 .\mark{0-2}
 .\marks3{}
 .\glue(\baselineskip) 0.0
-.\hbox(0.0+0.0)x0.0, yoko direction
+.\hbox(0.0+0.0)x0.0
 .\glue 5.0
 .\glue 0.0 plus 1.0fil
 
@@ -1212,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, yoko direction
+\vbox(35.0+0.0)x0.0, glue set 13.0fil
 .\mark{0-3}
 .\glue(\topskip) 0.0
-.\vbox(19.0+0.0)x0.0, yoko direction
+.\vbox(19.0+0.0)x0.0
 .\marks3{3-3}
 .\glue 3.0 plus 1.0fil
 
@@ -1237,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, yoko direction
+\vbox(35.0+0.0)x0.0, glue set 5.0fil
 .\glue(\topskip) 0.0
-.\vbox(30.0+0.0)x0.0, yoko direction
+.\vbox(30.0+0.0)x0.0
 .\glue 0.0 plus 1.0fil
 
 ! OK.
@@ -1260,9 +1260,9 @@ Current marks:
  \firstmarks 3=.
  \botmarks 3=.
 > \box255=
-\vbox(35.0+0.0)x10.0, glue set 35.0fil, yoko direction
+\vbox(35.0+0.0)x10.0, glue set 35.0fil
 .\glue(\topskip) 0.0
-.\hbox(0.0+0.0)x10.0, yoko direction
+.\hbox(0.0+0.0)x10.0
 .\mark{}
 .\marks1{}
 .\marks3{}
@@ -1286,9 +1286,9 @@ Current marks:
  \firstmarks 3=.
  \botmarks 3=.
 > \box255=
-\vbox(35.0+0.0)x0.0, glue set 35.0fil, yoko direction
+\vbox(35.0+0.0)x0.0, glue set 35.0fil
 .\glue(\topskip) 0.0
-.\hbox(0.0+0.0)x0.0, yoko direction
+.\hbox(0.0+0.0)x0.0
 .\mark{}
 .\marks1{}
 .\marks3{}
@@ -1312,9 +1312,9 @@ Current marks:
  \firstmarks 3=.
  \botmarks 3=.
 > \box255=
-\vbox(35.0+0.0)x0.0, glue set 35.0fil, yoko direction
+\vbox(35.0+0.0)x0.0, glue set 35.0fil
 .\glue(\topskip) 0.0
-.\hbox(0.0+0.0)x0.0, yoko direction
+.\hbox(0.0+0.0)x0.0
 .\glue 0.0 plus 1.0fil
 
 ! OK.
@@ -1326,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
@@ -1354,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
@@ -1363,7 +1363,7 @@ you left one out. Proceed, with fingers crossed.
 
 ! Missing $ inserted.
 <inserted text> 
-                
+                $
 ...
 l.511 ...box{\middle \par \right
                                  \par} % <== 8 errors
@@ -1391,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
@@ -1399,7 +1399,7 @@ I've inserted a begin-math/end-math symbol since I think
 you left one out. Proceed, with fingers crossed.
 
 
-### yoko(math) direction, math mode entered at line 522
+### math mode entered at line 522
 \mathord
 .\fam1 r
 this will be denominator of:
@@ -1413,7 +1413,7 @@ this will be denominator of:
 \\middle"142342
 \\mathord
 \.\fam1 q
-### yoko(math) direction, math mode entered at line 519
+### math mode entered at line 519
 \left"161361
 \mathord
 .\fam1 p
@@ -1423,7 +1423,7 @@ this will be denominator of:
 \middle"142342
 \mathord
 .\fam1 q
-### yoko(math) direction, math mode entered at line 515
+### math mode entered at line 515
 \mathord
 .\fam1 r
 this will be denominator of:
@@ -1431,14 +1431,14 @@ this will be denominator of:
 \\left"161361
 \\mathord
 \.\fam1 q
-### yoko(math) direction, math mode entered at line 514
+### math mode entered at line 514
 \left"161361
 \mathord
 .\fam1 p
-### 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
 spacefactor 1000
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -1446,7 +1446,7 @@ l.523 ...      \over r\showlists
                                 
 
 
-### yoko(math) direction, math mode entered at line 519
+### math mode entered at line 519
 \left"161361
 \mathord
 .\fam1 p
@@ -1470,7 +1470,7 @@ l.523 ...      \over r\showlists
 ./\mathord
 ./.\fam1 r
 .\right"162362
-### yoko(math) direction, math mode entered at line 515
+### math mode entered at line 515
 \mathord
 .\fam1 r
 this will be denominator of:
@@ -1478,14 +1478,14 @@ this will be denominator of:
 \\left"161361
 \\mathord
 \.\fam1 q
-### yoko(math) direction, math mode entered at line 514
+### math mode entered at line 514
 \left"161361
 \mathord
 .\fam1 p
-### 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
 spacefactor 1000
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -1493,7 +1493,7 @@ l.524 ...      \right]\showlists
                                 
 
 
-### yoko(math) direction, math mode entered at line 515
+### math mode entered at line 515
 \mathord
 .\fam1 r
 \mathinner
@@ -1526,14 +1526,14 @@ this will be denominator of:
 \\left"161361
 \\mathord
 \.\fam1 q
-### yoko(math) direction, math mode entered at line 514
+### math mode entered at line 514
 \left"161361
 \mathord
 .\fam1 p
-### 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
 spacefactor 1000
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -1541,7 +1541,7 @@ l.525 ...      \right]\showlists
                                 
 
 
-### yoko(math) direction, math mode entered at line 514
+### math mode entered at line 514
 \left"161361
 \mathord
 .\fam1 p
@@ -1578,10 +1578,10 @@ l.525 ...      \right]\showlists
 ./..\right"162362
 ./.\right"162362
 .\right"162362
-### 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
 spacefactor 1000
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -1589,7 +1589,7 @@ l.526         \right]\showlists
                                
 
 
-### yoko(math) direction, math mode entered at line 513
+### math mode entered at line 513
 \mathinner
 .\left"161361
 .\mathord
@@ -1628,9 +1628,9 @@ l.526         \right]\showlists
 ../.\right"162362
 ..\right"162362
 .\right"162362
-### yoko direction, restricted horizontal mode entered at line 512
+### restricted horizontal mode entered at line 512
 spacefactor 1000
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -1638,7 +1638,7 @@ l.527       \right]\showlists
                              
 
 
-### yoko direction, restricted horizontal mode entered at line 512
+### 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
@@ -1841,7 +1841,7 @@ l.527       \right]\showlists
 ...\trip B
 \mathoff
 spacefactor 1000
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -1849,7 +1849,7 @@ l.528     $\showlists
                      
 
 
-### yoko direction, restricted horizontal mode entered at line 530
+### 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
@@ -1857,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, yoko direction
+.\hbox(0.0+0.0)x0.0, shifted -16.5
 .\vbox(-1.00002+20.99998)x7.0, shifted -18.0
 ..\hbox(-1.00002+2.0)x7.0
 ...\trip ^^@
@@ -1869,7 +1869,7 @@ l.528     $\showlists
 ...\trip B
 \mathoff
 spacefactor 1000
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -1877,12 +1877,12 @@ l.532 ...box{}\right]$\showlists
                                 }
 
 
-### yoko direction, restricted horizontal mode entered at line 533
+### 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, yoko direction
+.\hbox(0.0+0.0)x0.0, shifted 3.0
 .\hbox(16.0+4.00002)x6.0, shifted -1.0
 ..\bigtrip B
 .\trip s
@@ -1901,7 +1901,7 @@ l.532 ...box{}\right]$\showlists
 ...\trip B
 \mathoff
 spacefactor 1000
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -1920,7 +1920,7 @@ Checking TeX--XeT enhancements:
 .\beginR
 .\kern 3.0
 .\penalty 0
-.\hbox(0.0+0.0)x0.0, yoko direction
+.\hbox(0.0+0.0)x0.0
 .\kern 3.0
 .\kern 0.0
 .\endR
@@ -1944,7 +1944,7 @@ Checking TeX--XeT enhancements:
 .\glue(\rightskip) 0.0
 
 > \box0=
-\vbox(0.0+0.0)x10.0, yoko direction
+\vbox(0.0+0.0)x10.0
 .\hbox(0.0+0.0)x10.0, glue set 8.5fil
 ..\hbox(0.0+0.0)x0.5
 ..\beginL
@@ -1971,7 +1971,7 @@ Checking TeX--XeT enhancements:
 ..\beginR
 ..\kern 3.0
 ..\penalty 0
-..\hbox(0.0+0.0)x0.0, yoko direction
+..\hbox(0.0+0.0)x0.0
 ..\kern 3.0
 ..\kern 0.0
 ..\endR
@@ -2347,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> 
-                
+<recently read> \9
+                  
 l.778 ...5=\dimexpr1sp*\skip44\9
                                 
 I can't evaluate this expression,
@@ -2369,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> 
-                
+<recently read> \9
+                  
 l.780 ...5=\dimexpr1sp*\skip44\9
                                 
 I can't evaluate this expression,
@@ -2379,8 +2379,8 @@ since the result is out of range.
 {changing \dimen45=16383.99998pt}
 {into \dimen45=0.0pt}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.781 ...4=\numexpr"7FFFFFFE+2\9
                                     \dimen44=\dimexpr"3FFFFFF...
 I can't evaluate this expression,
@@ -2389,8 +2389,8 @@ since the result is out of range.
 {changing \count44=2147450880}
 {into \count44=0}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.781 ...imexpr"3FFFFFFEsp+2sp\9
                                 
 I can't evaluate this expression,
@@ -2399,8 +2399,8 @@ since the result is out of range.
 {changing \dimen44=-16384.0pt}
 {into \dimen44=0.0pt}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.782 ...=\numexpr-"7FFFFFFE-2\9
                                    \dimen44=\dimexpr-"3FFFFFF...
 I can't evaluate this expression,
@@ -2408,8 +2408,8 @@ since the result is out of range.
 
 {reassigning \count44=0}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.782 ...mexpr-"3FFFFFFEsp-2sp\9
                                 
 I can't evaluate this expression,
@@ -2417,8 +2417,8 @@ since the result is out of range.
 
 {reassigning \dimen44=0.0pt}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.783 ...=\numexpr"10000*"8000\9
                                    \dimen44=\dimexpr"8000sp*"...
 I can't evaluate this expression,
@@ -2426,8 +2426,8 @@ since the result is out of range.
 
 {reassigning \count44=0}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.783 ...\dimexpr"8000sp*"8000\9
                                 
 I can't evaluate this expression,
@@ -2435,8 +2435,8 @@ since the result is out of range.
 
 {reassigning \dimen44=0.0pt}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.784 ...\numexpr"10000*-"8000\9
                                   \dimen44=\dimexpr"8000sp*-"...
 I can't evaluate this expression,
@@ -2444,8 +2444,8 @@ since the result is out of range.
 
 {reassigning \count44=0}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.784 ...dimexpr"8000sp*-"8000\9
                                 
 I can't evaluate this expression,
@@ -2453,8 +2453,8 @@ since the result is out of range.
 
 {reassigning \dimen44=0.0pt}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.785 ...\numexpr-"10000*"8000\9
                                   \dimen44=\dimexpr-"8000sp*"...
 I can't evaluate this expression,
@@ -2462,8 +2462,8 @@ since the result is out of range.
 
 {reassigning \count44=0}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.785 ...dimexpr-"8000sp*"8000\9
                                 
 I can't evaluate this expression,
@@ -2471,8 +2471,8 @@ since the result is out of range.
 
 {reassigning \dimen44=0.0pt}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.786 ...numexpr-"10000*-"8000\9
                                  \dimen44=\dimexpr-"8000sp*-"...
 I can't evaluate this expression,
@@ -2480,8 +2480,8 @@ since the result is out of range.
 
 {reassigning \count44=0}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.786 ...imexpr-"8000sp*-"8000\9
                                 
 I can't evaluate this expression,
@@ -2489,8 +2489,8 @@ since the result is out of range.
 
 {reassigning \dimen44=0.0pt}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.787     \count44=\numexpr0/0\9
                                             \dimen44=\dimexpr...
 I can't evaluate this expression,
@@ -2498,8 +2498,8 @@ since the result is out of range.
 
 {reassigning \count44=0}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.787 ...dimen44=\dimexpr0pt/0\9
                                 
 I can't evaluate this expression,
@@ -2507,8 +2507,8 @@ since the result is out of range.
 
 {reassigning \dimen44=0.0pt}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.788     \count44=\numexpr1/0\9
                                             \dimen44=\dimexpr...
 I can't evaluate this expression,
@@ -2516,8 +2516,8 @@ since the result is out of range.
 
 {reassigning \count44=0}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.788 ...dimen44=\dimexpr1pt/0\9
                                 
 I can't evaluate this expression,
@@ -2525,8 +2525,8 @@ since the result is out of range.
 
 {reassigning \dimen44=0.0pt}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.789 ...\count44=\numexpr-1/0\9
                                            \dimen44=\dimexpr-...
 I can't evaluate this expression,
@@ -2534,8 +2534,8 @@ since the result is out of range.
 
 {reassigning \count44=0}
 ! Arithmetic overflow.
-<recently read> 
-                
+<recently read> \9
+                  
 l.789 ...imen44=\dimexpr-1pt/0\9
                                 
 I can't evaluate this expression,
@@ -2571,8 +2571,8 @@ Expr quotient rounding 2 OK
 Expr quotient rounding 3 OK
 Expr quotient rounding 4 OK
 ! Incompatible glue units.
-<recently read> 
-                
+<recently read> \9
+                  
 ...
 l.829   \15{32}{5}{6}
                         % <== three mu_error's (! Incompatibl...
@@ -2587,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> 
-                
+<recently read> \relax 
+                       
 ...
 l.829   \15{32}{5}{6}
                         % <== three mu_error's (! Incompatibl...
@@ -2596,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> 
-                
+<recently read> \9
+                  
 ...
 l.830   \16{33}{5}{7}
                         % <== three mu_error's (! Incompatibl...
@@ -2612,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> 
-                
+<recently read> \relax 
+                       
 ...
 l.830   \16{33}{5}{7}
                         % <== three mu_error's (! Incompatibl...
@@ -2621,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> 
-                
+<recently read> \9
+                  
 ...
 l.831   \17{25}{4}{6}
                         % <== three mu_error's (! Incompatibl...
@@ -2637,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> 
-                
+<recently read> \relax 
+                       
 ...
 l.831   \17{25}{4}{6}
                         % <== three mu_error's (! Incompatibl...
@@ -2646,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> 
-                
+<recently read> \9
+                  
 ...
 l.832   \18{26}{4}{7}
                         % <== three mu_error's (! Incompatibl...
@@ -2662,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> 
-                
+<recently read> \relax 
+                       
 ...
 l.832   \18{26}{4}{7}
                         % <== three mu_error's (! Incompatibl...
@@ -2683,8 +2683,8 @@ I can't evaluate this expression,
 since the result is out of range.
 
 ! Arithmetic overflow.
-<inserted text> 
-                
+<inserted text> \relax 
+                       
 <to be read again> 
                    \else 
 \1...expr (#3sp)*(#4)/(#5)\else 
@@ -3189,7 +3189,7 @@ l.1044   \showbox32100
                       
 
 > \box32101=
-\hbox(0.0+0.0)x3.0, yoko direction
+\hbox(0.0+0.0)x3.0
 
 ! OK.
 l.1045   \showbox32101
@@ -3242,7 +3242,7 @@ Checking \lastlinefit:
 @@4: line 2.2- t=144 -> @@2
 
 > \box0=
-\vbox(0.0+0.0)x96.0, yoko direction
+\vbox(0.0+0.0)x96.0
 .\hbox(0.0+0.0)x96.0, glue set - 0.5 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x96.0, glue set 31.0fill []
@@ -3254,10 +3254,10 @@ l.1079     \lastlinefit=-1 \1
                              
 
 > \box0=
-\hbox(0.0+0.0)x96.0, glue set 31.0fill, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x96.0, glue set 31.0fill
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fill
 .\glue(\rightskip) 0.0
@@ -3285,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, yoko direction
+\vbox(0.0+0.0)x96.0
 .\hbox(0.0+0.0)x96.0, glue set - 0.5 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x96.0, glue set - 0.25 []
@@ -3297,10 +3297,10 @@ l.1080     \lastlinefit=500 \1
                               
 
 > \box0=
-\hbox(0.0+0.0)x96.0, glue set - 0.25, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x96.0, glue set - 0.25
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 32.0
 .\glue(\rightskip) 0.0
@@ -3328,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, yoko direction
+\vbox(0.0+0.0)x96.0
 .\hbox(0.0+0.0)x96.0, glue set - 0.5 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x96.0, glue set - 0.5 []
@@ -3340,10 +3340,10 @@ l.1081     \lastlinefit=1001 \1
                                
 
 > \box0=
-\hbox(0.0+0.0)x96.0, glue set - 0.5, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x96.0, glue set - 0.5
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 33.0
 .\glue(\rightskip) 0.0
@@ -3379,7 +3379,7 @@ l.1081     \lastlinefit=1001 \1
 @@5: line 5.2- t=0 -> @@4
 
 > \box0=
-\vbox(0.0+0.0)x98.0, yoko direction
+\vbox(0.0+0.0)x98.0
 .\hbox(0.0+0.0)x98.0, glue set 68.0fill []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x98.0, glue set 68.0fill []
@@ -3397,8 +3397,8 @@ l.1085 ...  \lastlinefit=1000 \1
                                 
 
 > \box0=
-\hbox(0.0+0.0)x98.0, glue set 34.0fill, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x98.0, glue set 34.0fill
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fill
 .\glue(\rightskip) 0.0 plus 1.0fill
@@ -3426,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, yoko direction
+\vbox(0.0+0.0)x98.0
 .\hbox(0.0+0.0)x98.0, glue set - 0.25 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x98.0, glue set - 0.125 []
@@ -3438,11 +3438,11 @@ l.1087       \lastlinefit=500 \1
                                 
 
 > \box0=
-\hbox(0.0+0.0)x98.0, glue set - 0.125, yoko direction
+\hbox(0.0+0.0)x98.0, glue set - 0.125
 .\glue(\leftskip) 0.0 plus -1.0fill
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 33.5
 .\glue(\rightskip) 0.0 plus 1.0fill
@@ -3470,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, yoko direction
+\vbox(0.0+0.0)x98.0
 .\hbox(0.0+0.0)x98.0, glue set - 0.25 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x98.0, glue set - 0.25 []
@@ -3482,10 +3482,10 @@ l.1089     \lastlinefit=1000 \1
                                
 
 > \box0=
-\hbox(0.0+0.0)x98.0, glue set - 0.25, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x98.0, glue set - 0.25
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 34.0
 .\glue(\rightskip) 0.0
@@ -3513,7 +3513,7 @@ l.1089     \lastlinefit=1000 \1
 @@4: line 2.2- t=0 -> @@2
 
 > \box0=
-\vbox(0.0+0.0)x100.0, yoko direction
+\vbox(0.0+0.0)x100.0
 .\hbox(0.0+0.0)x100.0 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x100.0, glue set 35.0fill []
@@ -3525,10 +3525,10 @@ l.1091     \lastlinefit=0 \1
                             
 
 > \box0=
-\hbox(0.0+0.0)x100.0, glue set 35.0fill, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x100.0, glue set 35.0fill
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fill
 .\glue(\rightskip) 0.0
@@ -3556,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, yoko direction
+\vbox(0.0+0.0)x100.0
 .\hbox(0.0+0.0)x100.0 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x100.0, glue set 35.0fill []
@@ -3568,10 +3568,10 @@ l.1092     \lastlinefit=500 \1
                               
 
 > \box0=
-\hbox(0.0+0.0)x100.0, glue set 35.0fill, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x100.0, glue set 35.0fill
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fill
 .\glue(\rightskip) 0.0
@@ -3599,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, yoko direction
+\vbox(0.0+0.0)x100.0
 .\hbox(0.0+0.0)x100.0 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x100.0, glue set 35.0fill []
@@ -3611,10 +3611,10 @@ l.1093     \lastlinefit=1000 \1
                                
 
 > \box0=
-\hbox(0.0+0.0)x100.0, glue set 35.0fill, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x100.0, glue set 35.0fill
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fill
 .\glue(\rightskip) 0.0
@@ -3642,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, yoko direction
+\vbox(0.0+0.0)x110.0
 .\hbox(0.0+0.0)x110.0, glue set 0.25 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x110.0, glue set 45.0fill []
@@ -3654,11 +3654,11 @@ l.1097 ...  \lastlinefit=1000 \1
                                 
 
 > \box0=
-\hbox(0.0+0.0)x110.0, glue set 45.0fill, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x110.0, glue set 45.0fill
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
 .\glue 0.0 plus 1.0fil
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fill
 .\glue(\rightskip) 0.0
@@ -3686,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, yoko direction
+\vbox(0.0+0.0)x110.0
 .\hbox(0.0+0.0)x110.0, glue set 0.25 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x110.0, glue set 0.125 []
@@ -3698,10 +3698,10 @@ l.1099     \lastlinefit=500 \1
                               
 
 > \box0=
-\hbox(0.0+0.0)x110.0, glue set 0.125, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x110.0, glue set 0.125
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 42.5
 .\glue(\rightskip) 0.0
@@ -3729,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, yoko direction
+\vbox(0.0+0.0)x110.0
 .\hbox(0.0+0.0)x110.0, glue set 0.25 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x110.0, glue set 0.25 []
@@ -3741,10 +3741,10 @@ l.1100     \lastlinefit=1000 \1
                                
 
 > \box0=
-\hbox(0.0+0.0)x110.0, glue set 0.25, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x110.0, glue set 0.25
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 40.0
 .\glue(\rightskip) 0.0
@@ -3772,7 +3772,7 @@ l.1100     \lastlinefit=1000 \1
 @@4: line 2.2- t=144 -> @@2
 
 > \box0=
-\vbox(0.0+0.0)x120.0, yoko direction
+\vbox(0.0+0.0)x120.0
 .\hbox(0.0+0.0)x120.0, glue set 0.5 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x120.0, glue set 55.0fill []
@@ -3784,10 +3784,10 @@ l.1102     \lastlinefit=0 \1
                             
 
 > \box0=
-\hbox(0.0+0.0)x120.0, glue set 55.0fill, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x120.0, glue set 55.0fill
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 0.0 plus 1.0fill
 .\glue(\rightskip) 0.0
@@ -3815,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, yoko direction
+\vbox(0.0+0.0)x120.0
 .\hbox(0.0+0.0)x120.0, glue set 0.5 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x120.0, glue set 0.25 []
@@ -3827,10 +3827,10 @@ l.1103     \lastlinefit=500 \1
                               
 
 > \box0=
-\hbox(0.0+0.0)x120.0, glue set 0.25, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x120.0, glue set 0.25
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 50.0
 .\glue(\rightskip) 0.0
@@ -3858,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, yoko direction
+\vbox(0.0+0.0)x120.0
 .\hbox(0.0+0.0)x120.0, glue set 0.5 []
 .\glue(\baselineskip) 0.0
 .\hbox(0.0+0.0)x120.0, glue set 0.5 []
@@ -3870,10 +3870,10 @@ l.1104     \lastlinefit=1000 \1
                                
 
 > \box0=
-\hbox(0.0+0.0)x120.0, glue set 0.5, yoko direction
-.\hbox(0.0+0.0)x30.0, yoko direction
+\hbox(0.0+0.0)x120.0, glue set 0.5
+.\hbox(0.0+0.0)x30.0
 .\glue 5.0 plus 20.0 minus 4.0
-.\hbox(0.0+0.0)x30.0, yoko direction
+.\hbox(0.0+0.0)x30.0
 .\penalty 10000
 .\glue(\parfillskip) 45.0
 .\glue(\rightskip) 0.0
@@ -3983,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}
@@ -3992,7 +3992,7 @@ you left one out. Proceed, with fingers crossed.
 
 ! Missing $ inserted.
 <inserted text> 
-                
+                $
 ...
 l.1146 ...noindent$\pagediscards
                                 }
@@ -4000,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, yoko direction
+\vbox(0.0+0.0)x0.0
 .\hbox(0.0+0.0)x0.0
 ..\mathon
 ..\mathoff
@@ -4021,17 +4021,17 @@ l.1147   \showbox27
                    
 
 > \box0=
-\vbox(40.0+0.0)x0.0, yoko direction
-.\vbox(20.0+0.0)x0.0, yoko direction
-..\vbox(20.0+0.0)x0.0, yoko direction
+\vbox(40.0+0.0)x0.0
+.\vbox(20.0+0.0)x0.0
+..\vbox(20.0+0.0)x0.0
 ..\openout0=abc
 ..\penalty 0
 ..\write1{write 1}
-.\vbox(20.0+0.0)x0.0, yoko direction
+.\vbox(20.0+0.0)x0.0
 ..\write2{write 2}
 ..\closeout3
 ..\glue(\splittopskip) 0.0
-..\vbox(20.0+0.0)x0.0, yoko direction
+..\vbox(20.0+0.0)x0.0
 ..\glue 0.0 plus 1.0fil
 
 ! OK.
@@ -4041,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, yoko direction
-.\vbox(30.0+0.0)x0.0, yoko direction
-..\vbox(20.0+0.0)x0.0, yoko direction
+\vbox(50.0+0.0)x0.0
+.\vbox(30.0+0.0)x0.0
+..\vbox(20.0+0.0)x0.0
 ..\openout0=abc
 ..\penalty 0
 ..\write1{write 1}
 ..\glue 10.0 plus 1.0 minus 1.0
 ..\write2{write 2}
-.\vbox(20.0+0.0)x0.0, yoko direction
+.\vbox(20.0+0.0)x0.0
 ..\closeout3
 ..\glue(\splittopskip) 0.0
-..\vbox(20.0+0.0)x0.0, yoko direction
+..\vbox(20.0+0.0)x0.0
 ..\glue 0.0 plus 1.0fil
 
 ! OK.
@@ -4062,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, yoko direction
-.\vbox(20.0+0.0)x0.0, yoko direction
-..\vbox(20.0+0.0)x0.0, yoko direction
+\vbox(60.0+0.0)x0.0
+.\vbox(20.0+0.0)x0.0
+..\vbox(20.0+0.0)x0.0
 ..\openout0=abc
 ..\penalty 0
 ..\write1{write 1}
 .\glue 10.0 plus 1.0 minus 1.0
 .\penalty 0
 .\kern 10.0
-.\vbox(20.0+0.0)x0.0, yoko direction
+.\vbox(20.0+0.0)x0.0
 ..\write2{write 2}
 ..\closeout3
 ..\glue(\splittopskip) 0.0
-..\vbox(20.0+0.0)x0.0, yoko direction
+..\vbox(20.0+0.0)x0.0
 ..\glue 0.0 plus 1.0fil
 
 ! OK.
@@ -4085,9 +4085,9 @@ l.1175 ...   \1 0 30    \1 1 20
                                    \1 2 30
 
 > \box0=
-\vbox(60.0+0.0)x0.0, yoko direction
-.\vbox(30.0+0.0)x0.0, yoko direction
-..\vbox(20.0+0.0)x0.0, yoko direction
+\vbox(60.0+0.0)x0.0
+.\vbox(30.0+0.0)x0.0
+..\vbox(20.0+0.0)x0.0
 ..\openout0=abc
 ..\penalty 0
 ..\write1{write 1}
@@ -4095,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, yoko direction
+.\vbox(20.0+0.0)x0.0
 ..\closeout3
 ..\glue(\splittopskip) 0.0
-..\vbox(20.0+0.0)x0.0, yoko direction
+..\vbox(20.0+0.0)x0.0
 ..\glue 0.0 plus 1.0fil
 
 ! OK.
@@ -4108,9 +4108,9 @@ l.1175 ...    \1 1 20    \1 2 30
                                 
 
 
-### yoko direction, internal vertical mode entered at line 1184
+### internal vertical mode entered at line 1184
 prevdepth ignored
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 ### recent contributions:
 \glue 0.0 plus 1.0fil
 \kern 20.0
@@ -4123,9 +4123,9 @@ l.1184 ...0 \vfil \kern 20 pt \1
                                  \penalty -1 \1
 
 
-### yoko direction, internal vertical mode entered at line 1184
+### internal vertical mode entered at line 1184
 prevdepth ignored
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -4135,9 +4135,9 @@ l.1184 ...0 pt \1 \penalty -1 \1
                                 
 
 
-### yoko direction, internal vertical mode entered at line 1185
+### internal vertical mode entered at line 1185
 prevdepth ignored
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 ### recent contributions:
 \glue 0.0 plus 1.0fill
 \kern 2.0
@@ -4150,12 +4150,12 @@ l.1185 ...1 \vfill \kern 2 pt \1
                                  \penalty 10 \1
 
 
-### yoko direction, internal vertical mode entered at line 1185
+### internal vertical mode entered at line 1185
 \glue 0.0 plus 1.0fill
 \kern 2.0
 \penalty 10
 prevdepth ignored
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -4165,7 +4165,7 @@ l.1185 ...2 pt \1 \penalty 10 \1
                                 
 
 > \box0=
-\vbox(12.0+0.0)x0.0, yoko direction
+\vbox(12.0+0.0)x0.0
 .\kern 5.0
 .\penalty 0
 .\kern 7.0
@@ -4178,12 +4178,12 @@ l.1190 ...box {} \penalty -10000
                                 
 
 > \box255=
-\vbox(0.0+0.0)x0.0, yoko direction
+\vbox(0.0+0.0)x0.0
 .\write1{}
 .\write2{}
 .\write3{}
 .\glue(\topskip) 0.0
-.\hbox(0.0+0.0)x0.0, yoko direction
+.\hbox(0.0+0.0)x0.0
 
 ! OK.
 <output> ...wbox 0 \showbox 255 
@@ -4192,10 +4192,10 @@ l.1190 ...box {} \penalty -10000
                                 
 
 
-### yoko direction, internal vertical mode entered at line 1191
+### internal vertical mode entered at line 1191
 \penalty 10000
 prevdepth ignored
-### yoko direction, vertical mode entered at line 0
+### vertical mode entered at line 0
 prevdepth 0.0
 
 ! OK.
@@ -4264,7 +4264,7 @@ laywidowpenalties:
 {restoring \interlinepenalties=3 101\ETC.}
 {changing \box0=void}
 {into \box0=
-\vbox(0.0+0.0)x0.0, yoko direction}
+\vbox(0.0+0.0)x0.0}
 {restoring \box0=void}
 {restoring \displaywidowpenalties=0}
 {restoring \widowpenalties=0}
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index 446a60a330a..5830868f40c 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* euptrip/euptrip.diffs: Updated.
+
 2011-12-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* euptex.ch1: Drop unused param2 of check_kanji().
diff --git a/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs b/Build/source/texk/web2c/euptexdir/euptrip/euptrip.diffs
index 1c589187d43..8a4fdb07e5a 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.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (INITEX)  11 MAY 2012 14:17
+> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (INITEX)  12 MAY 2012 14:18
 3,11c3
 < (trip.tex
 < ! Bad character code (256).
@@ -26,12 +26,6 @@
 < 
 ---
 > (./trip.tex
-47,48c39,40
-< <recently read> \font 
-<                       
----
-> <recently read> 
->                 
 91c83,84
 < ### horizontal mode entered at line 77 (language255:hyphenmin1,63)
 ---
@@ -43,7 +37,7 @@
 < 471 memory locations dumped; current usage is 96&278
 < 341 multiletter control sequences
 ---
->  (format=trip 2012.5.11)
+>  (format=trip 2012.5.12)
 > 1613 strings of total length 27734
 > 489 memory locations dumped; current usage is 110&278
 > 393 multiletter control sequences
@@ -66,20 +60,6 @@
 < 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
 ---
@@ -88,7 +68,7 @@
 1c1
 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15)  15 MAR 2008 02:23
 ---
-> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (format=trip 2012.5.11)  11 MAY 2012 14:17
+> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (format=trip 2012.5.12)  12 MAY 2012 14:18
 3c3
 < (trip.tex ##
 ---
@@ -130,12 +110,6 @@
 ---
 > \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
 ---
@@ -165,12 +139,6 @@
 ---
 > \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
 ---
@@ -180,12 +148,6 @@
 ---
 > ### 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
 ---
@@ -195,12 +157,6 @@
 ---
 > ### 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
 ---
@@ -215,12 +171,6 @@
 < 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
 ---
@@ -239,32 +189,10 @@
 < 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
 ---
@@ -273,28 +201,10 @@
 < 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
 ---
@@ -305,20 +215,10 @@
 > .\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
 ---
@@ -333,26 +233,10 @@
 < 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
 ---
@@ -385,24 +269,6 @@
 < 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
 ---
@@ -421,250 +287,26 @@
 < Since I expected to read a number between 0 and 15,
 < I changed this one to zero.
 < 
-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
+5700c5703
 < ! \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
 ---
@@ -693,7 +335,7 @@
 9c9
 < ' TeX output 2008.03.15:0223'
 ---
-> ' TeX output 2012.05.11:1417'
+> ' TeX output 2012.05.12:1418'
 419c419
 < 1121: down4 639342208 
 ---
@@ -723,7 +365,7 @@
 < I changed this one to zero.
 < 
 ---
-> 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
+> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (INITEX)  12 MAY 2012 14:18
 > entering extended mode
 > ***\input trip
 > (./trip.tex
@@ -734,12 +376,6 @@
 < 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)
 ---
@@ -751,7 +387,7 @@
 < 471 memory locations dumped; current usage is 96&278
 < 341 multiletter control sequences
 ---
->  (format=trip 2012.5.11)
+>  (format=trip 2012.5.12)
 > 1613 strings of total length 27734
 > 536 memory locations dumped; current usage is 157&278
 > 465 multiletter control sequences
@@ -775,20 +411,6 @@
 < 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
 ---
@@ -803,7 +425,7 @@
 < ** &trip  trip
 < (trip.tex ##
 ---
-> 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
+> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (format=trip 2012.5.12)  12 MAY 2012 14:18
 > entering extended mode
 > **&trip \toksdef\tokens=0 \input trip
 >  (./trip.tex
@@ -844,12 +466,6 @@
 ---
 > \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
 ---
@@ -879,12 +495,6 @@
 ---
 > \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
 ---
@@ -894,12 +504,6 @@
 ---
 > ### 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
 ---
@@ -909,12 +513,6 @@
 ---
 > ### 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
 ---
@@ -933,12 +531,6 @@
 < {restoring \fam=-1}
 1779d1786
 < {restoring \displayindent=0.0pt}
-1809,1810c1816,1817
-< <recently read> $
-<                  
----
-> <recently read> 
->                 
 1833d1839
 < {restoring \fam=-1}
 1954c1960
@@ -967,32 +559,10 @@
 < 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
 ---
@@ -1006,30 +576,12 @@
 < 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
 ---
@@ -1040,22 +592,12 @@
 > .\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
 ---
@@ -1080,18 +622,6 @@
 > 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
@@ -1110,10 +640,6 @@
 < ....\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
 ---
@@ -1156,24 +682,6 @@
 < 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
 ---
@@ -1196,250 +704,26 @@
 < Since I expected to read a number between 0 and 15,
 < I changed this one to zero.
 < 
-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
+5700c5697
 < ! \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
 ---
@@ -1474,7 +758,7 @@
 9c9
 < ' TeX output 2008.03.15:0223'
 ---
-> ' TeX output 2012.05.11:1417'
+> ' TeX output 2012.05.12:1418'
 419c419
 < 1121: down4 639342208 
 ---
@@ -1497,12 +781,14 @@
 1c1
 < 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.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (INITEX)  11 MAY 2012 14:17
-27,29c27,29
+> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (INITEX)  12 MAY 2012 14:18
+26,29c26,29
+<  (format=etrip 2012.5.11)
 < 1491 strings of total length 26238
 < 280 memory locations dumped; current usage is 36&166
 < 408 multiletter control sequences
 ---
+>  (format=etrip 2012.5.12)
 > 1614 strings of total length 27765
 > 283 memory locations dumped; current usage is 40&166
 > 465 multiletter control sequences
@@ -1515,309 +801,9 @@
 > 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-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.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
----
-> \vbox(30.00002+0.0)x0.0
-641c641
-< \vbox(0.0+0.0)x0.0, yoko direction
----
-> \vbox(0.0+0.0)x0.0
-666c666
-< \vbox(0.0+0.0)x0.0, yoko direction
----
-> \vbox(0.0+0.0)x0.0
-942c942
-< ### yoko direction, restricted horizontal mode entered at line 468
----
-> ### restricted horizontal mode entered at line 468
-953c953
-< ### yoko direction, vertical mode entered at line 0
----
-> ### vertical mode entered at line 0
-965c965
-< \hbox(8.0+2.0)x9.0, yoko direction []}
----
-> \hbox(8.0+2.0)x9.0 []}
-980c980
-< \vbox(188.0+0.0)x10.0, yoko direction
----
-> \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
----
-> .\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
+< This is e-pTeX, Version 3.1415926-p3.3-110825-2.4 (utf8.euc) (TeX Live 2012) (format=etrip 2012.5.12)  12 MAY 2012 14:12
 ---
-> .\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
+> This is e-upTeX, Version 3.1415926-p3.3-u1.10-110825-2.4 (utf8.uptex) (TeX Live 2012) (format=etrip 2012.5.12)  12 MAY 2012 14:18
 2189,2194d2188
 < ! Bad character code (256).
 < l.674   \iffontchar\font 256 
@@ -1825,342 +811,6 @@
 < 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
@@ -2177,6 +827,6 @@
 9c9
 < ' TeX output 2012.05.11:1347'
 ---
-> ' TeX output 2012.05.11:1417'
+> ' TeX output 2012.05.12:1418'
 + :
 PASS: euptexdir/euptrip.test
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index f0e5ae72017..a7df7f65e05 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* ptex-base.ch: Restore the 'unnecessary and seemingly wrong'
+	changes; they are required to show the error context.
+	* ptrip/ptrip.diffs: Adapted.
+
 2012-05-11  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* ptex-base.ch (pTeX_version_string): Version 3.3.
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index a72f3b362d8..4b553a5d612 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -1,4 +1,4 @@
-% This is a change file for pTeX 3.2
+% This is a change file for pTeX 3.3
 % By Sadayuki Tanaka and ASCII MEDIA WORKS.
 %
 % Thanks for :
@@ -1484,6 +1484,17 @@ kanji,kana,other_kchar: begin print("kanji character ");
    {|state| code at start of line}
 @z
 
+@x [22.311] l.6986 - pTeX: label
+@p procedure show_context; {prints where the scanner is}
+label done;
+var old_setting:0..max_selector; {saved |selector| setting}
+@y
+@p procedure show_context; {prints where the scanner is}
+label done, done1;
+var old_setting:0..max_selector; {saved |selector| setting}
+@!s: pointer; {temporary pointer}
+@z
+
 @x [22.316] l.7110 - pTeX: init kcode_pos
 @d begin_pseudoprint==
   begin l:=tally; tally:=0; selector:=pseudo;
@@ -1537,10 +1548,21 @@ else show_token_list(link(start),loc,100000) {avoid reference count}
 @ @<Pseudoprint the token list@>=
 begin_pseudoprint;
 if token_type<macro then
-  begin if (token_type=backed_up)and(loc<>null) then
+  begin  if (token_type=backed_up)and(loc<>null) then
+    begin  if (link(start)=null)and(check_kanji(info(start))) then {|wchar_token|}
+      begin cur_input:=input_stack[base_ptr-1];
+      s:=get_avail; info(s):=Lo(info(loc));
+      cur_input:=input_stack[base_ptr];
+      link(start):=s;
+      show_token_list(start,loc,100000);
+      free_avail(s);link(start):=null;
+      goto done1;
+      end;
+    end;
   show_token_list(start,loc,100000);
   end
 else show_token_list(link(start),loc,100000); {avoid reference count}
+done1:
 @z
 
 @x [24.341] l.7479 - pTeX: set last_chr
diff --git a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs
index 660b7af325e..3fec934b380 100644
--- a/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs
+++ b/Build/source/texk/web2c/ptexdir/ptrip/ptrip.diffs
@@ -13,7 +13,7 @@
 1c1
 < This is TeX, Version 3.1415926 (INITEX)  15 MAR 2008 02:23
 ---
-> This is pTeX, Version 3.1415926-p3.3 (utf8.euc) (TeX Live 2012) (INITEX)  11 MAY 2012 14:00
+> This is pTeX, Version 3.1415926-p3.3 (utf8.euc) (TeX Live 2012) (INITEX)  12 MAY 2012 14:18
 3c3
 < (trip.tex
 ---
@@ -22,12 +22,6 @@
 < A character number must be between 0 and 255.
 ---
 > A character number must be between 0 and 255, or KANJI code.
-47,48c47,48
-< <recently read> \font 
-<                       
----
-> <recently read> 
->                 
 91c91,92
 < ### horizontal mode entered at line 77 (language255:hyphenmin1,63)
 ---
@@ -39,7 +33,7 @@
 < 471 memory locations dumped; current usage is 96&278
 < 341 multiletter control sequences
 ---
->  (format=trip 2012.5.11)
+>  (format=trip 2012.5.12)
 > 1451 strings of total length 25461
 > 485 memory locations dumped; current usage is 106&278
 > 377 multiletter control sequences
@@ -62,20 +56,6 @@
 < 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
 ---
@@ -84,7 +64,7 @@
 1c1
 < This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15)  15 MAR 2008 02:23
 ---
-> This is pTeX, Version 3.1415926-p3.3 (utf8.euc) (TeX Live 2012) (format=trip 2012.5.11)  11 MAY 2012 14:00
+> This is pTeX, Version 3.1415926-p3.3 (utf8.euc) (TeX Live 2012) (format=trip 2012.5.12)  12 MAY 2012 14:18
 3c3
 < (trip.tex ##
 ---
@@ -122,12 +102,6 @@
 ---
 > \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
 ---
@@ -153,12 +127,6 @@
 ---
 > \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
 ---
@@ -168,12 +136,6 @@
 ---
 > ### 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
 ---
@@ -183,12 +145,6 @@
 ---
 > ### 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
 ---
@@ -203,12 +159,6 @@
 < 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
 ---
@@ -221,32 +171,10 @@
 < 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
 ---
@@ -255,24 +183,6 @@
 < 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
 ---
@@ -283,20 +193,10 @@
 > .\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
 ---
@@ -307,26 +207,10 @@
 < 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
 ---
@@ -347,24 +231,6 @@
 < 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
 ---
@@ -374,250 +240,26 @@
 < Memory usage before: 776&458; after: 464&452; still untouched: 175
 ---
 > Memory usage before: 1170&457; after: 672&451; still untouched: 241
-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
+5700c5711
 < ! \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
 ---
@@ -646,7 +288,7 @@
 9c9
 < ' TeX output 2008.03.15:0223'
 ---
-> ' TeX output 2012.05.11:1400'
+> ' TeX output 2012.05.12:1418'
 419c419
 < 1121: down4 639342208 
 ---
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 0ec955cff99..8dabb72557d 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* uptex-m.ch: Restore the 'unnecessary and seemingly wrong'
+	changes; they are required to show the error context.
+	* uptrip/uptrip.diffs: Adapted.
+
 2012-04-29  Takuji Tanaka  <KXD02663@nifty.ne.jp>
 
 	* uptex-m.ch, uppltotf.ch uptftopl.ch, updvitype.ch, upbibtex.ch:
diff --git a/Build/source/texk/web2c/uptexdir/uptex-m.ch b/Build/source/texk/web2c/uptexdir/uptex-m.ch
index 77e607cd6f5..6fbe1ac7e6e 100644
--- a/Build/source/texk/web2c/uptexdir/uptex-m.ch
+++ b/Build/source/texk/web2c/uptexdir/uptex-m.ch
@@ -351,6 +351,12 @@ if ((kcp mod @'10)>0)and(nrestmultichr(kcp)>0) then p:=p-(kcp mod @'10);
 @z
 
 @x
+      s:=get_avail; info(s):=Lo(info(loc));
+@y
+      s:=get_avail; info(s):=(info(loc) mod max_char_val);
+@z
+
+@x
   begin cur_chr:=buffer[loc]; incr(loc);
     if multistrlen(ustringcast(buffer), limit+1, loc-1)=2 then
       begin cur_chr:=fromBUFF(ustringcast(buffer), limit+1, loc-1);
diff --git a/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs b/Build/source/texk/web2c/uptexdir/uptrip/uptrip.diffs
index 0eeba883388..481b3c55e25 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.3-u1.10 (utf8.uptex) (TeX Live 2012) (INITEX)  11 MAY 2012 14:17
+> This is upTeX, Version 3.1415926-p3.3-u1.10 (utf8.uptex) (TeX Live 2012) (INITEX)  12 MAY 2012 14:18
 3,11c3
 < (trip.tex
 < ! Bad character code (256).
@@ -26,12 +26,6 @@
 < 
 ---
 > (./trip.tex
-47,48c39,40
-< <recently read> \font 
-<                       
----
-> <recently read> 
->                 
 91c83,84
 < ### horizontal mode entered at line 77 (language255:hyphenmin1,63)
 ---
@@ -43,7 +37,7 @@
 < 471 memory locations dumped; current usage is 96&278
 < 341 multiletter control sequences
 ---
->  (format=trip 2012.5.11)
+>  (format=trip 2012.5.12)
 > 1461 strings of total length 25482
 > 485 memory locations dumped; current usage is 106&278
 > 383 multiletter control sequences
@@ -66,20 +60,6 @@
 < 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
 ---
@@ -88,7 +68,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.3-u1.10 (utf8.uptex) (TeX Live 2012) (format=trip 2012.5.11)  11 MAY 2012 14:17
+> This is upTeX, Version 3.1415926-p3.3-u1.10 (utf8.uptex) (TeX Live 2012) (format=trip 2012.5.12)  12 MAY 2012 14:18
 3c3
 < (trip.tex ##
 ---
@@ -130,12 +110,6 @@
 ---
 > \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
 ---
@@ -165,12 +139,6 @@
 ---
 > \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
 ---
@@ -180,12 +148,6 @@
 ---
 > ### 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
 ---
@@ -195,12 +157,6 @@
 ---
 > ### 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
 ---
@@ -215,12 +171,6 @@
 < 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
 ---
@@ -239,32 +189,10 @@
 < 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
 ---
@@ -273,24 +201,6 @@
 < 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
 ---
@@ -301,20 +211,10 @@
 > .\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
 ---
@@ -329,26 +229,10 @@
 < 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
 ---
@@ -381,24 +265,6 @@
 < 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
 ---
@@ -408,250 +274,26 @@
 < Memory usage before: 776&458; after: 464&452; still untouched: 175
 ---
 > Memory usage before: 1170&457; after: 672&451; still untouched: 241
-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
+5700c5711
 < ! \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
 ---
@@ -680,7 +322,7 @@
 9c9
 < ' TeX output 2008.03.15:0223'
 ---
-> ' TeX output 2012.05.11:1417'
+> ' TeX output 2012.05.12:1418'
 419c419
 < 1121: down4 639342208 
 ---