Merge commit '9f697f3c5f0e19ab3beab9a2891c42aa8cc8a325'

3 files changed, 46 insertions, 29 deletions

diff --git a/luaotfload-auxiliary.lua b/luaotfload-auxiliary.lua
index 9f7974a..e93ea9d 100644
--- a/luaotfload-auxiliary.lua
+++ b/luaotfload-auxiliary.lua
@@ -68,7 +68,7 @@ local add_fontdata_fallbacks = function (fontdata)
       --- non-standard em-sizes (most ms fonts have 2048, others
       --- come with 256)
       --- this is considered a bug in the font loader
-      fontdata.size    = fontparameters.size * fontdata.units / 1000
+      --fontdata.size    = fontparameters.size * fontdata.units / 1000
       --- for legacy fontspec.lua and unicode-math.lua
       fontdata.shared.otfdata          = metadata
       fontdata.shared.otfdata.metadata = metadata --- brr, that’s meta indeed
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index f59954e..224fa61 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -317,7 +317,7 @@ end
 
 local type1_formats = { "tfm", "ofm", }
 
---- string -> (string * bool | int)
+--- string -> string
 crude_file_lookup_verbose = function (filename)
     if not names.data then names.data = load_names() end
     local data      = names.data
@@ -327,18 +327,18 @@ crude_file_lookup_verbose = function (filename)
     --- look up in db first ...
     found = data.barenames[filename]
     if found and mappings[found] then
-        found = mappings[found].filename
+        found = mappings[found].filename[1]
         report("info", 0, "db",
             "crude file lookup: req=%s; hit=bare; ret=%s",
-            filename, found[1])
+            filename, found)
         return found
     end
     found = data.basenames[filename]
     if found and mappings[found] then
-        found = mappings[found].filename
+        found = mappings[found].filename[1]
         report("info", 0, "db",
             "crude file lookup: req=%s; hit=base; ret=%s",
-            filename, found[1])
+            filename, found)
         return found
     end
 
@@ -346,13 +346,13 @@ crude_file_lookup_verbose = function (filename)
     for i=1, #type1_formats do
         local format = type1_formats[i]
         if resolvers.findfile(filename, format) then
-            return { file.addsuffix(filename, format), false }, format
+            return file.addsuffix(filename, format), format
         end
     end
-    return { filename, false }, nil
+    return filename, nil
 end
 
---- string -> (string * bool | int)
+--- string -> string
 crude_file_lookup = function (filename)
     if not names.data then names.data = load_names() end
     local data      = names.data
@@ -361,15 +361,15 @@ crude_file_lookup = function (filename)
                or data.basenames[filename]
     if found then
         found = data.mappings[found]
-        if found then return found.filename end
+        if found then return found.filename[1] end
     end
     for i=1, #type1_formats do
         local format = type1_formats[i]
         if resolvers.findfile(filename, format) then
-            return { file.addsuffix(filename, format), false }, format
+            return file.addsuffix(filename, format), format
         end
     end
-    return { filename, false }, nil
+    return filename, nil
 end
 
 --[[doc--
diff --git a/luaotfload-merged.lua b/luaotfload-merged.lua
index bf22bac..a0a58cc 100644
--- a/luaotfload-merged.lua
+++ b/luaotfload-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 04/29/13 20:30:03
+-- merge date  : 05/09/13 15:23:31
 
 do -- begin closure to overcome local limits and interference
 
@@ -4586,7 +4586,7 @@ local floor=math.floor
 local trace_loading=false trackers.register("fonts.loading",function(v) trace_loading=v end)
 local trace_mapping=false trackers.register("fonts.mapping",function(v) trace_unimapping=v end)
 local report_fonts=logs.reporter("fonts","loading") 
-local fonts=fonts
+local fonts=fonts or {}
 local mappings=fonts.mappings or {}
 fonts.mappings=mappings
 local function loadlumtable(filename) 
@@ -4602,7 +4602,7 @@ local function loadlumtable(filename)
 end
 local hex=R("AF","09")
 local hexfour=(hex*hex*hex*hex)/function(s) return tonumber(s,16) end
-local hexsix=(hex^1)/function(s) return tonumber(s,16) end
+local hexsix=(hex*hex*hex*hex*hex*hex)/function(s) return tonumber(s,16) end
 local dec=(R("09")^1)/tonumber
 local period=P(".")
 local unicode=P("uni")*(hexfour*(period+P(-1))*Cc(false)+Ct(hexfour^1)*Cc(true))
@@ -4622,16 +4622,16 @@ local function makenameparser(str)
     return p
   end
 end
-local function tounicode16(unicode)
+local function tounicode16(unicode,name)
   if unicode<0x10000 then
     return format("%04X",unicode)
   elseif unicode<0x1FFFFFFFFF then
     return format("%04X%04X",floor(unicode/1024),unicode%1024+0xDC00)
   else
-    report_fonts("can't convert %a into tounicode",unicode)
+    report_fonts("can't convert %a in %a into tounicode",unicode,name)
   end
 end
-local function tounicode16sequence(unicodes)
+local function tounicode16sequence(unicodes,name)
   local t={}
   for l=1,#unicodes do
     local unicode=unicodes[l]
@@ -4640,7 +4640,7 @@ local function tounicode16sequence(unicodes)
     elseif unicode<0x1FFFFFFFFF then
       t[l]=format("%04X%04X",floor(unicode/1024),unicode%1024+0xDC00)
     else
-      report_fonts ("can't convert %a into tounicode",unicode)
+      report_fonts ("can't convert %a in %a into tounicode",unicode,name)
     end
   end
   return concat(t)
@@ -4702,7 +4702,7 @@ function mappings.addtounicode(data,filename)
       local unicode=lumunic and lumunic[name] or unicodevector[name]
       if unicode then
         originals[index]=unicode
-        tounicode[index]=tounicode16(unicode)
+        tounicode[index]=tounicode16(unicode,name)
         ns=ns+1
       end
       if (not unicode) and usedmap then
@@ -4711,7 +4711,7 @@ function mappings.addtounicode(data,filename)
           unicode=cidcodes[foundindex] 
           if unicode then
             originals[index]=unicode
-            tounicode[index]=tounicode16(unicode)
+            tounicode[index]=tounicode16(unicode,name)
             ns=ns+1
           else
             local reference=cidnames[foundindex] 
@@ -4721,11 +4721,11 @@ function mappings.addtounicode(data,filename)
                 unicode=cidcodes[foundindex]
                 if unicode then
                   originals[index]=unicode
-                  tounicode[index]=tounicode16(unicode)
+                  tounicode[index]=tounicode16(unicode,name)
                   ns=ns+1
                 end
               end
-              if not unicode then
+              if not unicode or unicode=="" then
                 local foundcodes,multiple=lpegmatch(uparser,reference)
                 if foundcodes then
                   originals[index]=foundcodes
@@ -4734,7 +4734,7 @@ function mappings.addtounicode(data,filename)
                     nl=nl+1
                     unicode=true
                   else
-                    tounicode[index]=tounicode16(foundcodes)
+                    tounicode[index]=tounicode16(foundcodes,name)
                     ns=ns+1
                     unicode=foundcodes
                   end
@@ -4744,7 +4744,7 @@ function mappings.addtounicode(data,filename)
           end
         end
       end
-      if not unicode then
+      if not unicode or unicode=="" then
         local split=lpegmatch(ligsplitter,name)
         local nplit=split and #split or 0
         if nplit>=2 then
@@ -4765,7 +4765,7 @@ function mappings.addtounicode(data,filename)
           if n==0 then
           elseif n==1 then
             originals[index]=t[1]
-            tounicode[index]=tounicode16(t[1])
+            tounicode[index]=tounicode16(t[1],name)
           else
             originals[index]=t
             tounicode[index]=tounicode16sequence(t)
@@ -4775,17 +4775,17 @@ function mappings.addtounicode(data,filename)
         else
         end
       end
-      if not unicode then
+      if not unicode or unicode=="" then
         local foundcodes,multiple=lpegmatch(uparser,name)
         if foundcodes then
           if multiple then
             originals[index]=foundcodes
-            tounicode[index]=tounicode16sequence(foundcodes)
+            tounicode[index]=tounicode16sequence(foundcodes,name)
             nl=nl+1
             unicode=true
           else
             originals[index]=foundcodes
-            tounicode[index]=tounicode16(foundcodes)
+            tounicode[index]=tounicode16(foundcodes,name)
             ns=ns+1
             unicode=foundcodes
           end
@@ -8484,6 +8484,19 @@ local function toligature(kind,lookupname,head,start,stop,char,markflag,discfoun
       end
       start=start.next
     end
+    local start=base.next
+    while start and start.id==glyph_code do 
+      local char=start.char
+      if marks[char] then
+        start[a_ligacomp]=baseindex+(start[a_ligacomp] or componentindex)
+        if trace_marks then
+          logwarning("%s: find mark %s, gets index %s",pref(kind,lookupname),gref(char),start[a_ligacomp])
+        end
+      else
+        break
+      end
+      start=start.next
+    end
   end
   return head,base
 end
@@ -8751,6 +8764,10 @@ function handlers.gpos_mark2ligature(head,start,kind,lookupname,markanchors,sequ
                         pref(kind,lookupname),anchor,index,bound,gref(markchar),gref(basechar),index,dx,dy)
                     end
                     return head,start,true
+                  else
+                    if trace_bugs then
+                      logwarning("%s: no matching anchors for mark %s and baselig %s with index %a",pref(kind,lookupname),gref(markchar),gref(basechar),index)
+                    end
                   end
                 end
               end