2016-05-20 18:46:00

1 files changed, 40 insertions, 43 deletions

diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index f10f1399f..9c44911d0 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 05/17/16 10:06:55
+-- merge date  : 05/20/16 18:42:08
 
 do -- begin closure to overcome local limits and interference
 
@@ -5034,7 +5034,6 @@ if not modules then modules={} end modules ['font-ini']={
   license="see context related readme files"
 }
 local allocate=utilities.storage.allocate
-local report_defining=logs.reporter("fonts","defining")
 fonts=fonts or {}
 local fonts=fonts
 fonts.hashes={ identifiers=allocate() }
@@ -5061,7 +5060,6 @@ if not modules then modules={} end modules ['font-con']={
 }
 local next,tostring,rawget=next,tostring,rawget
 local format,match,lower,gsub=string.format,string.match,string.lower,string.gsub
-local utfbyte=utf.byte
 local sort,insert,concat,sortedkeys,serialize,fastcopy=table.sort,table.insert,table.concat,table.sortedkeys,table.serialize,table.fastcopy
 local derivetable=table.derive
 local trace_defining=false trackers.register("fonts.defining",function(v) trace_defining=v end)
@@ -6087,7 +6085,6 @@ function constructors.initializefeatures(what,tfmdata,features,trace,report)
     local properties=tfmdata.properties or {} 
     local whathandler=handlers[what]
     local whatfeatures=whathandler.features
-    local whatinitializers=whatfeatures.initializers
     local whatmodechecker=whatfeatures.modechecker
     local mode=properties.mode or (whatmodechecker and whatmodechecker(tfmdata,features,features.mode)) or features.mode or "base"
     properties.mode=mode 
@@ -6403,7 +6400,6 @@ if not modules then modules={} end modules ['font-map']={
 local tonumber,next,type=tonumber,next,type
 local match,format,find,concat,gsub,lower=string.match,string.format,string.find,table.concat,string.gsub,string.lower
 local P,R,S,C,Ct,Cc,lpegmatch=lpeg.P,lpeg.R,lpeg.S,lpeg.C,lpeg.Ct,lpeg.Cc,lpeg.match
-local utfbyte=utf.byte
 local floor=math.floor
 local formatters=string.formatters
 local trace_loading=false trackers.register("fonts.loading",function(v) trace_loading=v end)
@@ -6839,7 +6835,6 @@ tfm.version=1.000
 tfm.maxnestingdepth=5
 tfm.maxnestingsize=65536*1024
 local tfmfeatures=constructors.newfeatures("tfm")
-local registertfmfeature=tfmfeatures.register
 constructors.resolvevirtualtoo=false 
 fonts.formats.tfm="type1" 
 fonts.formats.ofm="type1"
@@ -7148,7 +7143,6 @@ local streamreader=utilities.files
 readers.streamreader=streamreader
 local openfile=streamreader.open
 local closefile=streamreader.close
-local skipbytes=streamreader.skip
 local setposition=streamreader.setposition
 local skipshort=streamreader.skipshort
 local readbytes=streamreader.readbytes
@@ -7156,8 +7150,7 @@ local readstring=streamreader.readstring
 local readbyte=streamreader.readcardinal1 
 local readushort=streamreader.readcardinal2 
 local readuint=streamreader.readcardinal3 
-local readulong=streamreader.readcardinal4 
-local readchar=streamreader.readinteger1  
+local readulong=streamreader.readcardinal4
 local readshort=streamreader.readinteger2  
 local readlong=streamreader.readinteger4  
 local readfixed=streamreader.readfixed4
@@ -10597,7 +10590,6 @@ local report=logs.reporter("otf reader")
 local readers=fonts.handlers.otf.readers
 local streamreader=readers.streamreader
 local setposition=streamreader.setposition
-local skipbytes=streamreader.skip
 local skipshort=streamreader.skipshort
 local readushort=streamreader.readcardinal2 
 local readulong=streamreader.readcardinal4 
@@ -15170,8 +15162,6 @@ local concat,unpack=table.concat,table.unpack
 local insert,remove=table.insert,table.remove
 local format,gmatch,gsub,find,match,lower,strip=string.format,string.gmatch,string.gsub,string.find,string.match,string.lower,string.strip
 local type,next,tonumber,tostring,rawget=type,next,tonumber,tostring,rawget
-local lpegmatch=lpeg.match
-local utfchar=utf.char
 local trace_baseinit=false trackers.register("otf.baseinit",function(v) trace_baseinit=v end)
 local trace_singles=false trackers.register("otf.singles",function(v) trace_singles=v end)
 local trace_multiples=false trackers.register("otf.multiples",function(v) trace_multiples=v end)
@@ -15543,7 +15533,6 @@ if not modules then modules={} end modules ['font-otj']={
 }
 if not nodes.properties then return end
 local next,rawget=next,rawget
-local utfchar=utf.char
 local fastcopy=table.fastcopy
 local registertracker=trackers.register
 local trace_injections=false registertracker("fonts.injections",function(v) trace_injections=v end)
@@ -15588,7 +15577,6 @@ local traverse_id=nuts.traverse_id
 local traverse_char=nuts.traverse_char
 local insert_node_before=nuts.insert_before
 local insert_node_after=nuts.insert_after
-local find_tail=nuts.tail
 local properties=nodes.properties.data
 function injections.installnewkern(nk)
   newkern=nk or newkern
@@ -16865,7 +16853,6 @@ local getsubtype=nuts.getsubtype
 local getchar=nuts.getchar
 local ischar=nuts.is_char
 local traverse_id=nuts.traverse_id
-local traverse_node_list=nuts.traverse
 local end_of_math=nuts.end_of_math
 local nodecodes=nodes.nodecodes
 local disc_code=nodecodes.disc
@@ -17257,7 +17244,6 @@ local report_chain=logs.reporter("fonts","otf chain")
 local report_process=logs.reporter("fonts","otf process")
 local report_warning=logs.reporter("fonts","otf warning")
 local report_run=logs.reporter("fonts","otf run")
-local report_check=logs.reporter("fonts","otf check")
 registertracker("otf.replacements","otf.singles,otf.multiples,otf.alternatives,otf.ligatures")
 registertracker("otf.positions","otf.marks,otf.kerns,otf.cursive")
 registertracker("otf.actions","otf.replacements,otf.positions")
@@ -17288,10 +17274,7 @@ local getdisc=nuts.getdisc
 local setdisc=nuts.setdisc
 local setlink=nuts.setlink
 local ischar=nuts.is_char
-local insert_node_before=nuts.insert_before
 local insert_node_after=nuts.insert_after
-local delete_node=nuts.delete
-local remove_node=nuts.remove
 local copy_node=nuts.copy
 local copy_node_list=nuts.copy_list
 local find_node_tail=nuts.tail
@@ -19686,7 +19669,7 @@ local function c_run_single(head,font,attr,lookupcache,step,dataset,sequence,rlm
   while start do
     local char=ischar(start,font)
     if char then
-      local a=getattr(start,0)
+      local a=attr and getattr(start,0)
       if not a or (a==attr) then
         local lookupmatch=lookupcache[char]
         if lookupmatch then
@@ -19716,7 +19699,7 @@ local function t_run_single(start,stop,font,attr,lookupcache)
   while start~=stop do
     local char=ischar(start,font)
     if char then
-      local a=getattr(start,0)
+      local a=attr and getattr(start,0)
       if not a or (a==attr) then
         local lookupmatch=lookupcache[char]
         if lookupmatch then
@@ -19749,7 +19732,7 @@ local function t_run_single(start,stop,font,attr,lookupcache)
   end
 end
 local function k_run_single(sub,injection,last,font,attr,lookupcache,step,dataset,sequence,rlmode,handler)
-  local a=getattr(sub,0)
+  local a=attr and getattr(sub,0)
   if not a or (a==attr) then
     for n in traverse_nodes(sub) do 
       if n==last then
@@ -19780,7 +19763,7 @@ local function c_run_multiple(head,font,attr,steps,nofsteps,dataset,sequence,rlm
   while start do
     local char=ischar(start,font)
     if char then
-      local a=getattr(start,0)
+      local a=attr and getattr(start,0)
       if not a or (a==attr) then
         for i=1,nofsteps do
           local step=steps[i]
@@ -19821,7 +19804,7 @@ local function t_run_multiple(start,stop,font,attr,steps,nofsteps)
   while start~=stop do
     local char=ischar(start,font)
     if char then
-      local a=getattr(start,0)
+      local a=attr and getattr(start,0)
       if not a or (a==attr) then
         for i=1,nofsteps do
           local step=steps[i]
@@ -19862,7 +19845,7 @@ local function t_run_multiple(start,stop,font,attr,steps,nofsteps)
   end
 end
 local function k_run_multiple(sub,injection,last,font,attr,steps,nofsteps,dataset,sequence,rlmode,handler)
-  local a=getattr(sub,0)
+  local a=attr and getattr(sub,0)
   if not a or (a==attr) then
     for n in traverse_nodes(sub) do 
       if n==last then
@@ -19944,6 +19927,9 @@ local function featuresprocessor(head,font,attr)
     nesting=nesting-1
     return head,false
   end
+  if attr==0 then
+    attr=false 
+  end
   head=tonut(head)
   if trace_steps then
     checkstep(head)
@@ -19981,7 +19967,7 @@ local function featuresprocessor(head,font,attr)
       while start do
         local char=ischar(start,font)
         if char then
-          local a=getattr(start,0)
+          local a=attr and getattr(start,0)
           if not a or (a==attr) then
             for i=1,nofsteps do
               local step=steps[i]
@@ -20022,7 +20008,7 @@ local function featuresprocessor(head,font,attr)
           while start do
             local char,id=ischar(start,font)
             if char then
-              local a=getattr(start,0)
+              local a=attr and getattr(start,0)
               if a then
                 a=(a==attr) and (not attribute or getprop(start,a_state)==attribute)
               else
@@ -20072,7 +20058,7 @@ local function featuresprocessor(head,font,attr)
         while start do
           local char,id=ischar(start,font)
           if char then
-            local a=getattr(start,0)
+            local a=attr and getattr(start,0)
             if a then
               a=(a==attr) and (not attribute or getprop(start,a_state)==attribute)
             else
@@ -20297,8 +20283,6 @@ fonts=fonts          or {}
 fonts.analyzers=fonts.analyzers     or {}
 fonts.analyzers.methods=fonts.analyzers.methods or { node={ otf={} } }
 local otf=fonts.handlers.otf
-local nodecodes=nodes.nodecodes
-local glyph_code=nodecodes.glyph
 local handlers=otf.handlers
 local methods=fonts.analyzers.methods
 local otffeatures=fonts.constructors.newfeatures("otf")
@@ -22272,6 +22256,7 @@ local lpegmatch,patterns=lpeg.match,lpeg.patterns
 local trace_indexing=false trackers.register("afm.indexing",function(v) trace_indexing=v end)
 local trace_loading=false trackers.register("afm.loading",function(v) trace_loading=v end)
 local report_afm=logs.reporter("fonts","afm loading")
+local report_afm=logs.reporter("fonts","pfb loading")
 fonts=fonts or {}
 local handlers=fonts.handlers or {}
 fonts.handlers=handlers
@@ -22324,16 +22309,16 @@ do
   local function loadpfbvector(filename)
     local data=io.loaddata(resolvers.findfile(filename))
     if not data then
-      print("no data",filename)
+      report_pfb("no data in %a",filename)
       return
     end
-    if not find(data,"!PS%-AdobeFont%-") then
-      print("no font",filename)
+    if not (find(data,"!PS%-AdobeFont%-") or find(data,"%%!FontType1")) then
+      report_pfb("no font in %a",filename)
       return
     end
     local ascii,binary=match(data,"(.*)eexec%s+......(.*)")
     if not binary then
-      print("no binary",filename)
+      report_pfb("no binary data in %a",filename)
       return
     end
     binary=decrypt(binary,4)
@@ -22342,7 +22327,7 @@ do
       vector[0]=table.remove(vector,1)
     end
     if not vector then
-      print("no vector",filename)
+      report_pfb("no vector in %a",filename)
       return
     end
     return vector
@@ -22367,16 +22352,18 @@ do
     end
   end
 end
-local spacing=patterns.whitespace
+local spacer=patterns.spacer
+local whitespace=patterns.whitespace
 local lineend=patterns.newline
+local spacing=spacer^0
 local number=spacing*S("+-")^-1*(R("09")+S("."))^1/tonumber
-local name=spacing*C((1-spacing)^1)
-local words=spacing*(1-lineend)^1/strip
+local name=spacing*C((1-whitespace)^1)
+local words=spacing*((1-lineend)^1/strip)
 local rest=(1-lineend)^0
 local fontdata=Carg(1)
 local semicolon=spacing*P(";")
-local plus=P("plus")*number
-local minus=P("minus")*number
+local plus=spacing*P("plus")*number
+local minus=spacing*P("minus")*number
 local function addkernpair(data,one,two,value)
   local chr=data.characters[one]
   if chr then
@@ -22461,6 +22448,7 @@ local p_parameters=P(false)+fontdata*((P("FontName")+P("FullName")+P("FamilyName
 +(fontdata*C("AXISHEIGHT")*number*rest)/set_1 
   )
 local fullparser=(P("StartFontMetrics")*fontdata*name/start )*(p_charmetrics+p_kernpairs+p_parameters+(1-P("EndFontMetrics")) )^0*(P("EndFontMetrics")/stop )
+local fullparser=(P("StartFontMetrics")*fontdata*name/start )*(p_charmetrics+p_kernpairs+p_parameters+(1-P("EndFontMetrics")) )^0*(P("EndFontMetrics")/stop )
 local infoparser=(P("StartFontMetrics")*fontdata*name/start )*(p_parameters+(1-P("EndFontMetrics")) )^0*(P("EndFontMetrics")/stop )
 local function read(filename,parser)
   local afmblob=io.loaddata(filename)
@@ -23195,7 +23183,8 @@ local function check_afm(specification,fullname)
   end
 end
 function readers.afm(specification,method)
-  local fullname,tfmdata=specification.filename or "",nil
+  local fullname=specification.filename or ""
+  local tfmdata=nil
   if fullname=="" then
     local forced=specification.forced or ""
     if forced~="" then
@@ -23223,8 +23212,17 @@ function readers.pfb(specification,method)
   if trace_defining then
     report_afm("using afm reader for %a",original)
   end
-  specification.specification=file.replacesuffix(original,"afm")
   specification.forced="afm"
+  local function swap(name)
+    local value=specification[swap]
+    if value then
+      specification[swap]=gsub("%.pfb",".afm",1)
+    end
+  end
+  swap("filename")
+  swap("fullname")
+  swap("forcedname")
+  swap("specification")
   return readers.afm(specification,method)
 end
 
@@ -24092,7 +24090,6 @@ local fonts=fonts
 local nodes=nodes
 local nuts=nodes.nuts 
 local traverse_id=nuts.traverse_id
-local remove_node=nuts.remove
 local free_node=nuts.free
 local glyph_code=nodes.nodecodes.glyph
 local disc_code=nodes.nodecodes.disc