147 files changed, 1480 insertions, 222 deletions

diff --git a/Master/bin/i386-linux/afm2pl b/Master/bin/i386-linux/afm2pl
index 7f936a63b38..c7924505ee1 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 5bb55196ee9..d04f380e34d 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 fe20c7480c9..0f32dfbb577 100755
--- a/Master/bin/i386-linux/aleph
+++ b/Master/bin/i386-linux/aleph
diff --git a/Master/bin/i386-linux/bg5conv b/Master/bin/i386-linux/bg5conv
index 19f33036cfb..bc50ee870f0 100755
--- a/Master/bin/i386-linux/bg5conv
+++ b/Master/bin/i386-linux/bg5conv
diff --git a/Master/bin/i386-linux/bg5latex b/Master/bin/i386-linux/bg5latex
index b9a36fa844c..257a8446e21 100755
--- a/Master/bin/i386-linux/bg5latex
+++ b/Master/bin/i386-linux/bg5latex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/bg5pdflatex b/Master/bin/i386-linux/bg5pdflatex
index f65d86d5417..80adc376a93 100755
--- a/Master/bin/i386-linux/bg5pdflatex
+++ b/Master/bin/i386-linux/bg5pdflatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/bibtex b/Master/bin/i386-linux/bibtex
index 1c045d14a9f..b9476246ac5 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 3ca8f59b235..f47aa5e3208 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 286e6a89fb8..b3144e92a90 100755
--- a/Master/bin/i386-linux/cef5conv
+++ b/Master/bin/i386-linux/cef5conv
diff --git a/Master/bin/i386-linux/cef5latex b/Master/bin/i386-linux/cef5latex
index b8917c1cd26..7eda1633766 100755
--- a/Master/bin/i386-linux/cef5latex
+++ b/Master/bin/i386-linux/cef5latex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/cef5pdflatex b/Master/bin/i386-linux/cef5pdflatex
index bd398e0240c..25fe066a53f 100755
--- a/Master/bin/i386-linux/cef5pdflatex
+++ b/Master/bin/i386-linux/cef5pdflatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/cefconv b/Master/bin/i386-linux/cefconv
index 7dbfcb57139..629b4d24dfc 100755
--- a/Master/bin/i386-linux/cefconv
+++ b/Master/bin/i386-linux/cefconv
diff --git a/Master/bin/i386-linux/ceflatex b/Master/bin/i386-linux/ceflatex
index 50c5be54fd9..d34244d9a5b 100755
--- a/Master/bin/i386-linux/ceflatex
+++ b/Master/bin/i386-linux/ceflatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/cefpdflatex b/Master/bin/i386-linux/cefpdflatex
index 0615149c5b9..4c7309f2bf2 100755
--- a/Master/bin/i386-linux/cefpdflatex
+++ b/Master/bin/i386-linux/cefpdflatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/cefsconv b/Master/bin/i386-linux/cefsconv
index 3e8171d7c1c..421a61e7582 100755
--- a/Master/bin/i386-linux/cefsconv
+++ b/Master/bin/i386-linux/cefsconv
diff --git a/Master/bin/i386-linux/cefslatex b/Master/bin/i386-linux/cefslatex
index fb2944ceda7..619d08c7577 100755
--- a/Master/bin/i386-linux/cefslatex
+++ b/Master/bin/i386-linux/cefslatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/cefspdflatex b/Master/bin/i386-linux/cefspdflatex
index 1985eebe5c8..02bf6598f71 100755
--- a/Master/bin/i386-linux/cefspdflatex
+++ b/Master/bin/i386-linux/cefspdflatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/cfftot1 b/Master/bin/i386-linux/cfftot1
index 40ecf754aec..5610ecaba6f 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 0af5f80b79d..5d2b37abaf5 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 2b14c9cace6..dc2524b07e4 100755
--- a/Master/bin/i386-linux/ctie
+++ b/Master/bin/i386-linux/ctie
diff --git a/Master/bin/i386-linux/cweave b/Master/bin/i386-linux/cweave
index 7b109820627..b09dbff39fe 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 521006e684d..72465085d06 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 46867d2dbd4..15bf558a378 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 baa150ef9ff..f6e046e1e96 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 ee432e48dde..682952b7b2a 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 c4c3586fae7..f5071b591f2 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 98b22e98bf1..5df8f64e55d 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 c5f98211e9e..d1fa2c59331 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 abd9383829f..498566e0dbb 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 d07d61acc9c..c4645b79cbd 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 938c4f25487..bfb1fabae42 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 4225a70f5b0..fc7ae87b41d 100755
--- a/Master/bin/i386-linux/dvidvi
+++ b/Master/bin/i386-linux/dvidvi
diff --git a/Master/bin/i386-linux/dvigif b/Master/bin/i386-linux/dvigif
deleted file mode 120000
index c1eef0afe05..00000000000
--- a/Master/bin/i386-linux/dvigif
+++ /dev/null
@@ -1 +0,0 @@
-dvipng
\ No newline at end of file
diff --git a/Master/bin/i386-linux/dvilj b/Master/bin/i386-linux/dvilj
index f2bdaa322b8..cd9ff89a83e 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 86b830e0796..a022806715c 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 21df3529361..1392c6b4a0c 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 54cbdd2ffb1..db483f91edb 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 f412d32ed03..beb331abeaf 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 8bd48b7579c..818fb5f6596 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 08521a8293b..b52bec0a237 100755
--- a/Master/bin/i386-linux/dvipng
+++ b/Master/bin/i386-linux/dvipng
diff --git a/Master/bin/i386-linux/dvips b/Master/bin/i386-linux/dvips
index e1c18f0bd14..5452ece5312 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 641ac7969ac..42004f895f6 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 7f4512cba27..5d2398a7c72 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 7c3dd524ca4..302bdc64414 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 845c543246a..85c8c651cb3 100755
--- a/Master/bin/i386-linux/dvitype
+++ b/Master/bin/i386-linux/dvitype
diff --git a/Master/bin/i386-linux/ebb b/Master/bin/i386-linux/ebb
index dc7254a44e9..a46caa546e4 100755
--- a/Master/bin/i386-linux/ebb
+++ b/Master/bin/i386-linux/ebb
diff --git a/Master/bin/i386-linux/epsffit b/Master/bin/i386-linux/epsffit
index 7935813642f..98201815821 100755
--- a/Master/bin/i386-linux/epsffit
+++ b/Master/bin/i386-linux/epsffit
diff --git a/Master/bin/i386-linux/extconv b/Master/bin/i386-linux/extconv
index 49885811ef6..5ce34d97f7e 100755
--- a/Master/bin/i386-linux/extconv
+++ b/Master/bin/i386-linux/extconv
diff --git a/Master/bin/i386-linux/gbklatex b/Master/bin/i386-linux/gbklatex
index c7fcf7f13bc..f799f7b6e63 100755
--- a/Master/bin/i386-linux/gbklatex
+++ b/Master/bin/i386-linux/gbklatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/gbkpdflatex b/Master/bin/i386-linux/gbkpdflatex
index 6cdb3cfee51..6dd3ee3de9e 100755
--- a/Master/bin/i386-linux/gbkpdflatex
+++ b/Master/bin/i386-linux/gbkpdflatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/getnonfreefonts b/Master/bin/i386-linux/getnonfreefonts
index 21dd7a0fff8..41f628becc0 100755
--- a/Master/bin/i386-linux/getnonfreefonts
+++ b/Master/bin/i386-linux/getnonfreefonts
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env perl
 
 ## getnonfreefonts
-## Copyright 2005 Reinhard Kotucha <reinhard.kotucha@web.de>
+## Copyright 2006 Reinhard Kotucha <reinhard.kotucha@web.de>
 #
 # This work may be distributed and/or modified under the
 # conditions of the LaTeX Project Public License, either version 1.3
@@ -11,156 +11,280 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
+my $TL_version='2006';
 
-# invoke the right shell (code from Thomas Esser):
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
-unset RUNNING_KSH
-
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
-  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
-unset RUNNING_BSH
-
-
-URL="${URL-ftp://tug.org/tex/getnonfreefonts/getfont}"
-
-die () { echo "$1." 1>&2; exit 1; }
-
-OLDIFS=$IFS
-IFS=:
-BINDIRS=`echo $PATH`
-IFS=$OLDIFS
-
-for BINDIR in $BINDIRS; do
-  if test "$BINDIR" != "."; then
-    for FTP_CLIENT in wget lftp ncftpget curl snarf gftp; do
-	test -x $BINDIR/$FTP_CLIENT && FTP=$FTP_CLIENT && break
-    done
-  fi
-done
-
-test -n "$FTP" || die "No ftp client found"
-
-export FTP
-
-case $0 in 
-  *-sys) SYS=true; GETFONT=getfont-sys;;
-      *) SYS=false; GETFONT=getfont;;
-esac
-export SYS GETFONT
-
-ALL=true
-RUNSHELL=false
-
-ARGS_FROM_GETNONFREEFONTS="$@"
-export ARGS_FROM_GETNONFREEFONTS
-
-for ARG in "$@"; do
-  case $ARG in
-    -*)
-      case $ARG in
-        -shell|--shell) RUNSHELL=true;;
-        -ftp-client=*|--ftp-client=*)
-          FTP=`echo "$ARG" | sed 's/.*=//'`;;
-        -url=*|--url=*)
-          URL=`echo "$ARG" | sed 's/.*=//'`;;
-	-h|-help|--help) ALL=false;;
-      esac;;
-    *) ALL=false;;
-  esac
-done
-
-export URL
-
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/getnonfreefonts.$$
-(umask 077; mkdir "${tmpdir}") || die "Can't mkdir ${tmpdir}"
-trap 'rm -rf ${tmpdir}' 0 1 2 3 7 13 15
-
-download () {
-  echo "Downloading: $1"
-  case ${FTP} in
-        wget) wget "$1"        || die "$1: Download failed";;
-        lftp) lftp -c "get $1" || die "$1: Download failed";;
-    ncftpget) ncftpget "$1"    || die "$1: Download failed";;
-        curl) curl -O "$1"     || die "$1: Download failed";;
-       snarf) snarf "$1"       || die "$1: Download failed";;
-        gftp) gftp -d "$1"     || die "$1: Download failed";;
-           *) die "This can't happen";;
-  esac
+my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
+
+use File::Copy;
+use Getopt::Long;
+$Getopt::Long::autoabbrev=0;
+
+$opt_lsfonts=0;
+$opt_force=0;
+
+sub usage {
+    print <<'EOF';
+Usage:
+    getnonfreefonts[-sys] [-a|--all] [-d|--debug] [-f|--force]
+        [-l|--lsfonts] [-v|--verbose] [--version] [font1] [font2] ...
+
+    getnonfreefonts installs fonts in $TEXMFHOME.
+    getnonfreefonts-sys installs fonts in $TEXMFLOCAL.
+
+    Options:
+        -a|--all      Install all fonts.
+
+        -d|--debug    Provide additional messages for debugging.
+
+        -f|--force    Install fonts even if they are installed already.
+
+        -h|--help     Print this message.
+
+        -l|--lsfonts  List all fonts available.
+
+        -v|--verbose  Be more verbose.
+
+        --version     Print version number.
+
+EOF
+;
+}
+
+unless (@ARGV) {
+    usage;
+    exit 1;
+}
+
+GetOptions 
+    "all|a",
+    "debug|d",
+    "force|f",
+    "help|h",
+    "lsfonts|l",
+    "verbose|v",
+    "version",
+    "sys";
+
+$^W=1 if $opt_debug;
+
+my $sys=($0=~/-sys$/)? 1:0;
+$sys=1 if $opt_sys;
+
+@allpackages=@ARGV;
+
+sub message {
+    my $message=shift;
+    if ($message=~/^\[/) {
+	print "$message\n";
+    } else {
+	printf "%-60s", $message;
+    }
+}
+
+
+sub debug_msg {
+    my $message=shift;
+    if ($opt_debug) {
+	print STDERR "DEBUG: $message.\n";
+    }
+}
+
+
+sub expand_var {
+    my $var=shift;
+
+    if (-d "/usr/bin") {
+	open KPSEWHICH, 'kpsewhich --expand-var=\$' . "$var |";
+    } else {
+	open KPSEWHICH, 'kpsewhich --expand-var=$'  . "$var |";
+    }
+    while (<KPSEWHICH>) {
+	chop;
+	return $_;
+    }
+    close KPSEWHICH;
+}
+
+
+
+# get TMP|TEMP|TMPDIR environment variable
+
+if ($opt_debug) {
+    for my $var ("TMP","TEMP","TMPDIR") {
+	if (defined $ENV{$var}) {
+	    debug_msg "Environment variable $var='$ENV{$var}'";
+	} else {
+	    debug_msg "Environment variable $var not set";
+	}
+    }
 }
 
-cd "${tmpdir}" || die "Can't cd ${tmpdir}"
-
-echo -------------------------------------------------------
-echo "FTP client:    ${FTP}"
-echo "Temporary dir: ${tmpdir}"
-echo "URL:           ${URL}"
-echo -------------------------------------------------------
-
-download ${URL}
-
-chmod 700 getfont
-ln -s getfont getfont-sys
-PATH=${tmpdir}:${PATH}
-export PATH
-
-UPDMAP_NEEDED=false
-
-if ${RUNSHELL}; then
-  if ${SYS}; then
-    PS1='[getfont-sys]\$ '
-  else
-    PS1='[getfont]\$ '
-  fi
-  export PS1
-  echo -------------------------------------------------------
-  echo "FTP client:    ${FTP}"
-  echo "Temporary dir: ${tmpdir}"
-  echo "URL:           ${URL}"
-  echo "SYS:           ${SYS}"
-  echo "ARGS:          ${ARGS_FROM_GETNONFREEFONTS}"
-  echo -------------------------------------------------------
-  echo "Run program \"getfont\" or \"getfont-sys\" for each font you want to install."
-  echo; echo "Supported fonts are:"
-  for f in `getfont --lsfonts`; do
-    echo "     $f"
-  done
-  echo; echo "Type \"getfont --help\" for more information."
-  echo "Type \"exit\" to leave this shell."; echo
-
-# Start the shell.  We start a shell even if someone has
-# SHELL=/sbin/shutdown in his environment.
-
-  test -z ${SHELL} || SHELL="/bin/sh"
-  case ${SHELL} in
-    /bin/bash) /bin/bash;;
-     /bin/ksh) /bin/ksh;;
-     /bin/ksh) /bin/ksh;;
-            *) /bin/sh;;
-  esac
-
-  echo "Please run \"updmap\" or \"updmap-sys\" now if necessary."
-else # no shell
-  if ${ALL} ; then
-    for font in `getfont --lsfonts`; do
-      ${GETFONT} ${ARGS_FROM_GETNONFREEFONTS} ${font} && UPDMAP_NEEDED=true
-    done
-  else
-    ${GETFONT} ${ARGS_FROM_GETNONFREEFONTS} && UPDMAP_NEEDED=true
-  fi
-
-  if ${UPDMAP_NEEDED}; then
-    if ${SYS}; then
-      updmap-sys
-    else 
-      updmap
-    fi
-  fi
-fi
-
-cd /
-rm -rf "${tmpdir}"
-
-exit 0
+print "$TL_version\n" and exit 0 if $opt_version; 
+
+
+if (defined $ENV{'TMP'}) {
+    $SYSTMP="$ENV{'TMP'}";
+} elsif (defined $ENV{'TEMP'}) {
+    $SYSTMP="$ENV{'TEMP'}";
+} elsif (defined $ENV{'TMPDIR'}) {
+    $SYSTMP="$ENV{'TMPDIR'}";
+} else {
+    $SYSTMP="/tmp";
+}
+
+debug_msg "Internal variable SYSTMP set to '$SYSTMP'";
+
+# Windows usually uses backslashes though forward slashes are probably
+# allowed.  Perl always needs forward slashes.
+
+# We convert backslashes to forward slashes if it looks like a Windows
+# directory.
+$SYSTMP=~s/\\/\//g if ($SYSTMP=~/^.:\\/); # c:\abc\def
+$SYSTMP=~s/\\/\//g if ($SYSTMP=~/^\\\\/); # \\abc\def
+
+debug_msg "Internal variable SYSTMP converted to '$SYSTMP'";
+
+die "! ERROR: The temporary directory '$SYSTMP' doesn't exist.\n"
+    unless (-d "$SYSTMP");
+
+die "! ERROR: The temporary directory '$SYSTMP' is not writable.\n"
+    unless (-w "$SYSTMP");
+
+
+# Determine INSTALLROOT.
+
+if ($opt_debug) {
+    my @path=split ':', $ENV{PATH};
+    for my $dir (@path) {
+	debug_msg "Search for kpsewhich in '$dir'";
+	opendir DIR, "$dir";
+	my @kpsewichs=grep /^kpsewhich/, readdir DIR;
+	closedir DIR;
+	for (@kpsewichs) {
+	    debug_msg "Found $dir/$_" if /^kpsewhich/;
+	}
+    }
+}
+
+
+if ($sys) {
+    $INSTALLROOT=expand_var 'TEXMFLOCAL';
+} else {
+    $INSTALLROOT=expand_var 'TEXMFHOME';
+}
+
+($sys)? debug_msg "sys=true":debug_msg "sys=false";
+
+debug_msg "INSTALLROOT='$INSTALLROOT'";
+
+$INSTALLROOT=~s/\\/\//g if ($INSTALLROOT=~/^.:\\/); # c:\abc\def
+$INSTALLROOT=~s/\\/\//g if ($INSTALLROOT=~/^\\\\/); # \\abc\def
+
+debug_msg "Internal variable INSTALLROOT converted to '$INSTALLROOT'";
+
+die "! ERROR: The install directory '$INSTALLROOT' doesn't exist.\n"
+    unless (-d "$INSTALLROOT");
+
+die "! ERROR: The install directory '$INSTALLROOT' is not writable.\n"
+    unless (-w "$INSTALLROOT");
+
+
+if ($opt_help) {
+    print "\nThis is getnonfreefonts";
+    print '-sys' if ($sys);
+    print ", version $TL_version.\n\n";
+    
+    usage; 
+    print <<"ENDUSAGE";
+  Directories:
+       temporary: '$SYSTMP/getfont-<PID>'
+       install:   '$INSTALLROOT'
+
+ENDUSAGE
+exit 0;
+}
+
+
+my $tmpdir="$SYSTMP/getfont-$$";
+debug_msg "Internal variable tmpdir set to '$tmpdir'";
+
+mkdir "$tmpdir" or die "! ERROR: Can't mkdir '$tmpdir'.";
+chdir "$tmpdir" or die "! ERROR: Can't cd '$tmpdir'.";
+
+sub remove_tmpdir {
+    chdir "$SYSTMP" or die "! ERROR: Can't cd '$SYSTMP'.\n";
+    opendir TMPDIR, "$tmpdir" 
+	or print "! ERROR: Can't read directory '$tmpdir'.\n";
+
+    @alltmps=readdir TMPDIR;
+    closedir TMPDIR;
+
+    foreach $file (@alltmps) {
+	next if $file=~/^\./;
+	unlink "$tmpdir/$file";
+    }
+    rmdir "$tmpdir" or die "! ERROR: Can't remove directory '$tmpdir'.\n";
+}
+
+# Signal handlers for UNIX, maybe ignored by Windows.
+
+$SIG{INT} =\&remove_tmpdir;
+$SIG{QUIT}=\&remove_tmpdir;
+$SIG{BUS} =\&remove_tmpdir;
+$SIG{PIPE}=\&remove_tmpdir;
+$SIG{TERM}=\&remove_tmpdir;
+$SIG{ABRT}=\&remove_tmpdir;
+$SIG{SEGV}=\&remove_tmpdir;
+
+# Download the script from tug.org.
+
+debug_msg "Running 'wget $getfont_url'";
+
+system ('wget', "$getfont_url");
+
+# Download the fonts.
+
+my @getfont=('perl', "./getfont$TL_version", '--getnonfreefonts');
+push @getfont, "--installroot=$INSTALLROOT";
+push @getfont, '--lsfonts' if $opt_lsfonts;
+push @getfont, '--force' if $opt_force;
+push @getfont, '--debug' if $opt_debug;
+push @getfont, '--verbose' if $opt_verbose;
+push @getfont, '--sys' if $sys;
+push @getfont, '--all' if $opt_all;
+push @getfont, @allpackages;
+
+debug_msg "Running '@getfont'";
+
+system @getfont;
+
+# Evaluate the exit status.  It will be 2 if something had been
+# installed and in this case we need to run texhash/updmap.
+
+my $exit_code=$?;
+my $exit_status=int($exit_code/256);
+
+if ($sys) {		     
+    debug_msg "Info: Execute updmap-sys if exit status is 2";
+} else {
+    debug_msg "Info: Execute updmap if exit status is 2";
+}
+
+debug_msg "Exit status of getfont$TL_version is $exit_status";
+
+if ($exit_status==2) {
+    print "\n";
+    system 'texhash', "$INSTALLROOT";
+    $updmap_command=($sys)? 'updmap-sys':'updmap';
+    @updmap=("$updmap_command");
+    push @updmap, '--quiet' unless $opt_verbose;
+    print "\n";
+    message "Updating map files ($updmap_command)...";
+    system @updmap;
+    
+    message $?? '[failed]':'[done]';
+}
+
+remove_tmpdir;
+
+__END__
diff --git a/Master/bin/i386-linux/gftodvi b/Master/bin/i386-linux/gftodvi
index 7bc4df25cf1..dfc6def584e 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 55118c849c2..768fc0135e2 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 8437e9df6b3..9bcf7e3a9fc 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 89d7b32a5fe..2527f962e74 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 d923eee68d2..c0792dc87ff 100755
--- a/Master/bin/i386-linux/hbf2gf
+++ b/Master/bin/i386-linux/hbf2gf
diff --git a/Master/bin/i386-linux/htcontext b/Master/bin/i386-linux/htcontext
index 190ac31f862..9d6d4549574 100755
--- a/Master/bin/i386-linux/htcontext
+++ b/Master/bin/i386-linux/htcontext
@@ -1,7 +1,7 @@
 #!/bin/sh
-        texexec --arg="opt-arg=$2" --use=tex4ht $5 $1 
+        texexec --arg="ht-1=$2" --use=tex4ht $5 $1 
         tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 -cvalidatehtml ## -d~/WWW/temp/ -m644 
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-linux/htlatex b/Master/bin/i386-linux/htlatex
index 04713bb7794..1b8b7cea74a 100755
--- a/Master/bin/i386-linux/htlatex
+++ b/Master/bin/i386-linux/htlatex
@@ -3,7 +3,7 @@
         latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
         latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
         tex4ht -f/$1  -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 -cvalidatehtml ## -d~/WWW/temp/ -m644 
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-linux/htmex b/Master/bin/i386-linux/htmex
index 7e34ac6d523..b4aa3d9a06e 100755
--- a/Master/bin/i386-linux/htmex
+++ b/Master/bin/i386-linux/htmex
@@ -3,7 +3,7 @@
         mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
         mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
         tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 -cvalidatehtml ## -d~/WWW/temp/ -m644 
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-linux/httex b/Master/bin/i386-linux/httex
index 1fdf5f3d940..44920e72077 100755
--- a/Master/bin/i386-linux/httex
+++ b/Master/bin/i386-linux/httex
@@ -3,7 +3,7 @@
         tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
         tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
         tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 -cvalidatehtml ## -d~/WWW/temp/ -m644 
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-linux/httexi b/Master/bin/i386-linux/httexi
index b3d841ed9a3..0ce3cb4a589 100755
--- a/Master/bin/i386-linux/httexi
+++ b/Master/bin/i386-linux/httexi
@@ -3,7 +3,7 @@
         tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1
         tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1
         tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 -cvalidatehtml ## -d~/WWW/temp/ -m644 
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 #        texindex ?
 
 
diff --git a/Master/bin/i386-linux/info b/Master/bin/i386-linux/info
index d55e74a76a8..1b09714efe4 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 7393d2543cf..acc9f9a7544 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 6a0d41da941..99da61c064a 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 777ee30caa5..10c51362656 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 ca0eb5ffdaa..dcdadf09458 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 b31e9994f7c..989e40d29da 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 422058941e2..764aa6d2a92 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 d6050c990e4..0a2334ec207 100755
--- a/Master/bin/i386-linux/lacheck
+++ b/Master/bin/i386-linux/lacheck
diff --git a/Master/bin/i386-linux/mag b/Master/bin/i386-linux/mag
index 5b8366f33c2..47bbacec4e8 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 7ab165868c8..7d2839ba924 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 33088872fc9..177b8b0050a 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 8aaa9bac1dc..0e4da552209 100755
--- a/Master/bin/i386-linux/makempx
+++ b/Master/bin/i386-linux/makempx
diff --git a/Master/bin/i386-linux/mf b/Master/bin/i386-linux/mf
index e4a1129e87f..f290ef76653 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 e16f8eb38cb..8c468bbc786 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 57ea6fbc161..72175be4e0a 100755
--- a/Master/bin/i386-linux/mft
+++ b/Master/bin/i386-linux/mft
diff --git a/Master/bin/i386-linux/mk4ht b/Master/bin/i386-linux/mk4ht
index 019d9cfc7c8..0f4b664506c 100755
--- a/Master/bin/i386-linux/mk4ht
+++ b/Master/bin/i386-linux/mk4ht
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-# mk4ht                                 2005-09-23-22:09 %
-# Copyright (C) 2003--2005               Eitan M. Gurari %
+# mk4ht                                 2006-08-28-20:45 %
+# Copyright (C) 2003--2006               Eitan M. Gurari %
 #                                                        %
 #                                                        %
 # This work may be distributed and/or modified under the %
@@ -29,56 +29,72 @@ my @options = (
  "ht",   "htlatex",   "latex",    "", "", "-cvalidatehtml",
  "ht",   "httex",     "tex",      "", "", "-cvalidatehtml",
  "ht",   "httexi",    "texi",     "", "", "-cvalidatehtml",
- "ht",   "htcontext", "texexec",  "", "", "-cvalidatehtml",
+ "ht",   "htcontext", "context",  "", "", "-cvalidatehtml",
+ "xh", "xhlatex",  "latex",   "xhtml", "", "-cvalidate",
+ "xh", "xhtex",    "tex",     "xhtml", "", "-cvalidate",
+ "xh", "xhtexi",   "texi",    "xhtml", "", "-cvalidate",
+ "xh", "xhcontext","context",  "xhtml", "", "-cvalidat",
  "uxh", "uxhlatex",  "latex",   "xhtml,uni-html4", " -cunihtf", "-cvalidate",
  "uxh", "uxhtex",    "tex",     "xhtml,uni-html4", " -cunihtf", "-cvalidate",
  "uxh", "uxhtexi",   "texi",    "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "uxh", "uxhcontext","texexec",  "xhtml,uni-html4", " -cunihtf", "-cvalidate",
+ "uxh", "uxhcontext","context",  "xhtml,uni-html4", " -cunihtf", "-cvalidate",
  "xhm", "xhmlatex", "latex",  "xhtml,mathml", " -cunihtf", "-cvalidate",
  "xhm", "xhmtex",   "tex",    "xhtml,mathml", " -cunihtf", "-cvalidate",
  "xhm", "xhmtexi",  "texi",   "xhtml,mathml", " -cunihtf", "-cvalidate",
- "xhm", "xhmcontext","texexec", "xhtml,mathml", " -cunihtf", "-cvalidate",
+ "xhm", "xhmcontext","context", "xhtml,mathml", " -cunihtf", "-cvalidate",
  "mz", "mzlatex",   "latex",   "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
  "mz", "mztex",     "tex",     "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
  "mz", "mztexi",    "texi",    "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "mz", "mzcontext", "texexec", "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "oo", "oolatex",   "latex",   "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-coo -cvalidate",
- "oo", "ootex",     "tex",     "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-coo -cvalidate",
- "oo", "ootexi",    "texi",    "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-coo -cvalidate",
- "oo", "oocontext", "texexec", "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-coo -cvalidate",
+ "mz", "mzcontext", "context", "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
+ "oo", "oolatex",   "latex",   "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
+ "oo", "ootex",     "tex",     "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
+ "oo", "ootexi",    "texi",    "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
+ "oo", "oocontext", "context", "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
+ "es", "eslatex",   "latex",   "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
+ "es", "estex",     "tex",     "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
+ "es", "estexi",    "texi",    "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
+ "es", "escontext", "context", "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
+ "js", "jslatex",   "latex",   "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
+ "js", "jstex",     "tex",     "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
+ "js", "jstexi",    "texi",    "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
+ "js", "jscontext", "context", "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
  "tei",  "teilatex",  "latex",   "xhtml,tei",    " -cunihtf",  "-cvalidate",
  "tei",  "teitex",    "tex",     "xhtml,tei",    " -cunihtf",  "-cvalidate",
  "tei",  "teitexi",   "texi",    "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "tei",  "teicontext","texexec", "xhtml,tei",    " -cunihtf",  "-cvalidate",
+ "tei",  "teicontext","context", "xhtml,tei",    " -cunihtf",  "-cvalidate",
  "teim", "teimlatex", "latex",   "xhtml,tei-mml"," -cunihtf",  "-cvalidate",
  "teim", "teimtex",   "tex",     "xhtml,tei-mml"," -cunihtf",  "-cvalidate",
  "teim", "teimtexi",  "texi",    "xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "teim", "teimcontext","texexec","xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "db",  "dblatex",   "latex",   "xhtml,docbook",     " -cunihtf",  "-cvalidate",
- "db",  "dbtex",     "tex",     "xhtml,docbook",     " -cunihtf",  "-cvalidate",
- "db",  "dbtexi",    "texi",    "xhtml,docbook",     " -cunihtf",  "-cvalidate",
- "db",  "dbcontext", "texexec", "xhtml,docbook",     " -cunihtf",  "-cvalidate",
- "dbm", "dbmlatex",  "latex",   "xhtml,docbook-mml", " -cunihtf",  "-cvalidate",
- "dbm", "dbmtex",    "tex",     "xhtml,docbook-mml", " -cunihtf",  "-cvalidate",
- "dbm", "dbmtexi",   "texi",    "xhtml,docbook-mml", " -cunihtf",  "-cvalidate",
- "dbm", "dbmcontext","texexec", "xhtml,docbook-mml", " -cunihtf",  "-cvalidate",
+ "teim", "teimcontext","context","xhtml,tei-mml"," -cunihtf",  "-cvalidate",
+ "db",  "dblatex",   "latex",   "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
+ "db",  "dbtex",     "tex",     "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
+ "db",  "dbtexi",    "texi",    "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
+ "db",  "dbcontext", "context", "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
+ "dbm", "dbmlatex",  "latex",   "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
+ "dbm", "dbmtex",    "tex",     "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
+ "dbm", "dbmtexi",   "texi",    "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
+ "dbm", "dbmcontext","context", "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
  "w", "wlatex",   "latex",   "xhtml,word", " -csymhtf", "",
  "w", "wtex",     "tex",     "xhtml,word", " -csymhtf", "",
  "w", "wtexi",    "texi",    "xhtml,word", " -csymhtf", "",
- "w", "wcontext", "texexec", "xhtml,word", " -csymhtf", "",
- "jh", "jhlatex",  "latex",  "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidate",
- "jh", "jhtex",    "tex",    "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidate",
- "jh", "jhtexi",   "texi",   "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidate",
- "jh", "jhcontext","texexec", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidate",
+ "w", "wcontext", "context", "xhtml,word", " -csymhtf", "",
+ "jh", "jhlatex",  "latex",  "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
+ "jh", "jhtex",    "tex",    "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
+ "jh", "jhtexi",   "texi",   "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
+ "jh", "jhcontext","context", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
+ "jh1", "jh1latex",  "latex",  "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
+ "jh1", "jh1tex",    "tex",    "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
+ "jh1", "jh1texi",   "texi",   "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
+ "jh1", "jh1context","context", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
 
 );
 
 sub showInstrucions(){
   print " option1:  mk4ht #1 \"#2\" \"#3\" \"#4\" \"#5\"\n";
   print " \n";
-  print "    #1: htlatex, mzlatex, oolatex, dblatex, dbmlatex,\n";
-  print "        teilatex, teimlatex, uxhlatex, wlatex, xhlatex,\n";
-  print "        xhmlatex\n";
+  print "    #1: htlatex, xhlatex, mzlatex, oolatex, dblatex, dbmlatex,\n";
+  print "        jhlatex, eslatex, teilatex, teimlatex, uxhlatex,  \n";
+  print "        wlatex, xhmlatex\n";
   print " \n";
   print "        also 'tex', 'texi', and 'context' instead of 'latex'\n";
   print " \n";
@@ -99,9 +115,70 @@ sub showInstrucions(){
   print " variable, the  requests for the commands \"latex\",\n";
   print " \"tex\", etc. can be replaced with other equivalent\n";
   print " commands (e.g., \"tex -fmt=latex\").\n";
+
+  print "--------------------------------------------------------------------------\n";
+print "           Private configuration file: mk4ht.cfg\n";
+print "--------------------------------------------------------------------------\n";
+print "\n";
+print "A private configuration file mk4ht.cfg or .mk4ht may be placed at the\n";
+print "work or home directory, to update existing commands and introduce new\n";
+print "ones. The configuration file may contain records of the following\n";
+print "kinds.\n";
+print "\n";
+print "   #  Comment\n";
+print "    \n";
+print "   name = type\n";
+print "          Defines a ht*tex like command, and assocites to it the \n";
+print "          TeX compiler of the specified type. Examples of TeX \n";
+print "          types: latex, tex, texi, and context.\n";
+print "    \n";
+print "   name.tex = options\n";
+print "          Command line options for the compilation under\n";
+print "          the (la)tex compiler\n";
+print "      \n";
+print "   name.tex4ht = options\n";
+print "          Command line options for tex4ht.c \n";
+print "    \n";
+print "   name.t4ht = options\n";
+print "          Command line options for t4ht.c\n";
+print "    \n";
+print "Each record should appear in a different line.  Variants\n";
+print "`name.tex += options', `name.tex4ht += options',\n";
+print "`name.t4ht += options' of the above records are also allowed.\n";
+print "They append the listed options to the base values.\n";
+print "\n";
+print "Example:\n";
+print "\n";
+print "   foohlatex         = latex\n";
+print "   foohlatex.tex     = xhtml,uni-html4\n";
+print "   foohlatex.tex4ht += -cunihtf\n";
+print "   foohlatex.t4ht    = -cvalidate\n";
+print "   htlatex.t4ht     += -d./\n";
+
+
+  print "--------------------------------------------------------------------------\n";
+print "           Deleting files\n";
+print "--------------------------------------------------------------------------\n";
+print "\n";
+print "The configuration file mk4ht.cfg may also contain requests for\n";
+print "removing files created in the work directory during the compilation.\n";
+print "The requests are to be made through records of the following forms.\n";
+print "\n";
+print "   clean ext1 ext2 ...\n";
+print "     The extensions of the file name to be removed.\n";
+print "   \n";
+print "   clean.name ext1 ext2 ...\n";
+print "     Conditional request. The `name' refers to the ht*tex \n";
+print "     like command in use.\n";
+print "\n";
+print "Example:\n";
+print "  clean             dvi idv\n";
+print "  clean.foohlatex   lg \n";
+print "  clean.htlatex     lg tmp\n";
+
 }
 
-print "mk4ht (2005-09-23-22:09)\n";
+print "mk4ht (2006-08-28-20:45)\n";
 if(  !@ARGV  ){
   print "improper command\n";
   showInstrucions(); exit(1);
@@ -110,22 +187,118 @@ my @command=("","","","","");
 my $i=0;
 my $j=0;
 my $param;
+my $name;
+my $compiler;
+my $tex;
+my $tex4ht;
+my $t4ht;
+my $texp;
+my $tex4htp = "";
+my $t4htp = "";
+my @ext;
+
 foreach $param (@ARGV) {
   if( $i == 0 ){
+    my $inf;
+open $inf, "<mk4ht.cfg"
+or
+(  open $inf, "<.mk4ht"
+   or
+  (
+     open $inf, "<" . $ENV{HOME} . "/mk4ht.cfg"
+     or
+     (
+        open $inf, "<" . $ENV{HOME} . "/.mk4ht"
+        or $inf = ""
+) )  )
+;
+
+if( $inf ){
+   print "(mk4ht cfg)\n";
+   while(<$inf>) {
+     my($line) = $_;
+     chomp($line);      # remove eoln char
+     if ($line =~ m|\s*#.*|) {}
+     elsif($line =~ m|^\s*(\S*)\.(\S*)\s*\+=\s*(.*\S)\s*$|) {
+         if( ($param."tex4ht") eq ($1.$2) ){
+              $tex4htp = $tex4htp . " " . $3;
+         }
+         elsif( ($param."t4ht") eq ($1.$2) ){
+              $t4htp = $t4htp . " " . $3;
+         }
+         elsif( ($param."tex") eq ($1.$2) ){
+              $texp = $texp . "," . $3;
+         }
+     }
+     elsif($line =~ m|^\s*(\S*)\.(\S*)\s*=\s*(.*\S)\s*$|) {
+         if( ($param."tex4ht") eq ($1.$2) ){
+              $tex4ht = $3 . " ";
+              $tex4htp = "";
+         }
+         elsif( ($param."t4ht") eq ($1.$2) ){
+              $t4ht = $3 . " ";
+              $t4htp = "";
+         }
+         elsif( ($param."tex") eq ($1.$2) ){
+              $tex = $3 . ",";
+              $texp = "";
+         }
+     }
+     elsif($line =~ m|^\s*(\S*)\s*=\s*(.*\S)\s*$|) {
+         if( $param eq $1 ){
+              $name = $1;
+              $compiler = $2;
+         }
+     }
+     elsif($line =~ m|^\s*clean\s+(.+)|){
+   my(@array) = split(' ',$1);
+   push(@ext,@array);
+} elsif($line =~ m|^\s*clean\.(\S+)\s+(.+)|){
+   if( $1 eq @ARGV[0] ){
+      my(@array) = split(' ',$2);
+      push(@ext,@array);
+}  }
+
+     elsif ($line) { print "--- Error --- " . $line . "\n"; }
+   }
+   close $inf;
+}
+
     for( $j=1; $j<$#options; $j+=6 ){
       if( $param eq $options[$j] ){
-         if( $options[$j-1] eq "" ){
-           $command[0] = $options[$j];
+         if( $name ){
+            $command[0] = "ht".$compiler;
+if( $tex    ){ $command[2] = $tex;    } else { $command[2] = ""; }
+if( $tex4ht ){ $command[3] = $tex4ht; } else { $command[3] = ""; }
+if( $t4ht   ){ $command[4] = $t4ht;   } else { $command[4] = ""; }
+
          } else {
-           $command[0] = "ht".$options[$j+1];
+            if( $options[$j-1] eq "" ){
+  $command[0] = $options[$j];
+} else {
+  $command[0] = "ht".$options[$j+1];
+}
+if( $tex    ){ $command[2] = $tex;    } else { $command[2] = $options[$j+2]; }
+if( $tex4ht ){ $command[3] = $tex4ht; } else { $command[3] = $options[$j+3]; }
+if( $t4ht   ){ $command[4] = $t4ht;   } else { $command[4] = $options[$j+4]; }
+
          }
-         $command[2] = $options[$j+2];
-         $command[3] = $options[$j+3];
-         $command[4] = $options[$j+4];
+         if( $texp   ){ $command[2] = $command[2] . "," . $texp; }
+if( $tex4htp){ $command[3] = $command[3] . " " . $tex4htp; }
+if( $t4htp  ){ $command[4] = $command[4] . " " . $t4htp; }
+
          last;
     } }
-    if( $j>$#options ){ print "improper command: $param \n";
-                        showInstrucions(); exit(1); }
+    if( $j>$#options ){
+      if( $name ){ $command[0] = "ht".$compiler;
+if( $tex    ){ $command[2] = $tex;    } else { $command[2] = ""; }
+if( $tex4ht ){ $command[3] = $tex4ht; } else { $command[3] = ""; }
+if( $t4ht   ){ $command[4] = $t4ht;   } else { $command[4] = ""; }
+ }
+      else {
+          print "improper command: $param \n";
+          showInstrucions(); exit(1);
+    } }
   } elsif ( $i== 1 ) {
     $command[1] = $param;
   } elsif ( $i== 2 ) {
@@ -148,6 +321,22 @@ print "$commando\n";
 my $rtrn;
 if( $rtrn = system($commando) ){
    print "--- error --- failed to execute command\n";
-} else { exit( !$rtrn ); }
+} else {
+   my $file;
+my $ext;
+my(@array) = split('\.',@ARGV[1]);
+my $texFile = @array[0];
+opendir(DIR,".") ;
+while ($file = readdir(DIR) ){
+  if(index($file,$texFile) == 0 ){
+    foreach $ext(@ext){
+    if (index($file,$ext,length($file)-length($ext)) != -1){
+      if( stat($file)){
+         unlink($file);
+         print  "Deleted: ". $file . "\n";
+} } } } }
+closedir(DIR);
 
+   exit( !$rtrn );
+}
 
diff --git a/Master/bin/i386-linux/mmafm b/Master/bin/i386-linux/mmafm
index ff16aa8836a..59687304155 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 402dc00196a..482e4bd7442 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 d31c10ef747..4e57fb3c17e 100755
--- a/Master/bin/i386-linux/mpost
+++ b/Master/bin/i386-linux/mpost
diff --git a/Master/bin/i386-linux/mpto b/Master/bin/i386-linux/mpto
index 91fa99909d6..9c6ffeea1f8 100755
--- a/Master/bin/i386-linux/mpto
+++ b/Master/bin/i386-linux/mpto
diff --git a/Master/bin/i386-linux/musixflx b/Master/bin/i386-linux/musixflx
index d6df22c60dc..bbc6b41a3d2 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 f18888119cb..5805a73d2c7 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 42dfc94eff0..584ac867bf8 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 ed5815e12d0..37df02bb4d3 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 e8f8a9641d5..d50a25cf583 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 443e0fd3ae1..ddf1eb2b9cb 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 89dedb04dde..6859f654ddf 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 a18be6525db..f7d196fdff3 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 0b868f74194..8f27424796a 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 db743a1112d..8ab7ea99a7a 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 e82b5264c39..39073dd8104 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 5712102afc4..b7ca816d504 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 0a0f03e5982..866f3e73230 100755
--- a/Master/bin/i386-linux/pdfclose
+++ b/Master/bin/i386-linux/pdfclose
diff --git a/Master/bin/i386-linux/pdfcrop b/Master/bin/i386-linux/pdfcrop
new file mode 100755
index 00000000000..c7d2319af7a
--- /dev/null
+++ b/Master/bin/i386-linux/pdfcrop
@@ -0,0 +1,308 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
+  if 0;
+use strict;
+$^W=1; # turn warning on
+#
+# pdfcrop.pl
+#
+# Copyright (C) 2002, 2004 Heiko Oberdiek.
+#
+# This program may be distributed and/or modified under the
+# conditions of the LaTeX Project Public License, either version 1.2
+# of this license or (at your option) any later version.
+# The latest version of this license is in
+#   http://www.latex-project.org/lppl.txt
+# and version 1.2 or later is part of all distributions of LaTeX
+# version 1999/12/01 or later.
+#
+# See file "readme.txt" for a list of files that belong to this project.
+#
+# This file "pdfcrop.pl" may be renamed to "pdfcrop"
+# for installation purposes.
+#
+my $file        = "pdfcrop.pl";
+my $program     = uc($&) if $file =~ /^\w+/;
+my $version     = "1.5";
+my $date        = "2004/06/24";
+my $author      = "Heiko Oberdiek";
+my $copyright   = "Copyright (c) 2002, 2004 by $author.";
+#
+# Reqirements: Perl5, Ghostscript
+# History:
+#   2002/10/30 v1.0: First release.
+#   2002/10/30 v1.1: Option --hires added.
+#   2002/11/04 v1.2: "nul" instead of "/dev/null" for windows.
+#   2002/11/23 v1.3: Use of File::Spec module's "devnull" call.
+#   2002/11/29 v1.4: Option --papersize added.
+#   2004/06/24 v1.5: Clear map file entries so that pdfTeX
+#                    does not touch the fonts.
+#
+
+### program identification
+my $title = "$program $version, $date - $copyright\n";
+
+### error strings
+my $Error = "!!! Error:"; # error prefix
+
+### string constants for Ghostscript run
+# get Ghostscript command name
+my $GS = "gs";
+$GS = "gs386"    if $^O =~ /dos/i;
+$GS = "gsos2"    if $^O =~ /os2/i;
+$GS = "gswin32c" if $^O =~ /mswin32/i;
+$GS = "gswin32c" if $^O =~ /cygwin/i;
+
+# Windows detection (no SIGHUP)
+my $Win = 0;
+$Win = 1 if $^O =~ /mswin32/i;
+$Win = 1 if $^O =~ /cygwin/i;
+
+# "null" device
+use File::Spec::Functions qw(devnull);
+my $null = devnull();
+
+### variables
+my $inputfile   = "";
+my $outputfile  = "";
+my $tmp = "tmp-\L$program\E-$$";
+
+### option variables
+my @bool = ("false", "true");
+$::opt_help       = 0;
+$::opt_debug      = 0;
+$::opt_verbose    = 0;
+$::opt_gscmd      = $GS;
+$::opt_pdftexcmd  = "pdftex";
+$::opt_margins    = "0 0 0 0";
+$::opt_clip       = 0;
+$::opt_hires      = 0;
+$::opt_papersize  = "";
+
+my $usage = <<"END_OF_USAGE";
+${title}Syntax:   \L$program\E [options] <input[.pdf]> [output file]
+Function: Margins are calculated and removed for each page in the file.
+Options:                                                    (defaults:)
+  --help              print usage
+  --(no)verbose       verbose printing                      ($bool[$::opt_verbose])
+  --(no)debug         debug informations                    ($bool[$::opt_debug])
+  --gscmd <name>      call of ghostscript                   ($::opt_gscmd)
+  --pdftexcmd <name>  call of pdfTeX                        ($::opt_pdftexcmd)
+  --margins "<left> <top> <right> <bottom>"                 ($::opt_margins)
+                      add extra margins, unit is bp. If only one number is
+                      given, then it is used for all margins, in the case
+                      of two numbers they are also used for right and bottom.
+  --(no)clip          clipping support, if margins are set  ($bool[$::opt_clip])
+  --(no)hires         using `%%HiResBoundingBox'            ($bool[$::opt_hires])
+                      instead of `%%BoundingBox'
+  --papersize <foo>   parameter for gs's -sPAPERSIZE=<foo>,
+                      use only with older gs versions <7.32 ($::opt_papersize)
+Examples:
+  \L$program\E --margins 10 input.pdf output.pdf
+  \L$program\E --margins '5 10 5 20' --clip input.pdf output.pdf
+END_OF_USAGE
+
+### process options
+my @OrgArgv = @ARGV;
+use Getopt::Long;
+GetOptions(
+  "help!",
+  "debug!",
+  "verbose!",
+  "gscmd=s",
+  "pdftexcmd=s",
+  "margins=s",
+  "clip!",
+  "hires!",
+  "papersize=s",
+) or die $usage;
+!$::opt_help or die $usage;
+
+$::opt_verbose = 1 if $::opt_debug;
+
+@ARGV >= 1 or die $usage;
+
+print $title;
+
+@ARGV <= 2 or die "$Error Too many files!\n";
+
+### input file
+$inputfile = shift @ARGV;
+
+if (! -f $inputfile) {
+    if (-f "$inputfile.pdf") {
+        $inputfile .= ".pdf";
+    }
+    else {
+        die "$Error Input file `$inputfile' not found!\n";
+    }
+}
+
+print "* Input file: $inputfile\n" if $::opt_debug;
+
+### output file
+if (@ARGV) {
+    $outputfile = shift @ARGV;
+}
+else {
+    $outputfile = $inputfile;
+    $outputfile =~ s/\.pdf$//i;
+    $outputfile .= "-crop.pdf";
+}
+
+print "* Output file: $outputfile\n" if $::opt_debug;
+
+### margins
+my ($llx, $lly, $urx, $ury) = (0, 0, 0, 0);
+if ($::opt_margins =~
+        /^\s*([\-\.\d]+)\s+([\-\.\d]+)\s+([\-\.\d]+)\s+([\-\.\d]+)\s*$/) {
+    ($llx, $lly, $urx, $ury) = ($1, $2, $3, $4);
+}
+else {
+    if ($::opt_margins =~ /^\s*([\-\.\d]+)\s+([\-\.\d]+)\s*$/) {
+        ($llx, $lly, $urx, $ury) = ($1, $2, $1, $2);
+    }
+    else {
+        if ($::opt_margins =~ /^\s*([\-\.\d]+)\s*$/) {
+            ($llx, $lly, $urx, $ury) = ($1, $1, $1, $1);
+        }
+        else {
+            die "$Error Parse error (option --margins)!\n";
+        }
+    }
+}
+print "* Margins: $llx $lly $urx $ury\n" if $::opt_debug;
+
+### cleanup system
+my @unlink_files = ();
+my $exit_code = 1;
+sub clean {
+    print "* Cleanup\n" if $::opt_debug;
+    if ($::opt_debug) {
+        print "* Temporary files: @unlink_files\n";
+    }
+    else {
+        for (; @unlink_files>0; ) {
+            unlink shift @unlink_files;
+        }
+    }
+}
+sub cleanup {
+    clean();
+    exit($exit_code);
+}
+$SIG{'INT'} = \&cleanup;
+$SIG{'__DIE__'} = \&clean;
+
+### Calculation of BoundingBoxes
+
+my $cmd = "$::opt_gscmd -sDEVICE=bbox -dBATCH -dNOPAUSE ";
+$cmd .= "-sPAPERSIZE=$::opt_papersize " if $::opt_papersize;
+$cmd .= "-c save pop -f " . $inputfile;
+my $cmdpipe = $cmd . " 2>&1 1>$null |";
+
+my $tmpfile = "$tmp.tex";
+push @unlink_files, $tmpfile;
+open(TMP, ">$tmpfile") or
+    die "$Error Cannot write tmp file `$tmpfile'!\n";
+print TMP "\\def\\pdffile{$inputfile}\n";
+print TMP <<'END_TMP_HEAD';
+\csname pdfmapfile\endcsname{}
+\def\page #1 [#2 #3 #4 #5]{%
+  \count0=#1\relax
+  \setbox0=\hbox{%
+    \pdfximage page #1{\pdffile}%
+    \pdfrefximage\pdflastximage
+  }%
+  \pdfhorigin=-#2bp\relax
+  \pdfvorigin=#3bp\relax
+  \pdfpagewidth=#4bp\relax
+  \advance\pdfpagewidth by -#2bp\relax
+  \pdfpageheight=#5bp\relax
+  \advance\pdfpageheight by -#3bp\relax
+  \ht0=\pdfpageheight
+  \shipout\box0\relax
+}
+\def\pageclip #1 [#2 #3 #4 #5][#6 #7 #8 #9]{%
+  \count0=#1\relax
+  \dimen0=#4bp\relax \advance\dimen0 by -#2bp\relax
+  \edef\imagewidth{\the\dimen0}%
+  \dimen0=#5bp\relax \advance\dimen0 by -#3bp\relax
+  \edef\imageheight{\the\dimen0}%
+  \pdfximage page #1{\pdffile}%
+  \setbox0=\hbox{%
+    \kern -#2bp\relax
+    \lower #3bp\hbox{\pdfrefximage\pdflastximage}%
+  }%
+  \wd0=\imagewidth\relax
+  \ht0=\imageheight\relax
+  \dp0=0pt\relax
+  \pdfhorigin=#6pt\relax
+  \pdfvorigin=#7bp\relax
+  \pdfpagewidth=\imagewidth
+  \advance\pdfpagewidth by #6bp\relax
+  \advance\pdfpagewidth by #8bp\relax
+  \pdfpageheight=\imageheight\relax
+  \advance\pdfpageheight by #7bp\relax
+  \advance\pdfpageheight by #9bp\relax
+  \pdfxform0\relax
+  \shipout\hbox{\pdfrefxform\pdflastxform}%
+}%
+END_TMP_HEAD
+
+print "* Running ghostscript for BoundingBox calculation ...\n"
+    if $::opt_verbose;
+print "* Ghostscript pipe: $cmdpipe\n" if $::opt_debug;
+
+my $page = 0;
+open(CMD, $cmdpipe) or
+    die "$Error Cannot call ghostscript!\n";
+while (<CMD>) {
+    my $bb = ($::opt_hires) ? "%%HiResBoundingBox" : "%%BoundingBox";
+    next unless
+        /^$bb:\s*([\.\d]+) ([\.\d]+) ([\.\d]+) ([\.\d]+)/o;
+    $page++;
+    print "* Page $page: $1 $2 $3 $4\n" if $::opt_verbose;
+    if ($::opt_clip) {
+        print TMP "\\pageclip $page [$1 $2 $3 $4][$llx $lly $urx $ury]\n";
+    }
+    else {
+        my ($a, $b, $c, $d) = ($1 - $llx, $2 - $ury, $3 + $urx, $4 + $lly);
+        print TMP "\\page $page [$a $b $c $d]\n";
+    }
+}
+close(CMD);
+
+print TMP "\\csname \@\@end\\endcsname\n\\end\n";
+close(TMP);
+
+### Run pdfTeX
+
+push @unlink_files, "$tmp.log";
+if ($::opt_verbose) {
+    $cmd = "$::opt_pdftexcmd -interaction=nonstopmode $tmp";
+}
+else {
+    $cmd = "$::opt_pdftexcmd -interaction=batchmode $tmp";
+}
+print "* Running pdfTeX ...\n" if $::opt_verbose;
+print "* pdfTeX call: $cmd\n" if $::opt_debug;
+if ($::opt_verbose) {
+    system($cmd);
+}
+else {
+    `$cmd`;
+}
+if ($?) {
+    die "$Error pdfTeX run failed!\n";
+}
+
+### Move temp file to output
+rename "$tmp.pdf", $outputfile or
+    die "$Error Cannot move `$tmp.pdf' to `$outputfile'!\n";
+
+print "==> $page pages written on `$outputfile'.\n";
+
+$exit_code = 0;
+cleanup();
+
+__END__
diff --git a/Master/bin/i386-linux/pdfetex b/Master/bin/i386-linux/pdfetex
index 26e57e34ed5..dd544728765 100755
--- a/Master/bin/i386-linux/pdfetex
+++ b/Master/bin/i386-linux/pdfetex
diff --git a/Master/bin/i386-linux/pdfopen b/Master/bin/i386-linux/pdfopen
index 095eb2015eb..56643c4c0b9 100755
--- a/Master/bin/i386-linux/pdfopen
+++ b/Master/bin/i386-linux/pdfopen
diff --git a/Master/bin/i386-linux/perltex b/Master/bin/i386-linux/perltex
index 09a656dae3f..dd8dda2804b 100755
--- a/Master/bin/i386-linux/perltex
+++ b/Master/bin/i386-linux/perltex
@@ -15,19 +15,23 @@
 #
 # This is a generated file.
 #
-# Copyright (C) 2004 by Scott Pakin <scott+pt@pakin.org>
+# Copyright (C) 2006, Scott Pakin <scott+pt@pakin.org>
 #
 # This file may be distributed and/or modified under the conditions
-# of the LaTeX Project Public License, either version 1.2 of this
+# of the LaTeX Project Public License, either version 1.3c of this
 # license or (at your option) any later version.  The latest
 # version of this license is in:
 #
 #    http://www.latex-project.org/lppl.txt
 #
-# and version 1.2 or later is part of all distributions of LaTeX
-# version 1999/12/01 or later.
+# and version 1.3c or later is part of all distributions of LaTeX
+# version 2006/05/20 or later.
 #-------------------------------------------------------------------
 
+sub top_level_eval ($)
+{
+    return eval $_[0];
+}
 use Safe;
 use Opcode;
 use Getopt::Long;
@@ -49,6 +53,7 @@ my $fromflag;
 my $doneflag;
 my $logfile;
 my $sandbox = new Safe;
+my $sandbox_eval;
 my $latexpid;
 $latexprog = $ENV{"PERLTEX"} || "latex";
 Getopt::Long::Configure("require_order", "pass_through");
@@ -97,9 +102,14 @@ if (!$latexpid) {
     exec {$latexcmdline[0]} @latexcmdline;
     die "exec('@latexcmdline'): $!\n";
 }
-@permittedops=(":browse") if $#permittedops==-1;
-@permittedops=(Opcode::full_opset()) if !$runsafely;
-$sandbox->permit_only (@permittedops);
+if ($runsafely) {
+    @permittedops=(":browse") if $#permittedops==-1;
+    $sandbox->permit_only (@permittedops);
+    $sandbox_eval = sub {$sandbox->reval($_[0])};
+}
+else {
+    $sandbox_eval = \&top_level_eval;
+}
 while (1) {
     my $awaitexists = sub {
       while (!-e $_[0]) {
@@ -136,12 +146,18 @@ while (1) {
     }
     my $perlcode;
     if ($optag eq "DEF") {
-      $perlcode =
-          sprintf "sub %s {%s}\n",
-          $macroname, $otherstuff[0];
+        $perlcode =
+            sprintf "sub %s {%s}\n",
+            $macroname, $otherstuff[0];
+    }
+    elsif ($optag eq "USE") {
+        $perlcode = sprintf "%s (%s);\n", $macroname, join(", ", @otherstuff);
+    }
+    elsif ($optag eq "RUN") {
+        $perlcode = $otherstuff[0];
     }
     else {
-      $perlcode = sprintf "%s (%s);\n", $macroname, join(", ", @otherstuff);
+        die "${progname}: Internal error -- unexpected operation tag \"$optag\"\n";
     }
     print LOGFILE "#" x 31, " PERL CODE ", "#" x 32, "\n";
     print LOGFILE $perlcode, "\n";
@@ -151,13 +167,13 @@ while (1) {
         my $warningmsg;
         local $SIG{__WARN__} =
             sub {chomp ($warningmsg=$_[0]); return 0};
-        $result = $sandbox->reval ($perlcode);
+        $result = $sandbox_eval->($perlcode);
         if (defined $warningmsg) {
             $warningmsg =~ s/at \(eval \d+\) line \d+\W+//;
             print LOGFILE "# ===> $warningmsg\n\n";
         }
     }
-    $result="" if !$result;
+    $result="" if !$result || $optag eq "RUN";
     if ($@) {
         my $msg = $@;
         $msg =~ s/at \(eval \d+\) line \d+\W+//;
diff --git a/Master/bin/i386-linux/pfb2pfa b/Master/bin/i386-linux/pfb2pfa
index 6bd50f6a329..7244eddd620 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 e29b96b49f8..21746175717 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 2b29d8ae584..2414658053c 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 a77bb1c824d..2168cb9661d 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 292ac0f9948..94efddc066c 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 8f8d70698c9..a892c5853a7 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 3aebfb127d1..8489778e2a6 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 45a276b4cdc..728cf601a9c 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 b78c62963e8..a6d1f66eac1 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 64fb999bbc6..c92cc153891 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 4bba49c2588..d3abffd3e9b 100755
--- a/Master/bin/i386-linux/psselect
+++ b/Master/bin/i386-linux/psselect
diff --git a/Master/bin/i386-linux/pstops b/Master/bin/i386-linux/pstops
index 55ea3df1de2..6caea8b3d1d 100755
--- a/Master/bin/i386-linux/pstops
+++ b/Master/bin/i386-linux/pstops
diff --git a/Master/bin/i386-linux/sam2p b/Master/bin/i386-linux/sam2p
deleted file mode 100755
index 7c7a832f0c2..00000000000
--- a/Master/bin/i386-linux/sam2p
+++ /dev/null
diff --git a/Master/bin/i386-linux/sjisconv b/Master/bin/i386-linux/sjisconv
index 6c5b3440a02..2392804e8c1 100755
--- a/Master/bin/i386-linux/sjisconv
+++ b/Master/bin/i386-linux/sjisconv
diff --git a/Master/bin/i386-linux/sjislatex b/Master/bin/i386-linux/sjislatex
index 2c9bc229c7b..68c554e6d71 100755
--- a/Master/bin/i386-linux/sjislatex
+++ b/Master/bin/i386-linux/sjislatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/sjispdflatex b/Master/bin/i386-linux/sjispdflatex
index 294c5b188d0..e8d070e9dc6 100755
--- a/Master/bin/i386-linux/sjispdflatex
+++ b/Master/bin/i386-linux/sjispdflatex
@@ -1,5 +1,22 @@
 #! /bin/sh
 
+# Copyright (C) 1994-2006  Werner Lemberg <wl@gnu.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in doc/COPYING; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
 n=1
 argv=
 
diff --git a/Master/bin/i386-linux/t1ascii b/Master/bin/i386-linux/t1ascii
index bc939d59e29..e4e4ddda8e2 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 eb5cfe3c894..7c69f41d5e2 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 5d28c60e94b..2b285fce375 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 b11d40470de..f65ab3ff7ea 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 98395805fca..cb5f3e92030 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 7f8dcde125c..ac329143a1f 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 ffe457dfddb..a2d98955e32 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 78fff666f35..79bd3b6f9d0 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 a0511ebd345..54300b7973b 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 96b97d16246..0817cd70f57 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 b5959b85b90..c15678c985a 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 8f4f4e3511a..8cd2c5b7db2 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 e72a2c208f4..75e44865f5b 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 3d35a812abd..335a0b2809f 100755
--- a/Master/bin/i386-linux/tex
+++ b/Master/bin/i386-linux/tex
diff --git a/Master/bin/i386-linux/tex4ht b/Master/bin/i386-linux/tex4ht
index e83d7e98d9c..10b91ef9d08 100755
--- a/Master/bin/i386-linux/tex4ht
+++ b/Master/bin/i386-linux/tex4ht
diff --git a/Master/bin/i386-linux/texi2html b/Master/bin/i386-linux/texi2html
index d0b983b1e7d..870a68a4157 100755
--- a/Master/bin/i386-linux/texi2html
+++ b/Master/bin/i386-linux/texi2html
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/local/bin/perl
 'di ';
 'ig 00 ';
 #+##############################################################################
@@ -75,7 +75,7 @@ my $THISVERSION = '1.76';
 my $THISPROG = "texi2html $THISVERSION"; # program name and version
 
 # set by configure, prefix for the sysconfdir and so on
-my $prefix = '/usr/TeX';
+my $prefix = '/home/texlive/karl/Build/source/inst';
 my $sysconfdir;
 my $pkgdatadir;
 my $datadir;
@@ -92,10 +92,10 @@ else
     $sysconfdir = "/usr/local/etc";
 }
 
-if ('${prefix}/share' ne '@' . 'datadir@')
+if ('/home/texlive/karl/Build/source/inst' ne '@' . 'datadir@')
 {
-    $pkgdatadir = eval '"${prefix}/share/texi2html"';
-    $datadir = eval '"${prefix}/share"';
+    $pkgdatadir = eval '"/home/texlive/karl/Build/source/inst/texi2html"';
+    $datadir = eval '"/home/texlive/karl/Build/source/inst"';
 }
 else
 {
@@ -5808,8 +5808,8 @@ sub t2h_nounicode_cross_manual_accent($$)
     return ascii_accents($text, $accent);
 }
 
-$USE_UNICODE = '0';
-if ($USE_UNICODE eq '0')
+$USE_UNICODE = '1';
+if ($USE_UNICODE eq '1')
 {
     $USE_UNICODE = 1;
     eval {
diff --git a/Master/bin/i386-linux/texindex b/Master/bin/i386-linux/texindex
index 04629dc8977..97c67d92191 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 b9ced8813e3..a886b2aa142 100755
--- a/Master/bin/i386-linux/texmfstart
+++ b/Master/bin/i386-linux/texmfstart
@@ -1506,11 +1506,6 @@ $makelist = [
     # no, 'texmfstart'
 ]
 
-# if ENV['TEXMFSTART_MODE'] = 'experimental' then
-    # $predefined['texexec'] = 'newtexexec.rb'
-    # $predefined['pstopdf'] = 'newpstopdf.rb'
-# end
-
 $scriptlist   = 'rb|pl|py|lua|jar'
 $documentlist = 'pdf|ps|eps|htm|html'
 
diff --git a/Master/bin/i386-linux/tftopl b/Master/bin/i386-linux/tftopl
index 52bb720f1b5..02af949e18f 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 24d4dfd3a63..f1891b93ab3 100755
--- a/Master/bin/i386-linux/tie
+++ b/Master/bin/i386-linux/tie
diff --git a/Master/bin/i386-linux/ttf2afm b/Master/bin/i386-linux/ttf2afm
index 8df9694735d..ea9a5dfe8f9 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 85e4a152742..a4b2bc1ab6e 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 56b8643c6cb..e153635a4d7 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
new file mode 100755
index 00000000000..7ec0a8bfdc6
--- /dev/null
+++ b/Master/bin/i386-linux/ttftotype42
diff --git a/Master/bin/i386-linux/vftovp b/Master/bin/i386-linux/vftovp
index a028e050c1e..4bae1318e9c 100755
--- a/Master/bin/i386-linux/vftovp
+++ b/Master/bin/i386-linux/vftovp
diff --git a/Master/bin/i386-linux/vpe b/Master/bin/i386-linux/vpe
new file mode 100755
index 00000000000..9eb52b69e3c
--- /dev/null
+++ b/Master/bin/i386-linux/vpe
@@ -0,0 +1,421 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
+  if 0;
+use strict;
+#
+# vpe.pl
+#
+# Copyright (C) 2000 Heiko Oberdiek.
+#
+# This program may be distributed and/or modified under the
+# conditions of the LaTeX Project Public License, either version 1.2
+# of this license or (at your option) any later version.
+# The latest version of this license is in
+#   http://www.latex-project.org/lppl.txt
+# and version 1.2 or later is part of all distributions of LaTeX
+# version 1999/12/01 or later.
+#
+# See file "vpe.txt" for a list of files that belong to this project.
+#
+# This file "vpe.pl" may be renamed to "vpe"
+# for installation purposes.
+#
+my $file        = "vpe.pl";
+my $program     = uc($&) if $file =~ /^\w+/;
+my $version     = "0.1";
+my $date        = "2000/09/15";
+my $author      = "Heiko Oberdiek";
+my $copyright   = "Copyright (c) 2000 by $author.";
+#
+# History:
+#   2000/09/15 v0.1: First release.
+#
+
+### program identification
+my $title = "$program $version, $date - $copyright\n";
+
+### editor call
+# %F: file name
+# %L: line number
+my $EditorCall = "xterm -e joe +%d %s";
+$EditorCall = $ENV{TEXEDIT} if $ENV{TEXEDIT};
+$EditorCall = $ENV{VPE} if $ENV{VPE};
+
+### error strings
+my $Error = "!!! Error:"; # error prefix
+
+my $usage = <<"END_OF_USAGE";
+${title}
+Depending on the name of the script `vpe' works in four modes:
+
+* [vpe] Syntax: vpe <pdf file>[.pdf]
+  The pdf file is scanned for actions created by VTeX,
+  that start an editor with the source file at the
+  specified line under Windows.
+  A symbol link is made from the source file name
+  extended by the extension `.vpe' to this script.
+  The line number is encoded in the path and the
+  action is changed to start this script.
+
+* [sty] Internal for vpe.sty:
+  Syntax: vpe --sty [--progname=...] <latex file> <vpe file>
+
+* [system] Internal for vpe.sty:
+  Syntax: vpe --system <vpe file>
+
+* [launch] Syntax: <source file name>.vpe
+  The script decodes the line number in the path of
+  the source file name and starts an editor with
+  this file at that line number.
+
+Options:
+  --help:     print usage.
+  --verbose:  print additional informations during running.
+  --force:    force symbol links
+  --delete:   delete symbol links
+  --sty:      internal for `vpe.sty' (get absolute file name and lines)
+  --system:   internal for `vpe.sty' (get system info linux or win)
+  --progname: latex, pdflatex, elatex, pdfelatex
+END_OF_USAGE
+
+### options
+$::opt_verbose = 0;
+$::opt_help = 0;
+$::opt_force = 0;
+$::opt_delete = 0;
+$::opt_sty = 0;
+$::opt_system = 0;
+$::opt_progname = "latex";
+use Getopt::Long;
+GetOptions(
+  "help!",
+  "verbose!",
+  "force!",
+  "delete!",
+  "sty!",
+  "system!",
+  "progname=s",
+) or die $usage;
+if ($::opt_help) {
+  die $usage;
+}
+
+if ($::opt_sty and $::opt_system) {
+  die "$usage" .
+      "$Error Options --sty and --system cannot used together!\n";
+}
+
+###################
+### launch mode ###
+###################
+if ($0 =~ /\.vpe/) {
+
+  @ARGV == 0 or
+    die "$usage$Error Too many arguments [launch mode]!\n";
+
+  my $file = "";
+  $0 =~ m|(^[\./]+\./)(.+)\.vpe$| or
+    die "$Error Cannot extract line number ($0)!\n";
+  my $str = $1;
+  $file = "/$2";
+
+  my $line = "";
+  while ($str ne "") {
+    $str =~ m|^(/*)(\.?)\./(.*)$| or
+      die "$Error Parse error!\n";
+    $line .= length($1) + (($2 eq ".") ? 5 : 0);
+    $str = $3;
+  }
+
+  my $callstr = $EditorCall;
+  $EditorCall =~ s/%s/$file/;
+  $EditorCall =~ s/%d/$line/;
+  print "File: $file, line: $line\n" if $::opt_verbose;
+  exec($EditorCall);
+  exit 1;
+}
+
+###
+### used by both sty and system mode:
+###
+my $system = "linux";
+$system = "" if $^O =~ /os2/i;
+$system = "" if $^O =~ /mac/i;
+$system = "win" if $^O =~ /dos/i;
+$system = "win" if $^O =~ /win/i;
+
+################
+### sty mode ###
+################
+if ($::opt_sty) {
+
+  @ARGV == 2 or
+    die "$usage$Error Wrong arguments [sty mode]!\n";
+
+  my $vpefile = $ARGV[1];
+  print "VPE file: $vpefile\n" if $::opt_verbose;
+
+  my $file = `kpsewhich -progname=$::opt_progname $ARGV[0]`;
+  chomp $file;
+  if (!($file =~ m|^/| or $file =~ m|^\w:|)) {
+    use Cwd;
+    $file = cwd() . "/" . $file;
+    $file =~ s|/[^/]+/\.\./|/|g;
+    $file =~ s|/\./|/|g;
+  }
+  -f $file or
+    die "$Error Cannot find file `$file' [sty mode]!\n";
+  print "File: $file\n" if $::opt_verbose;
+
+  my $last = 0;
+  if (open(IN, $file)) {
+    while (<IN>) {
+      $last++;
+    }
+  }
+  if ($last == 0) {
+    $last = 10000;
+  }
+  print "Last line: $last\n" if $::opt_verbose;
+
+  open(OUT, ">>$vpefile") or
+    die "$Error Cannot open file `$vpefile`!\n";
+  print OUT "\\vpeentry{$file}{$last}\n";
+
+  exit 1;
+}
+
+###################
+### system mode ###
+###################
+if ($::opt_system) {
+
+  @ARGV == 1 or
+    die "$usage$Error Wrong arguments [system mode]!\n";
+
+  my $vpefile = $ARGV[0];
+  print "VPE file: $vpefile\n" if $::opt_verbose;
+
+  open(OUT, ">>$vpefile") or
+    die "$Error Cannot open file `$vpefile`!\n";
+  print OUT "\\vpesystem{$system}\n";
+
+  exit 1;
+}
+
+################
+### vpe mode ###
+################
+if (@ARGV < 1) {
+  die "$usage$Error Missing pdf file [vpe mode]!\n";
+}
+if (@ARGV > 2) {
+  die "$usage$Error Too many arguments [vpe mode]!\n";
+}
+
+my $pdffile = $ARGV[0];
+if (!-f $pdffile) {
+  my $name = $pdffile;
+  $pdffile .= ".pdf";
+  -f $pdffile or
+    die "$Error File `$name' not found [vpe mode]!\n";
+}
+
+open(IN, "+<$pdffile") or
+  die "$Error Cannot open `$pdffile' [vpe mode]!\n";
+binmode(IN);
+my %symlinks = ();
+while (<IN>) {
+
+  if (m|/F\([\./]*(/.*)\.vpe\)|) {
+    $symlinks{$1} = 1;
+    next;
+  }
+
+  my $do = 0;
+  my ($action, $file, $line, $type);
+  # my $color; # only for debugging
+
+  if (m|^
+        /A \s* << \s*
+          /Type \s* /Action \s*
+          /S \s* /Launch \s*
+          /Win \s* << \s*
+            /F \s* \(aftcomp.exe\) \s*
+            /P \s* \("(.*)\" \s+ \d+\-(\d+)\) \s*
+          >> \s*
+        >> \s*
+        $
+       |x
+  ) {
+    $action = $_;
+    $file = $1;
+    $line = $2;
+    # $color = "/C[0 0 1]"; # only for debugging
+    $type = "aftcomp";
+    $do = 1;
+  }
+
+  if (m|^
+        /A \s* << \s*
+          /Type \s* /Action \s*
+          /S \s* /Launch \s*
+          /Win \s* << \s*
+            /F \s* \(repos.exe\) \s*
+            /P \s* \(
+              "(.*)" \s*
+              "(\d+)" \s*
+              "(.*)" \s*
+              "(\d+)"
+            \) \s*
+          >> \s*
+        >> \s*
+        $
+       |x
+  ) {
+    $action = $_;
+    if ($3 eq "") {
+      $file = $1;
+      $line = $2;
+    }
+    else {
+      # ???
+      $file = $1;
+      $line = $2;
+    }
+    # $color = "/C[1 0 0]"; # only for debugging
+    $type = "repos";
+    $do = 1;
+  }
+
+  if ($do) {
+    my $length = length($action);
+    print "* File: $file, line: $line, type: $type\n" if $::opt_verbose;
+
+    if (!($file =~ m|^/|)) {
+      print STDERR "$Error File `$file' lacks of absolute path!\n";
+      next;
+    }
+
+    if (!$::opt_delete) {
+      if ($line <= 0) {
+        $line = 1;
+      }
+
+      my $newaction = "";
+      {
+        my $digit = substr($line, 0, 1);
+        if ($digit <= 5) {
+          $newaction .= "/" x $digit;
+        }
+        else {
+          $newaction .= "/" x ($digit - 5) . ".";
+        }
+        $newaction .= "./";
+        my $rest = $line;
+        while (($rest = substr($rest, 1)) ne "") {
+          $digit = substr($rest, 0, 1);
+          if ($digit < 5) {
+            $newaction .= "/" x $digit;
+          }
+          else {
+            $newaction .= "/" x ($digit - 5) . ".";
+          }
+          $newaction .= "./";
+        }
+      }
+      $newaction .= substr($file, 1) . ".vpe";
+      $newaction = # $color . # only for debugging
+                   "/A<</Type/Action/S/Launch/F($newaction)>>";
+      $newaction .= " " x ($length - length($newaction) - 1);
+      if (length($newaction) > $length) {
+         print STDERR "$Error Action too long!\n";
+         next;
+      }
+
+      seek(IN, -length($action), 1);
+      print IN $newaction;
+    }
+
+    $symlinks{$file} = 1;
+  }
+}
+
+if (keys(%symlinks)) {
+
+  my $this = $0;
+  if (!$::opt_delete) {
+    if (!-f $0 or !-x $0) {
+      $this = `which $0`;
+      ($this ne "") or die "$Error Cannot find this script!\n";
+    }
+    if (!($this =~ m|^/|)) {
+      use Cwd;
+      $this = cwd() . "/" . $this;
+    }
+    $this =~ s|/[^/]+/\.\./|/|g;
+    $this =~ s|/\./|/|g;
+  }
+
+  if ($::opt_delete) {
+    print "Delete symlinks:\n";
+  }
+  else {
+    if ($::opt_force) {
+      print "Forced symlinks to $this:\n";
+    }
+    else {
+      print "Symlinks to $this:\n";
+    }
+  }
+
+  foreach (keys(%symlinks)) {
+    my $sym = $_ . ".vpe";
+    print "  $sym [";
+
+    if ($::opt_delete) {
+      if (!-l $sym) {
+        print "ok, not existing]\n";
+        next;
+      }
+      unlink($sym);
+      if (!-l $sym) {
+        print "ok, deleted]\n";
+        next;
+      }
+      print "failed]\n";
+      next;
+    }
+    if ($::opt_force) {
+      if (-l $sym) {
+        unlink($sym);
+        if (-l $sym) {
+          print "deletion failed]\n";
+          next;
+        }
+        if (symlink($this, $sym)) {
+          print "ok, deleted and created]\n";
+          next;
+        }
+        print "deleted, creation failed]\n";
+        next;
+      }
+      if (symlink($this, $sym)) {
+        print "ok, created]\n";
+        next;
+      }
+      print "creation failed]\n";
+      next;
+    }
+    if (-f $sym) {
+      print "exists]\n";
+      next;
+    }
+    if (symlink($this, $sym)) {
+      print "ok, created]\n";
+      next;
+    }
+    print "failed]\n";
+    next;
+  }
+}
+__END__
diff --git a/Master/bin/i386-linux/vptovf b/Master/bin/i386-linux/vptovf
index b969c6e12cb..1b263123c99 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 97584076155..8f721367c4a 100755
--- a/Master/bin/i386-linux/weave
+++ b/Master/bin/i386-linux/weave
diff --git a/Master/bin/i386-linux/xdvi-xaw.bin b/Master/bin/i386-linux/xdvi-xaw.bin
index 8fdf7816810..baefe539c6f 100755
--- a/Master/bin/i386-linux/xdvi-xaw.bin
+++ b/Master/bin/i386-linux/xdvi-xaw.bin
diff --git a/Master/bin/i386-linux/xdvipdfmx b/Master/bin/i386-linux/xdvipdfmx
new file mode 100755
index 00000000000..8b9cb35c742
--- /dev/null
+++ b/Master/bin/i386-linux/xdvipdfmx
diff --git a/Master/bin/i386-linux/xelatex b/Master/bin/i386-linux/xelatex
new file mode 120000
index 00000000000..ef9fe406fd6
--- /dev/null
+++ b/Master/bin/i386-linux/xelatex
@@ -0,0 +1 @@
+xetex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/xeplain b/Master/bin/i386-linux/xeplain
new file mode 120000
index 00000000000..ef9fe406fd6
--- /dev/null
+++ b/Master/bin/i386-linux/xeplain
@@ -0,0 +1 @@
+xetex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/xetex b/Master/bin/i386-linux/xetex
new file mode 100755
index 00000000000..a4071d9068f
--- /dev/null
+++ b/Master/bin/i386-linux/xetex