X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=a3d5505632deb790410d3aa266a439cbb47daccf;hb=de98cd76072bece098c9dd118557e60e81d7b148;hp=310a72aff6406d8bb40e057b55fb762c7dd56dd1;hpb=80d52971644cff20c157314b05ee0a4c3656f510;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 310a72a..a3d5505 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfont',
-  date = '2014/10/03',
+  date = '2015/02/08',
   description = 'Loader for Japanese fonts',
 })
 module('luatexja.jfont', package.seeall)
@@ -18,8 +18,6 @@ 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
@@ -28,7 +26,6 @@ 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
 
@@ -40,7 +37,6 @@ 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
 
 ------------------------------------------------------------------------
@@ -54,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
 
 function define_jfm(t)
    local real_char -- Does current character class have the 'real' character?
@@ -78,11 +74,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
@@ -159,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
@@ -191,6 +183,7 @@ do
       t.zw = round(metrics[j].zw*sz)
       t.zh = round(metrics[j].zh*sz)
       t.size = sz
+      --node_free(TEMP)
    end
 end
 
@@ -249,7 +242,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 ''
@@ -260,9 +254,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
@@ -290,7 +283,7 @@ do
       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
 
@@ -353,6 +346,11 @@ do
 	    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
 
@@ -360,9 +358,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)
@@ -601,6 +601,28 @@ 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
 
 ------------------------------------------------------------------------
 -- 追加のフォント情報
@@ -624,7 +646,7 @@ do
       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
@@ -649,7 +671,7 @@ do
 	    -- vertical metric
 	    local vw, tsb, vk = glyph_vmetric(gv)
 	    local gi = unitable[gv.name]
-	    if vw and vw~=asc_des then
+	    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
@@ -658,8 +680,8 @@ do
 	       dest[gi].vwidth = vw/units
 	    end
 	    -- vertical kern
-	    if vk then
-	       dest = dest or {}; 
+	    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
@@ -693,7 +715,7 @@ do
 				fl.ascent + fl.descent, fl.units_per_em)
          end
       end
-      fontloader.close(fl)
+      fontloader.close(fl); collectgarbage("collect")
       return dest
    end
    -- supply vkern table
@@ -713,44 +735,9 @@ do
    end
 end
 
--- 縦書き用字形への変換テーブル
-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 = 5
+   local cache_ver = 6
    local checksum = file.checksum
 
    local function prepare_extra_data_base(id)
@@ -769,7 +756,6 @@ do
 	    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,
@@ -783,7 +769,7 @@ do
       end
    end
    local function prepare_extra_data_font(id, res)
-      if type(res)=='table' and res.shared then 
+      if type(res)=='table' and res.shared then
 	 font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)]
       end
    end
@@ -803,12 +789,12 @@ do
       end,
       'ltj.prepare_extra_data', 1)
 
-   local function a (n, dat) font_extra_info[n] = dat end
-   ltjr.vert_addfunc = a
+   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 
+      if identifiers[i] then
 	 prepare_extra_data_base(identifiers[i])
 	 prepare_extra_data_font(i,identifiers[i])
       end
@@ -825,12 +811,12 @@ 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] 
+		  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] 
+		  if sv[2]~=0 and not already_vert then
+		     table_vorg[char_num]
 			= (table_vorg[char_num] or 0) + sv[2]
 		  end
 	       end
@@ -840,7 +826,7 @@ do
    end
 
 luatexbase.add_to_callback(
-   "luatexja.define_jfont", 
+   "luatexja.define_jfont",
    function (fmtable, fnum)
       local vadv = {}; fmtable.v_advance = vadv
       local vorg = {}; fmtable.v_origin = vorg
@@ -858,7 +844,7 @@ luatexbase.add_to_callback(
 	       end
 	    end
 	 end
-	 acc_feature(vadv, vorg, subtables, ft, 
+	 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
@@ -867,7 +853,7 @@ luatexbase.add_to_callback(
 	    vorg[i]=vorg[i]/ft.units_per_em*fmtable.size
 	 end
       end
-      return fmtable 
+      return fmtable
    end, 1, 'ltj.v_advance'
 )
 end
@@ -875,34 +861,38 @@ end
 -- 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 tex_set_attr = tex.setattribute
+   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
-	 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, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt)
-	    local j = font_metric_table[f]
+	    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
+	    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)
-	    else
-	       tex_set_attr(attr_icflag, 0)
-	       return node_free(g)
+	       node_write(g); ensure_tex_attr(attr_icflag, 0)
 	    end
 	 end
-	 node_write(g)
-	 tex_set_attr(attr_icflag, 0)
       end
+      node_free(TEMP)
    end
 end
-