beta 2011.06.28 09:16

10 files changed, 19 insertions, 10 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 69da6a74f..165ad43e3 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{2011.06.27 23:49}
+\newcontextversion{2011.06.28 09:16}
 
 %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 d1390ed87..e235ca964 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{2011.06.27 23:49}
+\newcontextversion{2011.06.28 09:16}
 
 %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/context.mkii b/tex/context/base/context.mkii
index 775310ff3..a2ec45363 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{2011.06.27 23:49}
+\edef\contextversion{2011.06.28 09:16}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 611652011..996b9a3d4 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.06.27 23:49}
+\edef\contextversion{2011.06.28 09:16}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/data-pre.lua b/tex/context/base/data-pre.lua
index fa3588c6e..4a5f0ecf5 100644
--- a/tex/context/base/data-pre.lua
+++ b/tex/context/base/data-pre.lua
@@ -24,6 +24,8 @@ local cleanpath, findgivenfile, expansion = resolvers.cleanpath, resolvers.findg
 local getenv = resolvers.getenv -- we can probably also use resolvers.expansion
 local P, Cs, lpegmatch = lpeg.P, lpeg.Cs, lpeg.match
 
+-- getenv = function(...) return resolvers.getenv(...) end -- needs checking (definitions changes later on)
+
 prefixes.environment = function(str)
     return cleanpath(expansion(str))
 end
diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua
index 773f7d58e..4d48c3027 100644
--- a/tex/context/base/data-res.lua
+++ b/tex/context/base/data-res.lua
@@ -136,7 +136,7 @@ local     instance = resolvers.instance or nil -- the current one (fast access)
 function resolvers.setenv(key,value,raw)
     if instance then
         -- this one will be consulted first when we stay inside
-        -- the current environment
+        -- the current environment (prefixes are not resolved here)
         instance.environment[key] = value
         -- we feed back into the environment, and as this is used
         -- by other applications (via os.execute) we need to make
diff --git a/tex/context/base/data-tmf.lua b/tex/context/base/data-tmf.lua
index 9391e881e..260beb9f4 100644
--- a/tex/context/base/data-tmf.lua
+++ b/tex/context/base/data-tmf.lua
@@ -47,7 +47,13 @@ function resolvers.load_tree(tree,resolve)
         -- Beware, we need to obey the relocatable autoparent so we
         -- set TEXMFCNF to its raw value. This is somewhat tricky when
         -- we run a mkii job from within. Therefore, in mtxrun, there
-        -- is a resolve applied when we're in mkii/kpse mode.
+        -- is a resolve applied when we're in mkii/kpse mode or when
+        -- --resolve is passed to mtxrun. Maybe we should also set the
+        -- local AUTOPARENT etc. although these are alwasy set new.
+
+        if resolve then
+            resolvers.luacnfspec = resolvers.resolve(resolvers.luacnfspec)
+        end
 
         setenv('SELFAUTOPARENT', newroot)
         setenv('SELFAUTODIR',    newtree)
@@ -55,11 +61,12 @@ function resolvers.load_tree(tree,resolve)
         setenv('TEXROOT',        newroot)
         setenv('TEXOS',          texos)
         setenv('TEXMFOS',        texmfos)
-        setenv('TEXMFCNF',       resolvers.luacnfspec, not resolve)
-        setenv("PATH",           newpath .. io.pathseparator .. getenv("PATH"))
+        setenv('TEXMFCNF',       resolvers.luacnfspec,true) -- already resolved
+        setenv('PATH',           newpath .. io.pathseparator .. getenv('PATH'))
 
         report_tds("changing from root '%s' to '%s'",oldroot,newroot)
-        report_tds("prepending '%s' to binary path",newpath)
+        report_tds("prepending '%s' to PATH",newpath)
+        report_tds("setting TEXMFCNF to '%s'",resolvers.luacnfspec)
         report_tds()
     end
 end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 35f00b308..990387a72 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 b6f9a41a3..9349a4b03 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 bfe81d7ab..b41dee808 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  : 06/27/11 23:49:30
+-- merge date  : 06/28/11 09:16:54
 
 do -- begin closure to overcome local limits and interference