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

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index c8743e5..aa92ceb 100644
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -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
@@ -355,7 +353,7 @@ do
       end
       if jfm_dir == 'tate' then
          if not name:match('vert') and not name:match('vrt2') then
-            name = name .. ';vrt2'
+            name = name .. ';vert;vrt2'
          end
       end
       return name
@@ -656,7 +654,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
@@ -665,7 +663,7 @@ do
 	       dest[gi].vwidth = vw/units
 	    end
 	    -- vertical kern
-	    if vk then
+	    if gi and vk then
 	       dest = dest or {};
 	       local dest_vk = dest.vkerns or {}; dest.vkerns = dest_vk
 	       for _,v in pairs(vk) do
@@ -700,7 +698,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
@@ -723,31 +721,31 @@ 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
+   -- 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]
@@ -809,8 +807,8 @@ 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
@@ -883,7 +881,7 @@ end
 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()
@@ -902,12 +900,12 @@ do
 	    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