153 files changed, 39 insertions, 2544 deletions

diff --git a/Master/bin/i386-linux/afm2pl b/Master/bin/i386-linux/afm2pl
index 4f8af38463d..5b765c86897 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 da550444e1c..2e3800ec2df 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 3ebacd683ea..a3a5c7ca5fa 100755
--- a/Master/bin/i386-linux/aleph
+++ b/Master/bin/i386-linux/aleph
diff --git a/Master/bin/i386-linux/bbox b/Master/bin/i386-linux/bbox
index 057b7ac90db..77f33a1a33f 100755
--- a/Master/bin/i386-linux/bbox
+++ b/Master/bin/i386-linux/bbox
diff --git a/Master/bin/i386-linux/bg5conv b/Master/bin/i386-linux/bg5conv
index d3231d18170..35c345590c8 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 79d66457cc5..22bcac0670a 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 a8d6d714bd4..8e341255504 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 e635ea3bdb3..fc9e9658754 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 68524933df3..1ef42abd518 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 cece80e4c50..c9434d71cc1 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 cbbda8527cf..072bc12cb4f 100755
--- a/Master/bin/i386-linux/cfftot1
+++ b/Master/bin/i386-linux/cfftot1
diff --git a/Master/bin/i386-linux/ctangle b/Master/bin/i386-linux/ctangle
index 1d02c04c096..ba16bddd35a 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 f72af77791e..b3ce0cd903b 100755
--- a/Master/bin/i386-linux/ctie
+++ b/Master/bin/i386-linux/ctie
diff --git a/Master/bin/i386-linux/ctxtools b/Master/bin/i386-linux/ctxtools
index 84e47bbee3c..66237b28340 100755..120000
--- a/Master/bin/i386-linux/ctxtools
+++ b/Master/bin/i386-linux/ctxtools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart ctxtools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/ctxtools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/cweave b/Master/bin/i386-linux/cweave
index afcb50c86fb..454c287fa45 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 c92bdec707d..cf62edcc0c3 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 a62816af102..9f730c141e2 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 85a086760e1..1a7b987b9a8 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 52be3df7c72..ce1b3b58b4f 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 59244bc3c61..efaf6e569ba 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 ad70250b54f..9f9ecf507ff 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 e2b64f841f4..8c75b9a3cc8 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 79767e4f2d2..0ae9014a985 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 8b53e02b708..655457ae08c 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 55461bb1b9c..1f749be2726 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 62cd243a3b7..5a7867cfd93 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 8e386e7f8f5..29c5185db2d 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 7eae267a8e6..982630a658c 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 8adf2f583b7..a03e2ede2b2 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 c4ea3a64e99..e2fcbf4c7ec 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 c72ea4d8175..58f4bec49a4 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 19eebe73df2..0b4b31a56fc 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 fb6caff519f..1cb2191cb05 100755
--- a/Master/bin/i386-linux/dvipng
+++ b/Master/bin/i386-linux/dvipng
diff --git a/Master/bin/i386-linux/dvipos b/Master/bin/i386-linux/dvipos
index d058dd808e3..ac6843f2d62 100755
--- a/Master/bin/i386-linux/dvipos
+++ b/Master/bin/i386-linux/dvipos
diff --git a/Master/bin/i386-linux/dvips b/Master/bin/i386-linux/dvips
index f1f438e3366..84770e74616 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 5044554892e..9974fd0934d 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 504e921fcaf..042018c47c4 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 a8b04798510..83f53dbb0b6 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 d3e79456cf6..438c95e83db 100755
--- a/Master/bin/i386-linux/dvitype
+++ b/Master/bin/i386-linux/dvitype
diff --git a/Master/bin/i386-linux/epsffit b/Master/bin/i386-linux/epsffit
index 9a1b79ba15f..9301fad9564 100755
--- a/Master/bin/i386-linux/epsffit
+++ b/Master/bin/i386-linux/epsffit
diff --git a/Master/bin/i386-linux/exatools b/Master/bin/i386-linux/exatools
index 50ff0f07e46..304ccdc7e15 100755..120000
--- a/Master/bin/i386-linux/exatools
+++ b/Master/bin/i386-linux/exatools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart exatools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/exatools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/extconv b/Master/bin/i386-linux/extconv
index 475ff190fff..285c554e45a 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 86196d3112f..b220abd42d6 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 856f6b7f3c2..4ef434639ee 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 5fed35d98fd..5b34a20c431 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 3d9b20a451c..f3abb04f896 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 507786e0050..17616b3d25d 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 2d87004ac18..b1799392049 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 6549dcbf61b..cd40ed789af 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 a18ee89da95..8642b169e4e 100755
--- a/Master/bin/i386-linux/install-info
+++ b/Master/bin/i386-linux/install-info
diff --git a/Master/bin/i386-linux/kpseaccess b/Master/bin/i386-linux/kpseaccess
index 906105cdf14..b6fe75a0b5f 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 e97c79f3cae..3bf440f8866 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 914629b1567..c060170ca65 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 5f956b0bd29..f4667533dee 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 a3d0ba9d278..bf4b64e0d0a 100755
--- a/Master/bin/i386-linux/lacheck
+++ b/Master/bin/i386-linux/lacheck
diff --git a/Master/bin/i386-linux/luatex b/Master/bin/i386-linux/luatex
index 8e70a8aac14..77cca4f6dce 100755
--- a/Master/bin/i386-linux/luatex
+++ b/Master/bin/i386-linux/luatex
diff --git a/Master/bin/i386-linux/luatools b/Master/bin/i386-linux/luatools
index cb3ec1add4a..8fd68d0935a 100755..120000
--- a/Master/bin/i386-linux/luatools
+++ b/Master/bin/i386-linux/luatools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart luatools.lua "$@"
+../../texmf-dist/scripts/context/stubs/unix/luatools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mag b/Master/bin/i386-linux/mag
index 36de0d6b3b5..f5c132c1026 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 7c53f42b83e..3199884ad60 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 8e2f6940110..fc5883a4656 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 48ee0ffd1a5..6899dc07895 100755
--- a/Master/bin/i386-linux/makempx
+++ b/Master/bin/i386-linux/makempx
diff --git a/Master/bin/i386-linux/makempy b/Master/bin/i386-linux/makempy
index 4bf7a1af230..a3df543b304 100755..120000
--- a/Master/bin/i386-linux/makempy
+++ b/Master/bin/i386-linux/makempy
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart makempy.pl "$@"
+../../texmf-dist/scripts/context/stubs/unix/makempy
\ No newline at end of file
diff --git a/Master/bin/i386-linux/metafun b/Master/bin/i386-linux/metafun
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/i386-linux/metafun
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mf b/Master/bin/i386-linux/mf
index 9ae567278a9..a2acf3bed5e 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 c3675413ae9..940a1b2b7cc 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 5c8b77cd503..3c2ebb4ac02 100755
--- a/Master/bin/i386-linux/mft
+++ b/Master/bin/i386-linux/mft
diff --git a/Master/bin/i386-linux/mktexlsr b/Master/bin/i386-linux/mktexlsr
index 5e9ddaa3c24..2c4ac96f3dd 100755
--- a/Master/bin/i386-linux/mktexlsr
+++ b/Master/bin/i386-linux/mktexlsr
@@ -11,7 +11,7 @@
 # <te@dbs.uni-hannover.de>, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 8399 2008-05-28 22:19:34Z karl $'
+version='$Id: mktexlsr 9164 2008-07-02 17:42:11Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname [DIR]...
 
@@ -86,7 +86,7 @@ while test $# -gt 0; do
     exit 1
   else
     test -d "$1" || echo "$progname: $1 not a directory." >&2
-    trees="$trees $1"  # don't want to update update system dirs
+    trees="$trees $1"  # don't want to update system dirs
   fi
   shift
 done
diff --git a/Master/bin/i386-linux/mktextfm b/Master/bin/i386-linux/mktextfm
index a423d0309b0..8884351d7a1 100755
--- a/Master/bin/i386-linux/mktextfm
+++ b/Master/bin/i386-linux/mktextfm
@@ -48,7 +48,7 @@ esac
 (
 
 NAME=`basename "$1" .tfm`
-MAG=1
+MAG=0
 #DEST="$2"
 DPI=$BDPI
 
diff --git a/Master/bin/i386-linux/mmafm b/Master/bin/i386-linux/mmafm
index bef35be54a9..14d341e5bba 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 39044b9b1a1..177af4bf673 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 53ac30d988f..00e94563f02 100755
--- a/Master/bin/i386-linux/mpost
+++ b/Master/bin/i386-linux/mpost
diff --git a/Master/bin/i386-linux/mpstools b/Master/bin/i386-linux/mpstools
index b4c8f634548..caf4ae949f7 100755..120000
--- a/Master/bin/i386-linux/mpstools
+++ b/Master/bin/i386-linux/mpstools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart mpstools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/mpstools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mpto b/Master/bin/i386-linux/mpto
index 9ba04a64e5a..4c5bfd47dff 100755
--- a/Master/bin/i386-linux/mpto
+++ b/Master/bin/i386-linux/mpto
diff --git a/Master/bin/i386-linux/mptopdf b/Master/bin/i386-linux/mptopdf
index 980a3123d1a..83172e791cd 100755..120000
--- a/Master/bin/i386-linux/mptopdf
+++ b/Master/bin/i386-linux/mptopdf
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart mptopdf.pl "$@"
+../../texmf-dist/scripts/context/stubs/unix/mptopdf
\ No newline at end of file
diff --git a/Master/bin/i386-linux/mtxtools b/Master/bin/i386-linux/mtxtools
index 2922e0b4674..d99a8081bb9 100755..120000
--- a/Master/bin/i386-linux/mtxtools
+++ b/Master/bin/i386-linux/mtxtools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart mtxtools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/mtxtools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/musixflx b/Master/bin/i386-linux/musixflx
index 974d27912fc..a981f5677ad 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 c86d8ff27d1..9588c12dfad 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 132ddfd2580..422fa4ee912 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 21a626401f7..2997868f466 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 bf68e5faf5c..7fa63fcd81a 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 4d0899ba9f9..43af7659ee9 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 a5d22ca4255..313b9cfb414 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 cebf064e36d..2cad52e90bf 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 1bd7328d484..fda3653b5a2 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 02674b42eef..69874a41c34 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 db82b051b82..92a6b485285 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 d510615b979..b853328dd9d 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 f7f33b4a6f7..bc61752e41f 100755
--- a/Master/bin/i386-linux/pdfclose
+++ b/Master/bin/i386-linux/pdfclose
diff --git a/Master/bin/i386-linux/pdfopen b/Master/bin/i386-linux/pdfopen
index 53ed3a23c0a..56191733158 100755
--- a/Master/bin/i386-linux/pdfopen
+++ b/Master/bin/i386-linux/pdfopen
diff --git a/Master/bin/i386-linux/pdftex b/Master/bin/i386-linux/pdftex
index f7b68d813a1..e1d4f0e78ff 100755
--- a/Master/bin/i386-linux/pdftex
+++ b/Master/bin/i386-linux/pdftex
diff --git a/Master/bin/i386-linux/pdftools b/Master/bin/i386-linux/pdftools
index 92ee803a868..fa012780ccc 100755..120000
--- a/Master/bin/i386-linux/pdftools
+++ b/Master/bin/i386-linux/pdftools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart pdftools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/pdftools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pdftosrc b/Master/bin/i386-linux/pdftosrc
index 35f3e2e4f7c..d732ed38db9 100755
--- a/Master/bin/i386-linux/pdftosrc
+++ b/Master/bin/i386-linux/pdftosrc
diff --git a/Master/bin/i386-linux/pdftrimwhite b/Master/bin/i386-linux/pdftrimwhite
new file mode 120000
index 00000000000..46526e8ffcc
--- /dev/null
+++ b/Master/bin/i386-linux/pdftrimwhite
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/stubs/unix/pdftrimwhite
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pfb2pfa b/Master/bin/i386-linux/pfb2pfa
index 33d57119ce4..d5efc4eb5a9 100755
--- a/Master/bin/i386-linux/pfb2pfa
+++ b/Master/bin/i386-linux/pfb2pfa
diff --git a/Master/bin/i386-linux/pk2bm b/Master/bin/i386-linux/pk2bm
index 1fef2f1edf9..868a6925fa1 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 209d924b9d7..a26d08fc66f 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 952b6b57209..902b04a2d7b 100755
--- a/Master/bin/i386-linux/pktype
+++ b/Master/bin/i386-linux/pktype
diff --git a/Master/bin/i386-linux/pltotf b/Master/bin/i386-linux/pltotf
index 089f51f3fa8..35744b8151b 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 2c07e155ceb..724111ea7ad 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 d7947d6f8fb..d531400fbac 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 2a46a32f264..01bdcc84247 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 a620ea51283..f989fd56f50 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 9b85b937a54..dbcfc8b1227 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 3edbeb17159..ea20d59606c 100755
--- a/Master/bin/i386-linux/psselect
+++ b/Master/bin/i386-linux/psselect
diff --git a/Master/bin/i386-linux/pst2pdf b/Master/bin/i386-linux/pst2pdf
new file mode 120000
index 00000000000..60a28335578
--- /dev/null
+++ b/Master/bin/i386-linux/pst2pdf
@@ -0,0 +1 @@
+../../texmf-dist/scripts/pst2pdf/pst2pdf.pl
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pstopdf b/Master/bin/i386-linux/pstopdf
index 5b38ed426cb..44478ee1dd4 100755..120000
--- a/Master/bin/i386-linux/pstopdf
+++ b/Master/bin/i386-linux/pstopdf
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart pstopdf.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/pstopdf
\ No newline at end of file
diff --git a/Master/bin/i386-linux/pstops b/Master/bin/i386-linux/pstops
index 2aa613688ef..4524552bd2a 100755
--- a/Master/bin/i386-linux/pstops
+++ b/Master/bin/i386-linux/pstops
diff --git a/Master/bin/i386-linux/rlxtools b/Master/bin/i386-linux/rlxtools
index 41cea40fc09..a5078af4f10 100755..120000
--- a/Master/bin/i386-linux/rlxtools
+++ b/Master/bin/i386-linux/rlxtools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart rlxtools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/rlxtools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/runtools b/Master/bin/i386-linux/runtools
index ff9a333791b..127f29a36df 100755..120000
--- a/Master/bin/i386-linux/runtools
+++ b/Master/bin/i386-linux/runtools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart runtools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/runtools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/sjisconv b/Master/bin/i386-linux/sjisconv
index 4e6d883bfcd..ff1c571c3aa 100755
--- a/Master/bin/i386-linux/sjisconv
+++ b/Master/bin/i386-linux/sjisconv
diff --git a/Master/bin/i386-linux/synctex b/Master/bin/i386-linux/synctex
index cac00273edc..a965823e4ed 100755
--- a/Master/bin/i386-linux/synctex
+++ b/Master/bin/i386-linux/synctex
diff --git a/Master/bin/i386-linux/t1ascii b/Master/bin/i386-linux/t1ascii
index dffa8a34766..e35fe363d3d 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 e078b17d454..ffda7822ad7 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 3cd64b75f69..0396247ee7e 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 1bc86891b5a..993dd5e4904 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 4e2a92ebd5b..4869cf4233b 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 d0c59b30800..c18d1b59f02 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 2b5d1374299..acecc713e7f 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 8089839f63e..e3612e09a77 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 9cff4c54caf..00cc6af73c3 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 a5ac93afe72..ddacee4fcbe 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 ff8fc9f525e..f8c5e5f28b8 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 1c3fe61a9ca..4b3d8d018cb 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 040819a23ae..f4ff6d0f044 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 7b5de502f33..c8519722e5d 100755
--- a/Master/bin/i386-linux/tex
+++ b/Master/bin/i386-linux/tex
diff --git a/Master/bin/i386-linux/tex2xindy b/Master/bin/i386-linux/tex2xindy
index 3f907e7f7e8..fc6c048f448 100755
--- a/Master/bin/i386-linux/tex2xindy
+++ b/Master/bin/i386-linux/tex2xindy
diff --git a/Master/bin/i386-linux/tex4ht b/Master/bin/i386-linux/tex4ht
index cf0a7ea5992..2e3fad004fc 100755
--- a/Master/bin/i386-linux/tex4ht
+++ b/Master/bin/i386-linux/tex4ht
diff --git a/Master/bin/i386-linux/texexec b/Master/bin/i386-linux/texexec
index 2158172906a..36d22caefe7 100755..120000
--- a/Master/bin/i386-linux/texexec
+++ b/Master/bin/i386-linux/texexec
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart texexec.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/texexec
\ No newline at end of file
diff --git a/Master/bin/i386-linux/texfind b/Master/bin/i386-linux/texfind
new file mode 120000
index 00000000000..e450f1060a3
--- /dev/null
+++ b/Master/bin/i386-linux/texfind
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/stubs/unix/texfind
\ No newline at end of file
diff --git a/Master/bin/i386-linux/texfont b/Master/bin/i386-linux/texfont
index a91f786e3f8..a3756e037ce 100755..120000
--- a/Master/bin/i386-linux/texfont
+++ b/Master/bin/i386-linux/texfont
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart texfont.pl "$@"
+../../texmf-dist/scripts/context/stubs/unix/texfont
\ No newline at end of file
diff --git a/Master/bin/i386-linux/texindex b/Master/bin/i386-linux/texindex
index c71a8882abb..dc44af00bc5 100755
--- a/Master/bin/i386-linux/texindex
+++ b/Master/bin/i386-linux/texindex
diff --git a/Master/bin/i386-linux/texmfstart b/Master/bin/i386-linux/texmfstart
index e43929213f5..db6dee0a29c 100755..120000
--- a/Master/bin/i386-linux/texmfstart
+++ b/Master/bin/i386-linux/texmfstart
@@ -1,2501 +1 @@
-#!/usr/bin/env ruby
-
-# program   : texmfstart
-# copyright : PRAGMA Advanced Document Engineering
-# version   : 1.9.0 - 2003/2006
-# author    : Hans Hagen
-#
-# project   : ConTeXt / eXaMpLe
-# info      : j.hagen@xs4all.nl
-# www       : www.pragma-pod.com / www.pragma-ade.com
-
-# no special requirements, i.e. no exa modules/classes used
-
-# texmfstart [switches] filename [optional arguments]
-#
-# ruby2exe texmfstart --help -> avoids stub test
-#
-# Of couse I can make this into a nice class, which i'll undoubtely will
-# do when I feel the need. In that case it will be part of a bigger game.
-
-# turning this into a service would be nice, so some day ...
-
-# --locate        => provides location
-# --exec          => exec instead of system
-# --iftouched=a,b => only if timestamp a<>b
-# --ifchanged=a,b => only if checksum changed
-#
-# file: path: bin:
-
-# texmfstart --exec bin:scite *.tex
-
-# we don't depend on other libs
-
-$: << File.expand_path(File.dirname($0)) ; $: << File.join($:.last,'lib') ; $:.uniq!
-
-require "rbconfig"
-require "md5"
-
-# funny, selfmergs was suddenly broken to case problems
-
-# kpse_merge_done: require 'base/kpseremote'
-# kpse_merge_done: require 'base/kpsedirect'
-# kpse_merge_done: require 'base/kpsefast'
-# kpse_merge_done: require 'base/merge'
-
-# kpse_merge_start
-
-# kpse_merge_file: 't:/ruby/base/kpsefast.rb'
-
-# module    : base/kpsefast
-# copyright : PRAGMA Advanced Document Engineering
-# version   : 2005
-# author    : Hans Hagen
-#
-# project   : ConTeXt / eXaMpLe
-# concept   : Hans Hagen
-# info      : j.hagen@xs4all.nl
-
-# todo: multiple cnf files
-#
-
-class String
-
-    def split_path
-        if self =~ /\;/o || self =~ /^[a-z]\:/io then
-            self.split(";")
-        else
-            self.split(":")
-        end
-    end
-
-end
-
-class Array
-
-    def join_path
-        self.join(File::PATH_SEPARATOR)
-    end
-
-end
-
-class File
-
-    def File.locate_file(path,name)
-        begin
-            files = Dir.entries(path)
-            if files.include?(name) then
-                fullname = File.join(path,name)
-                return fullname if FileTest.file?(fullname)
-            end
-            files.each do |p|
-                fullname = File.join(path,p)
-                if p != '.' and p != '..' and FileTest.directory?(fullname) and result = locate_file(fullname,name) then
-                    return result
-                end
-            end
-        rescue
-            # bad path
-        end
-        return nil
-    end
-
-    def File.glob_file(pattern)
-        return Dir.glob(pattern).first
-    end
-
-end
-
-module KpseUtil
-
-    # to be adapted, see loading cnf file
-
-    @@texmftrees = ['texmf-local','texmf.local','../..','texmf'] # '../..' is for gwtex
-    @@texmfcnf   = 'texmf.cnf'
-
-    def KpseUtil::identify
-        # we mainly need to identify the local tex stuff and wse assume that
-        # the texmfcnf variable is set; otherwise we need to expand the
-        # TEXMF variable and that takes time since it may involve more
-        ownpath = File.expand_path($0)
-        if ownpath.gsub!(/texmf.*?$/o, '') then
-            ENV['SELFAUTOPARENT'] = ownpath
-        else
-            ENV['SELFAUTOPARENT'] = '.' # fall back
-            # may be too tricky:
-            #
-            # (ENV['PATH'] ||'').split_path.each do |p|
-                # if p.gsub!(/texmf.*?$/o, '') then
-                    # ENV['SELFAUTOPARENT'] = p
-                    # break
-                # end
-            # end
-        end
-        filenames = Array.new
-        if ENV['TEXMFCNF'] && ! ENV['TEXMFCNF'].empty? then
-            ENV['TEXMFCNF'].to_s.split_path.each do |path|
-                filenames << File.join(path,@@texmfcnf)
-            end
-        elsif ENV['SELFAUTOPARENT'] == '.' then
-            filenames << File.join('.',@@texmfcnf)
-        else
-            @@texmftrees.each do |tree|
-                filenames << File.join(ENV['SELFAUTOPARENT'],tree,'web2c',@@texmfcnf)
-            end
-        end
-        loop do
-            busy = false
-            filenames.collect! do |f|
-                f.gsub(/\$([a-zA-Z0-9\_\-]+)/o) do
-                    if (! ENV[$1]) || (ENV[$1] == $1) then
-                        "$#{$1}"
-                    else
-                        busy = true
-                        ENV[$1]
-                    end
-                end
-            end
-            break unless busy
-        end
-        filenames.delete_if do |f|
-            ! FileTest.file?(f)
-        end
-        return filenames
-    end
-
-    def KpseUtil::environment
-        Hash.new.merge(ENV)
-    end
-
-end
-
-class KpseFast
-
-    # formats are an incredible inconsistent mess
-
-    @@suffixes  = Hash.new
-    @@formats   = Hash.new
-    @@suffixmap = Hash.new
-
-    @@texmfcnf  = 'texmf.cnf'
-
-    @@suffixes['gf']                       = ['.<resolution>gf'] # todo
-    @@suffixes['pk']                       = ['.<resolution>pk'] # todo
-    @@suffixes['tfm']                      = ['.tfm']
-    @@suffixes['afm']                      = ['.afm']
-    @@suffixes['base']                     = ['.base']
-    @@suffixes['bib']                      = ['.bib']
-    @@suffixes['bst']                      = ['.bst']
-    @@suffixes['cnf']                      = ['.cnf']
-    @@suffixes['ls-R']                     = ['ls-R', 'ls-r']
-    @@suffixes['fmt']                      = ['.fmt', '.efmt', '.efm', '.ofmt', '.ofm', '.oft', '.eofmt', '.eoft', '.eof', '.pfmt', '.pfm', '.epfmt', '.epf', '.xpfmt', '.xpf', '.afmt', '.afm']
-    @@suffixes['map']                      = ['.map']
-    @@suffixes['mem']                      = ['.mem']
-    @@suffixes['mf']                       = ['.mf']
-    @@suffixes['mfpool']                   = ['.pool']
-    @@suffixes['mft']                      = ['.mft']
-    @@suffixes['mp']                       = ['.mp']
-    @@suffixes['mppool']                   = ['.pool']
-    @@suffixes['ocp']                      = ['.ocp']
-    @@suffixes['ofm']                      = ['.ofm', '.tfm']
-    @@suffixes['opl']                      = ['.opl']
-    @@suffixes['otp']                      = ['.otp']
-    @@suffixes['ovf']                      = ['.ovf']
-    @@suffixes['ovp']                      = ['.ovp']
-    @@suffixes['graphic/figure']           = ['.eps', '.epsi']
-    @@suffixes['tex']                      = ['.tex']
-    @@suffixes['texpool']                  = ['.pool']
-    @@suffixes['PostScript header']        = ['.pro']
-    @@suffixes['type1 fonts']              = ['.pfa', '.pfb']
-    @@suffixes['vf']                       = ['.vf']
-    @@suffixes['ist']                      = ['.ist']
-    @@suffixes['truetype fonts']           = ['.ttf', '.ttc']
-    @@suffixes['web']                      = ['.web', '.ch']
-    @@suffixes['cweb']                     = ['.w', '.web', '.ch']
-    @@suffixes['enc files']                = ['.enc']
-    @@suffixes['cmap files']               = ['.cmap']
-    @@suffixes['subfont definition files'] = ['.sfd']
-    @@suffixes['lig files']                = ['.lig']
-    @@suffixes['bitmap font']              = []
-    @@suffixes['MetaPost support']         = []
-    @@suffixes['TeX system documentation'] = []
-    @@suffixes['TeX system sources']       = []
-    @@suffixes['Troff fonts']              = []
-    @@suffixes['dvips config']             = []
-    @@suffixes['type42 fonts']             = []
-    @@suffixes['web2c files']              = []
-    @@suffixes['other text files']         = []
-    @@suffixes['other binary files']       = []
-    @@suffixes['misc fonts']               = []
-    @@suffixes['opentype fonts']           = []
-    @@suffixes['pdftex config']            = []
-    @@suffixes['texmfscripts']             = []
-
-    # replacements
-
-    @@suffixes['fmt']                      = ['.fmt']
-    @@suffixes['type1 fonts']              = ['.pfa', '.pfb', '.pfm']
-    @@suffixes['tex']                      = ['.tex', '.xml']
-    @@suffixes['texmfscripts']             = ['rb','lua','py','pl']
-
-    @@suffixes.keys.each do |k| @@suffixes[k].each do |s| @@suffixmap[s] = k end end
-
-    # TTF2TFMINPUTS
-    # MISCFONTS
-    # TEXCONFIG
-    # DVIPDFMINPUTS
-    # OTFFONTS
-
-    @@formats['gf']                       = ''
-    @@formats['pk']                       = ''
-    @@formats['tfm']                      = 'TFMFONTS'
-    @@formats['afm']                      = 'AFMFONTS'
-    @@formats['base']                     = 'MFBASES'
-    @@formats['bib']                      = ''
-    @@formats['bst']                      = ''
-    @@formats['cnf']                      = ''
-    @@formats['ls-R']                     = ''
-    @@formats['fmt']                      = 'TEXFORMATS'
-    @@formats['map']                      = 'TEXFONTMAPS'
-    @@formats['mem']                      = 'MPMEMS'
-    @@formats['mf']                       = 'MFINPUTS'
-    @@formats['mfpool']                   = 'MFPOOL'
-    @@formats['mft']                      = ''
-    @@formats['mp']                       = 'MPINPUTS'
-    @@formats['mppool']                   = 'MPPOOL'
-    @@formats['ocp']                      = 'OCPINPUTS'
-    @@formats['ofm']                      = 'OFMFONTS'
-    @@formats['opl']                      = 'OPLFONTS'
-    @@formats['otp']                      = 'OTPINPUTS'
-    @@formats['ovf']                      = 'OVFFONTS'
-    @@formats['ovp']                      = 'OVPFONTS'
-    @@formats['graphic/figure']           = ''
-    @@formats['tex']                      = 'TEXINPUTS'
-    @@formats['texpool']                  = 'TEXPOOL'
-    @@formats['PostScript header']        = 'TEXPSHEADERS'
-    @@formats['type1 fonts']              = 'T1FONTS'
-    @@formats['vf']                       = 'VFFONTS'
-    @@formats['ist']                      = ''
-    @@formats['truetype fonts']           = 'TTFONTS'
-    @@formats['web']                      = ''
-    @@formats['cweb']                     = ''
-    @@formats['enc files']                = 'ENCFONTS'
-    @@formats['cmap files']               = 'CMAPFONTS'
-    @@formats['subfont definition files'] = 'SFDFONTS'
-    @@formats['lig files']                = 'LIGFONTS'
-    @@formats['bitmap font']              = ''
-    @@formats['MetaPost support']         = ''
-    @@formats['TeX system documentation'] = ''
-    @@formats['TeX system sources']       = ''
-    @@formats['Troff fonts']              = ''
-    @@formats['dvips config']             = ''
-    @@formats['type42 fonts']             = 'T42FONTS'
-    @@formats['web2c files']              = 'WEB2C'
-    @@formats['other text files']         = ''
-    @@formats['other binary files']       = ''
-    @@formats['misc fonts']               = ''
-    @@formats['opentype fonts']           = 'OPENTYPEFONTS'
-    @@formats['pdftex config']            = 'PDFTEXCONFIG'
-    @@formats['texmfscripts']             = 'TEXMFSCRIPTS'
-
-    attr_accessor :progname, :engine, :format, :rootpath, :treepath,
-        :verbose, :remember, :scandisk, :diskcache, :renewcache
-
-    @@cacheversion = '1'
-
-    def initialize
-        @rootpath    = ''
-        @treepath    = ''
-        @progname    = 'kpsewhich'
-        @engine      = 'pdftex'
-        @variables   = Hash.new
-        @expansions  = Hash.new
-        @files       = Hash.new
-        @found       = Hash.new
-        @kpsevars    = Hash.new
-        @lsrfiles    = Array.new
-        @cnffiles    = Array.new
-        @verbose     = true
-        @remember    = true
-        @scandisk    = true
-        @diskcache   = true
-        @renewcache  = false
-        @isolate     = false
-
-        @diskcache   = false
-        @cachepath   = nil
-        @cachefile   = 'tmftools.log'
-
-        @environment = ENV
-    end
-
-    def set(key,value)
-        case key
-            when 'progname' then @progname = value
-            when 'engine'   then @engine   = value
-            when 'format'   then @format   = value
-        end
-    end
-
-    def push_environment(env)
-        @environment = env
-    end
-
-    # {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-    #
-    # $SELFAUTOLOC    : /usr/tex/bin/platform
-    # $SELFAUTODIR    : /usr/tex/bin
-    # $SELFAUTOPARENT : /usr/tex
-    #
-    # since we live in scriptpath we need a slightly different method
-
-    def load_cnf(filenames=nil)
-        unless filenames then
-            ownpath = File.expand_path($0)
-            if ownpath.gsub!(/texmf.*?$/o, '') then
-                @environment['SELFAUTOPARENT'] = ownpath
-            else
-                @environment['SELFAUTOPARENT'] = '.'
-            end
-            unless @treepath.empty? then
-                unless @rootpath.empty? then
-                    @treepath = @treepath.split(',').collect do |p| File.join(@rootpath,p) end.join(',')
-                end
-                @environment['TEXMF'] = @treepath
-                # only the first one
-                @environment['TEXMFCNF'] = File.join(@treepath.split(',').first,'texmf/web2c')
-            end
-            unless @rootpath.empty? then
-                @environment['TEXMFCNF'] = File.join(@rootpath,'texmf/web2c')
-                @environment['SELFAUTOPARENT'] = @rootpath
-                @isolate = true
-            end
-            filenames = Array.new
-            if @environment['TEXMFCNF'] and not @environment['TEXMFCNF'].empty? then
-                @environment['TEXMFCNF'].to_s.split_path.each do |path|
-                    filenames << File.join(path,@@texmfcnf)
-                end
-            elsif @environment['SELFAUTOPARENT'] == '.' then
-                filenames << File.join('.',@@texmfcnf)
-            else
-                ['texmf-local','texmf'].each do |tree|
-                    filenames << File.join(@environment['SELFAUTOPARENT'],tree,'web2c',@@texmfcnf)
-                end
-            end
-        end
-        # <root>/texmf/web2c/texmf.cnf
-        filenames = _expanded_path_(filenames)
-        @rootpath = filenames.first
-        3.times do
-            @rootpath = File.dirname(@rootpath)
-        end
-        filenames.collect! do |f|
-            f.gsub("\\", '/')
-        end
-        filenames.each do |fname|
-            if FileTest.file?(fname) and f = File.open(fname) then
-                @cnffiles << fname
-                while line = f.gets do
-                    loop do
-                        # concatenate lines ending with \
-                        break unless line.sub!(/\\\s*$/o) do
-                            f.gets || ''
-                        end
-                    end
-                    case line
-                        when /^[\%\#]/o then
-                            # comment
-                        when /^\s*(.*?)\s*\=\s*(.*?)\s*$/o then
-                            key, value = $1, $2
-                            unless @variables.key?(key) then
-                                value.sub!(/\%.*$/,'')
-                                value.sub!(/\~/, "$HOME")
-                                @variables[key] = value
-                            end
-                            @kpsevars[key] = true
-                    end
-                end
-                f.close
-            end
-        end
-    end
-
-    def load_lsr
-        @lsrfiles = []
-        simplified_list(expansion('TEXMF')).each do |p|
-            ['ls-R','ls-r'].each do |f|
-                filename = File.join(p,f)
-                if FileTest.file?(filename) then
-                    @lsrfiles << [filename,File.size(filename)]
-                    break
-                end
-            end
-        end
-        @files = Hash.new
-        if @diskcache then
-            ['HOME','TEMP','TMP','TMPDIR'].each do |key|
-                if @environment[key] then
-                    if FileTest.directory?(@environment[key]) then
-                        @cachepath = @environment[key]
-                        @cachefile = [@rootpath.gsub(/[^A-Z0-9]/io, '-').gsub(/\-+/,'-'),File.basename(@cachefile)].join('-')
-                        break
-                    end
-                end
-            end
-            if @cachepath and not @renewcache and FileTest.file?(File.join(@cachepath,@cachefile)) then
-                begin
-                    if f = File.open(File.join(@cachepath,@cachefile)) then
-                        cacheversion = Marshal.load(f)
-                        if cacheversion == @@cacheversion then
-                            lsrfiles = Marshal.load(f)
-                            if lsrfiles == @lsrfiles then
-                                @files = Marshal.load(f)
-                            end
-                        end
-                        f.close
-                    end
-                rescue
-                   @files = Hash.new
-               end
-            end
-        end
-        return if @files.size > 0
-        @lsrfiles.each do |filedata|
-            filename, filesize = filedata
-            filepath = File.dirname(filename)
-            begin
-                path = '.'
-                data = IO.readlines(filename)
-                if data[0].chomp =~ /% ls\-R \-\- filename database for kpathsea\; do not change this line\./io then
-                    data.each do |line|
-                        case line
-                            when /^[a-zA-Z0-9]/o then
-                                line.chomp!
-                                if @files[line] then
-                                    @files[line] << path
-                                else
-                                    @files[line] = [path]
-                                end
-                            when /^\.\/(.*?)\:$/o then
-                                path = File.join(filepath,$1)
-                        end
-                    end
-                end
-            rescue
-                # sorry
-            end
-        end
-        if @diskcache and @cachepath and f = File.open(File.join(@cachepath,@cachefile),'wb') then
-            f << Marshal.dump(@@cacheversion)
-            f << Marshal.dump(@lsrfiles)
-            f << Marshal.dump(@files)
-            f.close
-        end
-    end
-
-    def expand_variables
-        @expansions = Hash.new
-        if @isolate then
-            @variables['TEXMFCNF'] = @environment['TEXMFCNF'].dup
-            @variables['SELFAUTOPARENT'] = @environment['SELFAUTOPARENT'].dup
-        else
-            @environment.keys.each do |e|
-                if e =~ /^([a-zA-Z]+)\_(.*)\s*$/o then
-                    @expansions["#{$1}.#{$2}"] = (@environment[e] ||'').dup
-                else
-                    @expansions[e] = (@environment[e] ||'').dup
-                end
-            end
-        end
-        @variables.keys.each do |k|
-            @expansions[k] = @variables[k].dup unless @expansions[k]
-        end
-        loop do
-            busy = false
-            @expansions.keys.each do |k|
-                @expansions[k].gsub!(/\$([a-zA-Z0-9\_\-]*)/o) do
-                    busy = true
-                    @expansions[$1] || ''
-                end
-                @expansions[k].gsub!(/\$\{([a-zA-Z0-9\_\-]*)\}/o) do
-                    busy = true
-                    @expansions[$1] || ''
-                end
-            end
-            break unless busy
-        end
-        @expansions.keys.each do |k|
-            @expansions[k] = @expansions[k].gsub("\\", '/')
-        end
-    end
-
-    def variable(name='')
-        (name and not name.empty? and @variables[name.sub('$','')]) or  ''
-    end
-
-    def expansion(name='')
-        (name and not name.empty? and @expansions[name.sub('$','')]) or ''
-    end
-
-    def variable?(name='')
-        name and not name.empty? and @variables.key?(name.sub('$',''))
-    end
-
-    def expansion?(name='')
-        name and not name.empty? and @expansions.key?(name.sub('$',''))
-    end
-
-    def simplified_list(str)
-        lst = str.gsub(/^\{/o,'').gsub(/\}$/o,'').split(",")
-        lst.collect do |l|
-            l.sub(/^[\!]*/,'').sub(/[\/\\]*$/o,'')
-        end
-    end
-
-    def original_variable(variable)
-        if variable?("#{@progname}.#{variable}") then
-            variable("#{@progname}.#{variable}")
-        elsif variable?(variable) then
-            variable(variable)
-        else
-            ''
-        end
-    end
-
-    def expanded_variable(variable)
-        if expansion?("#{variable}.#{@progname}") then
-            expansion("#{variable}.#{@progname}")
-        elsif expansion?(variable) then
-            expansion(variable)
-        else
-            ''
-        end
-    end
-
-    def original_path(filename='')
-        _expanded_path_(original_variable(var_of_format_or_suffix(filename)).split(";"))
-    end
-
-    def expanded_path(filename='')
-        _expanded_path_(expanded_variable(var_of_format_or_suffix(filename)).split(";"))
-    end
-
-    def _expanded_path_(pathlist)
-        i, n = 0, 0
-        pathlist.collect! do |mainpath|
-            mainpath.gsub(/([\{\}])/o) do
-                if $1 == "{" then
-                    i += 1 ; n = i if i > n ; "<#{i}>"
-                else
-                    i -= 1 ; "</#{i+1}>"
-                end
-            end
-        end
-        n.times do |i|
-            loop do
-                more = false
-                newlist = []
-                pathlist.each do |path|
-                    unless path.sub!(/^(.*?)<(#{n-i})>(.*?)<\/\2>(.*?)$/) do
-                        pre, mid, post = $1, $3, $4
-                        mid.gsub!(/\,$/,',.')
-                        mid.split(',').each do |m|
-                            more = true
-                            if m == '.' then
-                                newlist << "#{pre}#{post}"
-                            else
-                                newlist << "#{pre}#{m}#{post}"
-                            end
-                        end
-                    end then
-                        newlist << path
-                    end
-                end
-                if more then
-                    pathlist = [newlist].flatten # copy -)
-                else
-                    break
-                end
-            end
-        end
-        pathlist = pathlist.uniq.collect do |path|
-            p = path
-            # p.gsub(/^\/+/o) do '' end
-            # p.gsub!(/(.)\/\/(.)/o) do "#{$1}/#{$2}" end
-            # p.gsub!(/\/\/+$/o) do '//' end
-            p.gsub!(/\/\/+/o) do '//' end
-            p
-        end
-        pathlist
-    end
-
-    # todo: ignore case
-
-    def var_of_format(str)
-        @@formats[str] || ''
-    end
-
-    def var_of_suffix(str) # includes .
-        if @@suffixmap.key?(str) then @@formats[@@suffixmap[str]] else '' end
-    end
-
-    def var_of_format_or_suffix(str)
-        if @@formats.key?(str) then
-            @@formats[str]
-        elsif @@suffixmap.key?(File.extname(str)) then # extname includes .
-            @@formats[@@suffixmap[File.extname(str)]]  # extname includes .
-        else
-            ''
-        end
-    end
-
-end
-
-class KpseFast
-
-    # test things
-
-    def list_variables(kpseonly=true)
-        @variables.keys.sort.each do |k|
-            if kpseonly then
-                puts("#{k} = #{@variables[k]}") if @kpsevars[k]
-            else
-                puts("#{if @kpsevars[k] then 'K' else 'E' end} #{k} = #{@variables[k]}")
-            end
-        end
-    end
-
-    def list_expansions(kpseonly=true)
-        @expansions.keys.sort.each do |k|
-            if kpseonly then
-                puts("#{k} = #{@expansions[k]}") if @kpsevars[k]
-            else
-                puts("#{if @kpsevars[k] then 'K' else 'E' end} #{k} = #{@expansions[k]}")
-            end
-        end
-    end
-
-    def list_lsr
-        puts("files = #{@files.size}")
-    end
-
-    def set_test_patterns
-        @variables["KPSE_TEST_PATTERN_A"] = "foo/{1,2}/bar//"
-        @variables["KPSE_TEST_PATTERN_B"] = "!!x{A,B{1,2}}y"
-        @variables["KPSE_TEST_PATTERN_C"] = "x{A,B//{1,2}}y"
-        @variables["KPSE_TEST_PATTERN_D"] = "x{A,B//{1,2,}}//y"
-    end
-
-    def show_test_patterns
-        ['A','B','D'].each do |i|
-            puts ""
-            puts @variables ["KPSE_TEST_PATTERN_#{i}"]
-            puts ""
-            puts expand_path("KPSE_TEST_PATTERN_#{i}").split_path
-            puts ""
-        end
-    end
-
-end
-
-class KpseFast
-
-    # kpse stuff
-
-    def expand_braces(str) # output variable and brace expansion of STRING.
-        _expanded_path_(original_variable(str).split_path).join_path
-    end
-
-    def expand_path(str)   # output complete path expansion of STRING.
-        _expanded_path_(expanded_variable(str).split_path).join_path
-    end
-
-    def expand_var(str)    # output variable expansion of STRING.
-        expanded_variable(str)
-    end
-
-    def show_path(str)     # output search path for file type NAME
-        expanded_path(str).join_path
-    end
-
-    def var_value(str)     # output the value of variable $STRING.
-        original_variable(str)
-    end
-
-end
-
-class KpseFast
-
-    def _is_cnf_?(filename)
-        filename == File.basename((@cnffiles.first rescue @@texmfcnf) || @@texmfcnf)
-    end
-
-    def find_file(filename)
-        if _is_cnf_?(filename) then
-            @cnffiles.first rescue ''
-        else
-            [find_files(filename,true)].flatten.first || ''
-        end
-    end
-
-    def find_files(filename,first=false)
-        if _is_cnf_?(filename) then
-            result = @cnffiles.dup
-        else
-            if @remember then
-                # stamp = "#{filename}--#{@format}--#{@engine}--#{@progname}"
-                stamp = "#{filename}--#{@engine}--#{@progname}"
-                return @found[stamp] if @found.key?(stamp)
-            end
-            pathlist = expanded_path(filename)
-            result = []
-            filelist = if @files.key?(filename) then @files[filename].uniq else nil end
-            done = false
-            if pathlist.size == 0 then
-                if FileTest.file?(filename) then
-                    done = true
-                    result << '.'
-                end
-            else
-                pathlist.each do |path|
-                    doscan = if path =~ /^\!\!/o then false else true end
-                    recurse = if path =~ /\/\/$/o then true else false end
-                    pathname = path.dup
-                    pathname.gsub!(/^\!+/o, '')
-                    done = false
-                    if not done and filelist then
-                        # checking for exact match
-                        if filelist.include?(pathname) then
-                            result << pathname
-                            done = true
-                        end
-                        if not done and recurse then
-                            # checking for fuzzy //
-                            pathname.gsub!(/\/+$/o, '/.*')
-                            # pathname.gsub!(/\/\//o,'/[\/]*/')
-                            pathname.gsub!(/\/\//o,'/.*?/')
-                            re = /^#{pathname}/
-                            filelist.each do |f|
-                                if re =~ f then
-                                    result << f # duplicates will be filtered later
-                                    done = true
-                                end
-                                break if done
-                            end
-                        end
-                    end
-                    if not done and doscan then
-                        # checking for path itself
-                        pname = pathname.sub(/\.\*$/,'')
-                        if not pname =~ /\*/o and FileTest.file?(File.join(pname,filename)) then
-                            result << pname
-                            done = true
-                        end
-                    end
-                    break if done and first
-                end
-            end
-            if not done and @scandisk then
-                pathlist.each do |path|
-                    pathname = path.dup
-                    unless pathname.gsub!(/^\!+/o, '') then # !! prevents scan
-                        recurse = pathname.gsub!(/\/+$/o, '')
-                        complex = pathname.gsub!(/\/\//o,'/*/')
-                        if recurse then
-                            if complex then
-                                if ok = File.glob_file("#{pathname}/**/#{filename}") then
-                                    result << File.dirname(ok)
-                                    done = true
-                                end
-                            elsif ok = File.locate_file(pathname,filename) then
-                                result << File.dirname(ok)
-                                done = true
-                            end
-                        elsif complex then
-                            if ok = File.glob_file("#{pathname}/#{filename}") then
-                                result << File.dirname(ok)
-                                done = true
-                            end
-                        elsif FileTest.file?(File.join(pathname,filename)) then
-                            result << pathname
-                            done = true
-                        end
-                        break if done and first
-                    end
-                end
-            end
-            result = result.uniq.collect do |pathname|
-                File.join(pathname,filename)
-            end
-            @found[stamp] = result if @remember
-        end
-        return result # redundant
-    end
-
-end
-
-class KpseFast
-
-    class FileData
-        attr_accessor :tag, :name, :size, :date
-        def initialize(tag=0,name=nil,size=nil,date=nil)
-            @tag, @name, @size, @date = tag, name, size, date
-        end
-        def FileData.sizes(a)
-            a.collect do |aa|
-                aa.size
-            end
-        end
-        def report
-            case @tag
-                when 1 then "deleted  | #{@size.to_s.rjust(8)} | #{@date.strftime('%m/%d/%Y %I:%M')} | #{@name}"
-                when 2 then "present  | #{@size.to_s.rjust(8)} | #{@date.strftime('%m/%d/%Y %I:%M')} | #{@name}"
-                when 3 then "obsolete | #{' '*8} | #{' '*16} | #{@name}"
-            end
-        end
-    end
-
-    def analyze_files(filter='',strict=false,sort='',delete=false)
-        puts("command line     = #{ARGV.join(' ')}")
-        puts("number of files  = #{@files.size}")
-        puts("filter pattern   = #{filter}")
-        puts("loaded cnf files = #{@cnffiles.join(' ')}")
-        puts('')
-        if filter.gsub!(/^not:/,'') then
-            def the_same(filter,filename)
-                not filter or filter.empty? or /#{filter}/ !~ filename
-            end
-        else
-            def the_same(filter,filename)
-                not filter or filter.empty? or /#{filter}/ =~ filename
-            end
-        end
-        @files.keys.each do |name|
-            if @files[name].size > 1 then
-                data = Array.new
-                @files[name].each do |path|
-                    filename = File.join(path,name)
-                    # if not filter or filter.empty? or /#{filter}/ =~ filename then
-                    if the_same(filter,filename) then
-                        if FileTest.file?(filename) then
-                            if delete then
-                                data << FileData.new(1,filename,File.size(filename),File.mtime(filename))
-                                begin
-                                    File.delete(filename) if delete
-                                rescue
-                                end
-                            else
-                                data << FileData.new(2,filename,File.size(filename),File.mtime(filename))
-                            end
-                        else
-                            # data << FileData.new(3,filename)
-                        end
-                    end
-                end
-                if data.length > 1 then
-                    if strict then
-                        # if data.collect do |d| d.size end.uniq! then
-                            # data.sort! do |a,b| b.size <=> a.size end
-                            # data.each do |d| puts d.report end
-                            # puts ''
-                        # end
-                        data.sort! do |a,b|
-                            if a.size and b.size then
-                                b.size <=> a.size
-                            else
-                                0
-                            end
-                        end
-                        bunch = Array.new
-                        done = false
-                        data.each do |d|
-                            if bunch.size == 0 then
-                                bunch << d
-                            elsif bunch[0].size == d.size then
-                                bunch << d
-                            else
-                                if bunch.size > 1 then
-                                    bunch.each do |b|
-                                        puts b.report
-                                    end
-                                    done = true
-                                end
-                                bunch = [d]
-                            end
-                        end
-                        puts '' if done
-                    else
-                        case sort
-                            when 'size'    then data.sort! do |a,b| a.size <=> b.size end
-                            when 'revsize' then data.sort! do |a,b| b.size <=> a.size end
-                            when 'date'    then data.sort! do |a,b| a.date <=> b.date end
-                            when 'revdate' then data.sort! do |a,b| b.date <=> a.date end
-                        end
-                        data.each do |d| puts d.report end
-                        puts ''
-                    end
-                end
-            end
-        end
-    end
-
-end
-
-
-    # k = KpseFast.new # (root)
-    # k.set_test_patterns
-    # k.load_cnf
-    # k.expand_variables
-    # k.load_lsr
-
-    # k.show_test_patterns
-
-    # puts k.list_variables
-    # puts k.list_expansions
-    # k.list_lsr
-    # puts k.expansion("$TEXMF")
-    # puts k.expanded_path("TEXINPUTS","context")
-
-    # k.progname, k.engine, k.format = 'context', 'pdftex', 'tfm'
-    # k.scandisk = false # == must_exist
-    # k.expand_variables
-
-    # 10.times do |i| puts k.find_file('texnansi-lmr10.tfm') end
-
-    # puts "expand braces $TEXMF"
-    # puts k.expand_braces("$TEXMF")
-    # puts "expand path $TEXMF"
-    # puts k.expand_path("$TEXMF")
-    # puts "expand var $TEXMF"
-    # puts k.expand_var("$TEXMF")
-    # puts "expand path $TEXMF"
-    # puts k.show_path('tfm')
-    # puts "expand value $TEXINPUTS"
-    # puts k.var_value("$TEXINPUTS")
-    # puts "expand value $TEXINPUTS.context"
-    # puts k.var_value("$TEXINPUTS.context")
-
-    # exit
-
-
-
-# kpse_merge_file: 't:/ruby/base/kpse/trees.rb'
-
-require 'monitor'
-# kpse_merge_done: require 'base/kpsefast'
-
-class KpseTrees < Monitor
-
-    def initialize
-        @trees = Hash.new
-    end
-
-    def pattern(filenames)
-        filenames.join('|').gsub(/\\+/o,'/').downcase
-    end
-
-    def choose(filenames,environment)
-        current = pattern(filenames)
-        load(filenames,environment) unless @trees[current]
-        puts "enabling tree #{current}"
-        current
-    end
-
-    def fetch(filenames,environment) # will send whole object !
-        current = pattern(filenames)
-        load(filenames,environment) unless @trees[current]
-        puts "fetching tree #{current}"
-        @trees[current]
-    end
-
-    def load(filenames,environment)
-        current = pattern(filenames)
-        puts "loading tree #{current}"
-        @trees[current] = KpseFast.new
-        @trees[current].push_environment(environment)
-        @trees[current].load_cnf(filenames)
-        @trees[current].expand_variables
-        @trees[current].load_lsr
-    end
-
-    def set(tree,key,value)
-        case key
-            when 'progname' then @trees[tree].progname = value
-            when 'engine'   then @trees[tree].engine   = value
-            when 'format'   then @trees[tree].format   = value
-        end
-    end
-    def get(tree,key)
-        case key
-            when 'progname' then @trees[tree].progname
-            when 'engine'   then @trees[tree].engine
-            when 'format'   then @trees[tree].format
-        end
-    end
-
-    def load_cnf(tree)
-        @trees[tree].load_cnf
-    end
-    def load_lsr(tree)
-        @trees[tree].load_lsr
-    end
-    def expand_variables(tree)
-        @trees[tree].expand_variables
-    end
-    def expand_braces(tree,str)
-        @trees[tree].expand_braces(str)
-    end
-    def expand_path(tree,str)
-        @trees[tree].expand_path(str)
-    end
-    def expand_var(tree,str)
-        @trees[tree].expand_var(str)
-    end
-    def show_path(tree,str)
-        @trees[tree].show_path(str)
-    end
-    def var_value(tree,str)
-        @trees[tree].var_value(str)
-    end
-    def find_file(tree,filename)
-        @trees[tree].find_file(filename)
-    end
-    def find_files(tree,filename,first)
-        @trees[tree].find_files(filename,first)
-    end
-
-end
-
-
-# kpse_merge_file: 't:/ruby/base/kpse/drb.rb'
-
-require 'drb'
-# kpse_merge_done: require 'base/kpse/trees'
-
-class KpseServer
-
-    attr_accessor :port
-
-    def initialize(port=7000)
-        @port = port
-    end
-
-    def start
-        puts "starting drb service at port #{@port}"
-        DRb.start_service("druby://localhost:#{@port}", KpseTrees.new)
-        trap(:INT) do
-            DRb.stop_service
-        end
-        DRb.thread.join
-    end
-
-    def stop
-        # todo
-    end
-
-end
-
-class KpseClient
-
-    attr_accessor :port
-
-    def initialize(port=7000)
-        @port = port
-        @kpse = nil
-    end
-
-    def start
-        # only needed when callbacks are used / slow, due to Socket::getaddrinfo
-        # DRb.start_service
-    end
-
-    def object
-        @kpse = DRbObject.new(nil,"druby://localhost:#{@port}")
-    end
-
-end
-
-
-# SERVER_URI="druby://localhost:8787"
-#
-#   # Start a local DRbServer to handle callbacks.
-#   #
-#   # Not necessary for this small example, but will be required
-#   # as soon as we pass a non-marshallable object as an argument
-#   # to a dRuby call.
-#   DRb.start_service
-#
-
-
-# kpse_merge_file: 't:/ruby/base/kpseremote.rb'
-
-# kpse_merge_done: require 'base/kpsefast'
-
-case ENV['KPSEMETHOD']
-    when /soap/o then # kpse_merge_done: require 'base/kpse/soap'
-    when /drb/o  then # kpse_merge_done: require 'base/kpse/drb'
-    else              # kpse_merge_done: require 'base/kpse/drb'
-end
-
-class KpseRemote
-
-    @@port   = ENV['KPSEPORT']   || 7000
-    @@method = ENV['KPSEMETHOD'] || 'drb'
-
-    def KpseRemote::available?
-        @@method && @@port
-    end
-
-    def KpseRemote::start_server(port=nil)
-        kpse = KpseServer.new(port || @@port)
-        kpse.start
-    end
-
-    def KpseRemote::start_client(port=nil) # keeps object in server
-        kpseclient = KpseClient.new(port || @@port)
-        kpseclient.start
-        kpse = kpseclient.object
-        tree = kpse.choose(KpseUtil::identify, KpseUtil::environment)
-        [kpse, tree]
-    end
-
-    def KpseRemote::fetch(port=nil) # no need for defining methods but slower, send whole object
-        kpseclient = KpseClient.new(port || @@port)
-        kpseclient.start
-        kpseclient.object.fetch(KpseUtil::identify, KpseUtil::environment) rescue nil
-    end
-
-    def initialize(port=nil)
-        if KpseRemote::available? then
-            begin
-                @kpse, @tree = KpseRemote::start_client(port)
-            rescue
-                @kpse, @tree = nil, nil
-            end
-        else
-            @kpse, @tree = nil, nil
-        end
-    end
-
-    def progname=(value)
-        @kpse.set(@tree,'progname',value)
-    end
-    def format=(value)
-        @kpse.set(@tree,'format',value)
-    end
-    def engine=(value)
-        @kpse.set(@tree,'engine',value)
-    end
-
-    def progname
-        @kpse.get(@tree,'progname')
-    end
-    def format
-        @kpse.get(@tree,'format')
-    end
-    def engine
-        @kpse.get(@tree,'engine')
-    end
-
-    def load
-        @kpse.load(KpseUtil::identify, KpseUtil::environment)
-    end
-    def okay?
-        @kpse && @tree
-    end
-    def set(key,value)
-        @kpse.set(@tree,key,value)
-    end
-    def load_cnf
-        @kpse.load_cnf(@tree)
-    end
-    def load_lsr
-        @kpse.load_lsr(@tree)
-    end
-    def expand_variables
-        @kpse.expand_variables(@tree)
-    end
-    def expand_braces(str)
-        clean_name(@kpse.expand_braces(@tree,str))
-    end
-    def expand_path(str)
-        clean_name(@kpse.expand_path(@tree,str))
-    end
-    def expand_var(str)
-        clean_name(@kpse.expand_var(@tree,str))
-    end
-    def show_path(str)
-        clean_name(@kpse.show_path(@tree,str))
-    end
-    def var_value(str)
-        clean_name(@kpse.var_value(@tree,str))
-    end
-    def find_file(filename)
-        clean_name(@kpse.find_file(@tree,filename))
-    end
-    def find_files(filename,first=false)
-        # dodo: each filename
-        @kpse.find_files(@tree,filename,first)
-    end
-
-    private
-
-    def clean_name(str)
-        str.gsub(/\\/,'/')
-    end
-
-end
-
-
-# kpse_merge_file: 't:/ruby/base/kpsedirect.rb'
-
-class KpseDirect
-
-    attr_accessor :progname, :format, :engine
-
-    def initialize
-        @progname, @format, @engine = '', '', ''
-    end
-
-    def expand_path(str)
-        clean_name(`kpsewhich -expand-path=#{str}`.chomp)
-    end
-
-    def expand_var(str)
-        clean_name(`kpsewhich -expand-var=#{str}`.chomp)
-    end
-
-    def find_file(str)
-        clean_name(`kpsewhich #{_progname_} #{_format_} #{str}`.chomp)
-    end
-
-    def _progname_
-        if @progname.empty? then '' else "-progname=#{@progname}" end
-    end
-    def _format_
-        if @format.empty?   then '' else "-format=\"#{@format}\"" end
-    end
-
-    private
-
-    def clean_name(str)
-        str.gsub(/\\/,'/')
-    end
-
-end
-
-
-# kpse_merge_stop
-
-
-
-$mswindows = Config::CONFIG['host_os'] =~ /mswin/
-$separator = File::PATH_SEPARATOR
-$version   = "2.0.3"
-$ownpath   = File.dirname($0)
-
-if $mswindows then
-    require "win32ole"
-    require "Win32API"
-end
-
-# exit if defined?(REQUIRE2LIB)
-
-$stdout.sync = true
-$stderr.sync = true
-
-$applications = Hash.new
-$suffixinputs = Hash.new
-$predefined   = Hash.new
-$runners      = Hash.new
-
-$suffixinputs['pl']  = 'PERLINPUTS'
-$suffixinputs['rb']  = 'RUBYINPUTS'
-$suffixinputs['py']  = 'PYTHONINPUTS'
-$suffixinputs['lua'] = 'LUAINPUTS'
-$suffixinputs['jar'] = 'JAVAINPUTS'
-$suffixinputs['pdf'] = 'PDFINPUTS'
-
-$predefined['texexec']  = 'texexec.rb'
-$predefined['texutil']  = 'texutil.rb'
-$predefined['texfont']  = 'texfont.pl'
-$predefined['texshow']  = 'texshow.pl'
-
-$predefined['makempy']  = 'makempy.pl'
-$predefined['mptopdf']  = 'mptopdf.pl'
-$predefined['pstopdf']  = 'pstopdf.rb'
-
-$predefined['examplex'] = 'examplex.rb'
-$predefined['concheck'] = 'concheck.rb'
-
-$predefined['runtools'] = 'runtools.rb'
-$predefined['textools'] = 'textools.rb'
-$predefined['tmftools'] = 'tmftools.rb'
-$predefined['ctxtools'] = 'ctxtools.rb'
-$predefined['rlxtools'] = 'rlxtools.rb'
-$predefined['pdftools'] = 'pdftools.rb'
-$predefined['mpstools'] = 'mpstools.rb'
-$predefined['exatools'] = 'exatools.rb'
-$predefined['xmltools'] = 'xmltools.rb'
-# $predefined['luatools'] = 'luatools.lua'
-# $predefined['mtxtools'] = 'mtxtools.rb'
-
-$predefined['newpstopdf']   = 'pstopdf.rb'
-$predefined['newtexexec']   = 'texexec.rb'
-$predefined['pdftrimwhite'] = 'pdftrimwhite.pl'
-
-$makelist = [
-    # context
-    'texexec',
-    'texutil',
-    'texfont',
-    # mp/ps
-    'pstopdf',
-    'mptopdf',
-    'makempy',
-    # misc
-    'ctxtools',
-    'pdftools',
-    'xmltools',
-    'textools',
-    'mpstools',
-    'tmftools',
-    'exatools',
-    'runtools',
-    'rlxtools',
-    'pdftrimwhite',
-    'texfind',
-    'texshow'
-    #
-    # no 'luatools',
-    # no 'mtxtools',
-    # no, 'texmfstart'
-]
-
-$scriptlist   = 'rb|pl|py|lua|jar'
-$documentlist = 'pdf|ps|eps|htm|html'
-
-$editor       = ENV['TEXMFSTART_EDITOR'] || ENV['EDITOR'] || ENV['editor'] || 'scite'
-
-$crossover    = true # to other tex tools, else only local
-$kpse         = nil
-
-def set_applications(page=1)
-
-    $applications['unknown']  = ''
-    $applications['ruby']     = $applications['rb']  = 'ruby'
-    $applications['lua']      = $applications['lua'] = 'lua'
-    $applications['perl']     = $applications['pl']  = 'perl'
-    $applications['python']   = $applications['py']  = 'python'
-    $applications['java']     = $applications['jar'] = 'java'
-
-    if $mswindows then
-        $applications['pdf']  = ['',"pdfopen --page #{page} --file",'acroread']
-        $applications['html'] = ['','netscape','mozilla','opera','iexplore']
-        $applications['ps']   = ['','gview32','gv','gswin32','gs']
-    else
-        $applications['pdf']  = ["pdfopen --page #{page} --file",'acroread']
-        $applications['html'] = ['netscape','mozilla','opera']
-        $applications['ps']   = ['gview','gv','gs']
-    end
-
-    $applications['htm']      = $applications['html']
-    $applications['eps']      = $applications['ps']
-
-    $runners['lua']           = "texlua"
-
-end
-
-set_applications()
-
-def check_kpse
-    if $kpse then
-        # already done
-    else
-        begin
-            if KpseRemote::available? then
-                $kpse = KpseRemote.new
-                if $kpse.okay? then
-                    puts("kpse     : remote") if $verbose
-                else
-                    $kpse = KpseDirect.new
-                    puts("kpse     : direct (forced)") if $verbose
-                end
-            else
-                $kpse = KpseDirect.new
-                puts("kpse     : direct") if $verbose
-            end
-        rescue
-            puts("kpse     : direct (fallback)") if $verbose
-        end
-    end
-end
-
-if $mswindows then
-
-    GetShortPathName = Win32API.new('kernel32', 'GetShortPathName', ['P','P','N'], 'N')
-    GetLongPathName  = Win32API.new('kernel32', 'GetLongPathName',  ['P','P','N'], 'N')
-
-    def dowith_pathname (filename,filemethod)
-        filename = filename.gsub(/\\/o,'/') # no gsub! because filename can be frozen
-        case filename
-            when /\;/o then
-                # could be a path spec
-                return filename
-            when /\s+/o then
-                # danger lurking
-                buffer = ' ' * 260
-                length = filemethod.call(filename,buffer,buffer.size)
-                if length>0 then
-                    return buffer.slice(0..length-1)
-                else
-                    # when the path or file does not exist, nothing is returned
-                    # so we try to handle the path separately from the basename
-                    basename = File.basename(filename)
-                    pathname = File.dirname(filename)
-                    length = filemethod.call(pathname,buffer,260)
-                    if length>0 then
-                        return buffer.slice(0..length-1) + '/' + basename
-                    else
-                        return filename
-                    end
-                end
-            else
-                # no danger
-                return filename
-        end
-    end
-
-    def longpathname (filename)
-        dowith_pathname(filename,GetLongPathName)
-    end
-
-    def shortpathname (filename)
-        dowith_pathname(filename,GetShortPathName)
-    end
-
-else
-
-    def longpathname (filename)
-        filename
-    end
-
-    def shortpathname (filename)
-        filename
-    end
-
-end
-
-class File
-
-    # def File.needsupdate(oldname,newname)
-        # begin
-            # if $mswindows then
-                # return File.stat(oldname).mtime > File.stat(newname).mtime
-            # else
-                # return File.stat(oldname).mtime != File.stat(newname).mtime
-            # end
-        # rescue
-            # return true
-        # end
-    # end
-
-    @@update_eps = 1
-
-    def File.needsupdate(oldname,newname)
-        begin
-            oldtime = File.stat(oldname).mtime.to_i
-            newtime = File.stat(newname).mtime.to_i
-            if newtime >= oldtime then
-                return false
-            elsif oldtime-newtime < @@update_eps then
-                return false
-            else
-                return true
-            end
-        rescue
-            return true
-        end
-    end
-
-    def File.syncmtimes(oldname,newname)
-        return
-        begin
-            if $mswindows then
-                # does not work (yet) / gives future timestamp
-                # t = File.mtime(oldname) # i'm not sure if the time is frozen, so we do it here
-                # File.utime(0,t,oldname,newname)
-            else
-                t = File.mtime(oldname) # i'm not sure if the time is frozen, so we do it here
-                File.utime(0,t,oldname,newname)
-            end
-        rescue
-        end
-    end
-
-    def File.timestamp(name)
-        begin
-            "#{File.stat(name).mtime}"
-        rescue
-            return 'unknown'
-        end
-    end
-
-end
-
-# def hashed (arr=[])
-    # arg = if arr.class == String then arr.split(' ') else arr.dup end
-    # hsh = Hash.new
-    # if arg.length > 0
-        # hsh['arguments'] = ''
-        # done = false
-        # arg.each do |s|
-            # if done then
-                # if s =~ / / then
-                   # hsh['arguments'] += " \"#{s}\"" # maybe split on =
-                # else
-                   # hsh['arguments'] += " #{s}"
-                # end
-            # else
-                # kvl = s.split('=')
-                # if kvl[0].sub!(/^\-+/,'') then
-                    # hsh[kvl[0]] = if kvl.length > 1 then kvl[1] else true end
-                # else
-                    # hsh['file'] = s
-                    # done = true
-                # end
-            # end
-        # end
-    # end
-    # return hsh
-# end
-
-def hashed (arr=[])
-    arg = if arr.class == String then arr.split(' ') else arr.dup end
-    hsh = Hash.new
-    if arg.length > 0
-        hsh['arguments'] = ''
-        done = false
-        arg.each do |s|
-            if done then
-                if s =~ /\s/ then
-                    kvl = s.split('=')
-                    if kvl[1] and kvl[1] !~ /^[\"\']/ then
-                        hsh['arguments'] += ' ' + kvl[0] + "=" + '"' + kvl[1] + '"'
-                    elsif s =~ /\s/ then
-                        hsh['arguments'] += ' "' + s + '"'
-                    else
-                        hsh['arguments'] += ' ' + s
-                    end
-                else
-                    hsh['arguments'] += ' ' + s
-                end
-            else
-                kvl = s.split('=')
-                if kvl[0].sub!(/^\-+/,'') then
-                    hsh[kvl[0]] = if kvl.length > 1 then kvl[1] else true end
-                else
-                    hsh['file'] = s
-                    done = true
-                end
-            end
-        end
-    end
-    return hsh
-end
-
-
-def launch(filename)
-    if $browser && $mswindows then
-        filename = filename.gsub(/\.[\/\\]/) do
-            Dir.getwd + '/'
-        end
-        report("launching #{filename}")
-        ie = WIN32OLE.new("InternetExplorer.Application")
-        ie.visible = true
-        ie.navigate(filename)
-        return true
-    else
-        return false
-    end
-end
-
-# env|environment
-# rel|relative
-# loc|locate|kpse|path|file
-
-def quoted(str)
-    if str =~ /^\"/ then
-        return str
-    elsif str =~ / / then
-        return "\"#{str}\""
-    else
-        return str
-    end
-end
-
-def expanded(arg) # no "other text files", too restricted
-    arg.gsub(/(env|environment)\:([a-zA-Z\-\_\.0-9]+)/o) do
-        method, original, resolved = $1, $2, ''
-        if resolved = ENV[original] then
-            report("environment variable #{original} expands to #{resolved}") unless $report
-            quoted(resolved)
-        else
-            report("environment variable #{original} cannot be resolved") unless $report
-            quoted(original)
-        end
-    end . gsub(/(rel|relative)\:([a-zA-Z\-\_\.0-9]+)/o) do
-        method, original, resolved = $1, $2, ''
-        ['.','..','../..'].each do |r|
-            if FileTest.file?(File.join(r,original)) then
-                resolved = File.join(r,original)
-                break
-            end
-        end
-        if resolved.empty? then
-            quoted(original)
-        else
-            quoted(resolved)
-        end
-    end . gsub(/(kpse|loc|locate|file|path)\:([a-zA-Z\-\_\.0-9]+)/o) do
-        method, original, resolved = $1, $2, ''
-        if $program && ! $program.empty? then
-            # pstrings = ["-progname=#{$program}"]
-            pstrings = [$program]
-        else
-            # pstrings = ['','-progname=context']
-            pstrings = ['','context']
-        end
-        # auto suffix with texinputs as fall back
-        if ENV["_CTX_K_V_#{original}_"] then
-            resolved = ENV["_CTX_K_V_#{original}_"]
-            report("environment provides #{original} as #{resolved}") unless $report
-            quoted(resolved)
-        else
-            check_kpse
-            pstrings.each do |pstr|
-                if resolved.empty? then
-                    # command = "kpsewhich #{pstr} #{original}"
-                    # report("running #{command}")
-                    report("locating '#{original}' in program space '#{pstr}'")
-                    begin
-                        # resolved = `#{command}`.chomp
-                        $kpse.progname = pstr
-                        $kpse.format = ''
-                        resolved = $kpse.find_file(original).gsub(/\\/,'/')
-                    rescue
-                        resolved = ''
-                    end
-                end
-                # elsewhere in the tree
-                if resolved.empty? then
-                    # command = "kpsewhich #{pstr} -format=\"other text files\" #{original}"
-                    # report("running #{command}")
-                    report("locating '#{original}' in program space '#{pstr}' using format 'other text files'")
-                    begin
-                        # resolved = `#{command}`.chomp
-                        $kpse.progname = pstr
-                        $kpse.format = 'other text files'
-                        resolved = $kpse.find_file(original).gsub(/\\/,'/')
-                    rescue
-                        resolved = ''
-                    end
-                end
-            end
-            if resolved.empty? then
-                original = File.dirname(original) if method =~ /path/
-                report("#{original} is not resolved") unless $report
-                ENV["_CTX_K_V_#{original}_"] = original if $crossover
-                quoted(original)
-            else
-                resolved = File.dirname(resolved) if method =~ /path/
-                report("#{original} is resolved to #{resolved}") unless $report
-                ENV["_CTX_K_V_#{original}_"] = resolved if $crossover
-                quoted(resolved)
-            end
-        end
-    end
-end
-
-def changeddir?(path)
-    if path.empty? then
-        return true
-    else
-        oldpath = File.expand_path(path)
-        begin
-            Dir.chdir(path) if not path.empty?
-        rescue
-            report("unable to change to directory: #{path}")
-        else
-            report("changed to directory: #{path}")
-        end
-        newpath = File.expand_path(Dir.getwd)
-        return oldpath == newpath
-    end
-end
-
-def runcommand(command)
-    if $locate then
-        command = command.split(' ').collect do |c|
-            if c =~ /\//o then
-                begin
-                    cc = File.expand_path(c)
-                    c = cc if FileTest.file?(cc)
-                rescue
-                end
-            end
-            c
-        end . join(' ')
-        print command # to stdout and no newline
-    elsif $execute then
-        report("using 'exec' instead of 'system' call: #{command}")
-        exec(command) if changeddir?($path)
-    else
-        report("using 'system' call: #{command}")
-        system(command) if changeddir?($path)
-    end
-end
-
-def join_command(args)
-    args[0] = $runners[args[0]] || args[0]
-    [args].join(' ')
-end
-
-def runoneof(application,fullname,browserpermitted)
-    if browserpermitted && launch(fullname) then
-        return true
-    else
-        fullname = quoted(fullname) # added because MM ran into problems
-        report("starting #{$filename}") unless $report
-        output("\n") if $report && $verbose
-        applications = $applications[application.downcase]
-        if ! applications then
-            output("problems with determining application type")
-            return true
-        elsif applications.class == Array then
-            if $report then
-                output(join_command([fullname,expanded($arguments)]))
-                return true
-            else
-                applications.each do |a|
-                    return true if runcommand(join_command([a,fullname,expanded($arguments)]))
-                end
-            end
-        elsif applications.empty? then
-            if $report then
-                output(join_command([fullname,expanded($arguments)]))
-                return true
-            else
-                return runcommand(join_command([fullname,expanded($arguments)]))
-            end
-        else
-            if $report then
-                output(join_command([applications,fullname,expanded($arguments)]))
-                return true
-            else
-                return runcommand(join_command([applications,fullname,expanded($arguments)]))
-            end
-        end
-        return false
-    end
-end
-
-def report(str)
-    $stdout.puts(str) if $verbose
-end
-
-def output(str)
-    $stdout.puts(str)
-end
-
-def usage
-    print "version  : #{$version} - 2003/2006 - www.pragma-ade.com\n"
-    print("\n")
-    print("usage    : texmfstart [switches] filename [optional arguments]\n")
-    print("\n")
-    print("switches : --verbose --report --browser --direct --execute --locate --iftouched --ifchanged\n")
-    print("           --program --file --page --arguments --batch --edit --report --clear\n")
-    print("           --make --lmake --wmake --path --stubpath --indirect --before --after\n")
-    print("           --tree --autotree --environment --showenv\n")
-    print("\n")
-    print("example  : texmfstart pstopdf.rb cow.eps\n")
-    print("           texmfstart --locate examplex.rb\n")
-    print("           texmfstart --execute examplex.rb\n")
-    print("           texmfstart --browser examplap.pdf\n")
-    print("           texmfstart showcase.pdf\n")
-    print("           texmfstart --page=2 --file=showcase.pdf\n")
-    print("           texmfstart --program=yourtex yourscript.rb arg-1 arg-2\n")
-    print("           texmfstart --direct xsltproc kpse:somefile.xsl somefile.xml\n")
-    print("           texmfstart --direct ruby rel:wn-cleanup-1.rb oldfile.xml newfile.xml\n")
-    print("           texmfstart bin:xsltproc env:somepreset path:somefile.xsl somefile.xml\n")
-    print("           texmfstart --iftouched=normal,lowres downsample.rb normal lowres\n")
-    print("           texmfstart --ifchanged=somefile.dat --direct processit somefile.dat\n")
-    print("           texmfstart bin:scite kpse:texmf.cnf\n")
-    print("           texmfstart --exec bin:scite *.tex\n")
-    print("           texmfstart --edit texmf.cnf\n")
-    print("           texmfstart --edit kpse:texmf.cnf\n")
-    print("           texmfstart --serve\n")
-    print("\n")
-    print("           texmfstart --stubpath=/usr/local/bin [--make --remove] --verbose all\n")
-    print("           texmfstart --stubpath=auto [--make --remove] all\n")
-    print("\n")
-    check_kpse
-end
-
-# somehow registration does not work out (at least not under windows)
-# the . is also not accepted by unix as seperator
-
-def tag(name)
-    if $crossover then "_CTX_K_S_#{name}_" else "TEXMFSTART.#{name}" end
-end
-
-def registered?(filename)
-    return ENV[tag(filename)] != nil
-end
-
-def registered(filename)
-    return ENV[tag(filename)] || 'unknown'
-end
-
-def register(filename,fullname)
-    if fullname && ! fullname.empty? then # && FileTest.file?(fullname)
-        ENV[tag(filename)] = fullname
-        report("registering '#{filename}' as '#{fullname}'")
-        return true
-    else
-        return false
-    end
-end
-
-def find(filename,program)
-    begin
-        filename = filename.sub(/script:/o, '') # so we have bin: and script: and nothing
-        if $predefined.key?(filename) then
-            report("expanding '#{filename}' to '#{$predefined[filename]}'")
-            filename = $predefined[filename]
-        end
-        if registered?(filename) then
-            report("already located '#{filename}'")
-            return registered(filename)
-        end
-        # create suffix list
-        if filename =~ /^(.*)\.(.+)$/ then
-            filename = $1
-            suffixlist = [$2]
-        else
-            suffixlist = [$scriptlist.split('|'),$documentlist.split('|')].flatten
-        end
-        # first we honor a given path
-        if filename =~ /[\\\/]/ then
-            report("trying to honor '#{filename}'")
-            suffixlist.each do |suffix|
-                fullname = filename+'.'+suffix
-                if FileTest.file?(fullname) && register(filename,fullname)
-                    return shortpathname(fullname)
-                end
-            end
-        end
-        filename.sub!(/^.*[\\\/]/, '')
-        # next we look at the current path and the callerpath
-        pathlist = [ ]
-        progpath = $applications[suffixlist[0]]
-        threadok = registered("THREAD") !~ /unknown/
-        pathlist << ['.','current']
-        pathlist << [$ownpath,'caller']                                 if $ownpath != '.'
-        pathlist << ["#{$ownpath}/../#{progpath}",'caller']             if progpath
-        pathlist << [registered("THREAD"),'thread']                     if threadok
-        pathlist << ["#{registered("THREAD")}/../#{progpath}",'thread'] if progpath && threadok
-        pathlist.each do |p|
-            if p && ! p.empty? && ! (p[0] == 'unknown') then
-                suffixlist.each do |suffix|
-                    fname = "#{filename}.#{suffix}"
-                    fullname = File.expand_path(File.join(p[0],fname))
-                    report("locating '#{fname}' in #{p[1]} path '#{p[0]}'")
-                    if FileTest.file?(fullname) && register(filename,fullname) then
-                        report("'#{fname}' located in #{p[1]} path")
-                        return shortpathname(fullname)
-                    end
-                end
-            end
-        end
-        # now we consult environment settings
-        fullname = nil
-        check_kpse
-        $kpse.progname = program
-        suffixlist.each do |suffix|
-            begin
-                break unless $suffixinputs[suffix]
-                environment = ENV[$suffixinputs[suffix]] || ENV[$suffixinputs[suffix]+".#{$program}"]
-                if ! environment || environment.empty? then
-                    begin
-                        # environment = `kpsewhich -expand-path=\$#{$suffixinputs[suffix]}`.chomp
-                        environment = $kpse.expand_path("\$#{$suffixinputs[suffix]}")
-                    rescue
-                        environment = nil
-                    else
-                        if environment && ! environment.empty? then
-                            report("using kpsewhich variable #{$suffixinputs[suffix]}")
-                        end
-                    end
-                elsif environment && ! environment.empty? then
-                    report("using environment variable #{$suffixinputs[suffix]}")
-                end
-                if environment && ! environment.empty? then
-                    environment.split($separator).each do |e|
-                        e.strip!
-                        e = '.' if e == '\.' # somehow . gets escaped
-                        e += '/' unless e =~ /[\\\/]$/
-                        fullname = e + filename + '.' + suffix
-                        report("testing '#{fullname}'")
-                        if FileTest.file?(fullname) then
-                            break
-                        else
-                            fullname = nil
-                        end
-                    end
-                end
-            rescue
-                report("environment string '#{$suffixinputs[suffix]}' cannot be used to locate '#{filename}'")
-                fullname = nil
-            else
-                return shortpathname(fullname) if register(filename,fullname)
-            end
-        end
-        return shortpathname(fullname) if register(filename,fullname)
-        # then we fall back on kpsewhich
-        suffixlist.each do |suffix|
-            # TDS script scripts location as per 2004
-            if suffix =~ /(#{$scriptlist})/ then
-                begin
-                    report("using 'kpsewhich' to locate '#{filename}' in suffix space '#{suffix}' (1)")
-                    # fullname = `kpsewhich -progname=#{program} -format=texmfscripts #{filename}.#{suffix}`.chomp
-                    $kpse.format = 'texmfscripts'
-                    fullname = $kpse.find_file("#{filename}.#{suffix}").gsub(/\\/,'/')
-                rescue
-                    report("kpsewhich cannot locate '#{filename}' in suffix space '#{suffix}' (1)")
-                    fullname = nil
-                else
-                    return shortpathname(fullname) if register(filename,fullname)
-                end
-            end
-            # old TDS location: .../texmf/context/...
-            begin
-                report("using 'kpsewhich' to locate '#{filename}' in suffix space '#{suffix}' (2)")
-                # fullname = `kpsewhich -progname=#{program} -format="other text files" #{filename}.#{suffix}`.chomp
-                $kpse.format = 'other text files'
-                fullname = $kpse.find_file("#{filename}.#{suffix}").gsub(/\\/,'/')
-            rescue
-                report("kpsewhich cannot locate '#{filename}' in suffix space '#{suffix}' (2)")
-                fullname = nil
-            else
-                return shortpathname(fullname) if register(filename,fullname)
-            end
-        end
-        return shortpathname(fullname) if register(filename,fullname)
-        # let's take a look at the path
-        paths = ENV['PATH'].split($separator)
-        suffixlist.each do |s|
-            paths.each do |p|
-                suffixedname = "#{filename}.#{s}"
-                report("checking #{p} for #{filename}")
-                if FileTest.file?(File.join(p,suffixedname)) then
-                    fullname = File.join(p,suffixedname)
-                    return  shortpathname(fullname) if register(filename,fullname)
-                end
-            end
-        end
-        # bad luck, we need to search the tree ourselves
-        if (suffixlist.length == 1) && (suffixlist.first =~ /(#{$documentlist})/) then
-            report("aggressively locating '#{filename}' in document trees")
-            begin
-                # texroot = `kpsewhich -expand-var=$SELFAUTOPARENT`.chomp
-                texroot = $kpse.expand_var("$SELFAUTOPARENT")
-            rescue
-                texroot = ''
-            else
-                texroot.sub!(/[\\\/][^\\\/]*?$/, '')
-            end
-            if not texroot.empty? then
-                sffxlst = suffixlist.join(',')
-                begin
-                    report("locating '#{filename}' in document tree '#{texroot}/doc*'")
-                    if (result = Dir.glob("#{texroot}/doc*/**/#{filename}.{#{sffxlst}}")) && result && result[0] && FileTest.file?(result[0]) then
-                        fullname = result[0]
-                    end
-                rescue
-                    report("locating '#{filename}.#{suffixlist.join('|')}' in tree '#{texroot}' aborted")
-                end
-            end
-            return shortpathname(fullname) if register(filename,fullname)
-        end
-        report("aggressively locating '#{filename}' in tex trees")
-        begin
-            # textrees = `kpsewhich -expand-var=$TEXMF`.chomp
-            textrees = $kpse.expand_var("$TEXMF")
-        rescue
-            textrees = ''
-        end
-        if not textrees.empty? then
-            textrees.gsub!(/[\{\}\!]/, '')
-            textrees = textrees.split(',')
-            if (suffixlist.length == 1) && (suffixlist.first =~ /(#{$documentlist})/) then
-                speedup = ['doc**','**']
-            else
-                speedup = ['**']
-            end
-            sffxlst = suffixlist.join(',')
-            speedup.each do |speed|
-                textrees.each do |tt|
-                    tt.gsub!(/[\\\/]$/, '')
-                    if FileTest.directory?(tt) then
-                        begin
-                            report("locating '#{filename}' in tree '#{tt}/#{speed}/#{filename}.{#{sffxlst}}'")
-                            if (result = Dir.glob("#{tt}/#{speed}/#{filename}.{#{sffxlst}}")) && result && result[0] && FileTest.file?(result[0]) then
-                                fullname = result[0]
-                                break
-                            end
-                        rescue
-                            report("locating '#{filename}' in tree '#{tt}' aborted")
-                            next
-                        end
-                    end
-                end
-                break if fullname && ! fullname.empty?
-            end
-        end
-        if register(filename,fullname) then
-            return shortpathname(fullname)
-        else
-            return ''
-        end
-    rescue
-        error, trace = $!, $@.join("\n")
-        report("fatal error: #{error}\n#{trace}")
-        # report("fatal error")
-    end
-end
-
-def run(fullname)
-    if ! fullname || fullname.empty? then
-        output("the file '#{$filename}' is not found")
-    elsif FileTest.file?(fullname) then
-        begin
-            case fullname
-                when /\.(#{$scriptlist})$/i then
-                    return runoneof($1,fullname,false)
-                when /\.(#{$documentlist})$/i then
-                    return runoneof($1,fullname,true)
-                else
-                    return runoneof('unknown',fullname,false)
-            end
-        rescue
-            report("starting '#{$filename}' in program space '#{$program}' fails (#{$!})")
-        end
-    else
-        report("the file '#{$filename}' in program space '#{$program}' is not accessible")
-    end
-    return false
-end
-
-def direct(fullname)
-    begin
-        return runcommand([fullname.sub(/^(bin|binary)\:/, ''),expanded($arguments)].join(' '))
-    rescue
-        return false
-    end
-end
-
-def edit(filename)
-    begin
-        return runcommand([$editor,expanded(filename),expanded($arguments)].join(' '))
-    rescue
-        return false
-    end
-end
-
-def make(filename,windows=false,linux=false,remove=false)
-    basename = File.basename(filename).gsub(/\.[^.]+?$/, '')
-    if $stubpath == 'auto' then
-        basename = File.dirname($0) + '/' + basename
-    else
-        basename = $stubpath + '/' + basename unless $stubpath.empty?
-    end
-    if filename == 'texmfstart' then
-        program = 'ruby'
-        command = 'kpsewhich --format=texmfscripts --progname=context texmfstart.rb'
-        filename = `#{command}`.chomp.gsub(/\\/, '/')
-        if filename.empty? then
-            report("failure: #{command}")
-            return
-        elsif not remove then
-            if windows then
-                ['bat','exe'].each do |suffix|
-                    if FileTest.file?("#{basename}.#{suffix}") then
-                        report("windows stub '#{basename}.#{suffix}' skipped (already present)")
-                        return
-                    end
-                end
-            elsif linux && FileTest.file?(basename) then
-                report("unix stub '#{basename}' skipped (already present)")
-                return
-            end
-        end
-    else
-        program = nil
-        if filename =~ /[\\\/]/ && filename =~ /\.(#{$scriptlist})$/ then
-            program = $applications[$1]
-        end
-        filename = "\"#{filename}\"" if filename =~ /\s/
-        program = 'texmfstart' if $indirect || ! program || program.empty?
-    end
-    begin
-        callname = $predefined[filename.sub(/\.*?$/,'')] || filename
-        if remove then
-            if windows && (File.delete(basename+'.bat') rescue false) then
-                report("windows stub '#{basename}.bat' removed (calls #{callname})")
-            elsif linux && (File.delete(basename) rescue false) then
-                report("unix stub '#{basename}' removed (calls #{callname})")
-            end
-        else
-            if windows && f = open(basename+'.bat','w') then
-                f.binmode
-                f.write("@echo off\015\012")
-                f.write("#{program} #{callname} %*\015\012")
-                f.close
-                report("windows stub '#{basename}.bat' made (calls #{callname})")
-            elsif linux && f = open(basename,'w') then
-                f.binmode
-                f.write("#!/bin/sh\012")
-                f.write("#{program} #{callname} \"$@\"\012")
-                f.close
-                report("unix stub '#{basename}' made (calls #{callname})")
-            end
-        end
-    rescue
-        report("failed to make stub '#{basename}' #{$!}")
-        return false
-    else
-        return true
-    end
-end
-
-def process(&block)
-    if $iftouched then
-        files = $directives['iftouched'].split(',')
-        oldname, newname = files[0], files[1]
-        if oldname && newname && File.needsupdate(oldname,newname) then
-            report("file #{oldname}: #{File.timestamp(oldname)}")
-            report("file #{newname}: #{File.timestamp(newname)}")
-            report("file is touched, processing started")
-            yield
-            File.syncmtimes(oldname,newname)
-        else
-            report("file #{oldname} is untouched")
-        end
-    elsif $ifchanged then
-        filename = $directives['ifchanged']
-        checkname = filename + ".md5"
-        oldchecksum, newchecksum = "old", "new"
-        begin
-            newchecksum = MD5.new(IO.read(filename)).hexdigest.upcase
-        rescue
-            newchecksum = "new"
-        else
-            begin
-                oldchecksum = IO.read(checkname).chomp
-            rescue
-                oldchecksum = "old"
-            end
-        end
-        if $verbose then
-            report("old checksum #{filename}: #{oldchecksum}")
-            report("new checksum #{filename}: #{newchecksum}")
-        end
-        if oldchecksum != newchecksum then
-            report("file is changed, processing started")
-            begin
-                File.open(checkname,'w') do |f|
-                    f << newchecksum
-                end
-            rescue
-            end
-            yield
-        else
-            report("file #{filename} is unchanged")
-        end
-    else
-        yield
-    end
-end
-
-def checkenvironment(tree)
-    report('')
-    ENV['TMP'] = ENV['TMP'] || ENV['TEMP'] || ENV['TMPDIR'] || ENV['HOME']
-    case RUBY_PLATFORM
-        when /(mswin|bccwin|mingw|cygwin)/i then ENV['TEXOS'] = ENV['TEXOS'] || 'texmf-mswin'
-        when /(linux)/i                     then ENV['TEXOS'] = ENV['TEXOS'] || 'texmf-linux'
-        when /(darwin|rhapsody|nextstep)/i  then ENV['TEXOS'] = ENV['TEXOS'] || 'texmf-macosx'
-    #   when /(netbsd|unix)/i               then # todo
-        else                                     # todo
-    end
-    ENV['TEXOS']   = "#{ENV['TEXOS'].sub(/^[\\\/]*/, '').sub(/[\\\/]*$/, '')}"
-    ENV['TEXPATH'] = tree.sub(/\/+$/,'') # + '/'
-    ENV['TEXMFOS'] = "#{ENV['TEXPATH']}/#{ENV['TEXOS']}"
-    report('')
-    report("preset : TEXPATH => #{ENV['TEXPATH']}")
-    report("preset : TEXOS   => #{ENV['TEXOS']}")
-    report("preset : TEXMFOS => #{ENV['TEXMFOS']}")
-    report("preset : TMP => #{ENV['TMP']}")
-    report('')
-end
-
-def loadfile(filename)
-    begin
-        IO.readlines(filename).each do |line|
-            case line.chomp
-                when /^[\#\%]/ then
-                    # comment
-                when /^(.*?)\s*(\>|\=|\<)\s*(.*)\s*$/ then
-                    # = assign | > prepend | < append
-                    key, how, value = $1, $2, $3
-                    begin
-                        # $SAFE = 0
-                        value.gsub!(/\%(.*?)\%/) do
-                            ENV[$1] || ''
-                        end
-                        # value.gsub!(/\;/,$separator) if key =~ /PATH/i then
-                        case how
-                            when '=', '<<' then ENV[key] = value
-                            when '?', '??' then ENV[key] = ENV[key] || value
-                            when '<', '+=' then ENV[key] = (ENV[key] || '') + $separator + value
-                            when '>', '=+' then ENV[key] = value + $separator + (ENV[key] ||'')
-                        end
-                    rescue
-                        report("user set failed : #{key} (#{$!})")
-                    else
-                        report("user set : #{key} => #{ENV[key]}")
-                    end
-            end
-        end
-    rescue
-        report("error in reading file '#{filename}'")
-    end
-end
-
-def loadtree(tree)
-    begin
-        unless tree.empty? then
-            if File.directory?(tree) then
-                setuptex = File.join(tree,'setuptex.tmf')
-            else
-                setuptex = tree.dup
-            end
-            if FileTest.file?(setuptex) then
-                report("tex tree definition: #{setuptex}")
-                checkenvironment(File.dirname(setuptex))
-                loadfile(setuptex)
-            else
-                report("no setup file '#{setuptex}'")
-            end
-        end
-    rescue
-        # maybe tree is empty or boolean (no arg given)
-    end
-end
-
-def loadenvironment(environment)
-    begin
-        unless environment.empty? then
-            filename = if $path.empty? then environment else File.expand_path(File.join($path,environment)) end
-            if FileTest.file?(filename) then
-                report("environment : #{environment}")
-                loadfile(filename)
-            else
-                report("no environment file '#{environment}'")
-            end
-        end
-    rescue
-        report("problem while loading '#{environment}'")
-    end
-end
-
-def show_environment
-    if $showenv then
-        keys = ENV.keys.sort
-        size = 0
-        keys.each do |k|
-            size = k.size if k.size > size
-        end
-        report('')
-        keys.each do |k|
-            report("#{k.rjust(size)} => #{ENV[k]}")
-        end
-        report('')
-    end
-end
-
-def execute(arguments) # br global
-
-    arguments = arguments.split(/\s+/) if arguments.class == String
-    $directives = hashed(arguments)
-
-    $help        = $directives['help']        || false
-    $batch       = $directives['batch']       || false
-    $filename    = $directives['file']        || ''
-    $program     = $directives['program']     || 'context'
-    $direct      = $directives['direct']      || false
-    $edit        = $directives['edit']        || false
-    $page        = $directives['page']        || 1
-    $browser     = $directives['browser']     || false
-    $report      = $directives['report']      || false
-    $verbose     = $directives['verbose']     || false
-    $arguments   = $directives['arguments']   || ''
-    $execute     = $directives['execute']     || $directives['exec'] || false
-    $locate      = $directives['locate']      || false
-
-    $autotree    = if $directives['autotree'] then (ENV['TEXMFSTART_TREE'] || ENV['TEXMFSTARTTREE'] || '') else '' end
-
-    $path        = $directives['path']        || ''
-    $tree        = $directives['tree']        || $autotree || ''
-    $environment = $directives['environment'] || ''
-
-    $make        = $directives['make']        || false
-    $remove      = $directives['remove']      || $directives['delete'] || false
-    $unix        = $directives['unix']        || false
-    $windows     = $directives['windows']     || $directives['mswin'] || false
-    $stubpath    = $directives['stubpath']    || ''
-    $indirect    = $directives['indirect']    || false
-
-    $before      = $directives['before']      || ''
-    $after       = $directives['after']       || ''
-
-    $iftouched   = $directives['iftouched']   || false
-    $ifchanged   = $directives['ifchanged']   || false
-
-    $openoffice  = $directives['oo']          || false
-
-    $crossover   = false if $directives['clear']
-
-    $showenv     = $directives['showenv']     || false
-    $verbose     = true if $showenv
-
-    $serve       = $directives['serve']       || false
-
-    $verbose = true if (ENV['_CTX_VERBOSE_'] =~ /(y|yes|t|true|on)/io) && ! $locate && ! $report
-
-    set_applications($page)
-
-    # private:
-
-    $selfmerge   = $directives['selfmerge'] || false
-    $selfcleanup = $directives['selfclean'] || $directives['selfcleanup'] || false
-
-    ENV['_CTX_VERBOSE_'] = 'yes' if $verbose
-
-    if $openoffice then
-        if ENV['OOPATH'] then
-            if FileTest.directory?(ENV['OOPATH']) then
-                report("using open office python")
-                if $mswindows then
-                    $applications['python'] = $applications['py']  = "\"#{File.join(ENV['OOPATH'],'program','python.bat')}\""
-                else
-                    $applications['python'] = $applications['py']  = File.join(ENV['OOPATH'],'python')
-                end
-                report("python path #{$applications['python']}")
-            else
-                report("environment variable 'OOPATH' does not exist")
-            end
-        else
-            report("environment variable 'OOPATH' is not set")
-        end
-    end
-
-    if $selfmerge then
-        output("ruby libraries are cleaned up") if SelfMerge::cleanup
-        output("ruby libraries are merged")     if SelfMerge::merge
-        return true
-    elsif $selfcleanup then
-        output("ruby libraries are cleaned up") if SelfMerge::cleanup
-        return true
-    elsif $serve then
-        if ENV['KPSEMETHOD'] && ENV['KPSEPORT'] then
-            # # kpse_merge_done: require 'base/kpseremote'
-            begin
-                KpseRemote::start_server
-            rescue
-                return false
-            else
-                return true
-            end
-        else
-            usage
-            puts("")
-            puts("message  : set 'KPSEMETHOD' and 'KPSEPORT' variables")
-            return false
-        end
-    elsif $help || ! $filename || $filename.empty? then
-        usage
-        loadtree($tree)
-        loadenvironment($environment)
-        show_environment()
-        return true
-    elsif $batch && $filename && ! $filename.empty? then
-        # todo, take commands from file and avoid multiple starts and checks
-        return false
-    else
-        report("texmfstart version #{$version}")
-        loadtree($tree)
-        loadenvironment($environment)
-        show_environment()
-        if $make || $remove then
-            if $filename == 'all' then
-                makelist = $makelist
-            else
-                makelist = [$filename]
-            end
-            makelist.each do |filename|
-                if $windows then
-                    make(filename,true,false,$remove)
-                elsif $unix then
-                    make(filename,false,true,$remove)
-                else
-                    make(filename,$mswindows,!$mswindows,$remove)
-                end
-            end
-            return true # guess
-        elsif $browser && $filename =~ /^http\:\/\// then
-            return launch($filename)
-        else
-            begin
-                process do
-                    if $direct || $filename =~ /^bin\:/ then
-                        return direct($filename)
-                    elsif $edit && ! $editor.empty? then
-                        return edit($filename)
-                    else # script: or no prefix
-                        command = find(shortpathname($filename),$program)
-                        if command then
-                            register("THREAD",File.dirname(File.expand_path(command)))
-                            return run(command)
-                        else
-                            report('unable to locate program')
-                            return false
-                        end
-                    end
-                end
-            rescue
-                report('fatal error in starting process')
-                return false
-            end
-        end
-    end
-
-end
-
-if execute(ARGV) then
-    report("\nexecution was successful") if $verbose
-    exit(0)
-else
-    report("\nexecution failed") if $verbose
-    exit(1)
-end
+../../texmf-dist/scripts/context/ruby/texmfstart.rb
\ No newline at end of file
diff --git a/Master/bin/i386-linux/texshow b/Master/bin/i386-linux/texshow
new file mode 120000
index 00000000000..52a03692b74
--- /dev/null
+++ b/Master/bin/i386-linux/texshow
@@ -0,0 +1 @@
+../../texmf-dist/scripts/context/stubs/unix/texshow
\ No newline at end of file
diff --git a/Master/bin/i386-linux/textools b/Master/bin/i386-linux/textools
index 7445eac371c..d1a20375405 100755..120000
--- a/Master/bin/i386-linux/textools
+++ b/Master/bin/i386-linux/textools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart textools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/textools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/texutil b/Master/bin/i386-linux/texutil
index 607154af059..78f249c7f02 100755..120000
--- a/Master/bin/i386-linux/texutil
+++ b/Master/bin/i386-linux/texutil
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart texutil.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/texutil
\ No newline at end of file
diff --git a/Master/bin/i386-linux/tftopl b/Master/bin/i386-linux/tftopl
index 2d29a1e18a3..bfec76c510d 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 8e189f99b7d..c393be762fa 100755
--- a/Master/bin/i386-linux/tie
+++ b/Master/bin/i386-linux/tie
diff --git a/Master/bin/i386-linux/tmftools b/Master/bin/i386-linux/tmftools
index 7531a966390..444a68a40ee 100755..120000
--- a/Master/bin/i386-linux/tmftools
+++ b/Master/bin/i386-linux/tmftools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart tmftools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/tmftools
\ No newline at end of file
diff --git a/Master/bin/i386-linux/ttf2afm b/Master/bin/i386-linux/ttf2afm
index bd1dc6b90b0..69bddc4056a 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 6d9b4c5fcdb..02bcb7ac526 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 0f9cf7235bc..a78252e206d 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 d4b208f5c7c..1521811e45b 100755
--- a/Master/bin/i386-linux/ttftotype42
+++ b/Master/bin/i386-linux/ttftotype42
diff --git a/Master/bin/i386-linux/vftovp b/Master/bin/i386-linux/vftovp
index 8daf3169eee..31a14e5919a 100755
--- a/Master/bin/i386-linux/vftovp
+++ b/Master/bin/i386-linux/vftovp
diff --git a/Master/bin/i386-linux/vlna b/Master/bin/i386-linux/vlna
new file mode 100755
index 00000000000..3a59b91fb80
--- /dev/null
+++ b/Master/bin/i386-linux/vlna
diff --git a/Master/bin/i386-linux/vptovf b/Master/bin/i386-linux/vptovf
index 3f5aa3ef47b..ffa7b9b3a3f 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 e6b1c6ea0a5..5990a0714ca 100755
--- a/Master/bin/i386-linux/weave
+++ b/Master/bin/i386-linux/weave
diff --git a/Master/bin/i386-linux/xdvi b/Master/bin/i386-linux/xdvi
index 679b3f05aa7..29632097df1 100755
--- a/Master/bin/i386-linux/xdvi
+++ b/Master/bin/i386-linux/xdvi
@@ -17,15 +17,22 @@ test -f /bin/bsh && test -z "$RUNNING_BSH" \
   && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
 RUNNING_BSH=
 
-# -help and -version only work if they are the only options. Therefore,
-# we cannot give the "-name xdvi" parameter in that case.
-# SU: Actually, with current xdvik, they should work in any position; but
-# we may keep this for compatibility with older versions and non-k xdvi.
+# -help and -version only used to work if they were the only options,
+# so the "-name xdvi" parameter wasn't used in that case. With current
+# xdvik, it should work in any case, but we keep this logic for compatibility
+# with older xdvik and plain xdvi versions.
+have_basename=`basename foo/bar 2>&1 | grep -i 'not found'`
+if [ "$have_basename"xxx = "xxx" ]; then
+    BASE_NAME=`basename $0`
+else
+    BASE_NAME=`echo $0 | sed 's!.*/!!'`
+fi
+
 case "$#:$1" in
   1:-help|1:-version)
     NAMEOPT=;;
   *)
-    NAMEOPT='-name xdvi';;
+    NAMEOPT="-name $BASE_NAME";;
 esac
 
 xdviappfile=`kpsewhich -progname=xdvi --format='other text files' XDvi`
@@ -43,4 +50,4 @@ if test -n "$xdviappfile"; then
   XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
 fi
 
-exec xdvi-xaw.bin $NAMEOPT ${1+"$@"}
+exec xdvi-xaw $NAMEOPT ${1+"$@"}
diff --git a/Master/bin/i386-linux/xdvi-xaw b/Master/bin/i386-linux/xdvi-xaw
new file mode 100755
index 00000000000..3aae3b04ce2
--- /dev/null
+++ b/Master/bin/i386-linux/xdvi-xaw
diff --git a/Master/bin/i386-linux/xdvi-xaw.bin b/Master/bin/i386-linux/xdvi-xaw.bin
deleted file mode 100755
index e29fe986a9f..00000000000
--- a/Master/bin/i386-linux/xdvi-xaw.bin
+++ /dev/null
diff --git a/Master/bin/i386-linux/xdvipdfmx b/Master/bin/i386-linux/xdvipdfmx
index 1fa5084cbc6..f63f1cf24ec 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 922fd8aeca0..6f6c84cd6c6 100755
--- a/Master/bin/i386-linux/xetex
+++ b/Master/bin/i386-linux/xetex
diff --git a/Master/bin/i386-linux/xindy.mem b/Master/bin/i386-linux/xindy.mem
index 265ca4ee674..fa2e1c61cbe 100644
--- a/Master/bin/i386-linux/xindy.mem
+++ b/Master/bin/i386-linux/xindy.mem
diff --git a/Master/bin/i386-linux/xmltools b/Master/bin/i386-linux/xmltools
index 03086d0436b..873458dcc92 100755..120000
--- a/Master/bin/i386-linux/xmltools
+++ b/Master/bin/i386-linux/xmltools
@@ -1,2 +1 @@
-#!/bin/sh
-texmfstart xmltools.rb "$@"
+../../texmf-dist/scripts/context/stubs/unix/xmltools
\ No newline at end of file