summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2011-06-26 11:37:00 +0200
committerHans Hagen <pragma@wxs.nl>2011-06-26 11:37:00 +0200
commitc987f1f9c3add1eb3ad06ce40e9e1f521793cf77 (patch)
tree53b9dc8115aed15d5d17af3817360e75ba167b46
parent113472b1fb39f29dd8f02f31b5be100eb3e71536 (diff)
downloadcontext-c987f1f9c3add1eb3ad06ce40e9e1f521793cf77.tar.gz
beta 2011.06.26 11:37
-rw-r--r--scripts/context/lua/mtxrun.lua8
-rw-r--r--scripts/context/stubs/mswin/mtxrun.lua8
-rwxr-xr-xscripts/context/stubs/unix/mtxrun8
-rw-r--r--tex/context/base/data-res.lua4
-rw-r--r--tex/context/base/l-file.lua4
-rw-r--r--tex/context/base/status-files.pdfbin23700 -> 23705 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin157619 -> 157618 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua6
8 files changed, 19 insertions, 19 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index af7298858..33be959e2 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -2608,10 +2608,10 @@ end
local trick_1 = char(1)
local trick_2 = "^" .. trick_1 .. "/+"
-function file.join(...)
+function file.join(...) -- rather dirty
local lst = { ... }
local a, b = lst[1], lst[2]
- if a == "" then
+ if not a or a == "" then -- not a added
lst[1] = trick_1
elseif b and find(a,"^/+$") and find(b,"^/") then
lst[1] = ""
@@ -12483,7 +12483,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults)
if not subpath or subpath == "" then
-- rootscan already done
elseif type(subpath) == "string" then
- local fname = check_subpath(filejoin(ppname,subpath,w))
+ local fname = check_subpath(filejoin(pname,subpath,w))
if fname then
result[#result+1] = fname
done = true
@@ -12497,7 +12497,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults)
if sp == "" then
-- roottest already done
else
- local fname = check_subpath(filejoin(ppname,sp,w))
+ local fname = check_subpath(filejoin(pname,sp,w))
if fname then
result[#result+1] = fname
done = true
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index af7298858..33be959e2 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -2608,10 +2608,10 @@ end
local trick_1 = char(1)
local trick_2 = "^" .. trick_1 .. "/+"
-function file.join(...)
+function file.join(...) -- rather dirty
local lst = { ... }
local a, b = lst[1], lst[2]
- if a == "" then
+ if not a or a == "" then -- not a added
lst[1] = trick_1
elseif b and find(a,"^/+$") and find(b,"^/") then
lst[1] = ""
@@ -12483,7 +12483,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults)
if not subpath or subpath == "" then
-- rootscan already done
elseif type(subpath) == "string" then
- local fname = check_subpath(filejoin(ppname,subpath,w))
+ local fname = check_subpath(filejoin(pname,subpath,w))
if fname then
result[#result+1] = fname
done = true
@@ -12497,7 +12497,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults)
if sp == "" then
-- roottest already done
else
- local fname = check_subpath(filejoin(ppname,sp,w))
+ local fname = check_subpath(filejoin(pname,sp,w))
if fname then
result[#result+1] = fname
done = true
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index af7298858..33be959e2 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -2608,10 +2608,10 @@ end
local trick_1 = char(1)
local trick_2 = "^" .. trick_1 .. "/+"
-function file.join(...)
+function file.join(...) -- rather dirty
local lst = { ... }
local a, b = lst[1], lst[2]
- if a == "" then
+ if not a or a == "" then -- not a added
lst[1] = trick_1
elseif b and find(a,"^/+$") and find(b,"^/") then
lst[1] = ""
@@ -12483,7 +12483,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults)
if not subpath or subpath == "" then
-- rootscan already done
elseif type(subpath) == "string" then
- local fname = check_subpath(filejoin(ppname,subpath,w))
+ local fname = check_subpath(filejoin(pname,subpath,w))
if fname then
result[#result+1] = fname
done = true
@@ -12497,7 +12497,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults)
if sp == "" then
-- roottest already done
else
- local fname = check_subpath(filejoin(ppname,sp,w))
+ local fname = check_subpath(filejoin(pname,sp,w))
if fname then
result[#result+1] = fname
done = true
diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua
index d6de90ef0..773f7d58e 100644
--- a/tex/context/base/data-res.lua
+++ b/tex/context/base/data-res.lua
@@ -1152,7 +1152,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults)
if not subpath or subpath == "" then
-- rootscan already done
elseif type(subpath) == "string" then
- local fname = check_subpath(filejoin(ppname,subpath,w))
+ local fname = check_subpath(filejoin(pname,subpath,w))
if fname then
result[#result+1] = fname
done = true
@@ -1166,7 +1166,7 @@ local function find_intree(filename,filetype,wantedfiles,allresults)
if sp == "" then
-- roottest already done
else
- local fname = check_subpath(filejoin(ppname,sp,w))
+ local fname = check_subpath(filejoin(pname,sp,w))
if fname then
result[#result+1] = fname
done = true
diff --git a/tex/context/base/l-file.lua b/tex/context/base/l-file.lua
index bb5a5d49c..10ae1cb84 100644
--- a/tex/context/base/l-file.lua
+++ b/tex/context/base/l-file.lua
@@ -113,10 +113,10 @@ end
local trick_1 = char(1)
local trick_2 = "^" .. trick_1 .. "/+"
-function file.join(...)
+function file.join(...) -- rather dirty
local lst = { ... }
local a, b = lst[1], lst[2]
- if a == "" then
+ if not a or a == "" then -- not a added
lst[1] = trick_1
elseif b and find(a,"^/+$") and find(b,"^/") then
lst[1] = ""
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index f4fb8b1f2..8cb4e184f 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index e104b3f48..c98bcc945 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b9df76636..a17ff12ee 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/25/11 14:54:00
+-- merge date : 06/26/11 11:37:32
do -- begin closure to overcome local limits and interference
@@ -1955,10 +1955,10 @@ end
local trick_1 = char(1)
local trick_2 = "^" .. trick_1 .. "/+"
-function file.join(...)
+function file.join(...) -- rather dirty
local lst = { ... }
local a, b = lst[1], lst[2]
- if a == "" then
+ if not a or a == "" then -- not a added
lst[1] = trick_1
elseif b and find(a,"^/+$") and find(b,"^/") then
lst[1] = ""