X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=817940871af9140126c0d2b6ae792d119a381acf;hb=0526b27bf88ed7f2adedef267f4d9226f6f5a692;hp=9104f3b0b20d4d72900957a9820a4ac09aa5dedc;hpb=67538732d4fdea2dfc86d45ecb46c51aa65eff84;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 9104f3b..8179408 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -190,6 +190,7 @@ do
       t.xkanjiskip = mult_table(metrics[j].xkanjiskip,sz)
       t.zw = round(metrics[j].zw*sz)
       t.zh = round(metrics[j].zh*sz)
+      t.size = sz
    end
 end
 
@@ -606,16 +607,29 @@ end
 ------------------------------------------------------------------------
 font_extra_info = {}
 local font_extra_info = font_extra_info -- key: fontnumber
+local font_extra_basename = {} -- key: basename
 
 -- IVS and vertical metrics
 local prepare_fl_data
+local supply_vkern_table
 do
-   local ivs -- temp table
+   local fields = fontloader.fields
+   local function glyph_vmetric(glyph)
+      local flds = fields(glyph)
+      local vw, tsb, vk = nil, nil, nil
+      for _,i in ipairs(flds) do
+	 if i=='vwidth' then vw = glyph.vwidth end
+	 if i=='tsidebearing' then tsb = glyph.tsidebearing end
+	 if i=='vkerns' then vk = glyph.vkerns end
+      end
+      return vw, tsb, vk
+   end
+   
    local sort = table.sort
-   local function add_fl_table(dest, tg, unitable, glyphmax)
+   local function add_fl_table(dest, tg, unitable, glyphmax, asc_des, units)
       for i = 0, glyphmax-1 do
-	 if tg[i] then
-	    local gv = tg[i]
+	 local gv = tg[i]
+	 if gv then
 	    if gv.altuni then
 	       for _,at in pairs(gv.altuni) do
 		  local bu, vsel = at.unicode, at.variant
@@ -632,24 +646,62 @@ do
 		  end
 	       end
 	    end
+	    -- vertical metric
+	    local vw, tsb, vk = glyph_vmetric(gv)
+	    local gi = unitable[gv.name]
+	    if vw and vw~=asc_des then
+	       -- We do not use tsidebearing, since (1) fontloader does not read VORG table
+	       -- and (2) 'tsidebearing' doea not appear in the returned table by fontloader.fields.
+	       -- Hence, we assume that vertical origin == ascender
+	       -- (see capsule_glyph_tate in ltj-setwidth.lua)
+	       dest = dest or {}; dest[gi] = dest[gi] or {}
+	       dest[gi].vwidth = vw/units
+	    end
+	    -- vertical kern
+	    if vk then
+	       dest = dest or {}; 
+	       local dest_vk = dest.vkerns or {}; dest.vkerns = dest_vk
+	       for _,v in pairs(vk) do
+		  dest_vk[v.lookup] = dest_vk[v.lookup] or {}
+		  dest_vk[v.lookup][gi] = dest_vk[v.lookup][gi] or {}
+		  dest_vk[v.lookup][gi][unitable[v.char]] = v.off
+	       end
+	    end
 	 end
       end
       return dest
    end
-   prepare_fl_data = function (dest, id, fname)
-      local fl = fontloader.open(fname)
+   prepare_fl_data = function (dest, id)
+      local fl = fontloader.open(id.filename)
       local unicodes = id.resources.unicodes
       if fl.glyphs then
-	 dest = add_fl_table(dest, fl.glyphs, id.resources.unicodes, fl.glyphmax)
+	 dest = add_fl_table(dest, fl.glyphs, id.resources.unicodes, fl.glyphmax,
+			     fl.ascent + fl.descent, fl.units_per_em)
       end
       if fl.subfonts then
          for _,v in pairs(fl.subfonts) do
-            dest = add_fl_table(dest, v.glyphs, id.resources.unicodes, v.glyphmax)
+            dest = add_fl_table(dest, v.glyphs, id.resources.unicodes, v.glyphmax,
+				fl.ascent + fl.descent, fl.units_per_em)
          end
       end
       fontloader.close(fl)
       return dest
    end
+   -- supply vkern table
+   supply_vkern_table = function(id, bname)
+      local bx = font_extra_basename[bname].vkerns
+      local lookuphash =  id.resources.lookuphash
+      local desc = id.shared.rawdata.descriptions
+      if bx then
+	 for i,v in pairs(bx) do
+	    lookuphash[i] = lookuphash[i] or v
+	    for j,w in pairs(v) do
+	       desc[j].kerns = desc[j].kerns or {}
+	       desc[j].kerns[i] = w
+	    end
+	 end
+      end
+   end
 end
 
 -- 縦書き用字形への変換テーブル
@@ -660,8 +712,8 @@ do
 	 if type(v.slookups)=='table' then
 	    local s = v.slookups[tname]
 	    if s  then
-	       if not dest then dest = {} end
-	       if not dest[i] then dest[i] = {} end
+	       dest = dest or {}
+	       dest[i] = dest[i]  or {}
 	       dest[i].vert = dest[i].vert or s
 	    end
 	 end
@@ -689,61 +741,115 @@ end
 
 -- 
 do
-   local font_extra_basename = {} -- key: basename
-   local cache_ver = 2
+   local cache_ver = 3
    local checksum = file.checksum
 
-   local function prepare_extra_data(n, id)
-      -- test if already loaded
-      if type(id)=='number' then -- sometimes id is an integer
-         return
-      elseif (not id) or font_extra_info[n]  then return
-      end
-      local fname = id.filename
-      local bname = file.basename(fname)
-      if not fname then
-         font_extra_info[n] = {}; return
-      elseif font_extra_basename[bname] then
-         font_extra_info[n] = font_extra_basename[bname]; return
-      end
-      -- if the cache is present, read it
-      local newsum = checksum(fname) -- MD5 checksum of the fontfile
-      local v = "extra_" .. string.lower(file.nameonly(fname))
-      local dat = ltjb.load_cache(v,
-         function (t) return (t.version~=cache_ver) or (t.chksum~=newsum) end
-      )
-      -- if the cache is not found or outdated, save the cache
-      if dat then
-	 font_extra_basename[bname] = dat[1] or {}
-      else
-	 local dat = nil
-	 dat = prepare_vert_data(dat, id)
-	 dat = prepare_fl_data(dat, id, fname)
-	 font_extra_basename[bname] = dat or {}
-	 ltjb.save_cache( v,
-			  {
-			     chksum = checksum(fname),
-			     version = cache_ver,
-			     dat,
-			  })
-      end
-      font_extra_info[n] = font_extra_basename[bname]
-   end
-   luatexbase.add_to_callback('luatexja.define_font',
-			      function (res, name, size, id)
-				 prepare_extra_data(id, res)
-			      end,
-			      'ltj.prepare_extra_data', 1)
+   local function prepare_extra_data_base(id)
+      if not id then return end
+      local bname = file.nameonly(id.filename or '')
+      if not font_extra_basename[bname] then
+	 -- if the cache is present, read it
+	 local newsum = checksum(id.filename) -- MD5 checksum of the fontfile
+	 local v = "extra_" .. string.lower(file.nameonly(id.filename))
+	 local dat = ltjb.load_cache(
+	    v,
+	    function (t) return (t.version~=cache_ver) or (t.chksum~=newsum) end
+	 )
+	 -- if the cache is not found or outdated, save the cache
+	 if dat then
+	    font_extra_basename[bname] = dat[1] or {}
+	 else
+	    local dat = nil
+	    dat = prepare_vert_data(dat, id)
+	    dat = prepare_fl_data(dat, id)
+	    font_extra_basename[bname] = dat or {}
+	    ltjb.save_cache( v,
+			     {
+				chksum = checksum(id.filename),
+				version = cache_ver,
+				dat,
+			     })
+	 end
+	 return bname
+      end
+   end
+   local function prepare_extra_data_font(id, res)
+      if type(res)=='table' and res.shared then 
+	 font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)]
+      end
+   end
+    luatexbase.add_to_callback(
+       'luaotfload.patch_font',
+       function (tfmdata)
+	  -- these function is executed one time per one fontfile
+          local bname = prepare_extra_data_base(tfmdata)
+          if bname then supply_vkern_table(tfmdata, bname) end
+       end,
+       'ltj.prepare_extra_data', 1)
+   luatexbase.add_to_callback(
+      'luatexja.define_font',
+      function (res, name, size, id)
+	 prepare_extra_data_font(id, res)
+      end,
+      'ltj.prepare_extra_data', 1)
 
    local function a (n, dat) font_extra_info[n] = dat end
    ltjr.vert_addfunc = a
 
    local identifiers = fonts.hashes.identifiers
    for i=1,font.nextid()-1 do
-      if identifiers[i] then prepare_extra_data(i, identifiers[i]) end
+      if identifiers[i] then 
+	 prepare_extra_data_base(identifiers[i])
+	 prepare_extra_data_font(i,identifiers[i])
+      end
    end
 end
 
+
+------------------------------------------------------------------------
+-- calculate vadvance
+------------------------------------------------------------------------
+do
+   local function acc_feature(table_vadv, subtables, ft)
+      for char_num,v in pairs(ft.shared.rawdata.descriptions) do
+	 if v.slookups then
+	    for sn, sv in pairs(v.slookups) do
+	       if subtables[sn] and type(sv)=='table' and sv[4]~=0 then
+		  table_vadv[char_num] 
+		     = (table_vadv[char_num] or 0) + sv[4]
+	       end
+	    end
+	 end
+      end
+   end
+
+luatexbase.add_to_callback(
+   "luatexja.define_jfont", 
+   function (fmtable, fnum)
+      local vadv = {}; fmtable.v_advance = vadv
+      local ft = font_getfont(fnum)
+      local subtables = {}
+      if ft.specification then
+	 for feat_name,v in pairs(ft.specification.features.normal) do
+	    if v then
+	       for _,i in pairs(ft.resources.sequences) do
+		  if i.order[1]== feat_name and i.type == 'gpos_single' then
+		     for _,st in pairs(i.subtables) do
+			subtables[st] = true
+		     end
+		  end
+	       end
+	    end
+	 end
+	 acc_feature(vadv, subtables, ft)
+	 for i,v in pairs(vadv) do
+	    vadv[i]=vadv[i]/ft.units_per_em*fmtable.size
+	 end
+      end
+      return fmtable 
+   end, 1, 'ltj.v_advance'
+)
+end
 ------------------------------------------------------------------------
 -- MISC
 ------------------------------------------------------------------------