summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2011-06-26 12:40:13 +0300
committerMarius <mariausol@gmail.com>2011-06-26 12:40:13 +0300
commitf0224d26b7faf5a779ff1fd99d7be5ef75fad958 (patch)
tree99d94f3a25655bef3b224a270689c181fa018a75 /tex/generic
parentde576a467c1e444aa8ea9fb9ce5d944d795aac6b (diff)
downloadcontext-f0224d26b7faf5a779ff1fd99d7be5ef75fad958.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] = ""