X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=62b0e329c3a38bd1ec9dbd55e9f9ad870901818a;hb=43b3b49da87473dc407934da9fd9c652b938ba54;hp=42af5c42e705c2e414472e6a0932db3248868b1b;hpb=f97d8da8c583a10a6a5cb46e64dfaa203aa818bd;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 42af5c4..62b0e32 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -3,21 +3,21 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfont',
-  date = '2014/02/01',
+  date = '2015/05/03',
   description = 'Loader for Japanese fonts',
 })
 module('luatexja.jfont', package.seeall)
 
 luatexja.load_module('base');      local ltjb = luatexja.base
 luatexja.load_module('charrange'); local ltjc = luatexja.charrange
+luatexja.load_module('rmlgbm');    local ltjr = luatexja.rmlgbm
+luatexja.load_module('direction'); local ltjd = luatexja.direction
 
 
 local Dnode = node.direct or node
 
 local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
 local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
-local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
-local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
 
 local nullfunc = function(n) return n end
 local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
@@ -26,20 +26,19 @@ local node_new = Dnode.new
 local node_free = Dnode.free
 local has_attr = Dnode.has_attribute
 local set_attr = Dnode.set_attribute
-local node_write = Dnode.write
 local round = tex.round
 local font_getfont = font.getfont
 
 local attr_icflag = luatexbase.attributes['ltj@icflag']
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
+local attr_curtfnt = luatexbase.attributes['ltj@curtfnt']
 local id_glyph = node.id('glyph')
 local id_kern = node.id('kern')
 local id_glue_spec = node.id('glue_spec')
 local id_glue = node.id('glue')
 local cat_lp = luatexbase.catcodetables['latex-package']
-local ITALIC       = luatexja.icflag_table.ITALIC
 local FROM_JFM     = luatexja.icflag_table.FROM_JFM
-
+local tokenlib = luatexja.token
 ------------------------------------------------------------------------
 -- LOADING JFM
 ------------------------------------------------------------------------
@@ -51,7 +50,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, is_vert_enabled
 
 function define_jfm(t)
    local real_char -- Does current character class have the 'real' character?
@@ -69,17 +68,12 @@ function define_jfm(t)
 	 else
 	    real_char = false
 	    for j,w in pairs(v.chars) do
-	       if type(w) == 'number' then
+	       if type(w) == 'number' and w~=-1 then
 		  real_char = true;
 	       elseif type(w) == 'string' and utf.len(w)==1 then
 		  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
@@ -91,10 +85,12 @@ function define_jfm(t)
                v.align = 'left' -- left
             end
 	    if real_char then
-	       if not (type(v.width)=='number'
-		       or (jfm_dir=='yoko' and v.width~='prop')) then
+	       if type(v.width)~='number' and v.width~='prop' then
 		  defjfm_res= nil; return
 	       else
+		  if v.width=='prop' and jfm_dir=='tate' then
+		     v.width = 1.0
+		  end
 		  if type(v.height)~='number' then
 		     v.height = 0.0
 		  end
@@ -154,6 +150,7 @@ do
 
    update_jfm_cache = function (j,sz)
       if metrics[j].size_cache[sz] then return end
+      --local TEMP = node_new(id_kern)
       local t = {}
       metrics[j].size_cache[sz] = t
       t.chars = metrics[j].chars
@@ -185,6 +182,8 @@ 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
+      --node_free(TEMP)
    end
 end
 
@@ -192,12 +191,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
 
 
@@ -230,20 +242,22 @@ do
    end
 
 -- EXT
-   function jfontdefX(g)
-      local t = token.get_next()
-      cstemp=token.csname_name(t)
+   local utf8 = unicode.utf8
+   function jfontdefX(g, dir, csname)
+      jfm_dir, is_def_jfont = dir, true
+      cstemp = csname:sub( (utf8.byte(csname,1,1) == tex.escapechar) and 2 or 1, -1)
+      cstemp = cstemp:sub(1, ((cstemp:sub(-1,-1)==' ') and (cstemp:len()>=2)) and -2 or -1)
       global_flag = g and '\\global' or ''
-      tex.sprint(cat_lp, '\\expandafter\\font\\csname ', cstemp, '\\endcsname')
+      tex.sprint(cat_lp, '\\expandafter\\font\\csname ', 
+		 (cstemp==' ') and '\\space' or cstemp, '\\endcsname')
    end
 
    luatexbase.create_callback("luatexja.define_jfont", "data", function (ft, fn) return ft end)
 
 -- 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
@@ -251,7 +265,8 @@ do
 			    "bad JFM `" .. jfm_file_name .. "'",
 			    'The JFM file you specified is not valid JFM file.\n'..
 			       'So defining Japanese font is cancelled.')
-	 tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', cstemp,
+	 tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', 
+		    (cstemp==' ') and '\\space' or cstemp,
 		       '\\endcsname=\\relax')
 	 return
       end
@@ -264,24 +279,31 @@ do
 			descent = ad.descender,
 			chars = sz.chars, char_type = sz.char_type,
 			kanjiskip = sz.kanjiskip, xkanjiskip = sz.xkanjiskip,
+                        chars_cbcache = {},
+			vert_activated = is_vert_enabled,
       }
 
       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}')
+		    (cstemp==' ') and '\\space' or cstemp, '\\endcsname{\\ltj@cur'..
+		    (jfm_dir == 'yoko' and 'j' or 't') .. 'fnt', fn, '\\relax}')
    end
 end
 
 do
+   local get_dir_count = ltjd.get_dir_count
+   local dir_tate = luatexja.dir_table.dir_tate
+   local tex_get_attr = tex.getattribute
    -- PUBLIC function
    function get_zw()
-      local a = font_metric_table[tex.attribute[attr_curjfnt]]
+      local a = font_metric_table[
+	 tex_get_attr((get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)]
       return a and a.zw or 0
    end
    function get_zh()
-      local a = font_metric_table[tex.attribute[attr_curjfnt]]
+      local a = font_metric_table[
+	 tex_get_attr((get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)]
       return a and a.zw or 0
    end
 end
@@ -321,16 +343,37 @@ 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
+	 is_vert_enabled = (not name:match('-vert')) and (not  name:match('-vrt2'))
+         if not name:match('vert') and not name:match('vrt2') then
+            name = name .. ';vert;vrt2'
+         end
+      else
+	 is_vert_enabled = nil
+      end
       return name
    end
-   luatexja.jfont.extract_metric = extract_metric
+
+   -- define_font callback
+   local otfl_fdr = fonts.definers.read
+   local ltjr_font_callback = ltjr.font_callback
+   function luatexja.font_callback(name, size, id)
+      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)
+   luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1)
 end
 
 ------------------------------------------------------------------------
@@ -338,7 +381,8 @@ end
 ------------------------------------------------------------------------
 do
    -- these function are called from ltj-latex.sty
-   local kyenc_list, ktenc_list = {}, {}
+   local fenc_list, kyenc_list, ktenc_list = {}, {}, {}
+   function add_fenc_list(enc) fenc_list[enc] = 'true ' end
    function add_kyenc_list(enc) kyenc_list[enc] = 'true ' end
    function add_ktenc_list(enc) ktenc_list[enc] = 'true ' end
    function is_kyenc(enc)
@@ -353,36 +397,57 @@ do
    end
 
    local kfam_list, Nkfam_list = {}, {}
-   function add_kfam_list(enc, fam)
-      if not kfam_list[enc] then kfam_list[enc] = {} end
-      kfam_list[enc][fam] = 'true '
+   function add_kfam(fam)
+      kfam_list[fam]=true
    end
-   function add_Nkfam_list(enc, fam)
-      if not Nkfam_list[enc] then Nkfam_list[enc] = {} end
-      Nkfam_list[enc][fam] = 'true '
+   function search_kfam(fam, use_fd)
+      if kfam_list[fam] then 
+	 tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+      elseif Nkfam_list[fam] then 
+	 tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      elseif use_fd then
+	 for i,_ in pairs(kyenc_list) do
+	    if kpse.find_file(string.lower(i)..fam..'.fd') then
+	       tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+	    end
+	 end
+	 for i,_ in pairs(ktenc_list) do
+	    if kpse.find_file(string.lower(i)..fam..'.fd') then
+	       tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+	    end
+	 end
+	 Nkfam_list[fam]=true; tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      else
+	 tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      end
    end
-   function is_kfam(enc, fam)
-      tex.sprint(cat_lp, '\\let\\ifin@\\if'
-		 .. (kfam_list[enc] and kfam_list[enc][fam] or 'false ')) end
-   function is_Nkfam(enc, fam)
-      tex.sprint(cat_lp, '\\let\\ifin@\\if'
-		 .. (Nkfam_list[enc] and Nkfam_list[enc][fam] or 'false ')) end
-
    local ffam_list, Nffam_list = {}, {}
-   function add_ffam_list(enc, fam)
-      if not ffam_list[enc] then ffam_list[enc] = {} end
-      ffam_list[enc][fam] = 'true '
+   function is_ffam(fam)
+      tex.sprint(cat_lp, '\\let\\ifin@\\if' .. (ffam_list[fam] or 'false '))
    end
-   function add_Nffam_list(enc, fam)
-      if not Nffam_list[enc] then Nffam_list[enc] = {} end
-      Nffam_list[enc][fam] = 'true '
+   function add_ffam(fam)
+      ffam_list[fam]='true '
    end
-   function is_ffam(enc, fam)
-      tex.sprint(cat_lp, '\\let\\ifin@\\if'
-		 .. (ffam_list[enc] and ffam_list[enc][fam] or 'false ')) end
-   function is_Nffam(enc, fam)
-      tex.sprint(cat_lp, '\\let\\ifin@\\if'
-		 .. (Nffam_list[enc] and Nffam_list[enc][fam] or 'false ')) end
+   function search_ffam_declared()
+     local s = ''
+     for i,_ in pairs(fenc_list) do
+	s = s .. '\\cdp@elt{' .. i .. '}'
+     end
+     tex.sprint(cat_lp, s)
+   end
+   function search_ffam_fd(fam)
+      if Nffam_list[fam] then 
+	 tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      else
+	 for i,_ in pairs(fenc_list) do
+	    if kpse.find_file(string.lower(i)..fam..'.fd') then
+	       tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return
+	    end
+	 end
+	 Nffam_list[fam]=true; tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return
+      end
+   end
+
 end
 ------------------------------------------------------------------------
 -- ALTERNATE FONTS
@@ -506,17 +571,21 @@ do
    end
 
 -- EXT
-   function output_alt_font_cmd(bbase)
+   function output_alt_font_cmd(dir, bbase)
       alt_font_base = bbase
-      alt_font_base_num = tex.getattribute(attr_curjfnt)
+      if dir == 't' then
+	 alt_font_base_num = tex.getattribute(attr_curtfnt)
+      else
+	 alt_font_base_num = tex.getattribute(attr_curjfnt)
+      end
       local t = alt_font_table[alt_font_base_num]
       if t then
          for i,_ in pairs(t) do t[i]=nil end
       end
       t = alt_font_table_latex[bbase]
       if t then
-         for i,_ in pairs(t) do
-            tex.sprint(cat_lp, '\\ltj@pickup@altfont@aux{' .. i .. '}')
+       for i,_ in pairs(t) do
+            tex.sprint(cat_lp, '\\ltj@pickup@altfont@aux' .. dir .. '{' .. i .. '}')
          end
       end
    end
@@ -561,35 +630,343 @@ do
    end
 
 end
+------------------------------------------------------------------------
+-- 終了時に各種ノードを破棄
+------------------------------------------------------------------------
+do
+   function cleanup_size_cache()
+      --local gs, ke = 0, 0
+      for _,n in pairs(metrics) do
+	 for i,t in pairs(n.size_cache) do
+	    for _,v in pairs(t.char_type) do
+	       for k,w in pairs(v) do
+		  if type(k)=='number' then
+		     --if w[1] then gs = gs + 1 else ke = ke + 1 end
+		     node_free(w[2])
+		  end
+	       end
+	    end
+	    n.size_cache[i]=nil
+	 end
+      end
+      --print('glue spec: ', gs, 'kern: ', ke)
+   end
+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 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, glyphs, unitable, asc_des, units)
+      local tg, glyphmin, glyphmax = glyphs.glyphs, glyphs.glyphmin or 0, glyphs.glyphmax
+      for i = glyphmin, 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
+		  if unitable[v.char] then
+		     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
+      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, unicodes,
+			     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, unicodes, 
+				fl.ascent + fl.descent, fl.units_per_em)
+         end
+      end
+      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
+   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
 
 
 ------------------------------------------------------------------------
--- MISC
+-- 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
+
+------------------------------------------------------------------------
+-- supply tounicode entries
 ------------------------------------------------------------------------
+do
+  local ltjr_prepare_cid_font = ltjr.prepare_cid_font
+  luatexbase.add_to_callback(
+     'luaotfload.patch_font',
+     function (tfmdata)
+	if tfmdata.cidinfo then
+	   local rd = ltjr_prepare_cid_font(tfmdata.cidinfo.registry, tfmdata.cidinfo.ordering)
+	   if rd then
+	      local ru, rc = rd.resources.unicodes, rd.characters
+	      for i,v in pairs(tfmdata.characters) do
+		 local w = ru["Japan1." .. tostring(v.index)]
+		 if w then
+		    v.tounicode = v.tounicode or rc[w]. tounicode
+		 end
+	      end
+	   end
+	end
+
+	return tfmdata
+     end,
+     'ltj.supply_tounicode', 1)  
+end
 
-local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
--- EXT: italic correction
-function append_italic()
-   local p = to_direct(tex.nest[tex.nest.ptr].tail)
-   if p and getid(p)==id_glyph then
-      local f = getfont(p)
-      local g = node_new(id_kern)
-      setfield(g, 'subtype', 1)
-      set_attr(g, attr_icflag, ITALIC)
-      if is_ucs_in_japanese_char(p) then
-	 f = has_attr(p, 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)
-	 if h then
-	    setfield(g, 'kern', h.characters[getchar(p)].italic)
+
+------------------------------------------------------------------------
+-- MISC
+------------------------------------------------------------------------
+do
+   local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
+   local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
+   local get_dir_count = ltjd.get_dir_count
+   local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
+   local ensure_tex_attr = ltjb.ensure_tex_attr
+   local node_write = Dnode.write
+   local font = font
+   local ITALIC       = luatexja.icflag_table.ITALIC
+   -- EXT: italic correction
+   function append_italic()
+      local p = to_direct(tex.nest[tex.nest.ptr].tail)
+      local TEMP = node_new(id_kern)
+      if p and getid(p)==id_glyph then
+	 if is_ucs_in_japanese_char(p) then
+	    local j = font_metric_table[
+	       has_attr(p, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)
+	       ]
+	    local g = node_new(id_kern)
+	    setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC)
+	    setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic)
+	    node_write(g); ensure_tex_attr(attr_icflag, 0)
 	 else
-	    tex.attribute[attr_icflag] = 0
-	    return node_free(g)
+	    local f = getfont(p)
+	    local h = font_getfont(f) or font.fonts[f]
+	    if h then
+	       local g = node_new(id_kern)
+	       setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC)
+	       setfield(g, 'kern', h.characters[getchar(p)].italic)
+	       node_write(g); ensure_tex_attr(attr_icflag, 0)
+	    end
 	 end
       end
-      node_write(g)
-      tex.attribute[attr_icflag] = 0
+      node_free(TEMP)
    end
 end
+
+------------------------------------------------------------------------
+-- VERT VARIANT TABLE
+------------------------------------------------------------------------
+vert_form_table = {
+   [0x2013]=0xFE32, [0x2014]=0xFE31, [0x2025]=0xFE30,
+   [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38,
+   [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C,
+   [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40,
+   [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44,
+   [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33,
+}
+setmetatable(vert_form_table, {__index=function(t,k) return k end});
+