summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2021-08-30 17:21:31 +0200
committerContext Git Mirror Bot <phg@phi-gamma.net>2021-08-30 17:21:31 +0200
commit65bc427dff7ea819abb9b38a0407026baf13a0cc (patch)
tree6536fd752b3b52a504b274f20b1f58def4455910 /tex/generic
parent59dfd8f21ca1a5c793a89b6af87a28df5a78a3d3 (diff)
downloadcontext-65bc427dff7ea819abb9b38a0407026baf13a0cc.tar.gz
2021-08-30 16:23:00
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index c03144492..fe1f83d18 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 2021-08-24 22:14
+-- merge date : 2021-08-30 16:21
do -- begin closure to overcome local limits and interference
@@ -2794,7 +2794,7 @@ function file.join(one,two,three,...)
if not two then
return one=="" and one or lpegmatch(reslasher,one)
end
- if one=="" then
+ if not one or one=="" then
return lpegmatch(stripper,three and concat({ two,three,... },"/") or two)
end
if lpegmatch(isnetwork,one) then