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

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index aa92ceb..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
 
 ------------------------------------------------------------------------
@@ -136,11 +132,6 @@ 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 = { }
@@ -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
@@ -177,8 +169,10 @@ do
 	       setfield(h, 'shrink_order', 0)
 	    end
 	    for k,w in pairs(v.kern) do
-	       local g = node_copy(kern_skel)
+	       local g = node_new(id_kern)
 	       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
@@ -189,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
 
@@ -606,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
 
 ------------------------------------------------------------------------
 -- 追加のフォント情報
@@ -718,41 +735,6 @@ 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 = 6
@@ -879,33 +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 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
-	       ensure_tex_attr(attr_icflag, 0)
-	       return node_free(g)
+	       node_write(g); ensure_tex_attr(attr_icflag, 0)
 	    end
 	 end
-	 node_write(g)
-	 ensure_tex_attr(attr_icflag, 0)
       end
+      node_free(TEMP)
    end
 end