summaryrefslogtreecommitdiff
path: root/tex/generic
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2012-09-21 20:58:00 +0200
committerHans Hagen <pragma@wxs.nl>2012-09-21 20:58:00 +0200
commit0c505920129b0e27f00c7e7fa328c182b1576d67 (patch)
tree3014cc437d27e2f51e37b5093ea80cf5a5b381f9 /tex/generic
parentc60c6b0d5a3cefd662b44d08faecda1caf7e6cdc (diff)
downloadcontext-0c505920129b0e27f00c7e7fa328c182b1576d67.tar.gz
beta 2012.09.21 20:58
Diffstat (limited to 'tex/generic')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua30
1 files changed, 17 insertions, 13 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b40cb3eae..323c70c3e 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 : 09/16/12 23:18:22
+-- merge date : 09/21/12 20:58:19
do -- begin closure to overcome local limits and interference
@@ -1059,23 +1059,27 @@ function table.reversed(t)
end
end
-function table.sequenced(t,sep,simple) -- hash only
- local s, n = { }, 0
- for k, v in sortedhash(t) do
- if simple then
- if v == true then
- n = n + 1
- s[n] = k
- elseif v and v~= "" then
+function table.sequenced(t,sep) -- hash only
+ if t then
+ local s, n = { }, 0
+ for k, v in sortedhash(t) do
+ if simple then
+ if v == true then
+ n = n + 1
+ s[n] = k
+ elseif v and v~= "" then
+ n = n + 1
+ s[n] = k .. "=" .. tostring(v)
+ end
+ else
n = n + 1
s[n] = k .. "=" .. tostring(v)
end
- else
- n = n + 1
- s[n] = k .. "=" .. tostring(v)
end
+ return concat(s, sep or " | ")
+ else
+ return ""
end
- return concat(s, sep or " | ")
end
function table.print(t,...)