3 files changed, 15 insertions, 4 deletions
diff --git a/scripts/context/ruby/base/kpse.rb b/scripts/context/ruby/base/kpse.rb
index 7a7964127..adeaacbe1 100644
--- a/scripts/context/ruby/base/kpse.rb
+++ b/scripts/context/ruby/base/kpse.rb
@@ -38,9 +38,12 @@ module Kpse
         @@distribution = 'miktex' unless $1 =~ /(texmf\-mswin[\/\\]bin|bin[\/\\]win32)/i
     end
 
-    @@usekpserunner = false || ENV['KPSEFAST'] == 'yes'
-
-    require 'base/tool' if @@usekpserunner
+    if ENV['KPSEFAST'] == 'no' then
+        @@usekpserunner = false
+    else
+        @@usekpserunner = true
+        require 'base/kpsefast'
+    end
 
     if @@crossover then
         ENV.keys.each do |k|
@@ -287,6 +290,10 @@ module Kpse
         `#{cmd}`
     end
 
+    def Kpse.searchmethod
+        if @@usekpserunner then 'kpsefast' else 'kpsewhich' end
+    end
+
     private
 
     def Kpse.setvariable(key,value)
diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb
index eb7ba657a..15b18f255 100644
--- a/scripts/context/ruby/base/tex.rb
+++ b/scripts/context/ruby/base/tex.rb
@@ -446,6 +446,7 @@ class TEX
     end
 
     def makeformats
+        report("using search method '#{Kpse.searchmethod}'")
         if getvariable('fast') then
             report('using existing database')
         else
@@ -1168,6 +1169,8 @@ class TEX
 
         takeprecautions
 
+        report("using search method '#{Kpse.searchmethod}'") if getvariable('verbose')
+
         rawname = getvariable('filename')
 
         jobname = getvariable('filename')
@@ -1243,6 +1246,7 @@ class TEX
         envs = envs.uniq.join(',')
         mods = mods.uniq.join(',')
 
+        report("using search method '#{Kpse.searchmethod}'") if verbose
         report("using environments #{envs}") if envs.length > 0
         report("using modules #{mods}")      if mods.length > 0
 
diff --git a/scripts/context/ruby/newtexexec.rb b/scripts/context/ruby/newtexexec.rb
index dc06a3831..86780e742 100644
--- a/scripts/context/ruby/newtexexec.rb
+++ b/scripts/context/ruby/newtexexec.rb
@@ -1,4 +1,4 @@
-banner = ['TeXExec', 'version 6.1.0', '1997-2005', 'PRAGMA ADE/POD']
+banner = ['TeXExec', 'version 6.1.1', '1997-2006', 'PRAGMA ADE/POD']
 
 unless defined? ownpath
     ownpath = $0.sub(/[\\\/][a-z0-9\-]*?\.rb/i,'')