132 files changed, 91 insertions, 74 deletions

diff --git a/Master/bin/i386-darwin/T1Wrap b/Master/bin/i386-darwin/T1Wrap
index 719f0079c3c..4fdc1d30b5d 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 5938d81cf9c..652ade14051 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 0d44fab068c..90eeb53dace 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 2ff2b680ebe..a09a2b78ae3 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 1b4d8e9fad1..1c823afd860 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 52e72f8f82a..a2f9e0c33ce 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 ee8f6b51ec7..80d59d41ff7 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 a6de2e70556..23af2d1fe80 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 8584791385b..e5fa4be0df0 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 f9a5198f36f..0012dbd3d5b 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 2a12034d454..766616e3cf6 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 58b19de7238..62d0bf98e93 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 7a97a117284..a31ae477bb7 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 780fca1365d..140ad4da2f8 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 41968a6067a..a41b2399e53 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 f0b25a1435a..08db61e1e3f 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 ef5c298fbcb..9c0bac9ec73 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 b22e434e8ad..a9fe40aefde 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 c19742299d7..536426ec692 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 13dc919b94c..d61b2eb5770 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 f282818fbfc..e670d9d169a 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 90ffc1418e9..a5fe1786176 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 3da37fa6571..55fb9867b4a 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 c2c0c04dca9..36903e21df1 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 053026d744b..36b435ec37b 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 53b7c75c47e..a076ebf3f04 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 81efb350e46..7f0b75c678b 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 40890b38813..2a6d8ecdf99 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 8b1ebda0b72..11c89438e41 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 053c58d1f04..0fe494ded17 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 3cc041bb035..963ec5870a1 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 58dd60fa529..bf3d4e245de 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 94bb0cc11dd..7e4e816f560 100755
--- a/Master/bin/i386-darwin/dvipng
+++ b/Master/bin/i386-darwin/dvipng
diff --git a/Master/bin/i386-darwin/dvipos b/Master/bin/i386-darwin/dvipos
new file mode 100755
index 00000000000..a7f9025b3c9
--- /dev/null
+++ b/Master/bin/i386-darwin/dvipos
diff --git a/Master/bin/i386-darwin/dvips b/Master/bin/i386-darwin/dvips
index 611e9a251df..7854252b47c 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 8b911af34bc..aed521e84e7 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 f49e88f3ca3..90945888102 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 69207e056e1..53d99ef83f9 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 9c16a931288..1e7e35e005e 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 7934adc4bba..e722ef9f328 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 ae315af3972..f146c0a374c 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 5ace4f11fc4..7951eddb9f1 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 e061f4f20af..9342c679aaf 100755
--- a/Master/bin/i386-darwin/fmtutil
+++ b/Master/bin/i386-darwin/fmtutil
@@ -24,10 +24,12 @@
 # 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
@@ -198,6 +200,7 @@ 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)
@@ -383,6 +386,7 @@ main()
       ;;
   esac
 
+  use_engine_dir=true # whether to use web2c/$engine subdirs
   while
     case $1 in
       --cnffile)
@@ -393,6 +397,8 @@ 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)
@@ -547,31 +553,11 @@ main()
     refresh)
       recreate_existing;;
     byfmt)
-      create_one_format "$arg";;
+      recreate_by_fmt "$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
 }
 
@@ -622,9 +608,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost;;
-    mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex;;
+    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;;
   esac
 
   # See if we can find $inifile for return code:
@@ -699,16 +685,30 @@ 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 && echo "$fulldestdir/$fmtfile"
+      mktexupd "$fulldestdir" "$fmtfile"
+    fi
   else
     log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' failed"
   fi
 }
 
 ###############################################################################
-# recreate_loop(hyphenfile)
+# recreate_loop()
 #   for each line in config file: check match-condition and recreate format
 #   if there is a match
 ###############################################################################
@@ -723,7 +723,6 @@ recreate_loop()
   do
     parse_line $line || continue
     check_match || continue
-    echo; echo
     run_initex
   done
 }
@@ -759,15 +758,14 @@ check_match()
 }
 
 ###############################################################################
-# create_one_format(fmtname)
-#   (re)create the format file for the format `fmtname'
+# recreate_by_fmt(fmtname)
+#   recreate all versions of fmtname
 ###############################################################################
-create_one_format()
+recreate_by_fmt()
 {
   fmtname=$1
-
-  find_info_for_name $fmtname || abort "format \`$fmtname' not available"
-  run_initex
+  match_cmd="test x\$format = x$fmtname"
+  recreate_loop
 }
 
 ###############################################################################
@@ -777,7 +775,7 @@ create_one_format()
 create_missing()
 {
   # match_cmd='test ! -f $destdir/$fmtfile'
-  match_cmd='test ! -f "`kpsewhich -progname=$format $fmtfile`"'
+  match_cmd='test ! -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
   recreate_loop
 }
 
@@ -787,7 +785,7 @@ create_missing()
 ###############################################################################
 recreate_existing()
 {
-  match_cmd='test -f "`kpsewhich -progname=$format $fmtfile`"'
+  match_cmd='test -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
   recreate_loop
 }
 
@@ -862,7 +860,7 @@ disablefmt()
   grep "^$1[ 	]" $cnf_file >/dev/null || { (exit 0); return 0; }
 
   ed $cnf_file >/dev/null 2>&1 <<-eof
-	/^$1[ 	]/s/^/#! /
+	g/^$1[ 	]/s/^/#! /
 	w
 	q
 eof
@@ -877,7 +875,7 @@ enablefmt()
 {
   grep "^#![ 	]*$1[ 	]" $cnf_file >/dev/null || { (exit 0); return 0; }
   ed $cnf_file >/dev/null 2>&1 <<-eof
-	/^#![ 	]*$1[ 	]/s/..[ 	]*//
+	g/^#![ 	]*$1[ 	]/s/..[ 	]*//
 	w
 	q
 eof
diff --git a/Master/bin/i386-darwin/gftodvi b/Master/bin/i386-darwin/gftodvi
index 8dbcebdfd8f..5e8e198da28 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 d0f96b64b3e..2c68271d2f1 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 898f72aa039..0335b7f3e54 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 96fea063995..d8ba5f1c0c5 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 654e9639739..927114cbaba 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 9d6d4549574..9e01fa97f66 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 $5 $1 
-        tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
+        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 
 
 
 
diff --git a/Master/bin/i386-darwin/htlatex b/Master/bin/i386-darwin/htlatex
index 1b8b7cea74a..ebab47dbaa6 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 -f/$1  -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
+        tex4ht \dirchar $1  -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-darwin/htmex b/Master/bin/i386-darwin/htmex
index b4aa3d9a06e..485a7594468 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
+        tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-darwin/httex b/Master/bin/i386-darwin/httex
index 44920e72077..4c184897d13 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
+        tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
 
 
 
diff --git a/Master/bin/i386-darwin/httexi b/Master/bin/i386-darwin/httexi
index 0ce3cb4a589..26427698991 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 -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
+        tex4ht \dirchar $1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
+        t4ht \dirchar $1 $4 ## -d~/WWW/temp/ -m644 
 #        texindex ?
 
 
diff --git a/Master/bin/i386-darwin/info b/Master/bin/i386-darwin/info
index b307259ff03..fd183298c2b 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 61b8b864333..e826e0312bb 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 e71bac61fcb..a70909c1c90 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 c8db11e272d..0b724e8a86b 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 ab32812aebe..dfb32190af9 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 a4561fc8927..b47dea98eeb 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 8c390e11043..0612c63db5f 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 229f58c1cd2..6332e87ea58 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 08207319003..0445e5b6a09 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 5c423fdaf58..16afba85dac 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 e4120355943..2081ffb0706 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 bf6676b99cf..11b0b6ff347 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 38818ca99ce..d6a8f987a20 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 42f5e3f14ce..ce85db2277b 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 36e0ebb496f..e735def6212 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 0f4b664506c..2bd1f7e2038 100755
--- a/Master/bin/i386-darwin/mk4ht
+++ b/Master/bin/i386-darwin/mk4ht
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-# mk4ht                                 2006-08-28-20:45 %
-# Copyright (C) 2003--2006               Eitan M. Gurari %
+# mk4ht                                 2007-01-04-01:34 %
+# Copyright (C) 2003--2007               Eitan M. Gurari %
 #                                                        %
 #                                                        %
 # This work may be distributed and/or modified under the %
@@ -58,6 +58,10 @@ 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",
@@ -178,7 +182,7 @@ print "  clean.htlatex     lg tmp\n";
 
 }
 
-print "mk4ht (2006-08-28-20:45)\n";
+print "mk4ht (2007-01-04-01:34)\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 5510138adff..b30c7c2da03 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 3cb01bf4eac..2bca2949864 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 056c7aa9b19..34a6cc7254d 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 3583ccb3335..1b7ebb6cbbe 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 04f4a7fa2b8..ffc10ea5f96 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 ccb5b9dbb92..5d97137832f 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 5940cdfff38..696283e1463 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 bcc9c01641e..cfc19fc5c22 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 06eb3443840..b49651d0b92 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 68a321af5a5..065b6c27857 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 b4855ebb1b4..93562a1d3ca 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 9d0ee83b716..7bedbe6b51f 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 87fdd8c3d77..7a46221e5d5 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 fd9100467fc..cff5cc40e90 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 bb56ad0a38a..6b25cc8f644 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 427876601e8..ba1ae1595bc 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 aa80e9282f8..676c7bbfa30 100755
--- a/Master/bin/i386-darwin/pdftex
+++ b/Master/bin/i386-darwin/pdftex
diff --git a/Master/bin/i386-darwin/pdftosrc b/Master/bin/i386-darwin/pdftosrc
new file mode 100755
index 00000000000..4b38de81c4b
--- /dev/null
+++ b/Master/bin/i386-darwin/pdftosrc
diff --git a/Master/bin/i386-darwin/pfb2pfa b/Master/bin/i386-darwin/pfb2pfa
index f1654dcc535..9c6cf0a5036 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 b85523fb1c9..8f054c6a027 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 b3d45eb10ee..25b7d7c0cdb 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 462da450d66..3d051551c42 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 dfa069821ba..5c3ba52c356 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 08742f70db4..f3aae3aee6d 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 920e7398dd3..aeb0e9a8e43 100755
--- a/Master/bin/i386-darwin/ps2eps
+++ b/Master/bin/i386-darwin/ps2eps
@@ -1,12 +1,11 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' # -*-perl-*-
-        if 0;
+#!/usr/bin/env perl
 # The expression in the previous line replaces the unix specific line 
 # {#!/usr/bin/perl}.   
 # ps2eps - convert PostScript to EPS (Encapsulated PostScript) files
 # -------------------------------------------------------------------
-# $Id: ps2eps,v 1.54 2004/04/23 07:56:54 bless Exp $
+# $Id: ps2eps,v 1.61 2006/12/28 16:34:06 bless Exp $
 # -------------------------------------------------------
-# (C)opyright 1999-2004 Roland Bless
+# (C)opyright 1999-2006 Roland Bless
 #
 # 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     
@@ -23,7 +22,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 # Author: Roland Bless
-# Send bug reports to roland@bless.de
+# Send bug reports to roland <at> bless.de
 # -------------------------------------------------------------------
 # Additional filtering is performed when Windows generated PostScript files
 # are processed. Some instructions will otherwise lead to bad output
@@ -44,18 +43,21 @@ use Getopt::Long;
 Getopt::Long::Configure("no_ignore_case");
 
 $prgname= "ps2eps";
-if ($^O =~ /MSWin32/i or $^O =~ /cygwin/i) 
-{
+
+if (! -d "/usr/bin")
+{ # we assume that we are running under native windows
   $ghostscriptname = "gswin32c";
+  $NULLDEV = "nul";
 } 
 else 
-{
+{ # Unix or cygwin
   $ghostscriptname = "gs";
+  $NULLDEV = "/dev/null 2>&1";
 }
 
-$bboxver=`bbox >/dev/null 2>&1 -V`;
+$bboxver=`bbox >$NULLDEV -V`;
 $bboxname= ($?== -1) ? "" : "bbox";
-$version= '$Id: ps2eps,v 1.54 2004/04/23 07:56:54 bless Exp $'; #'
+$version= '$Id: ps2eps,v 1.61 2006/12/28 16:34:06 bless Exp $'; #'
 $insertPScode= 1;     # Insert surrounding Postscript code
 $infhandle = STDIN;   # Standard input is the default input file
 $outfhandle = STDOUT; # Standard output is default output if STDIN is input
@@ -142,7 +144,7 @@ $licensetxt= "\
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n";
 
 @prgidtxt= ( "$prgname - convert PostScript to EPS (Encapsulated PostScript) files\n",
-	     "(C)opyright 1998-2004 Roland Bless\n\n" );
+	     "(C)opyright 1998-2006 Roland Bless\n\n" );
 
 @helptxt= ("Version: $ver[2]\n",
           "Operation:\n",
@@ -174,6 +176,7 @@ $licensetxt= "\
 	    "                            use --size=list to list pre-defined page sizes\n",
 	    " -R, --rotate=<direction>   rotate resulting EPS. <direction>: +=+90 (clockw.),-=-90 (counter-clockw.) ^=180 degrees\n",
 	    " -t, --translate            specify x,y offset (may be negative) in postscript points (1/72 dpi)\n",
+	    " -r, --resolution           specify dpi resolution to render with ghostscript (default 144)",
             " -l, --loose                expand the original bounding box by one point in each direction\n",
 	    " -B, --ignoreBB             do not use existing bounding box as page size for rendering\n",
 	    " -E, --ignoreEOF            do not use %%EOF as hint for end of file\n",
@@ -210,6 +213,7 @@ if (defined($ENV{"$envname_gsbbox"}))
 
 $opt_t = '';          # for t-option
 $opt_R = '';          # for R-option
+$opt_r = '';          # for r-option
 $stopnow = 0;
 die "Wrong option(s), please check usage with $prgname --help\n" unless 
 GetOptions('f|force'	=> \$forceoverwrite,
@@ -227,6 +231,7 @@ GetOptions('f|force'	=> \$forceoverwrite,
 	   'E|ignoreEOF'=> \$ignoreEOFDSC,
 	   's|size=s'	=> \$opt_s,
 	   't|translate=s'	=> \$opt_t,
+	   'r|resolution=s' => \$opt_r,
 	   'R|rotate=s'	=> \$opt_R,
 	   'g|gsbbox'   => sub { $bboxname=""; },
 	   'H|nohires'  => \$nohires,
@@ -260,6 +265,11 @@ $filenames[0]= '-' if (scalar(@filenames) == 0); # no file arguments, use STDIN
 
 print STDERR "Input files: @filenames\n" if (!$quiet);
 
+if ($opt_r ne '') 
+{
+  $resolution=$opt_r;
+}
+
 # papersize stuff
 if ($opt_s ne '') 
 {
@@ -523,10 +533,10 @@ while ($infname= (shift @filenames))
   ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   ## -- calculate the bounding box --
   ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  if ($translate_x>0 || $translate_y>0)
+  if ($translate_x!=0 || $translate_y!=0)
   {
     $translation="$translate_x $translate_y translate";
-    $translatecmd="-c \'$translation\'";
+    $translatecmd="-c $translation";
   }
   else
   {
@@ -554,7 +564,9 @@ while ($infname= (shift @filenames))
   }
   else
   {
-      print STDERR "...using bbox device of $ghostscriptname...";
+      if (!$quiet) {
+	  print STDERR "...using bbox device of $ghostscriptname...";
+      }
       $cmdline = "$ghostscriptname -dSAFER -dBATCH -dNOPAUSE -q $gpar -r$resolution -sDEVICE=bbox -sOutputFile=- -c \"/setpagedevice {pop} def\" $translatecmd -f $tmpfname -c quit 2>&1";
   }
 
@@ -565,7 +577,7 @@ while ($infname= (shift @filenames))
   if ($debuggs) { print STDERR "Call result: $boundingbox"; }
 
   # check result of gs call
-  if ($boundingbox !~ /^%%BoundingBox/)
+  if ($boundingbox !~ /^%%BoundingBox/m)
   {
     print STDERR "Error: Could not determine bounding box!\n",
     "I suppose $ghostscriptname had some trouble interpreting the postscript-file\n";
@@ -601,9 +613,12 @@ while ($infname= (shift @filenames))
       if ($cBBlly > 0) { $cBBlly--; }
       $cBBurx++; $cBBury++;
   }
-  if (!$quiet && ($cBBllx < 0 || $cBBlly < 0 ))
+  if ($cBBllx < 0 || $cBBlly < 0)
   {
-    print STDERR "WARNING! Your drawing had a negative Bounding Box which is deprecated and may cause problems!. I'll shift it.\n";
+    if (!$quiet) 
+    {
+      print STDERR "WARNING! Your drawing had a negative Bounding Box which is deprecated and may cause problems!. I'll shift it.\n";
+    }
     $translate_x= -int($cBBllx);
     $translate_y= -int($cBBlly);
     $cBBllx=0;
diff --git a/Master/bin/i386-darwin/ps2pk b/Master/bin/i386-darwin/ps2pk
index 78f9e0756ec..cf7f2c00c00 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 662fb7b456b..1fcc3eaac52 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 26c9b9e5fdf..830d9b9c9d6 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 5f00ba10450..0be48e04138 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 dbeefb08905..12700adb56a 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 fc097e7f50a..7f796b7ece7 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 50592865275..495b58b8ecb 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 09380bb2d2d..05464f5cd78 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 68129e5fcff..8058b5ab670 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 2fef456dfa1..bbf2e3ec181 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 3fa0f680fdc..0818c258dcf 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 e9fa1c4c3dd..10a5cd17aad 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 5864db667da..44c2f6b32db 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 bf644f89ea5..afeec060a27 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 c3c22d8ca2c..1feda85dc12 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 faee32b4ba7..b339a4f3054 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 54ee90d6f02..017d4bd17c8 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 42eac4d39d7..fd2ec11ec9a 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 66bc7f617eb..0e14a44bf46 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 f719d1cfae7..3b5c690ad5e 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 ae262c0eb40..ef44ff409ec 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 a9b2747824b..fbfa20f1040 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 f5a85098e0d..3f02cebb312 100755
--- a/Master/bin/i386-darwin/texconfig
+++ b/Master/bin/i386-darwin/texconfig
@@ -1257,7 +1257,7 @@ Valid PAPER settings:
                 set x `getRes "$tcBatchPdftexMode"`; shift
                 fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1"
                 if $fmgrConfigReplaceChanged; then
-                  fmtutil --all
+                  fmtutil --refresh
                 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 --all
+                fmtutil --refresh
               fi
               ;;
             a4)
@@ -1285,7 +1285,7 @@ Valid PAPER settings:
               wChanged=$fmgrConfigReplaceChanged
               fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
               if $wChanged || $fmgrConfigReplaceChanged; then
-                fmtutil --all
+                fmtutil --refresh
               fi
               ;;
             "") echo "$help" >&2; rc=1;;
diff --git a/Master/bin/i386-darwin/texi2html b/Master/bin/i386-darwin/texi2html
index 9b45e2044e3..ea9fea942a7 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 = '/Users/jonathan/texlive/Build/source/inst';
+my $prefix = '/Volumes/Beta/texlive/Build/source/inst';
 my $sysconfdir;
 my $pkgdatadir;
 my $datadir;
@@ -92,10 +92,10 @@ else
     $sysconfdir = "/usr/local/etc";
 }
 
-if ('/Users/jonathan/texlive/Build/source/inst' ne '@' . 'datadir@')
+if ('/Volumes/Beta/texlive/Build/source/inst' ne '@' . 'datadir@')
 {
-    $pkgdatadir = eval '"/Users/jonathan/texlive/Build/source/inst/texi2html"';
-    $datadir = eval '"/Users/jonathan/texlive/Build/source/inst"';
+    $pkgdatadir = eval '"/Volumes/Beta/texlive/Build/source/inst/texi2html"';
+    $datadir = eval '"/Volumes/Beta/texlive/Build/source/inst"';
 }
 else
 {
diff --git a/Master/bin/i386-darwin/texindex b/Master/bin/i386-darwin/texindex
index 444a9c93f65..7baca83e506 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 c8cbaf1d155..611dd637b74 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 1974992a852..377932bbbab 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 f40f57deb7a..b357ecc127d 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 dbb34216ec9..af08af77a49 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 217e2faeec6..ae98a89c792 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 1a806932e33..b941e3f0db0 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 b0cb7e1ca0e..76806a8b00b 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 05a74901dc4..f032612a0b5 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 b176dfed7a1..1591a01a03c 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 89f04ad18b6..9e58bcd1462 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 9ca6de24d81..64e9b005580 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 8f6647b505e..fffcdf68e31 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 0e1faaa0fff..c7c27683604 100755
--- a/Master/bin/i386-darwin/xetex
+++ b/Master/bin/i386-darwin/xetex