ConTeXt 2012.05.14 16:00

git-svn-id: svn://tug.org/texlive/trunk@26371 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 59 insertions, 51 deletions

diff --git a/Master/texmf-dist/tex/context/base/font-def.lua b/Master/texmf-dist/tex/context/base/font-def.lua
index 182e543b006..96de480ac86 100644
--- a/Master/texmf-dist/tex/context/base/font-def.lua
+++ b/Master/texmf-dist/tex/context/base/font-def.lua
@@ -119,7 +119,7 @@ function definers.registersplit(symbol,action,verbosename)
     end
 end
 
-function definers.makespecification(specification, lookup, name, sub, method, detail, size)
+function definers.makespecification(specification,lookup,name,sub,method,detail,size)
     size = size or 655360
     if trace_defining then
         report_defining("%s -> lookup: %s, name: %s, sub: %s, method: %s, detail: %s",
@@ -170,13 +170,14 @@ end
 function resolvers.name(specification)
     local resolve = fonts.names.resolve
     if resolve then
-        local resolved, sub = fonts.names.resolve(specification.name,specification.sub)
-        specification.resolved, specification.sub = resolved, sub
+        local resolved, sub = resolve(specification.name,specification.sub,specification) -- we pass specification for overloaded versions
         if resolved then
+            specification.resolved = resolved
+            specification.sub      = sub
             local suffix = file.suffix(resolved)
             if fonts.formats[suffix] then
                 specification.forced = suffix
-                specification.name = file.removesuffix(resolved)
+                specification.name   = file.removesuffix(resolved)
             else
                 specification.name = resolved
             end
@@ -189,10 +190,12 @@ end
 function resolvers.spec(specification)
     local resolvespec = fonts.names.resolvespec
     if resolvespec then
-        specification.resolved, specification.sub = fonts.names.resolvespec(specification.name,specification.sub)
-        if specification.resolved then
-            specification.forced = file.extname(specification.resolved)
-            specification.name = file.removesuffix(specification.resolved)
+        local resolved, sub = resolvespec(specification.name,specification.sub,specification) -- we pass specification for overloaded versions
+        if resolved then
+            specification.resolved = resolved
+            specification.sub      = sub
+            specification.forced   = file.extname(resolved)
+            specification.name     = file.removesuffix(resolved)
         end
     else
         resolvers.name(specification)
@@ -211,17 +214,6 @@ function definers.resolve(specification)
     else
         specification.forced = specification.forced
     end
-    -- for the moment here (goodies set outside features)
-    local goodies = specification.goodies
-    if goodies and goodies ~= "" then
-        local normal = specification.features.normal
-        if not normal then
-            specification.features.normal = { goodies = goodies }
-        elseif not normal.goodies then
-            normal.goodies = goodies
-        end
-    end
-    --
     specification.hash = lower(specification.name .. ' @ ' .. constructors.hashfeatures(specification))
     if specification.sub and specification.sub ~= "" then
         specification.hash = specification.sub .. ' @ ' .. specification.hash
@@ -245,25 +237,43 @@ features (esp in virtual fonts) so let's not do that now.</p>
 specification yet.</p>
 --ldx]]--
 
--- not in context, at least not now:
---
+-- very experimental:
+
+function definers.applypostprocessors(tfmdata)
+    local postprocessors = tfmdata.postprocessors
+    if postprocessors then
+        for i=1,#postprocessors do
+            local extrahash = postprocessors[i](tfmdata) -- after scaling etc
+            if type(extrahash) == "string" and extrahash ~= "" then
+                -- e.g. a reencoding needs this
+                extrahash = gsub(lower(extrahash),"[^a-z]","-")
+                tfmdata.properties.fullname = format("%s-%s",tfmdata.properties.fullname,extrahash)
+            end
+        end
+    end
+    return tfmdata
+end
+
 -- function definers.applypostprocessors(tfmdata)
---     local postprocessors = tfmdata.postprocessors
---     if postprocessors then
---         for i=1,#postprocessors do
---             local extrahash = postprocessors[i](tfmdata) -- after scaling etc
---             if type(extrahash) == "string" and extrahash ~= "" then
---                 -- e.g. a reencoding needs this
---                 extrahash = gsub(lower(extrahash),"[^a-z]","-")
---                 tfmdata.properties.fullname = format("%s-%s",tfmdata.properties.fullname,extrahash)
---             end
---         end
---     end
 --     return tfmdata
 -- end
 
-function definers.applypostprocessors(tfmdata)
-    return tfmdata
+local function checkembedding(tfmdata)
+    local properties = tfmdata.properties
+    local embedding
+    if directive_embedall then
+        embedding = "full"
+    elseif properties and properties.filename and constructors.dontembed[properties.filename] then
+        embedding = "no"
+    else
+        embedding = "subset"
+    end
+    if properties then
+        properties.embedding = embedding
+    else
+        tfmdata.properties = { embedding = embedding }
+    end
+    tfmdata.embedding = embedding
 end
 
 function definers.loadfont(specification)
@@ -295,21 +305,8 @@ function definers.loadfont(specification)
             end
         end
         if tfmdata then
-            local properties = tfmdata.properties
-            local embedding
-            if directive_embedall then
-                embedding = "full"
-            elseif properties.filename and constructors.dontembed[properties.filename] then
-                embedding = "no"
-            else
-                embedding = "subset"
-            end
-            if properties then
-                properties.embedding = embedding
-            else
-                tfmdata.properties = { embedding = embedding }
-            end
             tfmdata = definers.applypostprocessors(tfmdata)
+            checkembedding(tfmdata) -- todo: general postprocessor
             loadedfonts[hash] = tfmdata
             designsizes[specification.hash] = tfmdata.parameters.designsize
         end
@@ -395,14 +392,25 @@ function definers.read(specification,size,id) -- id can be optional, name can al
     specification = definers.resolve(specification)
     local hash = constructors.hashinstance(specification)
     local tfmdata = definers.registered(hash) -- id
-    if not tfmdata then
+    if tfmdata then
+        if trace_defining then
+            report_defining("already hashed: %s",hash)
+        end
+    else
         tfmdata = definers.loadfont(specification) -- can be overloaded
         if tfmdata then
---~ constructors.checkvirtualid(tfmdata) -- interferes
+            if trace_defining then
+                report_defining("loaded and hashed: %s",hash)
+            end
+        --~ constructors.checkvirtualid(tfmdata) -- interferes
             tfmdata.properties.hash = hash
             if id then
                 definers.register(tfmdata,id)
             end
+        else
+            if trace_defining then
+                report_defining("not loaded and hashed: %s",hash)
+            end
         end
     end
     lastdefined = tfmdata or id -- todo ! ! ! ! !
@@ -412,7 +420,7 @@ function definers.read(specification,size,id) -- id can be optional, name can al
         local properties = tfmdata.properties or { }
         local parameters = tfmdata.parameters or { }
         report_defining("using %s font with id %s, name:%s size:%s bytes:%s encoding:%s fullname:%s filename:%s",
-                       properties.type          or "unknown",
+                       properties.format        or "unknown",
                        id                       or "?",
                        properties.name          or "?",
                        parameters.size          or "default",