support \ltjjachar<c> where <c> <= 255

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

diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua
index 56fa1c9..4e312be 100644 (file)
--- a/src/ltj-setwidth.lua
+++ b/src/ltj-setwidth.lua
@@ -14,7 +14,8 @@ local getfont = node.direct.getfont
 local getlist = node.direct.getlist
 local getchar = node.direct.getchar
 local getsubtype = node.direct.getsubtype
-local getdepth = node.direct.getdepth or function(n) getfield(n,'depth') end
+local getwidth = node.direct.getwidth or function(n) return getfield(n,'width') end
+local getdepth = node.direct.getdepth or function(n) return getfield(n,'depth') end
 local getwhd = node.direct.getwhd or function(n)
   return getfield(n,'width'), getfield(n,'height'),getfield(n,'depth') end
 
@@ -23,6 +24,7 @@ local setwhd = node.direct.setwhd or function(n,w,h,d)
 local setchar = node.direct.setchar or function(n,c) setfield(n,'char',c) end
 local setnext = node.direct.setnext or function(n,c) setfield(n,'next',c) end
 local setdir = node.direct.setdir or function(n,c) setfield(n,'dir',c) end
+local setkern = node.direct.setkern or function(n,c) setfield(n,'kern',c) end
 local setoffsets = node.direct.setoffsets or function(n,x,y)
   setfield(n,'xoffset',x); setfield(n,'yoffset',y)  end
 local getoffsets = node.direct.getoffsets or function(n)
@@ -57,7 +59,6 @@ local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
 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 PACKED       = luatexja.icflag_table.PACKED
@@ -82,7 +83,7 @@ luatexbase.create_callback("luatexja.set_width", "data",
                           end)
 local call_callback = luatexbase.call_callback
 
-local fshift =  { down = 0, left = 0}
+local fshift =  { down = 0, left = 0 }
 
 local min, max = math.min, math.max
 
@@ -144,19 +145,51 @@ end
 luatexja.setwidth.capsule_glyph_yoko = capsule_glyph_yoko
 
 -- 和文文字の位置補正（縦）
+-- UTR#50 で R もしくは Tr と指定されているが，縦組用グリフがないもの
+local function capsule_glyph_tate_rot(p, met, char_data, head, dir, asc)
+   fshift.down = char_data.down; fshift.left = char_data.left
+   fshift = call_callback("luatexja.set_width", fshift, met, char_data)
+   local kbl = has_attr(p, attr_tkblshift) or 0
+   -- f*: whd specified in JFM
+   local pwidth, pheight,pdepth = getwhd(p)
+   local fwidth = char_data.width or pwidth
+   local fheight= char_data.height or pheight
+   local fdepth = char_data.depth or pdepth
+   local q
+   head, q = node_remove(head, p)
+   local xo, yo = getoffsets(p)
+   setoffsets(p, xo + char_data.align*(fwidth-pwidth) - fshift.left,
+              yo - fshift.down - asc);
+   setnext(p, nil)
+   local box = node_new(id_hlist)
+   setwhd(box, fwidth, fheight, fdepth)
+   setfield(box, 'head', p)
+   setfield(box, 'shift', kbl)
+   setdir(box, 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
+end
+
 local function capsule_glyph_tate(p, met, char_data, head, dir)
    if not char_data then return node_next(p), head end
    local ascent, descent = met.ascent, met.descent
    local fwidth, pwidth = char_data.width
    do
-      local pf = getfont(p)
-      local pc = getchar(p)
-      setchar(p, 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[pc] or 0)
-      ascent = met.v_origin[pc] and ascent - met.v_origin[pc] or ascent
+      local pf, pc = getfont(p), getchar(p)
+      local feir = ltjf_font_extra_info[pf]
+      if feir and feir.rotation and met.vert_activated then
+        if feir.rotation[pc] then
+           return capsule_glyph_tate_rot(p, met, char_data, head, dir, 0.5*(ascent-descent))
+        end
+      end
+      local ident = fonts.hashes.identifiers[pf]
+      pwidth = (ident.descriptions and ident.descriptions[pc]
+         and ident.descriptions[pc].vheight
+         and ident.descriptions[pc].vheight / ident.units * met.size)
+         or (ident.metadata and ident.metadata.defaultvheight) or (ascent+descent)
+      ascent = feir.vorigin[pc] and (feir.vorigin[pc] / ident.units * met.size) or ascent
    end
    fwidth = fwidth or pwidth
    fshift.down = char_data.down; fshift.left = char_data.left
@@ -177,9 +210,9 @@ local function capsule_glyph_tate(p, met, char_data, head, dir)
    local ws = node_new(id_whatsit, sid_save)
    local wm = node_new(id_whatsit, sid_matrix)
    setfield(wm, 'data', '0 1 -1 0')
-   local pwnh = -round(0.5*getfield(p, 'width'))
-   local k2 = node_new(id_kern, 1); setfield(k2, 'kern', pwnh)
-   local k3 = node_new(id_kern, 1); setfield(k3, 'kern', -getfield(p, 'width')-pwnh)
+   local pwnh = -round(0.5*getwidth(p))
+   local k2 = node_new(id_kern, 1); setkern(k2, pwnh)
+   local k3 = node_new(id_kern, 1); setkern(k3, -getwidth(p)-pwnh)
    local wr = node_new(id_whatsit, sid_restore)
    setfield(box, 'head', ws)
    setnext(ws, wm);  setnext(wm, k2);
@@ -195,7 +228,7 @@ luatexja.setwidth.capsule_glyph_tate = capsule_glyph_tate
 
 local function capsule_glyph_math(p, met, char_data)
    if not char_data then return nil end
-   local fwidth, pwidth = char_data.width, getfield(p, 'width')
+   local fwidth, pwidth = char_data.width, getwidth(p)
    fwidth = fwidth or pwidth
    fshift.down = char_data.down; fshift.left = char_data.left
    fshift = call_callback("luatexja.set_width", fshift, met, char_data)