diff options
| author | Hans Hagen <pragma@wxs.nl> | 2010-07-30 11:35:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2010-07-30 11:35:00 +0200 |
| commit | d879fd040aa85b55875d8aed16394351518dde21 (patch) | |
| tree | 09d8d98b17282cb23362b8c94fe124b48afe89b9 /tex/generic | |
| parent | 84903d24d6d930438bb3cc4322c4b14271b713aa (diff) | |
| download | context-d879fd040aa85b55875d8aed16394351518dde21.tar.gz | |
stable 2010.07.30 11:35
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex-fonts-merged.lua | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index 6fd20b1e9..3f96aa593 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 07/15/10 15:01:32 +-- merge date : 07/30/10 11:35:46 do -- begin closure to overcome local limits and interference @@ -3112,6 +3112,8 @@ fontloader.totable = fontloader.to_table fonts = fonts or { } +-- we will also have des and fam hashes + fonts.ids = fonts.ids or { } fonts.identifiers = fonts.ids -- aka fontdata fonts.chr = fonts.chr or { } fonts.characters = fonts.chr -- aka chardata fonts.qua = fonts.qua or { } fonts.quads = fonts.qua -- aka quaddata @@ -7535,7 +7537,7 @@ local function prepare_base_substitutions(tfmdata,kind,value) -- we can share so if pv then local upv = unicodes[pv] if upv then - if type(upv) == "table" then + if type(upv) == "table" then -- zero change that table upv = upv[1] end if characters[upv] then @@ -7563,7 +7565,7 @@ local function prepare_base_substitutions(tfmdata,kind,value) -- we can share so if pc then local upc = unicodes[pc] if upc then - if type(upc) == "table" then + if type(upc) == "table" then -- zero change that table upc = upc[1] end if characters[upc] then @@ -11257,6 +11259,15 @@ function define.resolve(specification) else specification.forced = specification.forced end + -- for the moment here (goodies eset outside features) + local goodies = specification.goodies + if goodies and goodies ~= "" then + local normalgoodies = specification.features.normal.goodies + if not normalgoodies or normalgoodies == "" then + specification.features.normal.goodies = goodies + end + end + -- specification.hash = lower(specification.name .. ' @ ' .. tfm.hash_features(specification)) if specification.sub and specification.sub ~= "" then specification.hash = specification.sub .. ' @ ' .. specification.hash |