X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-pretreat.lua;h=7d332578e7ed2d1283e81eafd668a039c70e48f1;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=fa0573c93c23a0f151ccc7f934c3d63d362ffe65;hpb=af898c3b09bcc8bdfa305778e93bf467d1a52a21;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index fa0573c..7d33257 100644
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -43,8 +43,6 @@ local attr_icflag = luatexbase.attributes['ltj@icflag']
 local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
 local ltjs_orig_char_table = ltjs.orig_char_table
 local ltjf_replace_altfont = ltjf.replace_altfont
-local ltjf_font_extra_info = ltjf.font_extra_info
-local attr_orig_char = luatexbase.attributes['ltj@origchar']
 local STCK  = luatexja.userid_table.STCK
 local DIR   = luatexja.userid_table.DIR
 local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
@@ -102,8 +100,10 @@ do
 	    local pid = getid(p)
 	    while pid==id_glyph do
 	       local pc = getchar(p)
-	       if (has_attr(p, attr_icflag) or 0)<=0 and is_ucs_in_japanese_char(p, pc) then
-		  setfont(p, ltjf_replace_altfont(has_attr(p, attr_curjfnt) or getfont(p), pc))
+	       if has_attr(p, attr_icflag, 0) and is_ucs_in_japanese_char(p, pc) then
+                  local pf = has_attr(p, attr_curjfnt)
+                  pf = (pf and pf>0 and pf) or getfont(p)
+		  setfont(p, ltjf_replace_altfont(pf, pc))
 		  setlang(p, lang_ja)
 		  ltjs_orig_char_table[p] = pc
 	       end
@@ -130,8 +130,12 @@ local ltjf_font_metric_table  = ltjf.font_metric_table
 local font_getfont = font.getfont
 local function set_box_stack_level(head, mode)
    local box_set, cl = 0, tex.currentgrouplevel + 1
-   for _,p  in pairs(wt) do
-      if mode and getfield(p, 'value')==cl then box_set = 1 end; node_free(p)
+   if mode then
+      for _,p  in pairs(wt) do
+         if getfield(p, 'value')==cl then box_set = 1 end; node_free(p)
+      end
+   else
+      for _,p  in pairs(wt) do node_free(p) end
    end
    ltjs_report_stack_level(tex_getcount('ltj@@stack') + box_set)
    for _,p  in pairs(wtd) do
@@ -139,14 +143,13 @@ local function set_box_stack_level(head, mode)
    end
    if ltjs.list_dir == dir_tate then
       for p in node.direct.traverse_id(id_glyph,to_direct(head)) do
-         if (has_attr(p, attr_icflag) or 0)<=0 and getlang(p)==lang_ja then
-            local pc = ltjs_orig_char_table[p]
-	    local nf = ltjf_replace_altfont( has_attr(p, attr_curtfnt) or getfont(p) , pc)
+         if has_attr(p, attr_icflag, 0) and getlang(p)==lang_ja then
+	    local nf = ltjf_replace_altfont( has_attr(p, attr_curtfnt) or getfont(p) , ltjs_orig_char_table[p])
 	    setfont(p, nf)
 	    if ltjf_font_metric_table[nf].vert_activated then
 	       local pc = getchar(p)
-	       pc = (ltjf_font_extra_info[nf] and ltjf_font_extra_info[nf][pc] and ltjf_font_extra_info[nf][pc].vform)
-	       if pc and font_getfont(nf).characters[pc] then setchar(p,  pc) end
+	       pc = ltjf_font_metric_table[nf].vform[pc]
+               if pc then setchar(p,  pc) end
 	    end
 	 end
       end