146 files changed, 52 insertions, 36 deletions

diff --git a/Master/bin/i386-linux/afm2pl b/Master/bin/i386-linux/afm2pl
index c7924505ee1..14a7c542488 100755
--- a/Master/bin/i386-linux/afm2pl
+++ b/Master/bin/i386-linux/afm2pl
diff --git a/Master/bin/i386-linux/afm2tfm b/Master/bin/i386-linux/afm2tfm
index d04f380e34d..037b7346fc5 100755
--- a/Master/bin/i386-linux/afm2tfm
+++ b/Master/bin/i386-linux/afm2tfm
diff --git a/Master/bin/i386-linux/aleph b/Master/bin/i386-linux/aleph
index 0f32dfbb577..d9539d8ef21 100755
--- a/Master/bin/i386-linux/aleph
+++ b/Master/bin/i386-linux/aleph
diff --git a/Master/bin/i386-linux/amstex b/Master/bin/i386-linux/amstex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/amstex
+++ b/Master/bin/i386-linux/amstex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/bg5conv b/Master/bin/i386-linux/bg5conv
index bc50ee870f0..aaa7cd6d970 100755
--- a/Master/bin/i386-linux/bg5conv
+++ b/Master/bin/i386-linux/bg5conv
diff --git a/Master/bin/i386-linux/bibtex b/Master/bin/i386-linux/bibtex
index b9476246ac5..7279592d5cc 100755
--- a/Master/bin/i386-linux/bibtex
+++ b/Master/bin/i386-linux/bibtex
diff --git a/Master/bin/i386-linux/bibtex8 b/Master/bin/i386-linux/bibtex8
index f47aa5e3208..f300178a493 100755
--- a/Master/bin/i386-linux/bibtex8
+++ b/Master/bin/i386-linux/bibtex8
diff --git a/Master/bin/i386-linux/cef5conv b/Master/bin/i386-linux/cef5conv
index b3144e92a90..5a4511b54b8 100755
--- a/Master/bin/i386-linux/cef5conv
+++ b/Master/bin/i386-linux/cef5conv
diff --git a/Master/bin/i386-linux/cefconv b/Master/bin/i386-linux/cefconv
index 629b4d24dfc..8fdf84f2175 100755
--- a/Master/bin/i386-linux/cefconv
+++ b/Master/bin/i386-linux/cefconv
diff --git a/Master/bin/i386-linux/cefsconv b/Master/bin/i386-linux/cefsconv
index 421a61e7582..ef713431bbd 100755
--- a/Master/bin/i386-linux/cefsconv
+++ b/Master/bin/i386-linux/cefsconv
diff --git a/Master/bin/i386-linux/cfftot1 b/Master/bin/i386-linux/cfftot1
index 5610ecaba6f..1c75ca6c12f 100755
--- a/Master/bin/i386-linux/cfftot1
+++ b/Master/bin/i386-linux/cfftot1
diff --git a/Master/bin/i386-linux/cslatex b/Master/bin/i386-linux/cslatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/cslatex
+++ b/Master/bin/i386-linux/cslatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/csplain b/Master/bin/i386-linux/csplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/csplain
+++ b/Master/bin/i386-linux/csplain
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/ctangle b/Master/bin/i386-linux/ctangle
index 5d2b37abaf5..bb233c01734 100755
--- a/Master/bin/i386-linux/ctangle
+++ b/Master/bin/i386-linux/ctangle
diff --git a/Master/bin/i386-linux/ctie b/Master/bin/i386-linux/ctie
index dc2524b07e4..138ad0e5ab0 100755
--- a/Master/bin/i386-linux/ctie
+++ b/Master/bin/i386-linux/ctie
diff --git a/Master/bin/i386-linux/cweave b/Master/bin/i386-linux/cweave
index b09dbff39fe..44d6b9cb363 100755
--- a/Master/bin/i386-linux/cweave
+++ b/Master/bin/i386-linux/cweave
diff --git a/Master/bin/i386-linux/detex b/Master/bin/i386-linux/detex
index 72465085d06..445a6db6595 100755
--- a/Master/bin/i386-linux/detex
+++ b/Master/bin/i386-linux/detex
diff --git a/Master/bin/i386-linux/devnag b/Master/bin/i386-linux/devnag
index 15bf558a378..44ed322aa47 100755
--- a/Master/bin/i386-linux/devnag
+++ b/Master/bin/i386-linux/devnag
diff --git a/Master/bin/i386-linux/disdvi b/Master/bin/i386-linux/disdvi
index f6e046e1e96..d4d5260b117 100755
--- a/Master/bin/i386-linux/disdvi
+++ b/Master/bin/i386-linux/disdvi
diff --git a/Master/bin/i386-linux/dmp b/Master/bin/i386-linux/dmp
index 682952b7b2a..ed5372343f3 100755
--- a/Master/bin/i386-linux/dmp
+++ b/Master/bin/i386-linux/dmp
diff --git a/Master/bin/i386-linux/dt2dv b/Master/bin/i386-linux/dt2dv
index f5071b591f2..40985b9293c 100755
--- a/Master/bin/i386-linux/dt2dv
+++ b/Master/bin/i386-linux/dt2dv
diff --git a/Master/bin/i386-linux/dv2dt b/Master/bin/i386-linux/dv2dt
index 5df8f64e55d..b962048c84e 100755
--- a/Master/bin/i386-linux/dv2dt
+++ b/Master/bin/i386-linux/dv2dt
diff --git a/Master/bin/i386-linux/dvi2tty b/Master/bin/i386-linux/dvi2tty
index d1fa2c59331..2cbc5b26556 100755
--- a/Master/bin/i386-linux/dvi2tty
+++ b/Master/bin/i386-linux/dvi2tty
diff --git a/Master/bin/i386-linux/dvibook b/Master/bin/i386-linux/dvibook
index 498566e0dbb..f7c4eb97256 100755
--- a/Master/bin/i386-linux/dvibook
+++ b/Master/bin/i386-linux/dvibook
diff --git a/Master/bin/i386-linux/dviconcat b/Master/bin/i386-linux/dviconcat
index c4645b79cbd..8a08a925e91 100755
--- a/Master/bin/i386-linux/dviconcat
+++ b/Master/bin/i386-linux/dviconcat
diff --git a/Master/bin/i386-linux/dvicopy b/Master/bin/i386-linux/dvicopy
index bfb1fabae42..31167d605fc 100755
--- a/Master/bin/i386-linux/dvicopy
+++ b/Master/bin/i386-linux/dvicopy
diff --git a/Master/bin/i386-linux/dvidvi b/Master/bin/i386-linux/dvidvi
index fc7ae87b41d..7082d68be8e 100755
--- a/Master/bin/i386-linux/dvidvi
+++ b/Master/bin/i386-linux/dvidvi
diff --git a/Master/bin/i386-linux/dvilj b/Master/bin/i386-linux/dvilj
index cd9ff89a83e..ab36d0560f6 100755
--- a/Master/bin/i386-linux/dvilj
+++ b/Master/bin/i386-linux/dvilj
diff --git a/Master/bin/i386-linux/dvilj2p b/Master/bin/i386-linux/dvilj2p
index a022806715c..272e0f6ae18 100755
--- a/Master/bin/i386-linux/dvilj2p
+++ b/Master/bin/i386-linux/dvilj2p
diff --git a/Master/bin/i386-linux/dvilj4 b/Master/bin/i386-linux/dvilj4
index 1392c6b4a0c..9d4926c6a5c 100755
--- a/Master/bin/i386-linux/dvilj4
+++ b/Master/bin/i386-linux/dvilj4
diff --git a/Master/bin/i386-linux/dvilj4l b/Master/bin/i386-linux/dvilj4l
index db483f91edb..a5815077cae 100755
--- a/Master/bin/i386-linux/dvilj4l
+++ b/Master/bin/i386-linux/dvilj4l
diff --git a/Master/bin/i386-linux/dvipdfm b/Master/bin/i386-linux/dvipdfm
index beb331abeaf..b08bd1ca64d 100755
--- a/Master/bin/i386-linux/dvipdfm
+++ b/Master/bin/i386-linux/dvipdfm
diff --git a/Master/bin/i386-linux/dvipdfmx b/Master/bin/i386-linux/dvipdfmx
index 818fb5f6596..52d4094f3d5 100755
--- a/Master/bin/i386-linux/dvipdfmx
+++ b/Master/bin/i386-linux/dvipdfmx
diff --git a/Master/bin/i386-linux/dvipng b/Master/bin/i386-linux/dvipng
index b52bec0a237..3b8dbffa1c8 100755
--- a/Master/bin/i386-linux/dvipng
+++ b/Master/bin/i386-linux/dvipng
diff --git a/Master/bin/i386-linux/dvips b/Master/bin/i386-linux/dvips
index 5452ece5312..cc2f065a95c 100755
--- a/Master/bin/i386-linux/dvips
+++ b/Master/bin/i386-linux/dvips
diff --git a/Master/bin/i386-linux/dviselect b/Master/bin/i386-linux/dviselect
index 42004f895f6..1de83ad9909 100755
--- a/Master/bin/i386-linux/dviselect
+++ b/Master/bin/i386-linux/dviselect
diff --git a/Master/bin/i386-linux/dvitodvi b/Master/bin/i386-linux/dvitodvi
index 5d2398a7c72..ca0315ac58b 100755
--- a/Master/bin/i386-linux/dvitodvi
+++ b/Master/bin/i386-linux/dvitodvi
diff --git a/Master/bin/i386-linux/dvitomp b/Master/bin/i386-linux/dvitomp
index 302bdc64414..bc67acfcecd 100755
--- a/Master/bin/i386-linux/dvitomp
+++ b/Master/bin/i386-linux/dvitomp
diff --git a/Master/bin/i386-linux/dvitype b/Master/bin/i386-linux/dvitype
index 85c8c651cb3..1c2e437feee 100755
--- a/Master/bin/i386-linux/dvitype
+++ b/Master/bin/i386-linux/dvitype
diff --git a/Master/bin/i386-linux/ebb b/Master/bin/i386-linux/ebb
index a46caa546e4..a162685f208 100755
--- a/Master/bin/i386-linux/ebb
+++ b/Master/bin/i386-linux/ebb
diff --git a/Master/bin/i386-linux/eplain b/Master/bin/i386-linux/eplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/eplain
+++ b/Master/bin/i386-linux/eplain
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/epsffit b/Master/bin/i386-linux/epsffit
index 98201815821..a7d2d94c98f 100755
--- a/Master/bin/i386-linux/epsffit
+++ b/Master/bin/i386-linux/epsffit
diff --git a/Master/bin/i386-linux/epstopdf b/Master/bin/i386-linux/epstopdf
index e7ea5f239df..0fb015d4420 100755
--- a/Master/bin/i386-linux/epstopdf
+++ b/Master/bin/i386-linux/epstopdf
@@ -58,13 +58,17 @@ use strict;
 #    * Quote OutFilename
 #  2005/10/01 v2.9.3draft (Gerben Wierda)
 #    * Quote OutFilename
+#  2005/10/06 v2.9.4gw (Gerben Wierda)
+#    * This has become the official version for now
+#  2005/10/06 v2.9.5gw (Gerben Wierda)
+#    * Fixed a horrendous bug in the (atend) handling code
 #
 
 ### program identification
 my $program = "epstopdf";
-my $filedate="2003/04/20";
-my $fileversion="2.9.3draft";
-my $copyright = "Copyright 1998-2002 by Sebastian Rahtz et al.";
+my $filedate="2006/01/29";
+my $fileversion="2.9.5gw";
+my $copyright = "Copyright 1998-2006 by Sebastian Rahtz et al.";
 my $title = "\U$program\E $fileversion, $filedate - $copyright\n";
 
 ### ghostscript command name
@@ -249,13 +253,14 @@ if ($buflen > 0) {
   # that array until it is empty, then move again back to <IN>
   $buf .= <IN> unless eof( IN);
   $buflen = length( $buf);
+  $bufarraypos = 0;
 
   # Some extra magic is needed here: if we set $/ to \r, Perl's re engine
   # still thinks eol is \n in regular expressions (not very nice) so we
   # cannot split on ^, but have to split on \r and reappend those.
   if ($/ eq "\r") {
-    @bufarray = split( /\r/ms, $buf);
-    grep( $_ .= "\r", @bufarray);
+    @bufarray = split( /\r/ms, $buf); # split on \r
+    grep( $_ .= "\r", @bufarray); # re-append \r to each array item
   }
   else {
     @bufarray = split( /^/ms, $buf);
@@ -268,6 +273,8 @@ sub getline {
     $_ = shift( @bufarray);
     unshift( @parsedbufarray, $_); # for myseek and mytell
     $bufarraypos += length( $_);
+    # debug "getline from array. bufarraypos = $bufarraypos";
+    # debug "*** READ: $_";
   }
   else {
     $_ = <IN>;
@@ -278,31 +285,40 @@ sub getline {
 ### mytell and myseek, work on <IN> only
 sub mytell {
   if ($#bufarray) {
+    # debug "Telling ARRAY position $bufarraypos";
     return $bufarraypos;
   }
   else {
-    return tell( IN);
+    my $pos = tell( IN);
+    # debug "Telling FILE position $pos";
+    return $pos;
   }
 }
 
 sub myseek {
   my $pos = shift;
+  # debug "Seeking to position $pos in input";
   if ($pos < $buflen) {
+    # debug "myseek position $pos < buffer size $buflen";
     # We were still parsing the array, reset to the end of buf and
     # move to the right line in the array.
-    # Now, move stuff from the @parsedbufarray until we are back at $pos
+    # Now, move stuff from the @parsedbufarray back until we are back at $pos
     my $tmpline;
-    while ($pos > 0) {
+    while ($bufarraypos > $pos) {
+      # debug "myseek bufarray position $bufarraypos > position $pos";
       # we test on parsedbufarray to prevent an infinite loop on
       # a programming error (DEVELOP only)
       die "Programming error 1\n" unless $#parsedbufarray;
-      $tmpline = pop( @parsedbufarray);
-      $pos -= length( $tmpline);
-      push( @bufarray, $tmpline);
+      $tmpline = shift( @parsedbufarray);
+      $bufarraypos -= length( $tmpline);
+      unshift( @bufarray, $tmpline);
+      debug "*** UNREAD: $tmpline";
     }
+    # debug "Returning to ARRAY size position $buflen (bufarraypos = $bufarraypos)";
     return seek( IN, $buflen, 0);
   }
   else {
+    # debug "Seeking to FILE position $pos";
     return seek( IN, $pos, 0);
   }
 }
diff --git a/Master/bin/i386-linux/etex b/Master/bin/i386-linux/etex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/etex
+++ b/Master/bin/i386-linux/etex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/extconv b/Master/bin/i386-linux/extconv
index 5ce34d97f7e..ed30f768825 100755
--- a/Master/bin/i386-linux/extconv
+++ b/Master/bin/i386-linux/extconv
diff --git a/Master/bin/i386-linux/gftodvi b/Master/bin/i386-linux/gftodvi
index dfc6def584e..8f0c6fe41e9 100755
--- a/Master/bin/i386-linux/gftodvi
+++ b/Master/bin/i386-linux/gftodvi
diff --git a/Master/bin/i386-linux/gftopk b/Master/bin/i386-linux/gftopk
index 768fc0135e2..712c7cd46fe 100755
--- a/Master/bin/i386-linux/gftopk
+++ b/Master/bin/i386-linux/gftopk
diff --git a/Master/bin/i386-linux/gftype b/Master/bin/i386-linux/gftype
index 9bcf7e3a9fc..6d35f2b9064 100755
--- a/Master/bin/i386-linux/gftype
+++ b/Master/bin/i386-linux/gftype
diff --git a/Master/bin/i386-linux/gsftopk b/Master/bin/i386-linux/gsftopk
index 2527f962e74..f5d397630f1 100755
--- a/Master/bin/i386-linux/gsftopk
+++ b/Master/bin/i386-linux/gsftopk
diff --git a/Master/bin/i386-linux/hbf2gf b/Master/bin/i386-linux/hbf2gf
index c0792dc87ff..1d6024fa9fb 100755
--- a/Master/bin/i386-linux/hbf2gf
+++ b/Master/bin/i386-linux/hbf2gf
diff --git a/Master/bin/i386-linux/info b/Master/bin/i386-linux/info
index 1b09714efe4..e7cf45a1829 100755
--- a/Master/bin/i386-linux/info
+++ b/Master/bin/i386-linux/info
diff --git a/Master/bin/i386-linux/infokey b/Master/bin/i386-linux/infokey
index acc9f9a7544..9e8bd12f96e 100755
--- a/Master/bin/i386-linux/infokey
+++ b/Master/bin/i386-linux/infokey
diff --git a/Master/bin/i386-linux/install-info b/Master/bin/i386-linux/install-info
index 99da61c064a..79b73b3c4fb 100755
--- a/Master/bin/i386-linux/install-info
+++ b/Master/bin/i386-linux/install-info
diff --git a/Master/bin/i386-linux/jadetex b/Master/bin/i386-linux/jadetex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/jadetex
+++ b/Master/bin/i386-linux/jadetex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/kpseaccess b/Master/bin/i386-linux/kpseaccess
index 10c51362656..cadc75b4740 100755
--- a/Master/bin/i386-linux/kpseaccess
+++ b/Master/bin/i386-linux/kpseaccess
diff --git a/Master/bin/i386-linux/kpsereadlink b/Master/bin/i386-linux/kpsereadlink
index dcdadf09458..a667e877fad 100755
--- a/Master/bin/i386-linux/kpsereadlink
+++ b/Master/bin/i386-linux/kpsereadlink
diff --git a/Master/bin/i386-linux/kpsestat b/Master/bin/i386-linux/kpsestat
index 989e40d29da..35398dbe339 100755
--- a/Master/bin/i386-linux/kpsestat
+++ b/Master/bin/i386-linux/kpsestat
diff --git a/Master/bin/i386-linux/kpsewhich b/Master/bin/i386-linux/kpsewhich
index 764aa6d2a92..ebf4b04327d 100755
--- a/Master/bin/i386-linux/kpsewhich
+++ b/Master/bin/i386-linux/kpsewhich
diff --git a/Master/bin/i386-linux/lacheck b/Master/bin/i386-linux/lacheck
index 0a2334ec207..d6b9c2eeb09 100755
--- a/Master/bin/i386-linux/lacheck
+++ b/Master/bin/i386-linux/lacheck
diff --git a/Master/bin/i386-linux/latex b/Master/bin/i386-linux/latex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/latex
+++ b/Master/bin/i386-linux/latex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mag b/Master/bin/i386-linux/mag
index 47bbacec4e8..5cf71bb6d2e 100755
--- a/Master/bin/i386-linux/mag
+++ b/Master/bin/i386-linux/mag
diff --git a/Master/bin/i386-linux/makeindex b/Master/bin/i386-linux/makeindex
index 7d2839ba924..02010866d45 100755
--- a/Master/bin/i386-linux/makeindex
+++ b/Master/bin/i386-linux/makeindex
diff --git a/Master/bin/i386-linux/makeinfo b/Master/bin/i386-linux/makeinfo
index 177b8b0050a..af0f3d7f3d7 100755
--- a/Master/bin/i386-linux/makeinfo
+++ b/Master/bin/i386-linux/makeinfo
diff --git a/Master/bin/i386-linux/makempx b/Master/bin/i386-linux/makempx
index 0e4da552209..167916f5bc8 100755
--- a/Master/bin/i386-linux/makempx
+++ b/Master/bin/i386-linux/makempx
diff --git a/Master/bin/i386-linux/mex b/Master/bin/i386-linux/mex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/mex
+++ b/Master/bin/i386-linux/mex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mf b/Master/bin/i386-linux/mf
index f290ef76653..fbf991ae73d 100755
--- a/Master/bin/i386-linux/mf
+++ b/Master/bin/i386-linux/mf
diff --git a/Master/bin/i386-linux/mf-nowin b/Master/bin/i386-linux/mf-nowin
index 8c468bbc786..c03ef7adaa3 100755
--- a/Master/bin/i386-linux/mf-nowin
+++ b/Master/bin/i386-linux/mf-nowin
diff --git a/Master/bin/i386-linux/mft b/Master/bin/i386-linux/mft
index 72175be4e0a..47c491eea28 100755
--- a/Master/bin/i386-linux/mft
+++ b/Master/bin/i386-linux/mft
diff --git a/Master/bin/i386-linux/mllatex b/Master/bin/i386-linux/mllatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/mllatex
+++ b/Master/bin/i386-linux/mllatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mltex b/Master/bin/i386-linux/mltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/mltex
+++ b/Master/bin/i386-linux/mltex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mmafm b/Master/bin/i386-linux/mmafm
index 59687304155..a3e8ee9337b 100755
--- a/Master/bin/i386-linux/mmafm
+++ b/Master/bin/i386-linux/mmafm
diff --git a/Master/bin/i386-linux/mmpfb b/Master/bin/i386-linux/mmpfb
index 482e4bd7442..cccb65d380a 100755
--- a/Master/bin/i386-linux/mmpfb
+++ b/Master/bin/i386-linux/mmpfb
diff --git a/Master/bin/i386-linux/mpost b/Master/bin/i386-linux/mpost
index 4e57fb3c17e..f50727037e7 100755
--- a/Master/bin/i386-linux/mpost
+++ b/Master/bin/i386-linux/mpost
diff --git a/Master/bin/i386-linux/mpto b/Master/bin/i386-linux/mpto
index 9c6ffeea1f8..c3cc10e226c 100755
--- a/Master/bin/i386-linux/mpto
+++ b/Master/bin/i386-linux/mpto
diff --git a/Master/bin/i386-linux/musixflx b/Master/bin/i386-linux/musixflx
index bbc6b41a3d2..563b3098664 100755
--- a/Master/bin/i386-linux/musixflx
+++ b/Master/bin/i386-linux/musixflx
diff --git a/Master/bin/i386-linux/newer b/Master/bin/i386-linux/newer
index 5805a73d2c7..72e30fb078c 100755
--- a/Master/bin/i386-linux/newer
+++ b/Master/bin/i386-linux/newer
diff --git a/Master/bin/i386-linux/odvicopy b/Master/bin/i386-linux/odvicopy
index 584ac867bf8..9c4b8a61146 100755
--- a/Master/bin/i386-linux/odvicopy
+++ b/Master/bin/i386-linux/odvicopy
diff --git a/Master/bin/i386-linux/odvitype b/Master/bin/i386-linux/odvitype
index 37df02bb4d3..76fe6519052 100755
--- a/Master/bin/i386-linux/odvitype
+++ b/Master/bin/i386-linux/odvitype
diff --git a/Master/bin/i386-linux/omega b/Master/bin/i386-linux/omega
index d50a25cf583..1fc7714c195 100755
--- a/Master/bin/i386-linux/omega
+++ b/Master/bin/i386-linux/omega
diff --git a/Master/bin/i386-linux/omfonts b/Master/bin/i386-linux/omfonts
index ddf1eb2b9cb..44a744aef1a 100755
--- a/Master/bin/i386-linux/omfonts
+++ b/Master/bin/i386-linux/omfonts
diff --git a/Master/bin/i386-linux/otangle b/Master/bin/i386-linux/otangle
index 6859f654ddf..ecc8e3c2bab 100755
--- a/Master/bin/i386-linux/otangle
+++ b/Master/bin/i386-linux/otangle
diff --git a/Master/bin/i386-linux/otfinfo b/Master/bin/i386-linux/otfinfo
index f7d196fdff3..af015d2582b 100755
--- a/Master/bin/i386-linux/otfinfo
+++ b/Master/bin/i386-linux/otfinfo
diff --git a/Master/bin/i386-linux/otftotfm b/Master/bin/i386-linux/otftotfm
index 8f27424796a..b0a61d1999d 100755
--- a/Master/bin/i386-linux/otftotfm
+++ b/Master/bin/i386-linux/otftotfm
diff --git a/Master/bin/i386-linux/otp2ocp b/Master/bin/i386-linux/otp2ocp
index 8ab7ea99a7a..33f52cadd64 100755
--- a/Master/bin/i386-linux/otp2ocp
+++ b/Master/bin/i386-linux/otp2ocp
diff --git a/Master/bin/i386-linux/outocp b/Master/bin/i386-linux/outocp
index 39073dd8104..3818e3f0708 100755
--- a/Master/bin/i386-linux/outocp
+++ b/Master/bin/i386-linux/outocp
diff --git a/Master/bin/i386-linux/patgen b/Master/bin/i386-linux/patgen
index b7ca816d504..0b031ed3248 100755
--- a/Master/bin/i386-linux/patgen
+++ b/Master/bin/i386-linux/patgen
diff --git a/Master/bin/i386-linux/pdfclose b/Master/bin/i386-linux/pdfclose
index 866f3e73230..201db7d0cb4 100755
--- a/Master/bin/i386-linux/pdfclose
+++ b/Master/bin/i386-linux/pdfclose
diff --git a/Master/bin/i386-linux/pdfcslatex b/Master/bin/i386-linux/pdfcslatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/pdfcslatex
+++ b/Master/bin/i386-linux/pdfcslatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfcsplain b/Master/bin/i386-linux/pdfcsplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/pdfcsplain
+++ b/Master/bin/i386-linux/pdfcsplain
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfetex b/Master/bin/i386-linux/pdfetex
index dd544728765..f68cc91498e 100755..120000
--- a/Master/bin/i386-linux/pdfetex
+++ b/Master/bin/i386-linux/pdfetex
diff --git a/Master/bin/i386-linux/pdfjadetex b/Master/bin/i386-linux/pdfjadetex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/pdfjadetex
+++ b/Master/bin/i386-linux/pdfjadetex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdflatex b/Master/bin/i386-linux/pdflatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/pdflatex
+++ b/Master/bin/i386-linux/pdflatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfmex b/Master/bin/i386-linux/pdfmex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/pdfmex
+++ b/Master/bin/i386-linux/pdfmex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdfopen b/Master/bin/i386-linux/pdfopen
index 56643c4c0b9..e11b9711727 100755
--- a/Master/bin/i386-linux/pdfopen
+++ b/Master/bin/i386-linux/pdfopen
diff --git a/Master/bin/i386-linux/pdfplatex b/Master/bin/i386-linux/pdfplatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/pdfplatex
+++ b/Master/bin/i386-linux/pdfplatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdftex b/Master/bin/i386-linux/pdftex
index eb4e1e5aff7..3aa30088740 120000..100755
--- a/Master/bin/i386-linux/pdftex
+++ b/Master/bin/i386-linux/pdftex
diff --git a/Master/bin/i386-linux/pdfxmltex b/Master/bin/i386-linux/pdfxmltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/pdfxmltex
+++ b/Master/bin/i386-linux/pdfxmltex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pfb2pfa b/Master/bin/i386-linux/pfb2pfa
index 7244eddd620..24e32e8b0ad 100755
--- a/Master/bin/i386-linux/pfb2pfa
+++ b/Master/bin/i386-linux/pfb2pfa
diff --git a/Master/bin/i386-linux/physe b/Master/bin/i386-linux/physe
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/physe
+++ b/Master/bin/i386-linux/physe
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/phyzzx b/Master/bin/i386-linux/phyzzx
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/phyzzx
+++ b/Master/bin/i386-linux/phyzzx
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pk2bm b/Master/bin/i386-linux/pk2bm
index 21746175717..86d92afdf26 100755
--- a/Master/bin/i386-linux/pk2bm
+++ b/Master/bin/i386-linux/pk2bm
diff --git a/Master/bin/i386-linux/pktogf b/Master/bin/i386-linux/pktogf
index 2414658053c..5fc02fd1fc2 100755
--- a/Master/bin/i386-linux/pktogf
+++ b/Master/bin/i386-linux/pktogf
diff --git a/Master/bin/i386-linux/pktype b/Master/bin/i386-linux/pktype
index 2168cb9661d..522e8895d06 100755
--- a/Master/bin/i386-linux/pktype
+++ b/Master/bin/i386-linux/pktype
diff --git a/Master/bin/i386-linux/platex b/Master/bin/i386-linux/platex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/platex
+++ b/Master/bin/i386-linux/platex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pltotf b/Master/bin/i386-linux/pltotf
index 94efddc066c..7b2c1fb5c38 100755
--- a/Master/bin/i386-linux/pltotf
+++ b/Master/bin/i386-linux/pltotf
diff --git a/Master/bin/i386-linux/pooltype b/Master/bin/i386-linux/pooltype
index a892c5853a7..bd33f5c3c9b 100755
--- a/Master/bin/i386-linux/pooltype
+++ b/Master/bin/i386-linux/pooltype
diff --git a/Master/bin/i386-linux/ps2pk b/Master/bin/i386-linux/ps2pk
index 8489778e2a6..7b72590e4ec 100755
--- a/Master/bin/i386-linux/ps2pk
+++ b/Master/bin/i386-linux/ps2pk
diff --git a/Master/bin/i386-linux/psbook b/Master/bin/i386-linux/psbook
index 728cf601a9c..2ff7192fb26 100755
--- a/Master/bin/i386-linux/psbook
+++ b/Master/bin/i386-linux/psbook
diff --git a/Master/bin/i386-linux/psnup b/Master/bin/i386-linux/psnup
index a6d1f66eac1..9402eb77a91 100755
--- a/Master/bin/i386-linux/psnup
+++ b/Master/bin/i386-linux/psnup
diff --git a/Master/bin/i386-linux/psresize b/Master/bin/i386-linux/psresize
index c92cc153891..c7ddacef026 100755
--- a/Master/bin/i386-linux/psresize
+++ b/Master/bin/i386-linux/psresize
diff --git a/Master/bin/i386-linux/psselect b/Master/bin/i386-linux/psselect
index d3abffd3e9b..0b3022790f6 100755
--- a/Master/bin/i386-linux/psselect
+++ b/Master/bin/i386-linux/psselect
diff --git a/Master/bin/i386-linux/pstops b/Master/bin/i386-linux/pstops
index 6caea8b3d1d..477ef26007e 100755
--- a/Master/bin/i386-linux/pstops
+++ b/Master/bin/i386-linux/pstops
diff --git a/Master/bin/i386-linux/sjisconv b/Master/bin/i386-linux/sjisconv
index 2392804e8c1..5c6cd41e856 100755
--- a/Master/bin/i386-linux/sjisconv
+++ b/Master/bin/i386-linux/sjisconv
diff --git a/Master/bin/i386-linux/t1ascii b/Master/bin/i386-linux/t1ascii
index e4e4ddda8e2..5a880a4e037 100755
--- a/Master/bin/i386-linux/t1ascii
+++ b/Master/bin/i386-linux/t1ascii
diff --git a/Master/bin/i386-linux/t1asm b/Master/bin/i386-linux/t1asm
index 7c69f41d5e2..eedf079b612 100755
--- a/Master/bin/i386-linux/t1asm
+++ b/Master/bin/i386-linux/t1asm
diff --git a/Master/bin/i386-linux/t1binary b/Master/bin/i386-linux/t1binary
index 2b285fce375..89c1b6ee83f 100755
--- a/Master/bin/i386-linux/t1binary
+++ b/Master/bin/i386-linux/t1binary
diff --git a/Master/bin/i386-linux/t1disasm b/Master/bin/i386-linux/t1disasm
index f65ab3ff7ea..1f16cb7ed18 100755
--- a/Master/bin/i386-linux/t1disasm
+++ b/Master/bin/i386-linux/t1disasm
diff --git a/Master/bin/i386-linux/t1dotlessj b/Master/bin/i386-linux/t1dotlessj
index cb5f3e92030..b0c54de6447 100755
--- a/Master/bin/i386-linux/t1dotlessj
+++ b/Master/bin/i386-linux/t1dotlessj
diff --git a/Master/bin/i386-linux/t1lint b/Master/bin/i386-linux/t1lint
index ac329143a1f..cf802c4656b 100755
--- a/Master/bin/i386-linux/t1lint
+++ b/Master/bin/i386-linux/t1lint
diff --git a/Master/bin/i386-linux/t1mac b/Master/bin/i386-linux/t1mac
index a2d98955e32..01000702ce0 100755
--- a/Master/bin/i386-linux/t1mac
+++ b/Master/bin/i386-linux/t1mac
diff --git a/Master/bin/i386-linux/t1reencode b/Master/bin/i386-linux/t1reencode
index 79bd3b6f9d0..29d43f30b51 100755
--- a/Master/bin/i386-linux/t1reencode
+++ b/Master/bin/i386-linux/t1reencode
diff --git a/Master/bin/i386-linux/t1testpage b/Master/bin/i386-linux/t1testpage
index 54300b7973b..15ef2e10a62 100755
--- a/Master/bin/i386-linux/t1testpage
+++ b/Master/bin/i386-linux/t1testpage
diff --git a/Master/bin/i386-linux/t1unmac b/Master/bin/i386-linux/t1unmac
index 0817cd70f57..9d4e22e79d2 100755
--- a/Master/bin/i386-linux/t1unmac
+++ b/Master/bin/i386-linux/t1unmac
diff --git a/Master/bin/i386-linux/t4ht b/Master/bin/i386-linux/t4ht
index c15678c985a..c3bcdd2eb6b 100755
--- a/Master/bin/i386-linux/t4ht
+++ b/Master/bin/i386-linux/t4ht
diff --git a/Master/bin/i386-linux/tangle b/Master/bin/i386-linux/tangle
index 8cd2c5b7db2..93f72ecd711 100755
--- a/Master/bin/i386-linux/tangle
+++ b/Master/bin/i386-linux/tangle
diff --git a/Master/bin/i386-linux/tcdialog b/Master/bin/i386-linux/tcdialog
index 75e44865f5b..78bdad33884 100755
--- a/Master/bin/i386-linux/tcdialog
+++ b/Master/bin/i386-linux/tcdialog
diff --git a/Master/bin/i386-linux/tex b/Master/bin/i386-linux/tex
index 335a0b2809f..73e01f967fc 100755
--- a/Master/bin/i386-linux/tex
+++ b/Master/bin/i386-linux/tex
diff --git a/Master/bin/i386-linux/tex4ht b/Master/bin/i386-linux/tex4ht
index 10b91ef9d08..8788593c2ee 100755
--- a/Master/bin/i386-linux/tex4ht
+++ b/Master/bin/i386-linux/tex4ht
diff --git a/Master/bin/i386-linux/texconfig b/Master/bin/i386-linux/texconfig
index 633ba7e807d..976f4590ab5 100755
--- a/Master/bin/i386-linux/texconfig
+++ b/Master/bin/i386-linux/texconfig
@@ -632,7 +632,7 @@ Get more help with
       echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdfetex mktexpk dvips dvipdfm
       echo
       echo '=========================== active config files =========================='
-      echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort +1
+      echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort -k 2
       echo
       echo '============================= font map files ============================='
       for m in psfonts.map pdftex.map ps2pk.map dvipdfm.map; do
diff --git a/Master/bin/i386-linux/texindex b/Master/bin/i386-linux/texindex
index 97c67d92191..d48c1e0593d 100755
--- a/Master/bin/i386-linux/texindex
+++ b/Master/bin/i386-linux/texindex
diff --git a/Master/bin/i386-linux/texsis b/Master/bin/i386-linux/texsis
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/texsis
+++ b/Master/bin/i386-linux/texsis
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/tftopl b/Master/bin/i386-linux/tftopl
index 02af949e18f..afc3e9e2c96 100755
--- a/Master/bin/i386-linux/tftopl
+++ b/Master/bin/i386-linux/tftopl
diff --git a/Master/bin/i386-linux/tie b/Master/bin/i386-linux/tie
index f1891b93ab3..170a838df36 100755
--- a/Master/bin/i386-linux/tie
+++ b/Master/bin/i386-linux/tie
diff --git a/Master/bin/i386-linux/ttf2afm b/Master/bin/i386-linux/ttf2afm
index ea9a5dfe8f9..2f7a6505d44 100755
--- a/Master/bin/i386-linux/ttf2afm
+++ b/Master/bin/i386-linux/ttf2afm
diff --git a/Master/bin/i386-linux/ttf2pk b/Master/bin/i386-linux/ttf2pk
index a4b2bc1ab6e..8843fed8ff8 100755
--- a/Master/bin/i386-linux/ttf2pk
+++ b/Master/bin/i386-linux/ttf2pk
diff --git a/Master/bin/i386-linux/ttf2tfm b/Master/bin/i386-linux/ttf2tfm
index e153635a4d7..cd213053831 100755
--- a/Master/bin/i386-linux/ttf2tfm
+++ b/Master/bin/i386-linux/ttf2tfm
diff --git a/Master/bin/i386-linux/ttftotype42 b/Master/bin/i386-linux/ttftotype42
index 7ec0a8bfdc6..ca5101c7045 100755
--- a/Master/bin/i386-linux/ttftotype42
+++ b/Master/bin/i386-linux/ttftotype42
diff --git a/Master/bin/i386-linux/updmap b/Master/bin/i386-linux/updmap
index ced046f76b9..0f8cc469a83 100755
--- a/Master/bin/i386-linux/updmap
+++ b/Master/bin/i386-linux/updmap
@@ -122,7 +122,7 @@ export PATH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 # the version string
-version=1122009795 # seconds since `00:00:00 1970-01-01 UTC'
+version=1167072206 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 ###############################################################################
diff --git a/Master/bin/i386-linux/utf8mex b/Master/bin/i386-linux/utf8mex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/utf8mex
+++ b/Master/bin/i386-linux/utf8mex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/vftovp b/Master/bin/i386-linux/vftovp
index 4bae1318e9c..f9a382c163f 100755
--- a/Master/bin/i386-linux/vftovp
+++ b/Master/bin/i386-linux/vftovp
diff --git a/Master/bin/i386-linux/vptovf b/Master/bin/i386-linux/vptovf
index 1b263123c99..8d7f69e4e57 100755
--- a/Master/bin/i386-linux/vptovf
+++ b/Master/bin/i386-linux/vptovf
diff --git a/Master/bin/i386-linux/weave b/Master/bin/i386-linux/weave
index 8f721367c4a..2e25b88c4a8 100755
--- a/Master/bin/i386-linux/weave
+++ b/Master/bin/i386-linux/weave
diff --git a/Master/bin/i386-linux/xdvi-xaw.bin b/Master/bin/i386-linux/xdvi-xaw.bin
index baefe539c6f..d68bc859303 100755
--- a/Master/bin/i386-linux/xdvi-xaw.bin
+++ b/Master/bin/i386-linux/xdvi-xaw.bin
diff --git a/Master/bin/i386-linux/xdvipdfmx b/Master/bin/i386-linux/xdvipdfmx
index 8b9cb35c742..ac737d47b18 100755
--- a/Master/bin/i386-linux/xdvipdfmx
+++ b/Master/bin/i386-linux/xdvipdfmx
diff --git a/Master/bin/i386-linux/xetex b/Master/bin/i386-linux/xetex
index a4071d9068f..1c27f45318a 100755
--- a/Master/bin/i386-linux/xetex
+++ b/Master/bin/i386-linux/xetex
diff --git a/Master/bin/i386-linux/xmltex b/Master/bin/i386-linux/xmltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-linux/xmltex
+++ b/Master/bin/i386-linux/xmltex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file