8 files changed, 31 insertions, 23 deletions
diff --git a/Build/source/texk/web2c/triptrap/mftrap.fot b/Build/source/texk/web2c/triptrap/mftrap.fot
index c4eb700c4c7..fd0104a1606 100644
--- a/Build/source/texk/web2c/triptrap/mftrap.fot
+++ b/Build/source/texk/web2c/triptrap/mftrap.fot
@@ -1,4 +1,4 @@
-This is METAFONT, Version 2.71828 (INIMF)
+This is METAFONT, Version 2.718281 (INIMF)
 ** &trap  trap 
 (trap.mf
 \*//*\trap\pass2!
@@ -36,7 +36,7 @@ xpart '=-ypart '-0.66667
 {qq:=pen}
 {showstats}
 Memory usage 1476&588 (104 still untouched)
-String usage 42&168 (1818&17726 still untouched)
+String usage 41&161 (815&7634 still untouched)
 {[repeat the loop]}
 ! A group begun on line 163 never ended.
 <to be read again> 
diff --git a/Build/source/texk/web2c/triptrap/mftrap.log b/Build/source/texk/web2c/triptrap/mftrap.log
index 23bf114c633..e877070bed0 100644
--- a/Build/source/texk/web2c/triptrap/mftrap.log
+++ b/Build/source/texk/web2c/triptrap/mftrap.log
@@ -1,4 +1,4 @@
-This is METAFONT, Version 2.71828 (preloaded base=trap 2002.12.23)  23 DEC 2002 11:57
+This is METAFONT, Version 2.718281 (preloaded base=trap 2008.3.15)  15 MAR 2008 02:23
 ** &trap  trap
 (trap.mf
 {if}
@@ -1822,7 +1822,7 @@ row -2: | -4+ -3- -2+ -1-
 
 {showstats}
 Memory usage 1084&202 (749 still untouched)
-String usage 24&92 (1863&21408 still untouched)
+String usage 24&92 (858&11309 still untouched)
 {addto}
 {(path)yscaled(0.01666)}
 Path at line 82, before subdivision into octants:
@@ -4232,7 +4232,7 @@ xpart '=-ypart '-0.66667
 {qq:=pen}
 {showstats}
 Memory usage 1476&588 (104 still untouched)
-String usage 42&168 (1818&17726 still untouched)
+String usage 41&161 (815&7634 still untouched)
 {[repeat the loop]}
 ! A group begun on line 163 never ended.
 <to be read again> 
@@ -4248,8 +4248,8 @@ by `endgroup'. So I've inserted `endgroup' now.
 (end occurred when if on line 36 was incomplete)
 (end occurred when elseif on line 21 was incomplete) 
 Here is how much of METAFONT's memory you used:
- 69 strings out of 1887
- 3759 string characters out of 21485
+ 68 strings out of 883
+ 3752 string characters out of 11386
  2897 words of memory out of 3001
  289 symbolic tokens out of 2100
  8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b
diff --git a/Build/source/texk/web2c/triptrap/mftrapin.log b/Build/source/texk/web2c/triptrap/mftrapin.log
index f7740f9de91..0e1deb85b36 100644
--- a/Build/source/texk/web2c/triptrap/mftrapin.log
+++ b/Build/source/texk/web2c/triptrap/mftrapin.log
@@ -1,4 +1,4 @@
-This is METAFONT, Version 2.71828 (INIMF)  23 DEC 2002 11:57
+This is METAFONT, Version 2.718281 (INIMF)  15 MAR 2008 02:23
 **\input trap
 (trap.mf
 >> << == >> ::: ||`` ''--!! ??## && @@ $$[[]]{{ }}((5.5 0.5))
@@ -147,7 +147,7 @@ put one in, behind the scenes; this may fix the problem.
 {for}
 {showstats}
 Memory usage 291&41 (1922 still untouched)
-String usage 26&83 (1895&21534 still untouched)
+String usage 26&83 (891&11438 still untouched)
 ! OK.
 l.17 ...ing:fi endfor showstats;
                                  let!!=skipto;
@@ -173,7 +173,7 @@ Path at line 18, after choices:
 {elseif}
  )
 Beginning to dump on file trap.base
- (preloaded base=trap 98.8.8)
-1113 strings of total length 20515
+ (preloaded base=trap 2008.3.15)
+1117 strings of total length 20614
 395 memory locations dumped; current usage is 317&67
 265 symbolic tokens
diff --git a/Build/source/texk/web2c/triptrap/trap.typ b/Build/source/texk/web2c/triptrap/trap.typ
index 134766ec4f1..881bd5842a9 100644
--- a/Build/source/texk/web2c/triptrap/trap.typ
+++ b/Build/source/texk/web2c/triptrap/trap.typ
@@ -1,6 +1,6 @@
 This is GFtype, Version 3.1
 Options selected: Mnemonic output = true; pixel output = true.
-' METAFONT output 2002.12.23:1157'
+' METAFONT output 2008.03.15:0223'
 
 35: beginning of char 5: -4096<=m<=4094 -2<=n<=1
 (initially n=1) paint (4095)1
diff --git a/Build/source/texk/web2c/triptrap/trip.fot b/Build/source/texk/web2c/triptrap/trip.fot
index 6a2fcb3753a..b4009212153 100644
--- a/Build/source/texk/web2c/triptrap/trip.fot
+++ b/Build/source/texk/web2c/triptrap/trip.fot
@@ -1,4 +1,4 @@
-This is TeX, Version 3.141592 (INITEX)
+This is TeX, Version 3.1415926 (INITEX)
 ** &trip  trip 
 (trip.tex ##
 ! Bad number (-7).
diff --git a/Build/source/texk/web2c/triptrap/trip.log b/Build/source/texk/web2c/triptrap/trip.log
index ad152dd13ab..7b54cff274b 100644
--- a/Build/source/texk/web2c/triptrap/trip.log
+++ b/Build/source/texk/web2c/triptrap/trip.log
@@ -1,4 +1,4 @@
-This is TeX, Version 3.141592 (preloaded format=trip 2002.12.20)  20 DEC 2002 21:28
+This is TeX, Version 3.1415926 (preloaded format=trip 2008.3.15)  15 MAR 2008 02:23
 ** &trip  trip
 (trip.tex ##
 {vertical mode: \tracingrestores}
@@ -5350,6 +5350,16 @@ so that I will find a matching right brace soon.
 (If you're confused by all this, try typing `I}' now.)
 
 {\leaders}
+! Leaders not followed by proper glue.
+<to be read again> 
+                   \mskip 
+l.375 ^\leaders\vrule\mskip
+                           \shmip M\leaders\hrule\nonscript\h...
+You should say `\leaders <box or rule><hskip or vskip>'.
+I found the <box or rule>, but there's no suitable
+<hskip or vskip>, so I'm ignoring these leaders.
+
+{\mskip}
 {the letter M}
 {\leaders}
 ! Leaders not followed by proper glue.
@@ -6915,8 +6925,7 @@ spacefactor 1000
 .|hbox(0.0+0.0)x0.0
 .|mathon
 .|hbox(0.0+0.0)x3.99, shifted -8.2
-..|leaders 0.0 minus -0.00003fil
-...|rule(*+*)x0.4
+..|glue 0.0 minus -0.00003fil
 ..|smalltrip M
 ..|kern1.0
 ..|glue(|nonscript)
@@ -7285,11 +7294,11 @@ Memory usage before: 334&431; after: 292&418; still untouched: 175
 (end occurred when iftrue on line 413 was incomplete) 
 Here is how much of TeX's memory you used:
  47 strings out of 1674
- 251 string characters out of 8353
+ 253 string characters out of 8354
  2825 words of memory out of 3000
  372 multiletter control sequences out of 2100
  3041 words of font info for 4 fonts, out of 20000 for 75
  2 hyphenation exceptions out of 307
- 5i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s
+ 7i,7n,9p,113b,38s stack positions out of 200i,40n,60p,500b,600s
 
 Output written on trip.dvi (16 pages, 2920 bytes).
diff --git a/Build/source/texk/web2c/triptrap/trip.typ b/Build/source/texk/web2c/triptrap/trip.typ
index dbbc07ded00..dabab4c6d54 100644
--- a/Build/source/texk/web2c/triptrap/trip.typ
+++ b/Build/source/texk/web2c/triptrap/trip.typ
@@ -6,7 +6,7 @@ Options selected:
   Resolution =  72.27000000 pixels per inch
 numerator/denominator=25400000/473628672
 magnification=2000;       0.00003052 pixels per DVI unit
-' TeX output 2002.12.20:2128'
+' TeX output 2008.03.15:0223'
  
 42: beginning of page 0.0.0.0.11.0.0.0.0.0 
 87: down4 129105920 
@@ -1212,4 +1212,3 @@ Font 3: trip scaled 409600
 Font 2: trip scaled 4000 
 Font 1: trip 
 Font 0: trip scaled 2000 
- 
diff --git a/Build/source/texk/web2c/triptrap/tripin.log b/Build/source/texk/web2c/triptrap/tripin.log
index 0688b4eb919..e7baa824874 100644
--- a/Build/source/texk/web2c/triptrap/tripin.log
+++ b/Build/source/texk/web2c/triptrap/tripin.log
@@ -1,4 +1,4 @@
-This is TeX, Version 3.141592 (INITEX)  20 DEC 2002 20:24
+This is TeX, Version 3.1415926 (INITEX)  15 MAR 2008 02:23
 **\input trip
 (trip.tex
 ! Bad character code (256).
@@ -447,8 +447,8 @@ l.79 ...terns{toolate}\showbox0}
 
  )
 Beginning to dump on file trip.fmt
- (preloaded format=trip 2002.12.20)
-1320 strings of total length 23539
+ (preloaded format=trip 2008.3.15)
+1326 strings of total length 23646
 471 memory locations dumped; current usage is 96&278
 341 multiletter control sequences
 \font\nullfont=nullfont