ltj-setwidth.lua: try to use rules to adjusting dimensions of a glyph

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index a12be0a..f6a68ec 100644 (file)
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -1030,7 +1030,7 @@ do
             else
                finalize_inner(n)
             end
-         end
+        end
       end
    end
    local getbox = tex.getbox

diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua
index b73ec5e..d5b899e 100644 (file)
--- a/src/ltj-jfmglue.lua
+++ b/src/ltj-jfmglue.lua
@@ -149,16 +149,15 @@ end
 local function add_penalty(p,e)
    local pp = getfield(p, 'penalty')
    if pp>=10000 then
-      if e<=-10000 then pp = 0 end
+      if e<=-10000 then setfield(p, 'penalty', 0) end
    elseif pp<=-10000 then
-      if e>=10000 then pp = 0 end
+      if e>=10000 then  setfield(p, 'penalty', 0) end
    else
       pp = pp + e
       if pp>=10000 then      setfield(p, 'penalty', 10000)
       elseif pp<=-10000 then setfield(p, 'penalty', -10000)
       else                   setfield(p, 'penalty', pp) end
    end
-   return
 end
 
 -- 「異なる JFM」の間の調整方法
@@ -235,7 +234,8 @@ local function check_box(box_ptr, box_end)
            first_char = p; find_first_char = false
         end
         last_char = p; found_visible_node = true
-        --elseif pid==id_rule and get_attr_icflag(p)==PACKED then -- do nothing
+      elseif pid==id_rule and get_attr_icflag(p)==PACKED then 
+        -- do nothing
       elseif not (pid==id_ins   or pid==id_mark
                  or pid==id_adjust or pid==id_whatsit
                  or pid==id_penalty) then
@@ -321,9 +321,9 @@ local function calc_np_aux_glyph_common(lp)
    if (getfont(lp) == (has_attr(lp, attr_curjfnt) or -1)) then
       Np.id = id_jglyph
       set_np_xspc_jachar(Np, lp)
-      local npi
-      lp, head, npi = capsule_glyph(lp, Np.met, Np.class, head, tex_dir)
-      Np.first = (Np.first~=Np.nuc) and Np.first or npi
+      local npi, npf
+      lp, head, npi, npf = capsule_glyph(lp, Np.met, Np.class, head, tex_dir)
+      Np.first = (Np.first~=Np.nuc) and Np.first or npf or npi
       Np.nuc = npi
    else
       Np.id = id_glyph
@@ -791,8 +791,7 @@ do
    local XKANJI_SKIP_JFM   = luatexja.icflag_table.XKANJI_SKIP_JFM
    get_xkanjiskip_normal = function (Nn)
       if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then
-        local f = node_copy(xkanji_skip)
-        return f
+        return node_copy(xkanji_skip)
       else
         local g = node_copy(zero_glue)
         set_attr(g, attr_icflag, XKANJI_SKIP)

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 3094c93..b1943ca 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -212,7 +212,7 @@ do
       if not r then
          r = m.chars[c] or
             luatexbase.call_callback("luatexja.find_char_class", 0, m, c)
-         m.chars_cbcache[c] = r
+         m.chars_cbcache[c or 0] = r
       end
       return r
    end

diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua
index 3f3b503..da849e7 100644 (file)
--- a/src/ltj-setwidth.lua
+++ b/src/ltj-setwidth.lua
@@ -74,18 +74,48 @@ local call_callback = luatexbase.call_callback
 
 local fshift =  { down = 0, left = 0}
 
+local min = math.min
 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
+   -- f*: whd specified in JFM
    local fwidth, pwidth = char_data.width, getfield(p, 'width')
    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
-   if (pwidth ~= fwidth or getfield(p, 'height') ~= fheight 
-         or getfield(p, 'depth') ~= fdepth) then
-      local y_shift
-         = - getfield(p, 'yoffset') + (has_attr(p,attr_ykblshift) or 0)
+   local kbl = has_attr(p, attr_ykblshift) or 0
+   -- 
+   local need_hbox
+   if pwidth==fwidth then
+      -- 補正後glyph node は ht: p.height - kbl - down, dp: p.depth + min(0, kbl+down) を持つ
+      -- 設定されるべき寸法: ht: fheight - kbl, dp: fdepth + kbl
+      local ht_diff = fheight + fshift.down - getfield(p, 'height') 
+      local dp_diff = fdepth  + kbl - getfield(p, 'depth') - min(kbl + fshift.down, 0)
+      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)
+        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(box, 'width', 0)
+        setfield(box, 'height', fheight - kbl)
+        setfield(box, 'depth', fdepth + kbl)
+        setfield(box, 'dir', dir)
+        set_attr(box, 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
+      else
+        need_hbox = true
+      end
+   else 
+      need_hbox = true
+   end
+
+   if need_hbox then
       local q
       head, q = node_remove(head, p)
       setfield(p, 'yoffset', -fshift.down); setfield(p, 'next', nil)
@@ -96,20 +126,15 @@ local function capsule_glyph_yoko(p, met, class, head, dir)
       setfield(box, 'height', fheight)
       setfield(box, 'depth', fdepth)
       setfield(box, 'head', p)
-      setfield(box, 'shift', y_shift)
+      setfield(box, 'shift', kbl)
       setfield(box, 'dir', dir)
       set_attr(box, attr_icflag, PACKED)
       head = q and node_insert_before(head, q, box)
                or node_insert_after(head, node_tail(head), box)
       return q, head, box
-   else
-      set_attr(p, attr_icflag, PROCESSED)
-      setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left)
-      setfield(p, 'yoffset', getfield(p, 'yoffset')
-                 - (has_attr(p, attr_ykblshift) or 0) - fshift.down)
-      return node_next(p), head, p
    end
 end
+
 luatexja.setwidth.capsule_glyph_yoko = capsule_glyph_yoko
 
 local function capsule_glyph_tate(p, met, class, head, dir)
@@ -196,7 +221,7 @@ function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift)
            setfield(p, 'depth', getfield(p, 'depth')+v)
            set_attr(p, attr_icflag, PROCESSED)
         elseif pid==id_glyph then
-           -- 欧文文字; 和文文字は pid == i_hlist の場合で処理される
+           -- 欧文文字; 和文文字は pid == id_hlist の場合で処理される
            -- (see conv_jchar_to_hbox_A in ltj-math.lua)
            setfield(p, 'yoffset',
                     getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0))

diff --git a/src/luatexja.lua b/src/luatexja.lua
index df3ca12..fcfa48a 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -65,7 +65,7 @@ luatexja.dir_table = dir_table
 dir_table.dir_dtou = 1
 dir_table.dir_tate = 3
 dir_table.dir_yoko = 4
-dir_table.dir_math_mod    = 8 -- 組方向を合わせるために自動で作られたもの
+dir_table.dir_math_mod    = 8
 dir_table.dir_node_auto   = 128 -- 組方向を合わせるために自動で作られたもの
 dir_table.dir_node_manual = 256 -- 寸法代入によって作られたもの
 dir_table.dir_utod = dir_table.dir_tate + dir_table.dir_math_mod
@@ -430,6 +430,11 @@ local function debug_show_node_X(p,print_fn, limit)
         end
       end
       prefix=k
+   elseif pt=='rule' then
+      s = base .. '(' .. print_scaled(p.height) .. '+'
+         .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) 
+        .. ', dir=' .. tostring(node.has_attribute(p, attr_dir))
+      print_fn(s)
    elseif pt == 'glue' then
       s = base .. ' ' ..  print_spec(p.spec)
       if get_attr_icflag(p)>icflag_table.KINSOKU