131 files changed, 67 insertions, 72 deletions

diff --git a/Master/bin/i386-darwin/T1Wrap b/Master/bin/i386-darwin/T1Wrap
index 4fdc1d30b5d..f826fd0f23f 100755
--- a/Master/bin/i386-darwin/T1Wrap
+++ b/Master/bin/i386-darwin/T1Wrap
diff --git a/Master/bin/i386-darwin/afm2pl b/Master/bin/i386-darwin/afm2pl
index 652ade14051..fec9fcda93f 100755
--- a/Master/bin/i386-darwin/afm2pl
+++ b/Master/bin/i386-darwin/afm2pl
diff --git a/Master/bin/i386-darwin/afm2tfm b/Master/bin/i386-darwin/afm2tfm
index 90eeb53dace..de2851270a3 100755
--- a/Master/bin/i386-darwin/afm2tfm
+++ b/Master/bin/i386-darwin/afm2tfm
diff --git a/Master/bin/i386-darwin/aleph b/Master/bin/i386-darwin/aleph
index a09a2b78ae3..6697d6f670b 100755
--- a/Master/bin/i386-darwin/aleph
+++ b/Master/bin/i386-darwin/aleph
diff --git a/Master/bin/i386-darwin/bbox b/Master/bin/i386-darwin/bbox
index 1c823afd860..1b4d8e9fad1 100755
--- a/Master/bin/i386-darwin/bbox
+++ b/Master/bin/i386-darwin/bbox
diff --git a/Master/bin/i386-darwin/bg5conv b/Master/bin/i386-darwin/bg5conv
index a2f9e0c33ce..04f1756ba44 100755
--- a/Master/bin/i386-darwin/bg5conv
+++ b/Master/bin/i386-darwin/bg5conv
diff --git a/Master/bin/i386-darwin/bibtex b/Master/bin/i386-darwin/bibtex
index 80d59d41ff7..6e7694bd759 100755
--- a/Master/bin/i386-darwin/bibtex
+++ b/Master/bin/i386-darwin/bibtex
diff --git a/Master/bin/i386-darwin/bibtex8 b/Master/bin/i386-darwin/bibtex8
index 23af2d1fe80..57a6fb9040e 100755
--- a/Master/bin/i386-darwin/bibtex8
+++ b/Master/bin/i386-darwin/bibtex8
diff --git a/Master/bin/i386-darwin/cef5conv b/Master/bin/i386-darwin/cef5conv
index e5fa4be0df0..66d58310df7 100755
--- a/Master/bin/i386-darwin/cef5conv
+++ b/Master/bin/i386-darwin/cef5conv
diff --git a/Master/bin/i386-darwin/cefconv b/Master/bin/i386-darwin/cefconv
index 0012dbd3d5b..e788d4849e4 100755
--- a/Master/bin/i386-darwin/cefconv
+++ b/Master/bin/i386-darwin/cefconv
diff --git a/Master/bin/i386-darwin/cefsconv b/Master/bin/i386-darwin/cefsconv
index 766616e3cf6..d813e071327 100755
--- a/Master/bin/i386-darwin/cefsconv
+++ b/Master/bin/i386-darwin/cefsconv
diff --git a/Master/bin/i386-darwin/cfftot1 b/Master/bin/i386-darwin/cfftot1
index 62d0bf98e93..cde88b95758 100755
--- a/Master/bin/i386-darwin/cfftot1
+++ b/Master/bin/i386-darwin/cfftot1
diff --git a/Master/bin/i386-darwin/ctangle b/Master/bin/i386-darwin/ctangle
index a31ae477bb7..a1043dd64da 100755
--- a/Master/bin/i386-darwin/ctangle
+++ b/Master/bin/i386-darwin/ctangle
diff --git a/Master/bin/i386-darwin/ctie b/Master/bin/i386-darwin/ctie
index 140ad4da2f8..fe94ed233f2 100755
--- a/Master/bin/i386-darwin/ctie
+++ b/Master/bin/i386-darwin/ctie
diff --git a/Master/bin/i386-darwin/cweave b/Master/bin/i386-darwin/cweave
index a41b2399e53..53e62a9c30e 100755
--- a/Master/bin/i386-darwin/cweave
+++ b/Master/bin/i386-darwin/cweave
diff --git a/Master/bin/i386-darwin/detex b/Master/bin/i386-darwin/detex
index 08db61e1e3f..124bb8efc15 100755
--- a/Master/bin/i386-darwin/detex
+++ b/Master/bin/i386-darwin/detex
diff --git a/Master/bin/i386-darwin/devnag b/Master/bin/i386-darwin/devnag
index 9c0bac9ec73..5ed1a828c17 100755
--- a/Master/bin/i386-darwin/devnag
+++ b/Master/bin/i386-darwin/devnag
diff --git a/Master/bin/i386-darwin/disdvi b/Master/bin/i386-darwin/disdvi
index a9fe40aefde..dad62b85482 100755
--- a/Master/bin/i386-darwin/disdvi
+++ b/Master/bin/i386-darwin/disdvi
diff --git a/Master/bin/i386-darwin/dmp b/Master/bin/i386-darwin/dmp
index 536426ec692..7c8aab9797f 100755
--- a/Master/bin/i386-darwin/dmp
+++ b/Master/bin/i386-darwin/dmp
diff --git a/Master/bin/i386-darwin/dt2dv b/Master/bin/i386-darwin/dt2dv
index d61b2eb5770..360a865f6c3 100755
--- a/Master/bin/i386-darwin/dt2dv
+++ b/Master/bin/i386-darwin/dt2dv
diff --git a/Master/bin/i386-darwin/dv2dt b/Master/bin/i386-darwin/dv2dt
index e670d9d169a..fa97165f4d0 100755
--- a/Master/bin/i386-darwin/dv2dt
+++ b/Master/bin/i386-darwin/dv2dt
diff --git a/Master/bin/i386-darwin/dvi2tty b/Master/bin/i386-darwin/dvi2tty
index a5fe1786176..28b3c2fc5d7 100755
--- a/Master/bin/i386-darwin/dvi2tty
+++ b/Master/bin/i386-darwin/dvi2tty
diff --git a/Master/bin/i386-darwin/dvibook b/Master/bin/i386-darwin/dvibook
index 55fb9867b4a..10a9dbaeb76 100755
--- a/Master/bin/i386-darwin/dvibook
+++ b/Master/bin/i386-darwin/dvibook
diff --git a/Master/bin/i386-darwin/dviconcat b/Master/bin/i386-darwin/dviconcat
index 36903e21df1..ea9084555ce 100755
--- a/Master/bin/i386-darwin/dviconcat
+++ b/Master/bin/i386-darwin/dviconcat
diff --git a/Master/bin/i386-darwin/dvicopy b/Master/bin/i386-darwin/dvicopy
index 36b435ec37b..6ef3f20e5c7 100755
--- a/Master/bin/i386-darwin/dvicopy
+++ b/Master/bin/i386-darwin/dvicopy
diff --git a/Master/bin/i386-darwin/dvidvi b/Master/bin/i386-darwin/dvidvi
index a076ebf3f04..35fae39c9f7 100755
--- a/Master/bin/i386-darwin/dvidvi
+++ b/Master/bin/i386-darwin/dvidvi
diff --git a/Master/bin/i386-darwin/dvilj b/Master/bin/i386-darwin/dvilj
index 7f0b75c678b..db9f9e5fc4f 100755
--- a/Master/bin/i386-darwin/dvilj
+++ b/Master/bin/i386-darwin/dvilj
diff --git a/Master/bin/i386-darwin/dvilj2p b/Master/bin/i386-darwin/dvilj2p
index 2a6d8ecdf99..96215c3fe8f 100755
--- a/Master/bin/i386-darwin/dvilj2p
+++ b/Master/bin/i386-darwin/dvilj2p
diff --git a/Master/bin/i386-darwin/dvilj4 b/Master/bin/i386-darwin/dvilj4
index 11c89438e41..2d3211efac8 100755
--- a/Master/bin/i386-darwin/dvilj4
+++ b/Master/bin/i386-darwin/dvilj4
diff --git a/Master/bin/i386-darwin/dvilj4l b/Master/bin/i386-darwin/dvilj4l
index 0fe494ded17..d6c5991c250 100755
--- a/Master/bin/i386-darwin/dvilj4l
+++ b/Master/bin/i386-darwin/dvilj4l
diff --git a/Master/bin/i386-darwin/dvipdfm b/Master/bin/i386-darwin/dvipdfm
index 963ec5870a1..6f094c7704f 100755
--- a/Master/bin/i386-darwin/dvipdfm
+++ b/Master/bin/i386-darwin/dvipdfm
diff --git a/Master/bin/i386-darwin/dvipdfmx b/Master/bin/i386-darwin/dvipdfmx
index bf3d4e245de..dab4498612f 100755
--- a/Master/bin/i386-darwin/dvipdfmx
+++ b/Master/bin/i386-darwin/dvipdfmx
diff --git a/Master/bin/i386-darwin/dvipng b/Master/bin/i386-darwin/dvipng
index 7e4e816f560..56d36023bcf 100755
--- a/Master/bin/i386-darwin/dvipng
+++ b/Master/bin/i386-darwin/dvipng
diff --git a/Master/bin/i386-darwin/dvips b/Master/bin/i386-darwin/dvips
index 7854252b47c..e5ae253fea6 100755
--- a/Master/bin/i386-darwin/dvips
+++ b/Master/bin/i386-darwin/dvips
diff --git a/Master/bin/i386-darwin/dviselect b/Master/bin/i386-darwin/dviselect
index aed521e84e7..6e72ff031ae 100755
--- a/Master/bin/i386-darwin/dviselect
+++ b/Master/bin/i386-darwin/dviselect
diff --git a/Master/bin/i386-darwin/dvitodvi b/Master/bin/i386-darwin/dvitodvi
index 90945888102..dd589cff377 100755
--- a/Master/bin/i386-darwin/dvitodvi
+++ b/Master/bin/i386-darwin/dvitodvi
diff --git a/Master/bin/i386-darwin/dvitomp b/Master/bin/i386-darwin/dvitomp
index 53d99ef83f9..3a0f547bd5a 100755
--- a/Master/bin/i386-darwin/dvitomp
+++ b/Master/bin/i386-darwin/dvitomp
diff --git a/Master/bin/i386-darwin/dvitype b/Master/bin/i386-darwin/dvitype
index 1e7e35e005e..3e03a78101d 100755
--- a/Master/bin/i386-darwin/dvitype
+++ b/Master/bin/i386-darwin/dvitype
diff --git a/Master/bin/i386-darwin/ebb b/Master/bin/i386-darwin/ebb
index e722ef9f328..9b54767ad47 100755
--- a/Master/bin/i386-darwin/ebb
+++ b/Master/bin/i386-darwin/ebb
diff --git a/Master/bin/i386-darwin/epsffit b/Master/bin/i386-darwin/epsffit
index f146c0a374c..f38ff755c22 100755
--- a/Master/bin/i386-darwin/epsffit
+++ b/Master/bin/i386-darwin/epsffit
diff --git a/Master/bin/i386-darwin/extconv b/Master/bin/i386-darwin/extconv
index 7951eddb9f1..f530b34f4c8 100755
--- a/Master/bin/i386-darwin/extconv
+++ b/Master/bin/i386-darwin/extconv
diff --git a/Master/bin/i386-darwin/fmtutil b/Master/bin/i386-darwin/fmtutil
index ae04f067201..e061f4f20af 100755
--- a/Master/bin/i386-darwin/fmtutil
+++ b/Master/bin/i386-darwin/fmtutil
@@ -24,12 +24,10 @@
 # Options:
 #  --cnffile file             set configfile for fmtutil
 #  --fmtdir directory         set destination directory for format files
-#  --no-engine-subdir         don't use $engine subdirectory of the fmtdir
 ###############################################################################
 
 ###############################################################################
 # program history:
-#   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
 #   So Mär 27 18:52:06 CEST 2005 honor $TMPDIR, $TEMP and $TMP, not just $TMP
@@ -83,7 +81,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1112981053 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -200,7 +198,6 @@ Usage: fmtutil [option] ... cmd [argument]
 Valid options:
   --cnffile file
   --fmtdir directory
-  --no-engine-subdir         don't use engine-specific subdir of the fmtdir
   --quiet                    (not implemented, just for compatibility)
   --test                     (not implemented, just for compatibility)
   --dolinks                  (not implemented, just for compatibility)
@@ -362,9 +359,8 @@ main()
   tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
   verboseFlag=true
 
-  # mktexfmtMode: if called as mktexfmt, set to true. Will echo the
-  # first generated filename after successful generation to stdout then
-  # (and nothing else), since kpathsea can only deal with one.
+  # mktexfmtMode: if called as mktexfmt, set to true. Will echo the generated
+  # filename after successful generation to stdout then (and nothing else).
   mktexfmtMode=false
   case $argv0 in
     mktexfmt|*/mktexfmt)
@@ -387,7 +383,6 @@ main()
       ;;
   esac
 
-  use_engine_dir=true # whether to use web2c/$engine subdirs
   while
     case $1 in
       --cnffile)
@@ -398,8 +393,6 @@ main()
           shift; destdir=$1;;
       --fmtdir=*)
           destdir=`echo "$1" | sed 's/--fmtdir=//'`; shift ;;
-      --no-engine-subdir)
-          use_engine_dir=false;;
       --all|-a)
           cmd=all;;
       --edit|-e)
@@ -554,11 +547,31 @@ main()
     refresh)
       recreate_existing;;
     byfmt)
-      recreate_by_fmt "$arg";;
+      create_one_format "$arg";;
     byhyphen)
       recreate_by_hyphenfile "$arg";;
   esac
 
+  # install the log files and format files:
+  for i in *.log; do
+    test -f "$i" || continue
+    rm -f "$destdir/$i"
+
+    # We don't want user-interaction for the following "mv" command:
+    mv "$i" "$destdir/$i" </dev/null
+  done
+  for i in *.fmt *.mem *.base; do
+    test -f "$i" || continue
+    rm -f "$destdir/$i"
+
+    # We don't want user-interaction for the following "mv" command:
+    if mv "$i" "$destdir/$i" </dev/null; then
+      verboseMsg "$progname: $destdir/$i installed."
+      $mktexfmtMode && echo "$destdir/$i"
+    fi
+    mktexupd "$destdir" "$i"
+  done
+
   byebye
 }
 
@@ -609,9 +622,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
-    mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    mpost)  fmtfile="$format.mem";  kpsefmt=mpost;;
+    mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf;;
+    *)      fmtfile="$format.fmt";  kpsefmt=tex;;
   esac
 
   # See if we can find $inifile for return code:
@@ -686,33 +699,16 @@ run_initex()
     verbose $engine -ini $tcxflag $jobswitch $prgswitch $texargs
   ) </dev/null
 
-  if test $use_engine_dir; then
-    fulldestdir="$destdir/$texengine"
-  else
-    fulldestdir="$destdir"
-  fi
-  mkdir -p $fulldestdir
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
-    # We don't want user-interaction for the following "mv" commands:
-    mv "$format.log" "$fulldestdir/$format.log" </dev/null
-    if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
-      verboseMsg "$progname: $fulldestdir/$fmtfile installed."
-      #
-      $mktexfmtMode && $mktexfmtFirst \
-      && echo "$fulldestdir/$fmtfile" && mktexfmtFirst=false
-      #
-      mktexupd "$fulldestdir" "$fmtfile"
-    fi
   else
     log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' failed"
   fi
 }
 
 ###############################################################################
-# recreate_loop()
+# recreate_loop(hyphenfile)
 #   for each line in config file: check match-condition and recreate format
 #   if there is a match
 ###############################################################################
@@ -727,6 +723,7 @@ recreate_loop()
   do
     parse_line $line || continue
     check_match || continue
+    echo; echo
     run_initex
   done
 }
@@ -762,14 +759,15 @@ check_match()
 }
 
 ###############################################################################
-# recreate_by_fmt(fmtname)
-#   recreate all versions of fmtname
+# create_one_format(fmtname)
+#   (re)create the format file for the format `fmtname'
 ###############################################################################
-recreate_by_fmt()
+create_one_format()
 {
   fmtname=$1
-  match_cmd="test x\$format = x$fmtname"
-  recreate_loop
+
+  find_info_for_name $fmtname || abort "format \`$fmtname' not available"
+  run_initex
 }
 
 ###############################################################################
@@ -779,7 +777,7 @@ recreate_by_fmt()
 create_missing()
 {
   # match_cmd='test ! -f $destdir/$fmtfile'
-  match_cmd='test ! -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
+  match_cmd='test ! -f "`kpsewhich -progname=$format $fmtfile`"'
   recreate_loop
 }
 
@@ -789,7 +787,7 @@ create_missing()
 ###############################################################################
 recreate_existing()
 {
-  match_cmd='test -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
+  match_cmd='test -f "`kpsewhich -progname=$format $fmtfile`"'
   recreate_loop
 }
 
@@ -864,7 +862,7 @@ disablefmt()
   grep "^$1[ 	]" $cnf_file >/dev/null || { (exit 0); return 0; }
 
   ed $cnf_file >/dev/null 2>&1 <<-eof
-	g/^$1[ 	]/s/^/#! /
+	/^$1[ 	]/s/^/#! /
 	w
 	q
 eof
@@ -879,7 +877,7 @@ enablefmt()
 {
   grep "^#![ 	]*$1[ 	]" $cnf_file >/dev/null || { (exit 0); return 0; }
   ed $cnf_file >/dev/null 2>&1 <<-eof
-	g/^#![ 	]*$1[ 	]/s/..[ 	]*//
+	/^#![ 	]*$1[ 	]/s/..[ 	]*//
 	w
 	q
 eof
diff --git a/Master/bin/i386-darwin/getnonfreefonts b/Master/bin/i386-darwin/getnonfreefonts
index 3ab220ee570..5965b4fc64a 100755
--- a/Master/bin/i386-darwin/getnonfreefonts
+++ b/Master/bin/i386-darwin/getnonfreefonts
@@ -11,7 +11,7 @@
 # 
 # The current maintainer is Reinhard Kotucha.
 
-my $TL_version='2007';
+my $TL_version='2006';
 
 my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
 
diff --git a/Master/bin/i386-darwin/gftodvi b/Master/bin/i386-darwin/gftodvi
index 5e8e198da28..8f1e74056b4 100755
--- a/Master/bin/i386-darwin/gftodvi
+++ b/Master/bin/i386-darwin/gftodvi
diff --git a/Master/bin/i386-darwin/gftopk b/Master/bin/i386-darwin/gftopk
index 2c68271d2f1..ef729dae84b 100755
--- a/Master/bin/i386-darwin/gftopk
+++ b/Master/bin/i386-darwin/gftopk
diff --git a/Master/bin/i386-darwin/gftype b/Master/bin/i386-darwin/gftype
index 0335b7f3e54..d42668ff5fe 100755
--- a/Master/bin/i386-darwin/gftype
+++ b/Master/bin/i386-darwin/gftype
diff --git a/Master/bin/i386-darwin/gsftopk b/Master/bin/i386-darwin/gsftopk
index d8ba5f1c0c5..e7c0c41a9b1 100755
--- a/Master/bin/i386-darwin/gsftopk
+++ b/Master/bin/i386-darwin/gsftopk
diff --git a/Master/bin/i386-darwin/hbf2gf b/Master/bin/i386-darwin/hbf2gf
index 927114cbaba..9392f17cc89 100755
--- a/Master/bin/i386-darwin/hbf2gf
+++ b/Master/bin/i386-darwin/hbf2gf
diff --git a/Master/bin/i386-darwin/htcontext b/Master/bin/i386-darwin/htcontext
index 9e01fa97f66..9d6d4549574 100755
--- a/Master/bin/i386-darwin/htcontext
+++ b/Master/bin/i386-darwin/htcontext
@@ -1,7 +1,7 @@
 #!/bin/sh
-        texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 
-        tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
+        texexec --arg="ht-1=$2" --use=tex4ht $5 $1 
+        tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-darwin/htlatex b/Master/bin/i386-darwin/htlatex
index ebab47dbaa6..1b8b7cea74a 100755
--- a/Master/bin/i386-darwin/htlatex
+++ b/Master/bin/i386-darwin/htlatex
@@ -2,8 +2,8 @@
         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
         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 \dirchar $1  -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
+        tex4ht -f/$1  -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-darwin/htmex b/Master/bin/i386-darwin/htmex
index 485a7594468..b4aa3d9a06e 100755
--- a/Master/bin/i386-darwin/htmex
+++ b/Master/bin/i386-darwin/htmex
@@ -2,8 +2,8 @@
         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
         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 \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
+        tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-darwin/httex b/Master/bin/i386-darwin/httex
index 4c184897d13..44920e72077 100755
--- a/Master/bin/i386-darwin/httex
+++ b/Master/bin/i386-darwin/httex
@@ -2,8 +2,8 @@
         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
         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 \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
+        tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-darwin/httexi b/Master/bin/i386-darwin/httexi
index 26427698991..0ce3cb4a589 100755
--- a/Master/bin/i386-darwin/httexi
+++ b/Master/bin/i386-darwin/httexi
@@ -2,8 +2,8 @@
         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
         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 \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
+        tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
 #        texindex ?
 
 
diff --git a/Master/bin/i386-darwin/info b/Master/bin/i386-darwin/info
index fd183298c2b..b97223569b0 100755
--- a/Master/bin/i386-darwin/info
+++ b/Master/bin/i386-darwin/info
diff --git a/Master/bin/i386-darwin/infokey b/Master/bin/i386-darwin/infokey
index e826e0312bb..bd1b7c40d8a 100755
--- a/Master/bin/i386-darwin/infokey
+++ b/Master/bin/i386-darwin/infokey
diff --git a/Master/bin/i386-darwin/install-info b/Master/bin/i386-darwin/install-info
index a70909c1c90..fdd8e7c8859 100755
--- a/Master/bin/i386-darwin/install-info
+++ b/Master/bin/i386-darwin/install-info
diff --git a/Master/bin/i386-darwin/kpseaccess b/Master/bin/i386-darwin/kpseaccess
index 0b724e8a86b..bbb4d2f430d 100755
--- a/Master/bin/i386-darwin/kpseaccess
+++ b/Master/bin/i386-darwin/kpseaccess
diff --git a/Master/bin/i386-darwin/kpsereadlink b/Master/bin/i386-darwin/kpsereadlink
index dfb32190af9..4ed3d29a742 100755
--- a/Master/bin/i386-darwin/kpsereadlink
+++ b/Master/bin/i386-darwin/kpsereadlink
diff --git a/Master/bin/i386-darwin/kpsestat b/Master/bin/i386-darwin/kpsestat
index b47dea98eeb..eaca551cc48 100755
--- a/Master/bin/i386-darwin/kpsestat
+++ b/Master/bin/i386-darwin/kpsestat
diff --git a/Master/bin/i386-darwin/kpsewhich b/Master/bin/i386-darwin/kpsewhich
index 0612c63db5f..95ba2e754e8 100755
--- a/Master/bin/i386-darwin/kpsewhich
+++ b/Master/bin/i386-darwin/kpsewhich
diff --git a/Master/bin/i386-darwin/lacheck b/Master/bin/i386-darwin/lacheck
index 6332e87ea58..f64b06bf62c 100755
--- a/Master/bin/i386-darwin/lacheck
+++ b/Master/bin/i386-darwin/lacheck
diff --git a/Master/bin/i386-darwin/mag b/Master/bin/i386-darwin/mag
index 0445e5b6a09..a5a4a9c18c3 100755
--- a/Master/bin/i386-darwin/mag
+++ b/Master/bin/i386-darwin/mag
diff --git a/Master/bin/i386-darwin/makeindex b/Master/bin/i386-darwin/makeindex
index 16afba85dac..bcfa243a77b 100755
--- a/Master/bin/i386-darwin/makeindex
+++ b/Master/bin/i386-darwin/makeindex
diff --git a/Master/bin/i386-darwin/makeinfo b/Master/bin/i386-darwin/makeinfo
index 2081ffb0706..bf7e5dd3afb 100755
--- a/Master/bin/i386-darwin/makeinfo
+++ b/Master/bin/i386-darwin/makeinfo
diff --git a/Master/bin/i386-darwin/makempx b/Master/bin/i386-darwin/makempx
index 11b0b6ff347..11ea0231da8 100755
--- a/Master/bin/i386-darwin/makempx
+++ b/Master/bin/i386-darwin/makempx
diff --git a/Master/bin/i386-darwin/mf b/Master/bin/i386-darwin/mf
index d6a8f987a20..621f6c8d027 100755
--- a/Master/bin/i386-darwin/mf
+++ b/Master/bin/i386-darwin/mf
diff --git a/Master/bin/i386-darwin/mf-nowin b/Master/bin/i386-darwin/mf-nowin
index ce85db2277b..3e88f4e66cc 100755
--- a/Master/bin/i386-darwin/mf-nowin
+++ b/Master/bin/i386-darwin/mf-nowin
diff --git a/Master/bin/i386-darwin/mft b/Master/bin/i386-darwin/mft
index e735def6212..2150189080b 100755
--- a/Master/bin/i386-darwin/mft
+++ b/Master/bin/i386-darwin/mft
diff --git a/Master/bin/i386-darwin/mk4ht b/Master/bin/i386-darwin/mk4ht
index 2bd1f7e2038..0f4b664506c 100755
--- a/Master/bin/i386-darwin/mk4ht
+++ b/Master/bin/i386-darwin/mk4ht
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-# mk4ht                                 2007-01-04-01:34 %
-# Copyright (C) 2003--2007               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 %
@@ -58,10 +58,6 @@ my @options = (
  "js", "jstex",     "tex",     "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
  "js", "jstexi",    "texi",    "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
  "js", "jscontext", "context", "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "jm", "jmlatex",   "latex",   "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmtex",     "tex",     "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmtexi",    "texi",    "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmcontext", "context", "xhtml,jsmath", " -cmozhtf", "",
  "tei",  "teilatex",  "latex",   "xhtml,tei",    " -cunihtf",  "-cvalidate",
  "tei",  "teitex",    "tex",     "xhtml,tei",    " -cunihtf",  "-cvalidate",
  "tei",  "teitexi",   "texi",    "xhtml,tei",    " -cunihtf",  "-cvalidate",
@@ -182,7 +178,7 @@ print "  clean.htlatex     lg tmp\n";
 
 }
 
-print "mk4ht (2007-01-04-01:34)\n";
+print "mk4ht (2006-08-28-20:45)\n";
 if(  !@ARGV  ){
   print "improper command\n";
   showInstrucions(); exit(1);
diff --git a/Master/bin/i386-darwin/mmafm b/Master/bin/i386-darwin/mmafm
index b30c7c2da03..c1f946d163b 100755
--- a/Master/bin/i386-darwin/mmafm
+++ b/Master/bin/i386-darwin/mmafm
diff --git a/Master/bin/i386-darwin/mmpfb b/Master/bin/i386-darwin/mmpfb
index 2bca2949864..fb56776c9c9 100755
--- a/Master/bin/i386-darwin/mmpfb
+++ b/Master/bin/i386-darwin/mmpfb
diff --git a/Master/bin/i386-darwin/mpost b/Master/bin/i386-darwin/mpost
index 34a6cc7254d..4cb0dd0622c 100755
--- a/Master/bin/i386-darwin/mpost
+++ b/Master/bin/i386-darwin/mpost
diff --git a/Master/bin/i386-darwin/mpto b/Master/bin/i386-darwin/mpto
index 1b7ebb6cbbe..acc12b58c17 100755
--- a/Master/bin/i386-darwin/mpto
+++ b/Master/bin/i386-darwin/mpto
diff --git a/Master/bin/i386-darwin/musixflx b/Master/bin/i386-darwin/musixflx
index ffc10ea5f96..55505db928f 100755
--- a/Master/bin/i386-darwin/musixflx
+++ b/Master/bin/i386-darwin/musixflx
diff --git a/Master/bin/i386-darwin/newer b/Master/bin/i386-darwin/newer
index 5d97137832f..321ed58ed8b 100755
--- a/Master/bin/i386-darwin/newer
+++ b/Master/bin/i386-darwin/newer
diff --git a/Master/bin/i386-darwin/odvicopy b/Master/bin/i386-darwin/odvicopy
index 696283e1463..e833aa80cf5 100755
--- a/Master/bin/i386-darwin/odvicopy
+++ b/Master/bin/i386-darwin/odvicopy
diff --git a/Master/bin/i386-darwin/odvitype b/Master/bin/i386-darwin/odvitype
index cfc19fc5c22..16fdde83305 100755
--- a/Master/bin/i386-darwin/odvitype
+++ b/Master/bin/i386-darwin/odvitype
diff --git a/Master/bin/i386-darwin/omega b/Master/bin/i386-darwin/omega
index b49651d0b92..53093be3f50 100755
--- a/Master/bin/i386-darwin/omega
+++ b/Master/bin/i386-darwin/omega
diff --git a/Master/bin/i386-darwin/omfonts b/Master/bin/i386-darwin/omfonts
index 065b6c27857..486ea4c958a 100755
--- a/Master/bin/i386-darwin/omfonts
+++ b/Master/bin/i386-darwin/omfonts
diff --git a/Master/bin/i386-darwin/otangle b/Master/bin/i386-darwin/otangle
index 93562a1d3ca..b78f29cd38f 100755
--- a/Master/bin/i386-darwin/otangle
+++ b/Master/bin/i386-darwin/otangle
diff --git a/Master/bin/i386-darwin/otfinfo b/Master/bin/i386-darwin/otfinfo
index 7bedbe6b51f..7c8f676c820 100755
--- a/Master/bin/i386-darwin/otfinfo
+++ b/Master/bin/i386-darwin/otfinfo
diff --git a/Master/bin/i386-darwin/otftotfm b/Master/bin/i386-darwin/otftotfm
index 7a46221e5d5..54313ca7b7b 100755
--- a/Master/bin/i386-darwin/otftotfm
+++ b/Master/bin/i386-darwin/otftotfm
diff --git a/Master/bin/i386-darwin/otp2ocp b/Master/bin/i386-darwin/otp2ocp
index cff5cc40e90..a2508a3f995 100755
--- a/Master/bin/i386-darwin/otp2ocp
+++ b/Master/bin/i386-darwin/otp2ocp
diff --git a/Master/bin/i386-darwin/outocp b/Master/bin/i386-darwin/outocp
index 6b25cc8f644..3ac2694fc0a 100755
--- a/Master/bin/i386-darwin/outocp
+++ b/Master/bin/i386-darwin/outocp
diff --git a/Master/bin/i386-darwin/patgen b/Master/bin/i386-darwin/patgen
index ba1ae1595bc..92b130705cc 100755
--- a/Master/bin/i386-darwin/patgen
+++ b/Master/bin/i386-darwin/patgen
diff --git a/Master/bin/i386-darwin/pdftex b/Master/bin/i386-darwin/pdftex
index 676c7bbfa30..1ae3ad6350f 100755
--- a/Master/bin/i386-darwin/pdftex
+++ b/Master/bin/i386-darwin/pdftex
diff --git a/Master/bin/i386-darwin/pfb2pfa b/Master/bin/i386-darwin/pfb2pfa
index 9c6cf0a5036..c2e4b2f9a96 100755
--- a/Master/bin/i386-darwin/pfb2pfa
+++ b/Master/bin/i386-darwin/pfb2pfa
diff --git a/Master/bin/i386-darwin/pk2bm b/Master/bin/i386-darwin/pk2bm
index 8f054c6a027..89fc065f14d 100755
--- a/Master/bin/i386-darwin/pk2bm
+++ b/Master/bin/i386-darwin/pk2bm
diff --git a/Master/bin/i386-darwin/pktogf b/Master/bin/i386-darwin/pktogf
index 25b7d7c0cdb..95b9b4c73be 100755
--- a/Master/bin/i386-darwin/pktogf
+++ b/Master/bin/i386-darwin/pktogf
diff --git a/Master/bin/i386-darwin/pktype b/Master/bin/i386-darwin/pktype
index 3d051551c42..eb4250d3fbf 100755
--- a/Master/bin/i386-darwin/pktype
+++ b/Master/bin/i386-darwin/pktype
diff --git a/Master/bin/i386-darwin/pltotf b/Master/bin/i386-darwin/pltotf
index 5c3ba52c356..45a1222e01c 100755
--- a/Master/bin/i386-darwin/pltotf
+++ b/Master/bin/i386-darwin/pltotf
diff --git a/Master/bin/i386-darwin/pooltype b/Master/bin/i386-darwin/pooltype
index f3aae3aee6d..e8277b5a2b3 100755
--- a/Master/bin/i386-darwin/pooltype
+++ b/Master/bin/i386-darwin/pooltype
diff --git a/Master/bin/i386-darwin/ps2eps b/Master/bin/i386-darwin/ps2eps
index aeb0e9a8e43..fd00ba9faca 100755
--- a/Master/bin/i386-darwin/ps2eps
+++ b/Master/bin/i386-darwin/ps2eps
@@ -1,4 +1,5 @@
-#!/usr/bin/env perl
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' # -*-perl-*-
+        if 0;
 # The expression in the previous line replaces the unix specific line 
 # {#!/usr/bin/perl}.   
 # ps2eps - convert PostScript to EPS (Encapsulated PostScript) files
diff --git a/Master/bin/i386-darwin/ps2pk b/Master/bin/i386-darwin/ps2pk
index cf7f2c00c00..6ecf356a300 100755
--- a/Master/bin/i386-darwin/ps2pk
+++ b/Master/bin/i386-darwin/ps2pk
diff --git a/Master/bin/i386-darwin/psbook b/Master/bin/i386-darwin/psbook
index 1fcc3eaac52..5a01a49a553 100755
--- a/Master/bin/i386-darwin/psbook
+++ b/Master/bin/i386-darwin/psbook
diff --git a/Master/bin/i386-darwin/psnup b/Master/bin/i386-darwin/psnup
index 830d9b9c9d6..50add4f8cdc 100755
--- a/Master/bin/i386-darwin/psnup
+++ b/Master/bin/i386-darwin/psnup
diff --git a/Master/bin/i386-darwin/psresize b/Master/bin/i386-darwin/psresize
index 0be48e04138..d2de5bca974 100755
--- a/Master/bin/i386-darwin/psresize
+++ b/Master/bin/i386-darwin/psresize
diff --git a/Master/bin/i386-darwin/psselect b/Master/bin/i386-darwin/psselect
index 12700adb56a..c3fd638a1ce 100755
--- a/Master/bin/i386-darwin/psselect
+++ b/Master/bin/i386-darwin/psselect
diff --git a/Master/bin/i386-darwin/pstops b/Master/bin/i386-darwin/pstops
index 7f796b7ece7..96b036ce1ad 100755
--- a/Master/bin/i386-darwin/pstops
+++ b/Master/bin/i386-darwin/pstops
diff --git a/Master/bin/i386-darwin/sjisconv b/Master/bin/i386-darwin/sjisconv
index 495b58b8ecb..66bc6a38808 100755
--- a/Master/bin/i386-darwin/sjisconv
+++ b/Master/bin/i386-darwin/sjisconv
diff --git a/Master/bin/i386-darwin/t1ascii b/Master/bin/i386-darwin/t1ascii
index 05464f5cd78..5f797ac7e77 100755
--- a/Master/bin/i386-darwin/t1ascii
+++ b/Master/bin/i386-darwin/t1ascii
diff --git a/Master/bin/i386-darwin/t1asm b/Master/bin/i386-darwin/t1asm
index 8058b5ab670..87855c440d7 100755
--- a/Master/bin/i386-darwin/t1asm
+++ b/Master/bin/i386-darwin/t1asm
diff --git a/Master/bin/i386-darwin/t1binary b/Master/bin/i386-darwin/t1binary
index bbf2e3ec181..33efbea1b20 100755
--- a/Master/bin/i386-darwin/t1binary
+++ b/Master/bin/i386-darwin/t1binary
diff --git a/Master/bin/i386-darwin/t1disasm b/Master/bin/i386-darwin/t1disasm
index 0818c258dcf..cb9681343d5 100755
--- a/Master/bin/i386-darwin/t1disasm
+++ b/Master/bin/i386-darwin/t1disasm
diff --git a/Master/bin/i386-darwin/t1dotlessj b/Master/bin/i386-darwin/t1dotlessj
index 10a5cd17aad..2f3a059129d 100755
--- a/Master/bin/i386-darwin/t1dotlessj
+++ b/Master/bin/i386-darwin/t1dotlessj
diff --git a/Master/bin/i386-darwin/t1lint b/Master/bin/i386-darwin/t1lint
index 44c2f6b32db..400fba3477a 100755
--- a/Master/bin/i386-darwin/t1lint
+++ b/Master/bin/i386-darwin/t1lint
diff --git a/Master/bin/i386-darwin/t1mac b/Master/bin/i386-darwin/t1mac
index afeec060a27..c483f3b9cea 100755
--- a/Master/bin/i386-darwin/t1mac
+++ b/Master/bin/i386-darwin/t1mac
diff --git a/Master/bin/i386-darwin/t1reencode b/Master/bin/i386-darwin/t1reencode
index 1feda85dc12..02996c706b4 100755
--- a/Master/bin/i386-darwin/t1reencode
+++ b/Master/bin/i386-darwin/t1reencode
diff --git a/Master/bin/i386-darwin/t1testpage b/Master/bin/i386-darwin/t1testpage
index b339a4f3054..478accce211 100755
--- a/Master/bin/i386-darwin/t1testpage
+++ b/Master/bin/i386-darwin/t1testpage
diff --git a/Master/bin/i386-darwin/t1unmac b/Master/bin/i386-darwin/t1unmac
index 017d4bd17c8..69d369cdf86 100755
--- a/Master/bin/i386-darwin/t1unmac
+++ b/Master/bin/i386-darwin/t1unmac
diff --git a/Master/bin/i386-darwin/t4ht b/Master/bin/i386-darwin/t4ht
index fd2ec11ec9a..8d7c66619f7 100755
--- a/Master/bin/i386-darwin/t4ht
+++ b/Master/bin/i386-darwin/t4ht
diff --git a/Master/bin/i386-darwin/tangle b/Master/bin/i386-darwin/tangle
index 0e14a44bf46..5743dde3d39 100755
--- a/Master/bin/i386-darwin/tangle
+++ b/Master/bin/i386-darwin/tangle
diff --git a/Master/bin/i386-darwin/tcdialog b/Master/bin/i386-darwin/tcdialog
index 3b5c690ad5e..b06881a9f42 100755
--- a/Master/bin/i386-darwin/tcdialog
+++ b/Master/bin/i386-darwin/tcdialog
diff --git a/Master/bin/i386-darwin/tex b/Master/bin/i386-darwin/tex
index ef44ff409ec..5c0f007adb6 100755
--- a/Master/bin/i386-darwin/tex
+++ b/Master/bin/i386-darwin/tex
diff --git a/Master/bin/i386-darwin/tex4ht b/Master/bin/i386-darwin/tex4ht
index fbfa20f1040..5ff8ff42224 100755
--- a/Master/bin/i386-darwin/tex4ht
+++ b/Master/bin/i386-darwin/tex4ht
diff --git a/Master/bin/i386-darwin/texconfig b/Master/bin/i386-darwin/texconfig
index 7c3ced61b53..f5a85098e0d 100755
--- a/Master/bin/i386-darwin/texconfig
+++ b/Master/bin/i386-darwin/texconfig
@@ -24,7 +24,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 progname=texconfig
 
 # the version string
-version=1168796427 # seconds since `00:00:00 1970-01-01 UTC'
+version=1168206389 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 envVars="
@@ -629,7 +629,7 @@ Get more help with
       echo
       echo '==================== binaries found by searching $PATH ==================='
       echo "PATH=$PATH"
-      echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdftex mktexpk dvips dvipdfm
+      echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdfetex mktexpk dvips dvipdfm
       echo
       echo '=========================== active config files =========================='
       echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort -k 2
@@ -1187,7 +1187,7 @@ Valid MODE settings:"
             if checkForBinary dvips >/dev/null && tcfmgr --cmd find --file config.ps >/dev/null 2>&1; then
               tcBatch dvips mode "$tcBatchMode"
             fi
-            if checkForBinary pdftex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then
+            if checkForBinary pdfetex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then
               tcBatch pdftex mode "$tcBatchMode"
             fi
           else
@@ -1231,7 +1231,7 @@ Valid PAPER settings:
       if checkForBinary xdvi >/dev/null && tcfmgr --cmd find --file XDvi >/dev/null 2>&1; then
         tcBatch xdvi paper $pXdvi
       fi
-      if checkForBinary pdftex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then
+      if checkForBinary pdfetex >/dev/null && tcfmgr --cmd find --file pdftexconfig.tex >/dev/null 2>&1; then
         tcBatch pdftex paper $p
       fi
       ;;
@@ -1257,7 +1257,7 @@ Valid PAPER settings:
                 set x `getRes "$tcBatchPdftexMode"`; shift
                 fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1"
                 if $fmgrConfigReplaceChanged; then
-                  fmtutil --refresh
+                  fmtutil --all
                 fi
               else
                 echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2
@@ -1276,7 +1276,7 @@ Valid PAPER settings:
               wChanged=$fmgrConfigReplaceChanged
               fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
               if $wChanged || $fmgrConfigReplaceChanged; then
-                fmtutil --refresh
+                fmtutil --all
               fi
               ;;
             a4)
@@ -1285,7 +1285,7 @@ Valid PAPER settings:
               wChanged=$fmgrConfigReplaceChanged
               fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
               if $wChanged || $fmgrConfigReplaceChanged; then
-                fmtutil --refresh
+                fmtutil --all
               fi
               ;;
             "") echo "$help" >&2; rc=1;;
diff --git a/Master/bin/i386-darwin/texi2html b/Master/bin/i386-darwin/texi2html
index ea9fea942a7..40ff46094d8 100755
--- a/Master/bin/i386-darwin/texi2html
+++ b/Master/bin/i386-darwin/texi2html
@@ -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 = '/Volumes/Beta/texlive/Build/source/inst';
+my $prefix = '/usr/local/Build/i386/TeXLive.2006';
 my $sysconfdir;
 my $pkgdatadir;
 my $datadir;
@@ -92,10 +92,10 @@ else
     $sysconfdir = "/usr/local/etc";
 }
 
-if ('/Volumes/Beta/texlive/Build/source/inst' ne '@' . 'datadir@')
+if ('/usr/local/Build/i386/TeXLive.2006' ne '@' . 'datadir@')
 {
-    $pkgdatadir = eval '"/Volumes/Beta/texlive/Build/source/inst/texi2html"';
-    $datadir = eval '"/Volumes/Beta/texlive/Build/source/inst"';
+    $pkgdatadir = eval '"/usr/local/Build/i386/TeXLive.2006/texi2html"';
+    $datadir = eval '"/usr/local/Build/i386/TeXLive.2006"';
 }
 else
 {
diff --git a/Master/bin/i386-darwin/texindex b/Master/bin/i386-darwin/texindex
index 7baca83e506..5fb82887196 100755
--- a/Master/bin/i386-darwin/texindex
+++ b/Master/bin/i386-darwin/texindex
diff --git a/Master/bin/i386-darwin/tftopl b/Master/bin/i386-darwin/tftopl
index 611dd637b74..3ca14a8b64f 100755
--- a/Master/bin/i386-darwin/tftopl
+++ b/Master/bin/i386-darwin/tftopl
diff --git a/Master/bin/i386-darwin/tie b/Master/bin/i386-darwin/tie
index 377932bbbab..3ad284e81af 100755
--- a/Master/bin/i386-darwin/tie
+++ b/Master/bin/i386-darwin/tie
diff --git a/Master/bin/i386-darwin/ttf2afm b/Master/bin/i386-darwin/ttf2afm
index b357ecc127d..0b10689dff8 100755
--- a/Master/bin/i386-darwin/ttf2afm
+++ b/Master/bin/i386-darwin/ttf2afm
diff --git a/Master/bin/i386-darwin/ttf2pk b/Master/bin/i386-darwin/ttf2pk
index af08af77a49..70c3b2c0324 100755
--- a/Master/bin/i386-darwin/ttf2pk
+++ b/Master/bin/i386-darwin/ttf2pk
diff --git a/Master/bin/i386-darwin/ttf2tfm b/Master/bin/i386-darwin/ttf2tfm
index ae98a89c792..8c072f197a0 100755
--- a/Master/bin/i386-darwin/ttf2tfm
+++ b/Master/bin/i386-darwin/ttf2tfm
diff --git a/Master/bin/i386-darwin/ttftotype42 b/Master/bin/i386-darwin/ttftotype42
index b941e3f0db0..b44ea47f2eb 100755
--- a/Master/bin/i386-darwin/ttftotype42
+++ b/Master/bin/i386-darwin/ttftotype42
diff --git a/Master/bin/i386-darwin/vftovp b/Master/bin/i386-darwin/vftovp
index 76806a8b00b..d693e22fc07 100755
--- a/Master/bin/i386-darwin/vftovp
+++ b/Master/bin/i386-darwin/vftovp
diff --git a/Master/bin/i386-darwin/vptovf b/Master/bin/i386-darwin/vptovf
index f032612a0b5..cb7fb24adba 100755
--- a/Master/bin/i386-darwin/vptovf
+++ b/Master/bin/i386-darwin/vptovf
diff --git a/Master/bin/i386-darwin/weave b/Master/bin/i386-darwin/weave
index 1591a01a03c..aee72d224be 100755
--- a/Master/bin/i386-darwin/weave
+++ b/Master/bin/i386-darwin/weave
diff --git a/Master/bin/i386-darwin/xdv2pdf b/Master/bin/i386-darwin/xdv2pdf
index 9e58bcd1462..f459745b407 100755
--- a/Master/bin/i386-darwin/xdv2pdf
+++ b/Master/bin/i386-darwin/xdv2pdf
diff --git a/Master/bin/i386-darwin/xdvi-xaw.bin b/Master/bin/i386-darwin/xdvi-xaw.bin
index 64e9b005580..58840da4a6e 100755
--- a/Master/bin/i386-darwin/xdvi-xaw.bin
+++ b/Master/bin/i386-darwin/xdvi-xaw.bin
diff --git a/Master/bin/i386-darwin/xdvipdfmx b/Master/bin/i386-darwin/xdvipdfmx
index fffcdf68e31..f5585e0bebe 100755
--- a/Master/bin/i386-darwin/xdvipdfmx
+++ b/Master/bin/i386-darwin/xdvipdfmx
diff --git a/Master/bin/i386-darwin/xetex b/Master/bin/i386-darwin/xetex
index c7c27683604..8c903280d45 100755
--- a/Master/bin/i386-darwin/xetex
+++ b/Master/bin/i386-darwin/xetex