beta 2013.04.23 12:46

7 files changed, 8 insertions, 6 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 314ca4237..8c1b025c8 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{2013.04.22 16:19}
+\newcontextversion{2013.04.23 12:46}
 
 %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 fcddb4470..70ba3f23f 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 758525307..e57796a2d 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 437fc518d..ab6658451 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{2013.04.22 16:19}
+\edef\contextversion{2013.04.23 12:46}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/l-package.lua b/tex/context/base/l-package.lua
index 837502ca6..579fd3941 100644
--- a/tex/context/base/l-package.lua
+++ b/tex/context/base/l-package.lua
@@ -50,16 +50,18 @@ local function lualibfile(name)
     return lpegmatch(pattern,name) or name
 end
 
+local offset = luarocks and 1 or 0 -- todo: also check other extras
+
 local helpers = package.helpers or {
     cleanpath  = cleanpath,
     lualibfile = lualibfile,
     trace      = false,
     report     = function(...) print(format(...)) end,
     builtin    = {
-        ["preload table"]       = searchers[1], -- special case, built-in libs
-        ["path specification"]  = searchers[2],
-        ["cpath specification"] = searchers[3],
-        ["all in one fallback"] = searchers[4], -- special case, combined libs
+        ["preload table"]       = searchers[1+offset], -- special case, built-in libs
+        ["path specification"]  = searchers[2+offset],
+        ["cpath specification"] = searchers[3+offset],
+        ["all in one fallback"] = searchers[4+offset], -- special case, combined libs
     },
     methods    = {
     },
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index e39b3eb88..75f537ddc 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 a007ae8e3..104a26f06 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf