2014-01-03 00:42:00

1 files changed, 64 insertions, 143 deletions

diff --git a/tex/context/base/font-otf.lua b/tex/context/base/font-otf.lua
index eb28bc368..51c2af00f 100644
--- a/tex/context/base/font-otf.lua
+++ b/tex/context/base/font-otf.lua
@@ -20,7 +20,7 @@ local type, next, tonumber, tostring = type, next, tonumber, tostring
 local abs = math.abs
 local insert = table.insert
 local lpegmatch = lpeg.match
-local reversed, concat, remove, sortedkeys = table.reversed, table.concat, table.remove, table.sortedkeys
+local reversed, concat, remove = table.reversed, table.concat, table.remove
 local ioflush = io.flush
 local fastcopy, tohash, derivetable = table.fastcopy, table.tohash, table.derive
 local formatters = string.formatters
@@ -48,7 +48,7 @@ local otf                = fonts.handlers.otf
 
 otf.glists               = { "gsub", "gpos" }
 
-otf.version              = 2.751 -- beware: also sync font-mis.lua
+otf.version              = 2.749 -- beware: also sync font-mis.lua
 otf.cache                = containers.define("fonts", "otf", otf.version, true)
 
 local fontdata           = fonts.hashes.identifiers
@@ -106,8 +106,6 @@ function otf.fileformat(filename)
         return formats.otf, suffix == "otf"
     elseif leader == "ttcf" then
         return formats.ttc, suffix == "ttc"
- -- elseif leader == "true" then
- --     return formats.ttf, suffix == "ttf"
     elseif suffix == "ttc" then
         return formats.ttc, true
     elseif suffix == "dfont" then
@@ -239,7 +237,7 @@ local valid_fields = table.tohash {
     "upos",
     "use_typo_metrics",
     "uwidth",
-    "validation_state",
+ -- "validation_state",
     "version",
     "vert_base",
     "weight",
@@ -770,7 +768,7 @@ actions["prepare glyphs"] = function(data,filename,raw)
                 }
                 local altuni = glyph.altuni
                 if altuni then
-                 -- local d
+                    local d
                     for i=1,#altuni do
                         local a = altuni[i]
                         local u = a.unicode
@@ -785,15 +783,15 @@ actions["prepare glyphs"] = function(data,filename,raw)
                                 vv = { [u] = unicode }
                                 variants[v] = vv
                             end
-                     -- elseif d then
-                     --     d[#d+1] = u
-                     -- else
-                     --     d = { u }
+                        elseif d then
+                            d[#d+1] = u
+                        else
+                            d = { u }
                         end
                     end
-                 -- if d then
-                 --     duplicates[unicode] = d -- is this needed ?
-                 -- end
+                    if d then
+                        duplicates[unicode] = d
+                    end
                 end
             else
                 report_otf("potential problem: glyph %U is used but empty",index)
@@ -821,7 +819,6 @@ actions["check encoding"] = function(data,filename,raw)
 
     local mapdata        = raw.map or { }
     local unicodetoindex = mapdata and mapdata.map or { }
-    local indextounicode = mapdata and mapdata.backmap or { }
  -- local encname        = lower(data.enc_name or raw.enc_name or mapdata.enc_name or "")
     local encname        = lower(data.enc_name or mapdata.enc_name or "")
     local criterium      = 0xFFFF -- for instance cambria has a lot of mess up there
@@ -832,81 +829,42 @@ actions["check encoding"] = function(data,filename,raw)
         if trace_loading then
             report_otf("checking embedded unicode map %a",encname)
         end
-     -- if false then
-     --     for unicode, index in next, unicodetoindex do -- altuni already covers this
-     --         if unicode <= criterium and not descriptions[unicode] then
-     --             local parent = indices[index] -- why nil?
-     --             if not parent then
-     --                 report_otf("weird, unicode %U points to nowhere with index %H",unicode,index)
-     --             else
-     --                 local parentdescription = descriptions[parent]
-     --                 if parentdescription then
-     --                     local altuni = parentdescription.altuni
-     --                     if not altuni then
-     --                         altuni = { { unicode = unicode } }
-     --                         parentdescription.altuni = altuni
-     --                         duplicates[parent] = { unicode }
-     --                     else
-     --                         local done = false
-     --                         for i=1,#altuni do
-     --                             if altuni[i].unicode == unicode then
-     --                                 done = true
-     --                                 break
-     --                             end
-     --                         end
-     --                         if not done then
-     --                             -- let's assume simple cjk reuse
-     --                             insert(altuni,{ unicode = unicode })
-     --                             insert(duplicates[parent],unicode)
-     --                         end
-     --                     end
-     --                  -- if trace_loading then
-     --                  --     report_otf("weird, unicode %U points to nowhere with index %H",unicode,index)
-     --                  -- end
-     --                 else
-     --                     report_otf("weird, unicode %U points to %U with index %H",unicode,index)
-     --                 end
-     --             end
-     --         end
-     --     end
-     -- else
-            local hash  = { }
-            for index, unicode in next, indices do -- indextounicode
-                hash[index] = descriptions[unicode]
-            end
-            local reported = { }
-            for unicode, index in next, unicodetoindex do
-                if not descriptions[unicode] then
-                    local d = hash[index]
-                    if d then
-                        if d.unicode ~= unicode then
-                            local c = d.copies
-                            if c then
-                                c[unicode] = true
-                            else
-                                d.copies = { [unicode] = true }
+        for unicode, index in next, unicodetoindex do -- altuni already covers this
+            if unicode <= criterium and not descriptions[unicode] then
+                local parent = indices[index] -- why nil?
+                if not parent then
+                    report_otf("weird, unicode %U points to nowhere with index %H",unicode,index)
+                else
+                    local parentdescription = descriptions[parent]
+                    if parentdescription then
+                        local altuni = parentdescription.altuni
+                        if not altuni then
+                            altuni = { { unicode = unicode } }
+                            parentdescription.altuni = altuni
+                            duplicates[parent] = { unicode }
+                        else
+                            local done = false
+                            for i=1,#altuni do
+                                if altuni[i].unicode == unicode then
+                                    done = true
+                                    break
+                                end
                             end
+                            if not done then
+                                -- let's assume simple cjk reuse
+                                insert(altuni,{ unicode = unicode })
+                                insert(duplicates[parent],unicode)
+                            end
+                        end
+                        if trace_loading then
+                            report_otf("weird, unicode %U points to nowhere with index %H",unicode,index)
                         end
-                    elseif not reported[i] then
-                        report_otf("missing index %i",index)
-                        reported[i] = true
+                    else
+                        report_otf("weird, unicode %U points to %U with index %H",unicode,index)
                     end
                 end
             end
-            for index, data in next, hash do -- indextounicode
-                data.copies = sortedkeys(data.copies)
-            end
-            for index, unicode in next, indices do -- indextounicode
-                local description = hash[index]
-                local copies = description.copies
-                if copies then
-                    duplicates[unicode] = copies
-                    description.copies = nil
-                else
-                    report_otf("copies but no unicode parent %U",unicode)
-                end
-            end
-     -- end
+        end
     elseif properties.cidinfo then
         report_otf("warning: no unicode map, used cidmap %a",properties.cidinfo.usedname)
     else
@@ -914,15 +872,12 @@ actions["check encoding"] = function(data,filename,raw)
     end
 
     if mapdata then
-        mapdata.map     = { } -- clear some memory
-        mapdata.backmap = { } -- clear some memory
+        mapdata.map = { } -- clear some memory
     end
 end
 
 -- for the moment we assume that a font with lookups will not use
--- altuni so we stick to kerns only .. alternatively we can always
--- do an indirect lookup uni_to_uni . but then we need that in
--- all lookups
+-- altuni so we stick to kerns only
 
 actions["add duplicates"] = function(data,filename,raw)
     local descriptions = data.descriptions
@@ -933,38 +888,29 @@ actions["add duplicates"] = function(data,filename,raw)
     local duplicates   = resources.duplicates
 
     for unicode, d in next, duplicates do
-        local nofduplicates = #d
-        if nofduplicates > 4 then
-            if trace_loading then
-                report_otf("ignoring excessive duplicates of %U (n=%s)",unicode,nofduplicates)
-            end
-        else
-            for i=1,nofduplicates do
-                local u = d[i]
-                if not descriptions[u] then
-                    local description = descriptions[unicode]
-                    local n = 0
-                    for _, description in next, descriptions do
-                        if kerns then
-                            local kerns = description.kerns
-                            for _, k in next, kerns do
-                                local ku = k[unicode]
-                                if ku then
-                                    k[u] = ku
-                                    n = n + 1
-                                end
+        for i=1,#d do
+            local u = d[i]
+            if not descriptions[u] then
+                local description = descriptions[unicode]
+                local duplicate = table.copy(description) -- else packing problem
+                duplicate.comment = format("copy of U+%05X", unicode)
+                descriptions[u] = duplicate
+                local n = 0
+                for _, description in next, descriptions do
+                    if kerns then
+                        local kerns = description.kerns
+                        for _, k in next, kerns do
+                            local ku = k[unicode]
+                            if ku then
+                                k[u] = ku
+                                n = n + 1
                             end
                         end
-                        -- todo: lookups etc
-                    end
-                    if u > 0 then
-                        local duplicate = table.copy(description) -- else packing problem
-                        duplicate.comment = format("copy of U+%05X", unicode)
-                        descriptions[u] = duplicate
-                        if trace_loading then
-                            report_otf("duplicating %U to %U with index %H (%s kerns)",unicode,u,description.index,n)
-                        end
                     end
+                    -- todo: lookups etc
+                end
+                if trace_loading then
+                    report_otf("duplicating %U to %U with index %H (%s kerns)",unicode,u,description.index,n)
                 end
             end
         end
@@ -1772,13 +1718,6 @@ actions["check metadata"] = function(data,filename,raw)
             ttftables[i].data = "deleted"
         end
     end
-    --
-    if metadata.validation_state and table.contains(metadata.validation_state,"bad_ps_fontname") then
-        local name = file.nameonly(filename)
-        metadata.fontname = "bad-fontname-" .. name
-        metadata.fullname = "bad-fullname-" .. name
-    end
-    --
 end
 
 actions["cleanup tables"] = function(data,filename,raw)
@@ -2145,24 +2084,6 @@ local function otftotfm(specification)
         local features = specification.features.normal
         local rawdata  = otf.load(filename,sub,features and features.featurefile)
         if rawdata and next(rawdata) then
-            local descriptions = rawdata.descriptions
-            local duplicates = rawdata.resources.duplicates
-            if duplicates then
-                local nofduplicates, nofduplicated = 0, 0
-                for parent, list in next, duplicates do
-                    for i=1,#list do
-                        local unicode = list[i]
-                        if not descriptions[unicode] then
-                            descriptions[unicode] = descriptions[parent] -- or copy
-                            nofduplicated = nofduplicated + 1
-                        end
-                    end
-                    nofduplicates = nofduplicates + #list
-                end
-                if trace_otf and nofduplicated ~= nofduplicates then
-                    report_otf("%i extra duplicates copied out of %i",nofduplicated,nofduplicates)
-                end
-            end
             rawdata.lookuphash = { }
             tfmdata = copytotfm(rawdata,cache_id)
             if tfmdata and next(tfmdata) then