beta 2014.01.29 23:48

8 files changed, 6 insertions, 5 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 2d3973b12..bb5c6c3fe 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{2014.01.28 15:12}
+\newcontextversion{2014.01.29 23:48}
 
 %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 57f261af3..1c546e7c1 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index dca07e787..9c3074395 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.01.28 15:12}
+\edef\contextversion{2014.01.29 23:48}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/core-two.lua b/tex/context/base/core-two.lua
index d6e006e04..1f2bc7c6c 100644
--- a/tex/context/base/core-two.lua
+++ b/tex/context/base/core-two.lua
@@ -54,7 +54,7 @@ end
 
 function jobpasses.getdata(id,index,default)
     local jti = collected[id]
-    local value = jit and jti[index]
+    local value = jti and jti[index]
     return value ~= "" and value or default or ""
 end
 
diff --git a/tex/context/base/data-aux.lua b/tex/context/base/data-aux.lua
index b969e6070..dae96ce62 100644
--- a/tex/context/base/data-aux.lua
+++ b/tex/context/base/data-aux.lua
@@ -16,7 +16,8 @@ local resolvers = resolvers
 local report_scripts = logs.reporter("resolvers","scripts")
 
 function resolvers.updatescript(oldname,newname) -- oldname -> own.name, not per se a suffix
-    local scriptpath = "scripts/context/lua"
+ -- local scriptpath = "scripts/context/lua"
+    local scriptpath = "context/lua"
     newname = file.addsuffix(newname,"lua")
     local oldscript = resolvers.cleanpath(oldname)
     if trace_locating then
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 99439fdce..2bb18b6a8 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 471081c36..85982c483 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 5bad2140b..b8f2ede2a 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  : 01/28/14 15:12:08
+-- merge date  : 01/29/14 23:48:33
 
 do -- begin closure to overcome local limits and interference