binary update from gerben

git-svn-id: svn://tug.org/texlive/trunk@3611 c570f23f-e606-0410-a88d-b1316a301751

73 files changed, 67 insertions, 48 deletions

diff --git a/Master/bin/i386-darwin/afm2pl b/Master/bin/i386-darwin/afm2pl
index fec9fcda93f..4e56a9d5535 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 de2851270a3..6a09ba80b91 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 6697d6f670b..b746561db94 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..26d03e43037 100755
--- a/Master/bin/i386-darwin/bbox
+++ b/Master/bin/i386-darwin/bbox
diff --git a/Master/bin/i386-darwin/bibtex b/Master/bin/i386-darwin/bibtex
index 6e7694bd759..3ab9ea41b1d 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 57a6fb9040e..e4059b18012 100755
--- a/Master/bin/i386-darwin/bibtex8
+++ b/Master/bin/i386-darwin/bibtex8
diff --git a/Master/bin/i386-darwin/ctangle b/Master/bin/i386-darwin/ctangle
index a1043dd64da..16943fcc63b 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 fe94ed233f2..a9e4019c550 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 53e62a9c30e..a2e7a8c2c5c 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 124bb8efc15..843f09cef38 100755
--- a/Master/bin/i386-darwin/detex
+++ b/Master/bin/i386-darwin/detex
diff --git a/Master/bin/i386-darwin/dmp b/Master/bin/i386-darwin/dmp
index 7c8aab9797f..764e68654d2 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 360a865f6c3..fe231792788 100755
--- a/Master/bin/i386-darwin/dt2dv
+++ b/Master/bin/i386-darwin/dt2dv
diff --git a/Master/bin/i386-darwin/dvicopy b/Master/bin/i386-darwin/dvicopy
index 6ef3f20e5c7..d6d50f581c4 100755
--- a/Master/bin/i386-darwin/dvicopy
+++ b/Master/bin/i386-darwin/dvicopy
diff --git a/Master/bin/i386-darwin/dvilj b/Master/bin/i386-darwin/dvilj
index db9f9e5fc4f..79fda56b220 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 96215c3fe8f..ac3a03ede12 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 2d3211efac8..e51e2a28442 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 d6c5991c250..342d6f77347 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 6f094c7704f..d3cb8ad3e61 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 dab4498612f..ed8f8887094 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 56d36023bcf..750244344e8 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
index a7f9025b3c9..bceaee2ea6a 100755
--- a/Master/bin/i386-darwin/dvipos
+++ b/Master/bin/i386-darwin/dvipos
diff --git a/Master/bin/i386-darwin/dvips b/Master/bin/i386-darwin/dvips
index e5ae253fea6..f3dd4dd1e07 100755
--- a/Master/bin/i386-darwin/dvips
+++ b/Master/bin/i386-darwin/dvips
diff --git a/Master/bin/i386-darwin/dvitomp b/Master/bin/i386-darwin/dvitomp
index 3a0f547bd5a..6b851c25257 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 3e03a78101d..95c12cf3a74 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 9b54767ad47..fa6338b40f6 100755
--- a/Master/bin/i386-darwin/ebb
+++ b/Master/bin/i386-darwin/ebb
diff --git a/Master/bin/i386-darwin/gftodvi b/Master/bin/i386-darwin/gftodvi
index 8f1e74056b4..f116ea4bb56 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 ef729dae84b..abac512ad2c 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 d42668ff5fe..4b8ccbb4be5 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 e7c0c41a9b1..3918892c3db 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 9392f17cc89..54a624f543a 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/kpsewhich b/Master/bin/i386-darwin/kpsewhich
index 95ba2e754e8..31abed10889 100755
--- a/Master/bin/i386-darwin/kpsewhich
+++ b/Master/bin/i386-darwin/kpsewhich
diff --git a/Master/bin/i386-darwin/makeindex b/Master/bin/i386-darwin/makeindex
index bcfa243a77b..e7776e5a71b 100755
--- a/Master/bin/i386-darwin/makeindex
+++ b/Master/bin/i386-darwin/makeindex
diff --git a/Master/bin/i386-darwin/makempx b/Master/bin/i386-darwin/makempx
index 11ea0231da8..c5bdbd7738f 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 621f6c8d027..402037a2c3e 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 3e88f4e66cc..babbdbf3e82 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 2150189080b..f9282219fe8 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/mpost b/Master/bin/i386-darwin/mpost
index 4cb0dd0622c..f47a51609d1 100755
--- a/Master/bin/i386-darwin/mpost
+++ b/Master/bin/i386-darwin/mpost
diff --git a/Master/bin/i386-darwin/odvicopy b/Master/bin/i386-darwin/odvicopy
index e833aa80cf5..ca539a24208 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 16fdde83305..26ab6e712c0 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 53093be3f50..37e21613765 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 486ea4c958a..5340d594ee1 100755
--- a/Master/bin/i386-darwin/omfonts
+++ b/Master/bin/i386-darwin/omfonts
diff --git a/Master/bin/i386-darwin/otftotfm b/Master/bin/i386-darwin/otftotfm
index 54313ca7b7b..46c6c813900 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 a2508a3f995..9aad462402d 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 3ac2694fc0a..204fc86450f 100755
--- a/Master/bin/i386-darwin/outocp
+++ b/Master/bin/i386-darwin/outocp
diff --git a/Master/bin/i386-darwin/pdftex b/Master/bin/i386-darwin/pdftex
index 1ae3ad6350f..2645c36c41f 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
index 4b38de81c4b..602da14d7b3 100755
--- a/Master/bin/i386-darwin/pdftosrc
+++ b/Master/bin/i386-darwin/pdftosrc
diff --git a/Master/bin/i386-darwin/pktogf b/Master/bin/i386-darwin/pktogf
index 95b9b4c73be..1b508b2ca9e 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 eb4250d3fbf..e0b61346ec0 100755
--- a/Master/bin/i386-darwin/pktype
+++ b/Master/bin/i386-darwin/pktype
diff --git a/Master/bin/i386-darwin/ps2eps b/Master/bin/i386-darwin/ps2eps
index fd00ba9faca..aeb0e9a8e43 100755
--- a/Master/bin/i386-darwin/ps2eps
+++ b/Master/bin/i386-darwin/ps2eps
@@ -1,5 +1,4 @@
-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
diff --git a/Master/bin/i386-darwin/ps2pk b/Master/bin/i386-darwin/ps2pk
index 6ecf356a300..a6d2567fd1a 100755
--- a/Master/bin/i386-darwin/ps2pk
+++ b/Master/bin/i386-darwin/ps2pk
diff --git a/Master/bin/i386-darwin/t4ht b/Master/bin/i386-darwin/t4ht
index 8d7c66619f7..d84dbe389e8 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 5743dde3d39..1a2cb11b84d 100755
--- a/Master/bin/i386-darwin/tangle
+++ b/Master/bin/i386-darwin/tangle
diff --git a/Master/bin/i386-darwin/tex b/Master/bin/i386-darwin/tex
index 5c0f007adb6..7be3557fa68 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 5ff8ff42224..794da76dec1 100755
--- a/Master/bin/i386-darwin/tex4ht
+++ b/Master/bin/i386-darwin/tex4ht
diff --git a/Master/bin/i386-darwin/texi2html b/Master/bin/i386-darwin/texi2html
index 40ff46094d8..e8a17e540db 100755
--- a/Master/bin/i386-darwin/texi2html
+++ b/Master/bin/i386-darwin/texi2html
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 'di ';
 'ig 00 ';
 #+##############################################################################
@@ -5705,7 +5705,6 @@ $LANGUAGES->{'en'} = {
 
 $T2H_OBSOLETE_STRINGS->{'en'} = {};
 
-
 my $index_name = -1;
 my @index_to_hash = ('style_map', 'style_map_pre', 'style_map_texi');
 foreach my $hash (\%style_map, \%style_map_pre, \%style_map_texi, \%unformatted_text_style_map_texi)
diff --git a/Master/bin/i386-darwin/texlinks b/Master/bin/i386-darwin/texlinks
index f84f55a95bd..148d457aa84 100755
--- a/Master/bin/i386-darwin/texlinks
+++ b/Master/bin/i386-darwin/texlinks
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Thomas Esser, 1999, 2002, 2003. public domain.
+# Copyright Thomas Esser, 1999, 2002, 2003. public domain.
 
 # texlinks: script to maintain symlinks from format to engine. Interprets
 # the lines given in fmtutil.cnf.
@@ -35,7 +35,7 @@ export PATH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 cnf=fmtutil.cnf   # name of the config file
-version=1169050907 # seconds since `00:00:00 1970-01-01 UTC'
+version=1125258113 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 progname=texlinks
 
@@ -133,23 +133,16 @@ install_link()
 
   case $src in
     */mf)
-      if test "$dest" = mf-nowin; then
-        if test -f $selfautoloc/mfw; then
-          dest=mfw  # name for windows-enabled mf, once upon a time
-          verbose_echo "both mfw and mf-nowin exists, $src linked to $dest"
-        fi
-        if test -f $selfautoloc/mf && test -f $selfautoloc/mf-nowin; then
-          # have both mf and mf-nowin binaries.  no link.
-          verbose_echo "metafont symlink $src -> $dest skipped (special case)"
-          return
-        fi
+      if test $dest = "mf-nowin" && test -f $selfautoloc/mfw; then
+        dest="mfw"
+        verbose_echo "both mfw and mf-nowin exists, $src linked to $dest"
       fi
       ;;
   esac
 
   case $src in
     */cont-??|*/metafun|*/mptopdf)
-      verbose_echo "symlink $src -> $dest skipped (special case)"
+      verbose_echo "symlink $2 -> $dest skipped (special case)"
       ;;
     *)
       test "x$src" != "x`(ls -ld $src | awk '{print $NF}') 2>/dev/null`" &&
@@ -160,7 +153,7 @@ install_link()
           true)
             ;;
           *)
-            errmsg "install_link $src -> $dest failed: file already exists."
+            errmsg "install_link failed for $src. File already exists."
             ;;
         esac
       else
diff --git a/Master/bin/i386-darwin/texmfstart b/Master/bin/i386-darwin/texmfstart
index a886b2aa142..4d1e2976145 100755
--- a/Master/bin/i386-darwin/texmfstart
+++ b/Master/bin/i386-darwin/texmfstart
@@ -425,7 +425,7 @@ class KpseFast
         @rootpath    = ''
         @treepath    = ''
         @progname    = 'kpsewhich'
-        @engine      = 'pdfetex'
+        @engine      = 'pdftex'
         @variables   = Hash.new
         @expansions  = Hash.new
         @files       = Hash.new
@@ -1074,7 +1074,7 @@ end
     # puts k.expansion("$TEXMF")
     # puts k.expanded_path("TEXINPUTS","context")
 
-    # k.progname, k.engine, k.format = 'context', 'pdfetex', 'tfm'
+    # k.progname, k.engine, k.format = 'context', 'pdftex', 'tfm'
     # k.scandisk = false # == must_exist
     # k.expand_variables
 
@@ -1429,7 +1429,7 @@ end
 
 $mswindows = Config::CONFIG['host_os'] =~ /mswin/
 $separator = File::PATH_SEPARATOR
-$version   = "2.0.2"
+$version   = "2.0.3"
 $ownpath   = File.dirname($0)
 
 if $mswindows then
@@ -1520,7 +1520,7 @@ def set_applications(page=1)
     $applications['perl']     = $applications['pl']  = 'perl'
     $applications['ruby']     = $applications['rb']  = 'ruby'
     $applications['python']   = $applications['py']  = 'python'
-    $applications['lua']      = $applications['lua'] = 'lua'
+    $applications['lua']      = $applications['lua'] = 'luatex --luaonly'
     $applications['java']     = $applications['jar'] = 'java'
 
     if $mswindows then
@@ -1804,14 +1804,16 @@ def changeddir?(path)
     if path.empty? then
         return true
     else
+        oldpath = File.expand_path(path)
         begin
-            Dir.chdir(path) if ! path.empty?
+            Dir.chdir(path) if not path.empty?
         rescue
             report("unable to change to directory: #{path}")
         else
             report("changed to directory: #{path}")
         end
-        return File.expand_path(Dir.getwd) == File.expand_path(path)
+        newpath = File.expand_path(Dir.getwd)
+        return oldpath == newpath
     end
 end
 
@@ -1971,10 +1973,15 @@ def find(filename,program)
         end
         filename.sub!(/^.*[\\\/]/, '')
         # next we look at the current path and the callerpath
-        [ ['.','current'],
-          [$ownpath,'caller'], ["#{$ownpath}/../#{suffixlist[0]}",'caller'],
-          [registered("THREAD"),'thread'], ["#{registered("THREAD")}/../#{suffixlist[0]}",'thread'],
-        ].each do |p|
+        pathlist = [ ]
+        progpath = $applications[suffixlist[0]]
+        threadok = registered("THREAD") !~ /unknown/
+        pathlist << ['.','current']
+        pathlist << [$ownpath,'caller']                                 if $ownpath != '.'
+        pathlist << ["#{$ownpath}/../#{progpath}",'caller']             if progpath
+        pathlist << [registered("THREAD"),'thread']                     if threadok
+        pathlist << ["#{registered("THREAD")}/../#{progpath}",'thread'] if progpath && threadok
+        pathlist.each do |p|
             if p && ! p.empty? && ! (p[0] == 'unknown') then
                 suffixlist.each do |suffix|
                     fname = "#{filename}.#{suffix}"
@@ -2483,27 +2490,35 @@ def execute(arguments)
     if $selfmerge then
         output("ruby libraries are cleaned up") if SelfMerge::cleanup
         output("ruby libraries are merged")     if SelfMerge::merge
+        return true
     elsif $selfcleanup then
         output("ruby libraries are cleaned up") if SelfMerge::cleanup
+        return true
     elsif $serve then
         if ENV['KPSEMETHOD'] && ENV['KPSEPORT'] then
             # # kpse_merge_done: require 'base/kpseremote'
             begin
                 KpseRemote::start_server
             rescue
+                return false
+            else
+                return true
             end
         else
             usage
             puts("")
             puts("message  : set 'KPSEMETHOD' and 'KPSEPORT' variables")
+            return false
         end
     elsif $help || ! $filename || $filename.empty? then
         usage
         loadtree($tree)
         loadenvironment($environment)
         show_environment()
+        return true
     elsif $batch && $filename && ! $filename.empty? then
         # todo, take commands from file and avoid multiple starts and checks
+        return false
     else
         report("texmfstart version #{$version}")
         loadtree($tree)
@@ -2524,33 +2539,42 @@ def execute(arguments)
                     make(filename,$mswindows,!$mswindows,$remove)
                 end
             end
+            return true # guess
         elsif $browser && $filename =~ /^http\:\/\// then
-            launch($filename)
+            return launch($filename)
         else
             begin
                 process do
                     if $direct || $filename =~ /^bin\:/ then
-                        direct($filename)
+                        return direct($filename)
                     elsif $edit && ! $editor.empty? then
-                        edit($filename)
+                        return edit($filename)
                     else # script: or no prefix
                         command = find(shortpathname($filename),$program)
                         if command then
                             register("THREAD",File.dirname(File.expand_path(command)))
-                            run(command)
+                            return run(command)
                         else
                             report('unable to locate program')
+                            return false
                         end
                     end
                 end
             rescue
                 report('fatal error in starting process')
+                return false
             end
         end
     end
 
 end
 
-execute(ARGV)
+if execute(ARGV) then
+    report("\nexecution was successful") if $verbose
+    exit(0)
+else
+    report("\nexecution failed") if $verbose
+    exit(1)
+end
 
-exit (if ($?.to_i rescue 0) > 0 then 1 else 0 end)
+# exit (if ($?.to_i rescue 0) > 0 then 1 else 0 end)
diff --git a/Master/bin/i386-darwin/tftopl b/Master/bin/i386-darwin/tftopl
index 3ca14a8b64f..e8c03562252 100755
--- a/Master/bin/i386-darwin/tftopl
+++ b/Master/bin/i386-darwin/tftopl
diff --git a/Master/bin/i386-darwin/ttf2afm b/Master/bin/i386-darwin/ttf2afm
index 0b10689dff8..ee6c026fce1 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 70c3b2c0324..e0cb19d65de 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 8c072f197a0..b55c3186a8f 100755
--- a/Master/bin/i386-darwin/ttf2tfm
+++ b/Master/bin/i386-darwin/ttf2tfm
diff --git a/Master/bin/i386-darwin/vftovp b/Master/bin/i386-darwin/vftovp
index d693e22fc07..a3516499fee 100755
--- a/Master/bin/i386-darwin/vftovp
+++ b/Master/bin/i386-darwin/vftovp
diff --git a/Master/bin/i386-darwin/weave b/Master/bin/i386-darwin/weave
index aee72d224be..944b61999cf 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 f459745b407..90e7889a04e 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 58840da4a6e..521c190b21a 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 f5585e0bebe..8cc357fc194 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 8c903280d45..5b6221b0230 100755
--- a/Master/bin/i386-darwin/xetex
+++ b/Master/bin/i386-darwin/xetex