X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=aa92cebb151e5e36772c2b7c4deb5746ba14a355;hb=bcdd1199d689c06bf177c0a5b886c21a664558b7;hp=ccff2ee947c08234ce1a77c5b9f63bb3dbf8d18a;hpb=9316152a70d8504ac5dc81b92fe913cf0474fdab;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index ccff2ee..aa92ceb 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfont',
-  date = '2014/08/12',
+  date = '2014/10/03',
   description = 'Loader for Japanese fonts',
 })
 module('luatexja.jfont', package.seeall)
@@ -54,7 +54,7 @@ luatexbase.create_callback("luatexja.load_jfm", "data", function (ft, jn) return
 
 local jfm_file_name, jfm_var
 local defjfm_res
-local jfm_dir
+local jfm_dir, is_def_jfont
 
 function define_jfm(t)
    local real_char -- Does current character class have the 'real' character?
@@ -78,11 +78,6 @@ function define_jfm(t)
 		  real_char = true; w = utf.byte(w)
 	       elseif type(w) == 'string' and utf.len(w)==2 and utf.sub(w,2) == '*' then
 		  real_char = true; w = utf.byte(utf.sub(w,1,1))
-                  if not t.chars[-w] then
-                     t.chars[-w] = i
-                  else
-                     defjfm_res= nil; return
-                  end
 	       end
 	       if not t.chars[w] then
 		  t.chars[w] = i
@@ -141,6 +136,11 @@ end
 
 local update_jfm_cache
 do
+   local node_copy = Dnode.copy
+   local kern_skel = node_new(id_kern)
+   set_attr(kern_skel, attr_icflag, FROM_JFM)
+   setfield(kern_skel, 'subtype', 1)
+
    local function mult_table(old,scale) -- modified from table.fastcopy
       if old then
 	 local new = { }
@@ -177,10 +177,8 @@ do
 	       setfield(h, 'shrink_order', 0)
 	    end
 	    for k,w in pairs(v.kern) do
-	       local g = node_new(id_kern)
+	       local g = node_copy(kern_skel)
 	       setfield(g, 'kern', w[1])
-	       setfield(g, 'subtype', 1)
-	       set_attr(g, attr_icflag, FROM_JFM)
 	       v[k] = {false, g, w[2]/sz}
 	    end
 	 end
@@ -190,6 +188,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
 
@@ -197,12 +196,25 @@ luatexbase.create_callback("luatexja.find_char_class", "data",
 			   function (arg, fmtable, char)
 			      return 0
 			   end)
-
-function find_char_class(c,m)
--- c: character code, m:
-   if not m then return 0 end
-   return m.chars[c] or
-      luatexbase.call_callback("luatexja.find_char_class", 0, m, c)
+do
+   local start_time_measure = ltjb.start_time_measure
+   local stop_time_measure = ltjb.stop_time_measure
+   local fcc_temp = { chars_cbcache = {} }
+   setmetatable(
+      fcc_temp.chars_cbcache,
+      {
+         __index = function () return 0 end,
+      })
+   function find_char_class(c,m)
+      -- c: character code, m:
+      local r = (m or fcc_temp).chars_cbcache[c]
+      if not r then
+         r = m.chars[c] or
+            luatexbase.call_callback("luatexja.find_char_class", 0, m, c)
+         m.chars_cbcache[c or 0] = r
+      end
+      return r
+   end
 end
 
 
@@ -235,7 +247,8 @@ do
    end
 
 -- EXT
-   function jfontdefX(g)
+   function jfontdefX(g, dir)
+      jfm_dir, is_def_jfont = dir, true
       local t = token.get_next()
       cstemp=token.csname_name(t)
       global_flag = g and '\\global' or ''
@@ -246,9 +259,8 @@ do
 
 -- EXT
    local identifiers = fonts.hashes.identifiers
-   function jfontdefY(dir)
-      jfm_dir = dir
-      local j = load_jfont_metric(dir)
+   function jfontdefY()
+      local j = load_jfont_metric(jfm_dir)
       local fn = font.id(cstemp)
       local f = font_getfont(fn)
       if not j then
@@ -269,13 +281,14 @@ do
 			descent = ad.descender,
 			chars = sz.chars, char_type = sz.char_type,
 			kanjiskip = sz.kanjiskip, xkanjiskip = sz.xkanjiskip,
+                        chars_cbcache = {},
       }
 
       fmtable = luatexbase.call_callback("luatexja.define_jfont", fmtable, fn)
       font_metric_table[fn]=fmtable
       tex.sprint(cat_lp, global_flag, '\\protected\\expandafter\\def\\csname ',
 		    cstemp , '\\endcsname{\\ltj@cur'..
-		    (dir == 'yoko' and 'j' or 't') .. 'fnt', fn, '\\relax}')
+		    (jfm_dir == 'yoko' and 'j' or 't') .. 'fnt', fn, '\\relax}')
    end
 end
 
@@ -331,13 +344,18 @@ do
       end
       if jfm_file_name~='' then
 	 local l = name:sub(-1)
-	 name = name 
+	 name = name
 	    .. ((l==':' or l==';') and '' or ';')
 	    .. 'jfm=' .. jfm_file_name
 	 if jfm_var~='' then
 	    name = name .. 'jfmvar=' .. jfm_var
 	 end
       end
+      if jfm_dir == 'tate' then
+         if not name:match('vert') and not name:match('vrt2') then
+            name = name .. ';vert;vrt2'
+         end
+      end
       return name
    end
 
@@ -345,9 +363,11 @@ do
    local otfl_fdr = fonts.definers.read
    local ltjr_font_callback = ltjr.font_callback
    function luatexja.font_callback(name, size, id)
-      local new_name = extract_metric(name)
+      local new_name = is_def_jfont and extract_metric(name) or name
+      is_def_jfont = false
       local res =  ltjr_font_callback(new_name, size, id, otfl_fdr)
       luatexbase.call_callback('luatexja.define_font', res, new_name, size, id)
+      -- this callback processes variation selector, so we execute it always
       return res
    end
    luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end)
@@ -533,7 +553,7 @@ do
 	 alt_font_base_num = tex.getattribute(attr_curtfnt)
       else
 	 alt_font_base_num = tex.getattribute(attr_curjfnt)
-      end	    
+      end
       local t = alt_font_table[alt_font_base_num]
       if t then
          for i,_ in pairs(t) do t[i]=nil end
@@ -587,72 +607,282 @@ do
 
 end
 
-
 ------------------------------------------------------------------------
--- 縦書き用字形への変換テーブル
+-- 追加のフォント情報
 ------------------------------------------------------------------------
-local font_vert_table = {} -- key: fontnumber
+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 font_vert_basename = {} -- key: basename
-   local function add_feature_table(tname, src, dest)
-      for i,v in pairs(src) do
-	 if type(v.slookups)=='table' then
-	    local s = v.slookups[tname]
-	    if s and not dest[i] then
-	       dest[i] = s
+   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, asc_des, units)
+      for i = 0, glyphmax-1 do
+	 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
+		  if vsel then
+		     if vsel>=0xE0100 then vsel = vsel - 0xE0100 end
+		     dest = dest or {}; dest[bu] = dest[bu] or {}
+		     local uniq_flag = true
+		     for i,_ in pairs(dest[bu]) do
+			if i==vs then uniq_flag = false; break end
+		     end
+		     if uniq_flag then
+			dest[bu][vsel] = unitable[gv.name]
+		     end
+		  end
+	       end
+	    end
+	    -- vertical metric
+	    local vw, tsb, vk = glyph_vmetric(gv)
+	    local gi = unitable[gv.name]
+	    if gi and 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 gi and vk then
+	       dest = dest or {};
+	       local dest_vk = dest.vkerns or {}; dest.vkerns = dest_vk
+	       for _,v in pairs(vk) do
+		  local vl = v.lookup
+		  if type(vl)=='table' then
+		     for _,vlt in pairs(vl) do
+			dest_vk[vlt] = dest_vk[vlt] or {}
+			dest_vk[vlt][gi] = dest_vk[vlt][gi] or {}
+			dest_vk[vlt][gi][unitable[v.char]] = v.off
+		     end
+		  else
+		     dest_vk[vl] = dest_vk[vl] or {}
+		     dest_vk[vl][gi] = dest_vk[vl][gi] or {}
+		     dest_vk[vl][gi][unitable[v.char]] = v.off
+		  end
+	       end
 	    end
 	 end
       end
-   end
-
-   local function prepare_vert_data(n, id)
-      -- test if already loaded
-      if type(id)=='number' then -- sometimes id is an integer
-         font_vert_table[n] = font_vert_table[id]; return
-      elseif (not id) or font_vert_table[n]  then return
+      return dest
+   end
+   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,
+			     fl.ascent + fl.descent, fl.units_per_em)
       end
-      local fname = id.filename
-      local bname = file.basename(fname)
-      if not fname then
-         font_vert_table[n] = {}; return
-      elseif font_vert_basename[bname] then
-         font_vert_table[n] = font_vert_basename[bname]; return
+      if fl.subfonts then
+         for _,v in pairs(fl.subfonts) do
+            dest = add_fl_table(dest, v.glyphs, id.resources.unicodes, v.glyphmax,
+				fl.ascent + fl.descent, fl.units_per_em)
+         end
       end
-      local vtable = {}
-      local a = id.resources.sequences
-      if a then
-	 local s = id.shared.rawdata.descriptions
-	 for i,v in pairs(a) do
-	    if v.features.vert or v.features.vrt2 then
-	       add_feature_table(v.subtables[1], s, vtable)
+      fontloader.close(fl); collectgarbage("collect")
+      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
-      font_vert_basename[bname] = vtable
-      font_vert_table[n] = vtable
    end
-   -- 縦書き用字形への変換
-   function get_vert_glyph(n, chr)
-      local fn = font_vert_table[n]
-      return fn and fn[chr] or chr
-   end
-   luatexbase.add_to_callback('luatexja.define_font',
-			      function (res, name, size, id)
-				 prepare_vert_data(id, res)
-			      end,
-			      'prepare_vert_data', 1)
+end
 
-   local function a (n, dat) font_vert_table[n] = dat end
-   ltjr.vert_addfunc = a
+-- 縦書き用字形への変換テーブル
+local prepare_vert_data
+do
+   -- local function add_feature_table(tname, src, dest)
+   --    for i,v in pairs(src) do
+   --       if type(v.slookups)=='table' then
+   --          local s = v.slookups[tname]
+   --          if s  then
+   --             dest = dest or {}
+   --             dest[i] = dest[i]  or {}
+   --             dest[i].vert = dest[i].vert or s
+   --          end
+   --       end
+   --    end
+   --    return dest
+   -- end
+   -- prepare_vert_data = function (dest, id)
+   --    local a = id.resources.sequences
+   --    if a then
+   --       local s = id.shared.rawdata.descriptions
+   --       for i,v in pairs(a) do
+   --          if v.features.vert or v.features.vrt2 then
+   --             dest= add_feature_table(v.subtables[1], s, dest)
+   --          end
+   --       end
+   --    end
+   --    return dest
+   -- end
+   -- -- 縦書き用字形への変換
+   -- function get_vert_glyph(n, chr)
+   --    local fn = font_extra_info[n]
+   --    return (fn and fn[chr] and fn[chr].vert) or chr
+   -- end
+end
 
+--
+do
+   local cache_ver = 6
+   local checksum = file.checksum
+
+   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_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
+	  return tfmdata
+       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 nulltable = {} -- dummy
+   ltjr.vert_addfunc = function (n) font_extra_info[n] = nulltable end
+
+   local identifiers = fonts.hashes.identifiers
+   for i=1,font.nextid()-1 do
+      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, table_vorg, subtables, ft,  already_vert)
+      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' then
+		  if sv[4]~=0 then
+		     table_vadv[char_num]
+			= (table_vadv[char_num] or 0) + sv[4]
+		  end
+		  if sv[2]~=0 and not already_vert then
+		     table_vorg[char_num]
+			= (table_vorg[char_num] or 0) + sv[2]
+		  end
+	       end
+	    end
+	 end
+      end
+   end
+
+luatexbase.add_to_callback(
+   "luatexja.define_jfont",
+   function (fmtable, fnum)
+      local vadv = {}; fmtable.v_advance = vadv
+      local vorg = {}; fmtable.v_origin = vorg
+      local ft = font_getfont(fnum)
+      local subtables = {}
+      if ft.specification then
+	 for feat_name,v in pairs(ft.specification.features.normal) do
+	    if v==true 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, vorg, subtables, ft,
+		     ft.specification.features.normal.vrt2 or ft.specification.features.normal.vert)
+	 for i,v in pairs(vadv) do
+	    vadv[i]=vadv[i]/ft.units_per_em*fmtable.size
+	 end
+	 for i,v in pairs(vorg) do
+	    vorg[i]=vorg[i]/ft.units_per_em*fmtable.size
+	 end
+      end
+      return fmtable
+   end, 1, 'ltj.v_advance'
+)
+end
 ------------------------------------------------------------------------
 -- MISC
 ------------------------------------------------------------------------
 do
+   local get_dir_count = ltjd.get_dir_count
    local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
-   local tex_set_attr = tex.setattribute
+   local ensure_tex_attr = ltjb.ensure_tex_attr
+   local font = font
    -- EXT: italic correction
    function append_italic()
       local p = to_direct(tex.nest[tex.nest.ptr].tail)
@@ -662,20 +892,20 @@ do
 	 setfield(g, 'subtype', 1)
 	 set_attr(g, attr_icflag, ITALIC)
 	 if is_ucs_in_japanese_char(p) then
-	    f = has_attr(p, attr_curjfnt)
+	    f = has_attr(p, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)
 	    local j = font_metric_table[f]
 	    setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic)
 	 else
-	    local h = font_getfont(f)
+	    local h = font_getfont(f) or font.fonts[f]
 	    if h then
 	       setfield(g, 'kern', h.characters[getchar(p)].italic)
 	    else
-	       tex_set_attr(attr_icflag, 0)
+	       ensure_tex_attr(attr_icflag, 0)
 	       return node_free(g)
 	    end
 	 end
 	 node_write(g)
-	 tex_set_attr(attr_icflag, 0)
+	 ensure_tex_attr(attr_icflag, 0)
       end
    end
 end