From 39e30629c15ae4a899532d84c4abea127f2847a6 Mon Sep 17 00:00:00 2001
From: Marius <mariausol@gmail.com>
Date: Sat, 14 Aug 2010 15:54:19 +0300
Subject: stable 2010.07.30 11:35

---
 tex/generic/context/luatex-fonts-merged.lua | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'tex/generic')

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
-- 
cgit v1.2.3