beta 2012.05.24 11:02

16 files changed, 73 insertions, 37 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index eec7f0d4f..08d44195a 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -11169,7 +11169,7 @@ local stripper = Cs(
 )
 
 function resolvers.checkedvariable(str) -- assumes str is a string
-    return lpegmatch(stripper,str) or str
+    return type(str) == "string" and lpegmatch(stripper,str) or str
 end
 
 -- The path splitter:
@@ -14030,13 +14030,21 @@ function resolvers.resetresolve(str)
 end
 
 local function resolve(str) -- use schemes, this one is then for the commandline only
-    local res = resolved[str]
-    if not res then
-        res = gsub(str,"([a-z][a-z]+):([^ \"\';]*)",_resolve_) -- home:xx;selfautoparent:xx; etc
-        resolved[str] = res
-        abstract[res] = str
+    if type(str) == "table" then
+        local t = { }
+        for i=1,#str do
+            t[i] = resolve(str[i])
+        end
+        return t
+    else
+        local res = resolved[str]
+        if not res then
+            res = gsub(str,"([a-z][a-z]+):([^ \"\';,]*)",_resolve_) -- home:xx;selfautoparent:xx; etc (comma added)
+            resolved[str] = res
+            abstract[res] = str
+        end
+        return res
     end
-    return res
 end
 
 local function unresolve(str)
@@ -15225,6 +15233,7 @@ function resolvers.load_tree(tree,resolve)
         -- local AUTOPARENT etc. although these are alwasy set new.
 
         if resolve then
+         -- resolvers.luacnfspec = resolvers.joinpath(resolvers.resolve(resolvers.expandedpathfromlist(resolvers.splitpath(resolvers.luacnfspec))))
             resolvers.luacnfspec = resolvers.resolve(resolvers.luacnfspec)
         end
 
@@ -15300,7 +15309,7 @@ function resolvers.listers.variables(pattern)
             report_lists("  env: %s",tabstr(rawget(environment,key))    or "unset")
             report_lists("  var: %s",tabstr(configured[key])            or "unset")
             report_lists("  exp: %s",tabstr(expansions[key])            or "unset")
-            report_lists("  res: %s",resolvers.resolve(expansions[key]) or "unset")
+            report_lists("  res: %s",tabstr(resolvers.resolve(expansions[key])) or "unset")
         end
     end
     instance.environment = fastcopy(env)
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index eec7f0d4f..08d44195a 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -11169,7 +11169,7 @@ local stripper = Cs(
 )
 
 function resolvers.checkedvariable(str) -- assumes str is a string
-    return lpegmatch(stripper,str) or str
+    return type(str) == "string" and lpegmatch(stripper,str) or str
 end
 
 -- The path splitter:
@@ -14030,13 +14030,21 @@ function resolvers.resetresolve(str)
 end
 
 local function resolve(str) -- use schemes, this one is then for the commandline only
-    local res = resolved[str]
-    if not res then
-        res = gsub(str,"([a-z][a-z]+):([^ \"\';]*)",_resolve_) -- home:xx;selfautoparent:xx; etc
-        resolved[str] = res
-        abstract[res] = str
+    if type(str) == "table" then
+        local t = { }
+        for i=1,#str do
+            t[i] = resolve(str[i])
+        end
+        return t
+    else
+        local res = resolved[str]
+        if not res then
+            res = gsub(str,"([a-z][a-z]+):([^ \"\';,]*)",_resolve_) -- home:xx;selfautoparent:xx; etc (comma added)
+            resolved[str] = res
+            abstract[res] = str
+        end
+        return res
     end
-    return res
 end
 
 local function unresolve(str)
@@ -15225,6 +15233,7 @@ function resolvers.load_tree(tree,resolve)
         -- local AUTOPARENT etc. although these are alwasy set new.
 
         if resolve then
+         -- resolvers.luacnfspec = resolvers.joinpath(resolvers.resolve(resolvers.expandedpathfromlist(resolvers.splitpath(resolvers.luacnfspec))))
             resolvers.luacnfspec = resolvers.resolve(resolvers.luacnfspec)
         end
 
@@ -15300,7 +15309,7 @@ function resolvers.listers.variables(pattern)
             report_lists("  env: %s",tabstr(rawget(environment,key))    or "unset")
             report_lists("  var: %s",tabstr(configured[key])            or "unset")
             report_lists("  exp: %s",tabstr(expansions[key])            or "unset")
-            report_lists("  res: %s",resolvers.resolve(expansions[key]) or "unset")
+            report_lists("  res: %s",tabstr(resolvers.resolve(expansions[key])) or "unset")
         end
     end
     instance.environment = fastcopy(env)
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index eec7f0d4f..08d44195a 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -11169,7 +11169,7 @@ local stripper = Cs(
 )
 
 function resolvers.checkedvariable(str) -- assumes str is a string
-    return lpegmatch(stripper,str) or str
+    return type(str) == "string" and lpegmatch(stripper,str) or str
 end
 
 -- The path splitter:
@@ -14030,13 +14030,21 @@ function resolvers.resetresolve(str)
 end
 
 local function resolve(str) -- use schemes, this one is then for the commandline only
-    local res = resolved[str]
-    if not res then
-        res = gsub(str,"([a-z][a-z]+):([^ \"\';]*)",_resolve_) -- home:xx;selfautoparent:xx; etc
-        resolved[str] = res
-        abstract[res] = str
+    if type(str) == "table" then
+        local t = { }
+        for i=1,#str do
+            t[i] = resolve(str[i])
+        end
+        return t
+    else
+        local res = resolved[str]
+        if not res then
+            res = gsub(str,"([a-z][a-z]+):([^ \"\';,]*)",_resolve_) -- home:xx;selfautoparent:xx; etc (comma added)
+            resolved[str] = res
+            abstract[res] = str
+        end
+        return res
     end
-    return res
 end
 
 local function unresolve(str)
@@ -15225,6 +15233,7 @@ function resolvers.load_tree(tree,resolve)
         -- local AUTOPARENT etc. although these are alwasy set new.
 
         if resolve then
+         -- resolvers.luacnfspec = resolvers.joinpath(resolvers.resolve(resolvers.expandedpathfromlist(resolvers.splitpath(resolvers.luacnfspec))))
             resolvers.luacnfspec = resolvers.resolve(resolvers.luacnfspec)
         end
 
@@ -15300,7 +15309,7 @@ function resolvers.listers.variables(pattern)
             report_lists("  env: %s",tabstr(rawget(environment,key))    or "unset")
             report_lists("  var: %s",tabstr(configured[key])            or "unset")
             report_lists("  exp: %s",tabstr(expansions[key])            or "unset")
-            report_lists("  res: %s",resolvers.resolve(expansions[key]) or "unset")
+            report_lists("  res: %s",tabstr(resolvers.resolve(expansions[key])) or "unset")
         end
     end
     instance.environment = fastcopy(env)
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 1f32e6ecd..ac124665b 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.05.24 09:57}
+\newcontextversion{2012.05.24 11:02}
 
 %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 62989cb45..8233e370b 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.05.24 09:57}
+\newcontextversion{2012.05.24 11:02}
 
 %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-version.pdf b/tex/context/base/context-version.pdf
index 839a1957b..f3d7742ca 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 4a4d2765d..6fe15b1ce 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 8ba29f083..91329b50f 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.05.24 09:57}
+\edef\contextversion{2012.05.24 11:02}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 72e5adfd4..298368e65 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.05.24 09:57}
+\edef\contextversion{2012.05.24 11:02}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/data-exp.lua b/tex/context/base/data-exp.lua
index 19d4a9ec8..8040e5963 100644
--- a/tex/context/base/data-exp.lua
+++ b/tex/context/base/data-exp.lua
@@ -207,7 +207,7 @@ local stripper = Cs(
 )
 
 function resolvers.checkedvariable(str) -- assumes str is a string
-    return lpegmatch(stripper,str) or str
+    return type(str) == "string" and lpegmatch(stripper,str) or str
 end
 
 -- The path splitter:
diff --git a/tex/context/base/data-lst.lua b/tex/context/base/data-lst.lua
index b1dedfae3..c86e58fd8 100644
--- a/tex/context/base/data-lst.lua
+++ b/tex/context/base/data-lst.lua
@@ -49,7 +49,7 @@ function resolvers.listers.variables(pattern)
             report_lists("  env: %s",tabstr(rawget(environment,key))    or "unset")
             report_lists("  var: %s",tabstr(configured[key])            or "unset")
             report_lists("  exp: %s",tabstr(expansions[key])            or "unset")
-            report_lists("  res: %s",resolvers.resolve(expansions[key]) or "unset")
+            report_lists("  res: %s",tabstr(resolvers.resolve(expansions[key])) or "unset")
         end
     end
     instance.environment = fastcopy(env)
diff --git a/tex/context/base/data-pre.lua b/tex/context/base/data-pre.lua
index 383ca291e..5b25c5f87 100644
--- a/tex/context/base/data-pre.lua
+++ b/tex/context/base/data-pre.lua
@@ -122,13 +122,21 @@ function resolvers.resetresolve(str)
 end
 
 local function resolve(str) -- use schemes, this one is then for the commandline only
-    local res = resolved[str]
-    if not res then
-        res = gsub(str,"([a-z][a-z]+):([^ \"\';]*)",_resolve_) -- home:xx;selfautoparent:xx; etc
-        resolved[str] = res
-        abstract[res] = str
+    if type(str) == "table" then
+        local t = { }
+        for i=1,#str do
+            t[i] = resolve(str[i])
+        end
+        return t
+    else
+        local res = resolved[str]
+        if not res then
+            res = gsub(str,"([a-z][a-z]+):([^ \"\';,]*)",_resolve_) -- home:xx;selfautoparent:xx; etc (comma added)
+            resolved[str] = res
+            abstract[res] = str
+        end
+        return res
     end
-    return res
 end
 
 local function unresolve(str)
diff --git a/tex/context/base/data-tmf.lua b/tex/context/base/data-tmf.lua
index 260beb9f4..75dcdd956 100644
--- a/tex/context/base/data-tmf.lua
+++ b/tex/context/base/data-tmf.lua
@@ -52,6 +52,7 @@ function resolvers.load_tree(tree,resolve)
         -- local AUTOPARENT etc. although these are alwasy set new.
 
         if resolve then
+         -- resolvers.luacnfspec = resolvers.joinpath(resolvers.resolve(resolvers.expandedpathfromlist(resolvers.splitpath(resolvers.luacnfspec))))
             resolvers.luacnfspec = resolvers.resolve(resolvers.luacnfspec)
         end
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 9559a4446..c224af0f8 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 a97ac7f24..3bbab9a34 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 339d2dbbd..ae5f553f7 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  : 05/24/12 09:57:57
+-- merge date  : 05/24/12 11:02:35
 
 do -- begin closure to overcome local limits and interference