2015-10-09 11:01:00

3 files changed, 46 insertions, 15 deletions

diff --git a/tex/generic/context/luatex/luatex-fonts-inj.lua b/tex/generic/context/luatex/luatex-fonts-inj.lua
index da1364d9d..36781f72f 100644
--- a/tex/generic/context/luatex/luatex-fonts-inj.lua
+++ b/tex/generic/context/luatex/luatex-fonts-inj.lua
@@ -462,7 +462,11 @@ local function collect_glyphs(head,offsets)
         local f = getfont(n)
         if f ~= nf then
             nf = f
-            tm = fontdata[nf].resources.marks -- other hash in ctx
+            -- other hash in ctx:
+            tm = fontdata[nf].resources
+            if tm then
+                tm = tm.marks
+            end
         end
         if tm and tm[getchar(n)] then
             nofmarks = nofmarks + 1
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 118fde56b..1504a0ee7 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 : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 10/07/15 12:03:10
+-- merge date  : 10/09/15 10:59:21
 
 do -- begin closure to overcome local limits and interference
 
@@ -7126,7 +7126,7 @@ local report_otf=logs.reporter("fonts","otf loading")
 local fonts=fonts
 local otf=fonts.handlers.otf
 otf.glists={ "gsub","gpos" }
-otf.version=2.818 
+otf.version=2.819 
 otf.cache=containers.define("fonts","otf",otf.version,true)
 local hashes=fonts.hashes
 local definers=fonts.definers
@@ -8770,16 +8770,18 @@ actions["check metadata"]=function(data,filename,raw)
       ttftables[i].data="deleted"
     end
   end
+  local names=raw.names
   if metadata.validation_state and table.contains(metadata.validation_state,"bad_ps_fontname") then
     local function valid(what)
-      local names=raw.names
-      for i=1,#names do
-        local list=names[i]
-        local names=list.names
-        if names then
-          local name=names[what]
-          if name and valid_ps_name(name) then
-            return name
+      if names then
+        for i=1,#names do
+          local list=names[i]
+          local names=list.names
+          if names then
+            local name=names[what]
+            if name and valid_ps_name(name) then
+              return name
+            end
           end
         end
       end
@@ -8802,6 +8804,28 @@ actions["check metadata"]=function(data,filename,raw)
     check("fontname")
     check("fullname")
   end
+  if names then
+    local psname=metadata.psname
+    if not psname or psname=="" then
+      for i=1,#names do
+        local name=names[i]
+        if lower(name.lang)=="english (us)" then
+          local specification=name.names
+          if specification then
+            local postscriptname=specification.postscriptname
+            if postscriptname then
+              psname=postscriptname
+            end
+          end
+        end
+        break
+      end
+    end
+    if psname~=metadata.fontname then
+      report_otf("fontname %a, fullname %a, psname %a",metadata.fontname,metadata.fullname,psname)
+    end
+    metadata.psname=psname
+  end
 end
 actions["cleanup tables"]=function(data,filename,raw)
   local duplicates=data.resources.duplicates
@@ -9166,7 +9190,7 @@ local function copytotfm(data,cache_id)
     local filename=constructors.checkedfilename(resources)
     local fontname=metadata.fontname
     local fullname=metadata.fullname or fontname
-    local psname=fontname or fullname
+    local psname=metadata.psname or fontname or fullname
     local units=metadata.units or metadata.units_per_em or 1000
     if units==0 then 
       units=1000 
@@ -10510,7 +10534,10 @@ local function collect_glyphs(head,offsets)
     local f=getfont(n)
     if f~=nf then
       nf=f
-      tm=fontdata[nf].resources.marks 
+      tm=fontdata[nf].resources
+      if tm then
+        tm=tm.marks
+      end
     end
     if tm and tm[getchar(n)] then
       nofmarks=nofmarks+1
diff --git a/tex/generic/context/luatex/luatex-fonts.lua b/tex/generic/context/luatex/luatex-fonts.lua
index dab3025e0..f18ba35db 100644
--- a/tex/generic/context/luatex/luatex-fonts.lua
+++ b/tex/generic/context/luatex/luatex-fonts.lua
@@ -215,9 +215,9 @@ if non_generic_context.luatex_fonts.skip_loading ~= true then
         loadmodule('font-oti.lua')
         loadmodule('font-otf.lua')
         loadmodule('font-otb.lua')
-        loadmodule('luatex-fonts-inj.lua')
+        loadmodule('luatex-fonts-inj.lua') -- normally the same as font-inj.lua
         loadmodule('luatex-fonts-ota.lua')
-        loadmodule('luatex-fonts-otn.lua')
+        loadmodule('luatex-fonts-otn.lua') -- normally the same as font-otn.lua
         loadmodule('font-otp.lua')
         loadmodule('luatex-fonts-lua.lua')
         loadmodule('font-def.lua')         -- this code (stripped) might end up in luatex-fonts-def.lua