summaryrefslogtreecommitdiff
path: root/tex/generic
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 /tex/generic
parent113472b1fb39f29dd8f02f31b5be100eb3e71536 (diff)
downloadcontext-c987f1f9c3add1eb3ad06ce40e9e1f521793cf77.tar.gz
beta 2011.06.26 11:37
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua6
1 files changed, 3 insertions, 3 deletions
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] = ""