diff options
author | Hans Hagen <pragma@wxs.nl> | 2013-03-21 18:26:00 +0100 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2013-03-21 18:26:00 +0100 |
commit | c794ddc750d2f2a4264bd5e108babe4348b60c42 (patch) | |
tree | 3f5d856259f5b3b5d76b789542c2fda197d93691 /tex/context/base/font-ctx.lua | |
parent | c971a249f8c3c8c394dc1f173bae8fc14a81b700 (diff) | |
download | context-c794ddc750d2f2a4264bd5e108babe4348b60c42.tar.gz |
beta 2013.03.21 18:26
Diffstat (limited to 'tex/context/base/font-ctx.lua')
-rw-r--r-- | tex/context/base/font-ctx.lua | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua index ea4418fef..deba4e49d 100644 --- a/tex/context/base/font-ctx.lua +++ b/tex/context/base/font-ctx.lua @@ -20,6 +20,7 @@ local concat, serialize, sort, fastcopy, mergedtable = table.concat, table.seria local sortedhash, sortedkeys, sequenced = table.sortedhash, table.sortedkeys, table.sequenced local settings_to_hash, hash_to_string = utilities.parsers.settings_to_hash, utilities.parsers.hash_to_string local formatcolumns = utilities.formatters.formatcolumns +local mergehashes = utilities.parsers.mergehashes local tostring, next, type, rawget = tostring, next, type, rawget local utfchar, utfbyte = utf.char, utf.byte @@ -509,8 +510,16 @@ local function mergecontext(currentnumber,extraname,option) -- number string num end end +local extrasets = { } + +setmetatableindex(extrasets,function(t,k) + local v = mergehashes(setups,k) + t[k] = v + return v +end) + local function mergecontextfeatures(currentname,extraname,how,mergedname) -- string string - local extra = setups[extraname] + local extra = setups[extraname] or extrasets[extraname] if extra then local current = setups[currentname] local mergedfeatures = { } |