beta 2012.10.16 09:52

11 files changed, 33 insertions, 14 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index cd12d88c5..9103d7a86 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.10.15 23:12}
+\newcontextversion{2012.10.16 09:52}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 1ec6b988d..51d741811 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.10.15 23:12}
+\newcontextversion{2012.10.16 09:52}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 0a9f2db52..573342959 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index b169c45ed..18b511819 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index e0a325132..b35abf50b 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.10.15 23:12}
+\edef\contextversion{2012.10.16 09:52}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 494ae4072..906d1faae 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.10.15 23:12}
+\edef\contextversion{2012.10.16 09:52}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/file-job.lua b/tex/context/base/file-job.lua
index bced0b4d2..ee20e2bcc 100644
--- a/tex/context/base/file-job.lua
+++ b/tex/context/base/file-job.lua
@@ -177,7 +177,7 @@ end
 --
 
 local action  = function(name,foundname) input(foundname) end
-local failure = function(name,foundname) end
+local failure = function(name,foundname) report_jobfiles("unknown tex file %q",name) end
 
 local function usetexfile(name,onlyonce,notext)
     startprocessing(name,notext)
@@ -192,7 +192,7 @@ local function usetexfile(name,onlyonce,notext)
 end
 
 local action  = function(name,foundname) dofile(foundname) end
-local failure = function(name,foundname) end
+local failure = function(name,foundname) report_jobfiles("unknown lua file %q",name) end
 
 local function useluafile(name,onlyonce,notext)
     uselibrary {
@@ -205,7 +205,7 @@ local function useluafile(name,onlyonce,notext)
 end
 
 local action  = function(name,foundname) dofile(foundname) end
-local failure = function(name,foundname) end
+local failure = function(name,foundname) report_jobfiles("unknown cld file %q",name) end
 
 local function usecldfile(name,onlyonce,notext)
     startprocessing(name,notext)
@@ -220,7 +220,7 @@ local function usecldfile(name,onlyonce,notext)
 end
 
 local action  = function(name,foundname) context.xmlprocess(foundname,"main","") end
-local failure = function(name,foundname) end
+local failure = function(name,foundname) report_jobfiles("unknown xml file %q",name) end
 
 local function usexmlfile(name,onlyonce,notext)
     startprocessing(name,notext)
@@ -562,11 +562,10 @@ local function toppath()
     end
 end
 
-resolvers.toppath = topath
+resolvers.toppath = toppath
 
 resolvers.prefixes.toppath = function(str)
-    local fullname = cleanpath(joinpath(toppath(),str))
-    return fullname
+    return cleanpath(joinpath(toppath(),str))
 end
 
 local function process(what,name)
diff --git a/tex/context/base/m-graph.mkiv b/tex/context/base/m-graph.mkiv
index 35f487775..34e53cebe 100644
--- a/tex/context/base/m-graph.mkiv
+++ b/tex/context/base/m-graph.mkiv
@@ -119,12 +119,32 @@
         Gneedgr_ := false ;
         if str tx <> "" :
             for x=auto.x :
-                tx(if known Autoform_x : Autoform_x else : Autoform fi,x) w ;
+                tx (
+                    if string Autoform_x :
+                        if Autoform_x <> "" :
+                            Autoform_x
+                        else :
+                            Autoform
+                        fi
+                    else :
+                        Autoform
+                    fi,
+                    x) w ;
             endfor
         fi ;
         if str ty <> "" :
             for y=auto.y :
-                ty(if known Autoform_y : Autoform_y else : Autoform fi,y) w ;
+                ty (
+                    if string Autoform_y :
+                        if Autoform_y <> "" :
+                            Autoform_y
+                        else :
+                            Autoform
+                        fi
+                    else :
+                        Autoform
+                    fi,
+                    y) w ;
             endfor
         fi ;
     enddef ;
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index e721baed5..f9532af6e 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index e0627ac52..ff1a4fd7b 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 6003239a4..922632cf9 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 10/15/12 23:12:56
+-- merge date  : 10/16/12 09:52:42
 
 do -- begin closure to overcome local limits and interference