get rid of attr_orig_char

[luatex-ja/luatexja.git] / src / ltj-setwidth.lua

diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua
index 9d1b830..d9b903c 100644 (file)
--- a/src/ltj-setwidth.lua
+++ b/src/ltj-setwidth.lua
@@ -46,6 +46,7 @@ local attr_tkblshift = luatexbase.attributes['ltj@tkblshift']
 local attr_icflag = luatexbase.attributes['ltj@icflag']
 
 local ltjf_font_metric_table = ltjf.font_metric_table
+local ltjf_font_extra_info = ltjf.font_extra_info
 local ltjf_get_vert_glyph = ltjf.get_vert_glyph
 
 local PACKED       = luatexja.icflag_table.PACKED
@@ -73,7 +74,9 @@ local call_callback = luatexbase.call_callback
 
 local fshift =  { down = 0, left = 0}
 
-local min = math.min
+local min, max = math.min, math.max
+
+-- 和文文字の位置補正（横）
 local function capsule_glyph_yoko(p, met, class, head, dir)
    local char_data = met.char_type[class]
    if not char_data then return node_next(p), head, p end
@@ -94,16 +97,17 @@ local function capsule_glyph_yoko(p, met, class, head, dir)
       if  ht_diff == 0 and dp_diff ==0 then -- offset only
         set_attr(p, attr_icflag, PROCESSED)
         setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left)
-        setfield(p, 'yoffset', - kbl - fshift.down)
+        setfield(p, 'yoffset', getfield(p, 'yoffset') - kbl - fshift.down)
         return node_next(p), head, p
       elseif ht_diff >= 0 and dp_diff >=0 then -- rule
         local box = node_new(id_rule)
-        setfield(p, 'yoffset', - kbl - fshift.down)
+        setfield(p, 'yoffset', getfield(p, 'yoffset') - kbl - fshift.down)
         setfield(box, 'width', 0)
         setfield(box, 'height', fheight - kbl)
         setfield(box, 'depth', fdepth + kbl)
         setfield(box, 'dir', dir)
         set_attr(box, attr_icflag, PACKED)
+        set_attr(p, attr_icflag, PACKED)
         head = p and node_insert_before(head, p, box)
            or node_insert_after(head, node_tail(head), box)
         return node_next(p), head, p, box
@@ -117,7 +121,9 @@ local function capsule_glyph_yoko(p, met, class, head, dir)
    if need_hbox then
       local q
       head, q = node_remove(head, p)
-      setfield(p, 'yoffset', -fshift.down); setfield(p, 'next', nil)
+      local box = node_new(id_hlist)
+      setfield(p, 'yoffset', getfield(p, 'yoffset') -fshift.down);
+      setfield(p, 'next', nil)
       setfield(p, 'xoffset', getfield(p, 'xoffset') 
                  + char_data.align*(fwidth-pwidth) - fshift.left)
       local box = node_new(id_hlist)
@@ -136,20 +142,28 @@ end
 
 luatexja.setwidth.capsule_glyph_yoko = capsule_glyph_yoko
 
+-- 和文文字の位置補正（縦）
 local function capsule_glyph_tate(p, met, class, head, dir)
    local char_data = met.char_type[class]
    if not char_data then return node_next(p), head end
    local ascent, descent = met.ascent, met.descent
-   local fwidth, pwidth = char_data.width, ascent + descent
+   local fwidth, pwidth = char_data.width
+   do
+      local pf = getfont(p)
+      local pc = getchar(p) -- ltjf_get_vert_glyph(pf, getchar(p))
+      setfield(p, 'char', pc)
+      pwidth = ltjf_font_extra_info[pf] and  ltjf_font_extra_info[pf][pc] 
+        and ltjf_font_extra_info[pf][pc].vwidth 
+        and ltjf_font_extra_info[pf][pc].vwidth * met.size or (ascent+descent)
+      pwidth = pwidth + (met.v_advance and met.v_advance[pc] or 0)
+   end
    fwidth = (fwidth ~= 'prop') and fwidth or pwidth
    fshift.down = char_data.down; fshift.left = char_data.left
    fshift = call_callback("luatexja.set_width", fshift, met, class)
    local fheight, fdepth = char_data.height, char_data.depth
 
-   setfield(p, 'char', ltjf_get_vert_glyph(getfont(p), getchar(p)))
-
    local y_shift
-      = - getfield(p, 'yoffset') + (has_attr(p,attr_tkblshift) or 0)
+      = getfield(p, 'xoffset') + (has_attr(p,attr_tkblshift) or 0)
    local q
    head, q = node_remove(head, p)
    local box = node_new(id_hlist)
@@ -159,8 +173,8 @@ local function capsule_glyph_tate(p, met, class, head, dir)
    setfield(box, 'shift', y_shift)
    setfield(box, 'dir', dir)
 
-   setfield(p, 'xoffset', -fshift.down)
-   setfield(p, 'yoffset', - (getfield(p, 'xoffset') + ascent
+   setfield(p, 'xoffset', - fshift.down)
+   setfield(p, 'yoffset', getfield(p, 'yoffset') -(ascent
                                 + char_data.align*(fwidth-pwidth) - fshift.left) )
    local ws = node_new(id_whatsit, sid_save)
    local wm = node_new(id_whatsit, sid_matrix)
@@ -228,3 +242,40 @@ function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift)
       end
    end
 end
+
+-- discretionary の位置補正
+do
+   local attr_yablshift = luatexbase.attributes['ltj@yablshift']
+   local attr_tablshift = luatexbase.attributes['ltj@tablshift']
+   local attr_ablshift
+   local disc, tex_dir
+   local function ashift_disc_inner(field)
+      local head = getfield(disc, field)
+      if not head then return end
+      local y_adjust, node_depth, adj_depth = 0, 0, 0
+      for lp in node_traverse_id(id_glyph, head) do
+        y_adjust = has_attr(lp,attr_ablshift) or 0
+        node_depth = max(getfield(lp, 'depth') + min(y_adjust, 0), node_depth)
+        adj_depth = (y_adjust>0) and max(getfield(lp, 'depth') + y_adjust, adj_depth) or adj_depth
+        setfield(lp, 'yoffset', getfield(lp, 'yoffset') - y_adjust)
+      end
+      if adj_depth>node_depth then
+        local r = node_new(id_rule)
+        setfield(r, 'width', 0); setfield(r, 'height', 0)
+        setfield(r, 'depth', adj_depth); setfield(r, 'dir', tex_dir)
+        set_attr(r, attr_icflag, PROCESSED)
+        if field=='post' then
+           node_insert_after(head, head, r)
+        else
+           setfield(disc, field, (node_insert_before(head, head, r)))
+        end
+      end
+   end
+   function luatexja.setwidth.apply_ashift_disc(d, is_dir_tate, dir)
+      attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift
+      disc, tex_dir = d, dir
+      ashift_disc_inner('pre')
+      ashift_disc_inner('post')
+      ashift_disc_inner('replace')
+   end
+end