X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-setwidth.lua;h=5b3ad29152141129f5b521de1ab30cb351dd895a;hb=c35bc9236b8c249d3089a824fe197d0d1cde7e78;hp=615975ec3816ef84a2d2e74c3bf3ca8587c3255a;hpb=4679b304375e2dc5614e5706a4ff01c1659bffa2;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua
index 615975e..5b3ad29 100644
--- a/src/ltj-setwidth.lua
+++ b/src/ltj-setwidth.lua
@@ -23,6 +23,7 @@ local node_insert_before = node.insert_before
 local node_insert_after = node.insert_after
 local round = tex.round
 
+
 local id_glyph = node.id('glyph')
 local id_kern = node.id('kern')
 local id_hlist = node.id('hlist')
@@ -35,20 +36,24 @@ local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 local attr_yablshift = luatexbase.attributes['ltj@yablshift']
 local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
 local attr_icflag = luatexbase.attributes['ltj@icflag']
-local attr_uniqid = luatexbase.attributes['ltj@uniqid']
 
 local ltjf_font_metric_table = ltjf.font_metric_table
 
 local PACKED = 2
-local PROCESSED = 8
-local IC_PROCESSED = 9
-
-head = nil
+local PROCESSED = 11
+local IC_PROCESSED = 12
+local PROCESSED_BEGIN_FLAG = 32
 
--- return true if and only if p is a Japanese character node
-local function is_japanese_glyph_node(p)
-   return p.font==has_attr(p, attr_curjfnt)
+do
+   local floor = math.floor
+   function get_pr_begin_flag(p)
+      local i = has_attr(p, attr_icflag) or 0
+      return i - i%PROCESSED_BEGIN_FLAG
+   end
 end
+local get_pr_begin_flag = get_pr_begin_flag
+
+head = nil
 
 luatexbase.create_callback("luatexja.set_width", "data", 
 			   function (fstable, fmtable, jchar_class) 
@@ -56,42 +61,39 @@ luatexbase.create_callback("luatexja.set_width", "data",
 			   end)
 
 local fshift =  { down = 0, left = 0}
+
 -- mode: true iff p will be always encapsuled by a hbox
 function capsule_glyph(p, dir, mode, met, class)
    local char_data = met.size_cache.char_type[class]
    if not char_data then return node_next(p) end
-   local fwidth
-   if char_data.width ~= 'prop' then
-      fwidth = char_data.width
-   else fwidth = p.width end
+   local fwidth, pwidth = char_data.width, p.width
+   fwidth = (fwidth ~= 'prop') and fwidth or pwidth
    local fheight, fdepth = char_data.height, char_data.depth
    fshift.down = char_data.down; fshift.left = char_data.left
    fshift = luatexbase.call_callback("luatexja.set_width", fshift, met, class)
-   if (mode or p.width ~= fwidth or p.height ~= fheight or p.depth ~= fdepth) then
-      local y_shift, total = - p.yoffset + (has_attr(p,attr_ykblshift) or 0), fwidth - p.width
+   if (mode or pwidth ~= fwidth or p.height ~= fheight or p.depth ~= fdepth) then
+      local y_shift, ca
+         = - p.yoffset + (has_attr(p,attr_ykblshift) or 0), char_data.align
       local q; head, q = node.remove(head, p)
       p.yoffset, p.next = -fshift.down, nil
-      if total ~= 0 and char_data.align~='left' then
+      if total ~= 0 and ca~='left'  then
 	 p.xoffset = p.xoffset - fshift.left
-	    + (((char_data.align=='right') and total) or round(total*0.5))
+	    + (((ca=='right') and fwidth - pwidth) or round((fwidth - pwidth)*0.5))
       else
 	 p.xoffset = p.xoffset - fshift.left
       end
       local box = node_new(id_hlist); 
       box.width, box.height, box.depth = fwidth, fheight, fdepth
-      box.glue_set, box.glue_order, box.head = 0, 0, p
-      box.shift = y_shift; box.dir = dir or 'TLT'
-      set_attr(box, attr_icflag, PACKED)
-      set_attr(box, attr_uniqid, has_attr(p, attr_uniqid) or 0)
-      if q then
-	 head = node_insert_before(head, q, box)
-      else
-	 head = node_insert_after(head, node_tail(head), box)
-      end
+      box.head, box.shift, box.dir = p, y_shift, (dir or 'TLT')
+      --box.glue_set, box.glue_order = 0, 0 not needed
+      set_attr(box, attr_icflag, PACKED + get_pr_begin_flag(p))
+      head = q and node_insert_before(head, q, box) 
+               or node_insert_after(head, node_tail(head), box)
       return q
    else
+      set_attr(p, attr_icflag, PROCESSED + get_pr_begin_flag(p))
       p.xoffset = p.xoffset - fshift.left
-      p.yoffset = p.yoffset - (has_attr(p, attr_yablshift) or 0) - fshift.down
+      p.yoffset = p.yoffset - (has_attr(p, attr_ykblshift) or 0) - fshift.down
       return node_next(p)
    end
 end
@@ -100,12 +102,14 @@ function set_ja_width(ahead, dir)
    local p = ahead; head  = ahead
    local m = false -- is in math mode?
    while p do
-      if (p.id==id_glyph) and (has_attr(p, attr_icflag, PROCESSED) or 0)<=0  then
-	 if is_japanese_glyph_node(p) then
-	    set_attr(p, attr_icflag, PROCESSED)
-	    p = capsule_glyph(p, dir, false, ltjf_font_metric_table[p.font], has_attr(p, attr_jchar_class))
+      if (p.id==id_glyph) 
+      and ((has_attr(p, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG)<=0 then
+      local pf = p.font
+	 if pf == has_attr(p, attr_curjfnt) then
+	    p = capsule_glyph(p, dir, false, ltjf_font_metric_table[pf], 
+			      has_attr(p, attr_jchar_class))
 	 else
-	    set_attr(p, attr_icflag, PROCESSED) 
+	    set_attr(p, attr_icflag, PROCESSED + get_pr_begin_flag(p))
 	    p.yoffset = p.yoffset - (has_attr(p,attr_yablshift) or 0); p = node_next(p)
 	 end
       elseif p.id==id_math then