62 files changed, 41 insertions, 18 deletions

diff --git a/Master/bin/alpha-linux/afm2pl b/Master/bin/alpha-linux/afm2pl
index 6a630e58b1b..5903bddd202 100755
--- a/Master/bin/alpha-linux/afm2pl
+++ b/Master/bin/alpha-linux/afm2pl
diff --git a/Master/bin/alpha-linux/afm2tfm b/Master/bin/alpha-linux/afm2tfm
index 4c691b9fc45..460a55297b9 100755
--- a/Master/bin/alpha-linux/afm2tfm
+++ b/Master/bin/alpha-linux/afm2tfm
diff --git a/Master/bin/alpha-linux/aleph b/Master/bin/alpha-linux/aleph
index c30bf906a53..01fd0b0a9ea 100755
--- a/Master/bin/alpha-linux/aleph
+++ b/Master/bin/alpha-linux/aleph
diff --git a/Master/bin/alpha-linux/bibtex b/Master/bin/alpha-linux/bibtex
index 5872fec2cef..5f633985571 100755
--- a/Master/bin/alpha-linux/bibtex
+++ b/Master/bin/alpha-linux/bibtex
diff --git a/Master/bin/alpha-linux/bibtex8 b/Master/bin/alpha-linux/bibtex8
index 385cf788395..b1108507884 100755
--- a/Master/bin/alpha-linux/bibtex8
+++ b/Master/bin/alpha-linux/bibtex8
diff --git a/Master/bin/alpha-linux/ctangle b/Master/bin/alpha-linux/ctangle
index 74d284e7842..3e08810129b 100755
--- a/Master/bin/alpha-linux/ctangle
+++ b/Master/bin/alpha-linux/ctangle
diff --git a/Master/bin/alpha-linux/ctie b/Master/bin/alpha-linux/ctie
index 0ff715c1d40..87e1a5e9c70 100755
--- a/Master/bin/alpha-linux/ctie
+++ b/Master/bin/alpha-linux/ctie
diff --git a/Master/bin/alpha-linux/cweave b/Master/bin/alpha-linux/cweave
index 41625ae2960..66eb5f5bcd6 100755
--- a/Master/bin/alpha-linux/cweave
+++ b/Master/bin/alpha-linux/cweave
diff --git a/Master/bin/alpha-linux/detex b/Master/bin/alpha-linux/detex
index 7517352db2d..9016b5d8cf2 100755
--- a/Master/bin/alpha-linux/detex
+++ b/Master/bin/alpha-linux/detex
diff --git a/Master/bin/alpha-linux/dmp b/Master/bin/alpha-linux/dmp
index 287a22cbf36..ac69ed4b83e 100755
--- a/Master/bin/alpha-linux/dmp
+++ b/Master/bin/alpha-linux/dmp
diff --git a/Master/bin/alpha-linux/dt2dv b/Master/bin/alpha-linux/dt2dv
index 3d24f2c6254..e14bd90b4fd 100755
--- a/Master/bin/alpha-linux/dt2dv
+++ b/Master/bin/alpha-linux/dt2dv
diff --git a/Master/bin/alpha-linux/dvicopy b/Master/bin/alpha-linux/dvicopy
index 0f95ff353be..9efc561747c 100755
--- a/Master/bin/alpha-linux/dvicopy
+++ b/Master/bin/alpha-linux/dvicopy
diff --git a/Master/bin/alpha-linux/dvilj b/Master/bin/alpha-linux/dvilj
index 7ce80f67e09..867dde659a0 100755
--- a/Master/bin/alpha-linux/dvilj
+++ b/Master/bin/alpha-linux/dvilj
diff --git a/Master/bin/alpha-linux/dvilj2p b/Master/bin/alpha-linux/dvilj2p
index 3a73d9cd31b..f0b5e949c1e 100755
--- a/Master/bin/alpha-linux/dvilj2p
+++ b/Master/bin/alpha-linux/dvilj2p
diff --git a/Master/bin/alpha-linux/dvilj4 b/Master/bin/alpha-linux/dvilj4
index 610959bcc3e..b902c30033e 100755
--- a/Master/bin/alpha-linux/dvilj4
+++ b/Master/bin/alpha-linux/dvilj4
diff --git a/Master/bin/alpha-linux/dvilj4l b/Master/bin/alpha-linux/dvilj4l
index 984577581e5..17a6fb6222a 100755
--- a/Master/bin/alpha-linux/dvilj4l
+++ b/Master/bin/alpha-linux/dvilj4l
diff --git a/Master/bin/alpha-linux/dvipdfm b/Master/bin/alpha-linux/dvipdfm
index 7592b7dadcc..65549642c33 100755
--- a/Master/bin/alpha-linux/dvipdfm
+++ b/Master/bin/alpha-linux/dvipdfm
diff --git a/Master/bin/alpha-linux/dvipdfmx b/Master/bin/alpha-linux/dvipdfmx
index fd52b0b2557..89af0577cf1 100755
--- a/Master/bin/alpha-linux/dvipdfmx
+++ b/Master/bin/alpha-linux/dvipdfmx
diff --git a/Master/bin/alpha-linux/dvipng b/Master/bin/alpha-linux/dvipng
index 99d80e253f6..98cf364cf54 100755
--- a/Master/bin/alpha-linux/dvipng
+++ b/Master/bin/alpha-linux/dvipng
diff --git a/Master/bin/alpha-linux/dvipos b/Master/bin/alpha-linux/dvipos
index b129c70576a..f9cf86dc8c0 100755
--- a/Master/bin/alpha-linux/dvipos
+++ b/Master/bin/alpha-linux/dvipos
diff --git a/Master/bin/alpha-linux/dvips b/Master/bin/alpha-linux/dvips
index f83efcc3c61..375ab24e1d6 100755
--- a/Master/bin/alpha-linux/dvips
+++ b/Master/bin/alpha-linux/dvips
diff --git a/Master/bin/alpha-linux/dvitomp b/Master/bin/alpha-linux/dvitomp
index 8618a1a8500..98615f7e650 100755
--- a/Master/bin/alpha-linux/dvitomp
+++ b/Master/bin/alpha-linux/dvitomp
diff --git a/Master/bin/alpha-linux/dvitype b/Master/bin/alpha-linux/dvitype
index 2b05e4e4c4b..27397d4e29c 100755
--- a/Master/bin/alpha-linux/dvitype
+++ b/Master/bin/alpha-linux/dvitype
diff --git a/Master/bin/alpha-linux/ebb b/Master/bin/alpha-linux/ebb
index 319eb314f14..4b73951400a 100755
--- a/Master/bin/alpha-linux/ebb
+++ b/Master/bin/alpha-linux/ebb
diff --git a/Master/bin/alpha-linux/gftodvi b/Master/bin/alpha-linux/gftodvi
index 2e609af9c91..5003496080c 100755
--- a/Master/bin/alpha-linux/gftodvi
+++ b/Master/bin/alpha-linux/gftodvi
diff --git a/Master/bin/alpha-linux/gftopk b/Master/bin/alpha-linux/gftopk
index 02a99730239..53a96e67e24 100755
--- a/Master/bin/alpha-linux/gftopk
+++ b/Master/bin/alpha-linux/gftopk
diff --git a/Master/bin/alpha-linux/gftype b/Master/bin/alpha-linux/gftype
index f7935490652..11fec98f06c 100755
--- a/Master/bin/alpha-linux/gftype
+++ b/Master/bin/alpha-linux/gftype
diff --git a/Master/bin/alpha-linux/gsftopk b/Master/bin/alpha-linux/gsftopk
index 22dc273c847..9d4664d44ac 100755
--- a/Master/bin/alpha-linux/gsftopk
+++ b/Master/bin/alpha-linux/gsftopk
diff --git a/Master/bin/alpha-linux/hbf2gf b/Master/bin/alpha-linux/hbf2gf
index 241ed66a9c1..ab29ad7d8a7 100755
--- a/Master/bin/alpha-linux/hbf2gf
+++ b/Master/bin/alpha-linux/hbf2gf
diff --git a/Master/bin/alpha-linux/kpsewhich b/Master/bin/alpha-linux/kpsewhich
index d468c258e99..15371e4c720 100755
--- a/Master/bin/alpha-linux/kpsewhich
+++ b/Master/bin/alpha-linux/kpsewhich
diff --git a/Master/bin/alpha-linux/makeindex b/Master/bin/alpha-linux/makeindex
index 9aca95b44b1..d4527badcec 100755
--- a/Master/bin/alpha-linux/makeindex
+++ b/Master/bin/alpha-linux/makeindex
diff --git a/Master/bin/alpha-linux/makempx b/Master/bin/alpha-linux/makempx
index 17dffac5c08..53ade06747f 100755
--- a/Master/bin/alpha-linux/makempx
+++ b/Master/bin/alpha-linux/makempx
diff --git a/Master/bin/alpha-linux/mf b/Master/bin/alpha-linux/mf
index 64b9851d0ee..43a36862323 100755
--- a/Master/bin/alpha-linux/mf
+++ b/Master/bin/alpha-linux/mf
diff --git a/Master/bin/alpha-linux/mf-nowin b/Master/bin/alpha-linux/mf-nowin
index d8a6bcb6ab6..4c09146d1e9 100755
--- a/Master/bin/alpha-linux/mf-nowin
+++ b/Master/bin/alpha-linux/mf-nowin
diff --git a/Master/bin/alpha-linux/mft b/Master/bin/alpha-linux/mft
index fa855f2ab50..66a0795f279 100755
--- a/Master/bin/alpha-linux/mft
+++ b/Master/bin/alpha-linux/mft
diff --git a/Master/bin/alpha-linux/mpost b/Master/bin/alpha-linux/mpost
index 7af9b135f9e..b4763964fa8 100755
--- a/Master/bin/alpha-linux/mpost
+++ b/Master/bin/alpha-linux/mpost
diff --git a/Master/bin/alpha-linux/odvicopy b/Master/bin/alpha-linux/odvicopy
index 8a582932316..aea427c24d7 100755
--- a/Master/bin/alpha-linux/odvicopy
+++ b/Master/bin/alpha-linux/odvicopy
diff --git a/Master/bin/alpha-linux/odvitype b/Master/bin/alpha-linux/odvitype
index 22bd6d9e87c..d1f5fd8c735 100755
--- a/Master/bin/alpha-linux/odvitype
+++ b/Master/bin/alpha-linux/odvitype
diff --git a/Master/bin/alpha-linux/omega b/Master/bin/alpha-linux/omega
index 13a7e3485b9..4f9237d0e8f 100755
--- a/Master/bin/alpha-linux/omega
+++ b/Master/bin/alpha-linux/omega
diff --git a/Master/bin/alpha-linux/omfonts b/Master/bin/alpha-linux/omfonts
index 64b9fddbc34..516e02f315f 100755
--- a/Master/bin/alpha-linux/omfonts
+++ b/Master/bin/alpha-linux/omfonts
diff --git a/Master/bin/alpha-linux/otftotfm b/Master/bin/alpha-linux/otftotfm
index 5774cdfb449..dccd6a7f49c 100755
--- a/Master/bin/alpha-linux/otftotfm
+++ b/Master/bin/alpha-linux/otftotfm
diff --git a/Master/bin/alpha-linux/otp2ocp b/Master/bin/alpha-linux/otp2ocp
index 8bf3a5528f8..044e988a455 100755
--- a/Master/bin/alpha-linux/otp2ocp
+++ b/Master/bin/alpha-linux/otp2ocp
diff --git a/Master/bin/alpha-linux/outocp b/Master/bin/alpha-linux/outocp
index f8c418a4b9b..8bab40eec99 100755
--- a/Master/bin/alpha-linux/outocp
+++ b/Master/bin/alpha-linux/outocp
diff --git a/Master/bin/alpha-linux/pdftex b/Master/bin/alpha-linux/pdftex
index b62011469f8..a99386e4dc1 100755
--- a/Master/bin/alpha-linux/pdftex
+++ b/Master/bin/alpha-linux/pdftex
diff --git a/Master/bin/alpha-linux/pktogf b/Master/bin/alpha-linux/pktogf
index 92c52a3e7bf..d4380b6190c 100755
--- a/Master/bin/alpha-linux/pktogf
+++ b/Master/bin/alpha-linux/pktogf
diff --git a/Master/bin/alpha-linux/pktype b/Master/bin/alpha-linux/pktype
index 38655d07984..81b6c879898 100755
--- a/Master/bin/alpha-linux/pktype
+++ b/Master/bin/alpha-linux/pktype
diff --git a/Master/bin/alpha-linux/ps2pk b/Master/bin/alpha-linux/ps2pk
index d03688e9400..6de575c2f3a 100755
--- a/Master/bin/alpha-linux/ps2pk
+++ b/Master/bin/alpha-linux/ps2pk
diff --git a/Master/bin/alpha-linux/t4ht b/Master/bin/alpha-linux/t4ht
index 71cbadae41c..b05372b5a19 100755
--- a/Master/bin/alpha-linux/t4ht
+++ b/Master/bin/alpha-linux/t4ht
diff --git a/Master/bin/alpha-linux/tangle b/Master/bin/alpha-linux/tangle
index 229948d73b4..6582e4012db 100755
--- a/Master/bin/alpha-linux/tangle
+++ b/Master/bin/alpha-linux/tangle
diff --git a/Master/bin/alpha-linux/tex b/Master/bin/alpha-linux/tex
index ae38a6e5c89..c2917a33823 100755
--- a/Master/bin/alpha-linux/tex
+++ b/Master/bin/alpha-linux/tex
diff --git a/Master/bin/alpha-linux/tex4ht b/Master/bin/alpha-linux/tex4ht
index 8c271884347..7af5025586c 100755
--- a/Master/bin/alpha-linux/tex4ht
+++ b/Master/bin/alpha-linux/tex4ht
diff --git a/Master/bin/alpha-linux/texi2html b/Master/bin/alpha-linux/texi2html
index b83245ae03e..f73a674725b 100755
--- a/Master/bin/alpha-linux/texi2html
+++ b/Master/bin/alpha-linux/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/alpha-linux/texmfstart b/Master/bin/alpha-linux/texmfstart
index a886b2aa142..4d1e2976145 100755
--- a/Master/bin/alpha-linux/texmfstart
+++ b/Master/bin/alpha-linux/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/alpha-linux/tftopl b/Master/bin/alpha-linux/tftopl
index b093934d9de..0b21cb121e4 100755
--- a/Master/bin/alpha-linux/tftopl
+++ b/Master/bin/alpha-linux/tftopl
diff --git a/Master/bin/alpha-linux/ttf2afm b/Master/bin/alpha-linux/ttf2afm
index f342c5b5a70..ca5174bb569 100755
--- a/Master/bin/alpha-linux/ttf2afm
+++ b/Master/bin/alpha-linux/ttf2afm
diff --git a/Master/bin/alpha-linux/ttf2pk b/Master/bin/alpha-linux/ttf2pk
index 36e318ceab9..3931c359dee 100755
--- a/Master/bin/alpha-linux/ttf2pk
+++ b/Master/bin/alpha-linux/ttf2pk
diff --git a/Master/bin/alpha-linux/ttf2tfm b/Master/bin/alpha-linux/ttf2tfm
index 849e70bec3f..6fdbab19a21 100755
--- a/Master/bin/alpha-linux/ttf2tfm
+++ b/Master/bin/alpha-linux/ttf2tfm
diff --git a/Master/bin/alpha-linux/vftovp b/Master/bin/alpha-linux/vftovp
index 2a6e6e7a122..4a7ff009817 100755
--- a/Master/bin/alpha-linux/vftovp
+++ b/Master/bin/alpha-linux/vftovp
diff --git a/Master/bin/alpha-linux/weave b/Master/bin/alpha-linux/weave
index 9deee0d7af9..e41fa93f69c 100755
--- a/Master/bin/alpha-linux/weave
+++ b/Master/bin/alpha-linux/weave
diff --git a/Master/bin/alpha-linux/xdvi-xaw.bin b/Master/bin/alpha-linux/xdvi-xaw.bin
index 6ea87dcb822..369eb2e6d18 100755
--- a/Master/bin/alpha-linux/xdvi-xaw.bin
+++ b/Master/bin/alpha-linux/xdvi-xaw.bin
diff --git a/Master/bin/alpha-linux/xdvipdfmx b/Master/bin/alpha-linux/xdvipdfmx
index c8766fd6260..fcb5ef89231 100755
--- a/Master/bin/alpha-linux/xdvipdfmx
+++ b/Master/bin/alpha-linux/xdvipdfmx
diff --git a/Master/bin/alpha-linux/xetex b/Master/bin/alpha-linux/xetex
index 66008a7a912..4c7ecafccfb 100755
--- a/Master/bin/alpha-linux/xetex
+++ b/Master/bin/alpha-linux/xetex