X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-setwidth.lua;h=9f13c97c61ac8a02dc2cab739a6d691c7f32d3b2;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=457ecd806ca4dbfe5f8d649a5a6385f9aba2b0b7;hpb=1a139ec449b922a03f1e6608380bdea12aa532b0;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua
index 457ecd8..9f13c97 100644
--- a/src/ltj-setwidth.lua
+++ b/src/ltj-setwidth.lua
@@ -1,26 +1,46 @@
 --
--- luatexja/setwidth.lua
+-- src/ltj-setwidth.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.setwidth',
-  date = '2011/06/28',
-  version = '0.1',
-  description = '',
-})
-module('luatexja.setwidth', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
 
 luatexja.load_module('base');      local ltjb = luatexja.base
+luatexja.load_module('stack');     local ltjs = luatexja.stack
 luatexja.load_module('jfont');     local ltjf = luatexja.jfont
+luatexja.load_module('direction'); local ltjd = luatexja.direction
 
-local node_type = node.type
-local node_new = node.new
-local node_tail = node.tail
-local node_next = node.next
-local has_attr = node.has_attribute
-local set_attr = node.set_attribute
-local node_insert_before = node.insert_before
-local node_insert_after = node.insert_after
+local setfield = node.direct.setfield
+local getfield = node.direct.getfield
+local getid = node.direct.getid
+local getfont = node.direct.getfont
+local getlist = node.direct.getlist
+local getchar = node.direct.getchar
+local getsubtype = node.direct.getsubtype
+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
+
+local setwhd = node.direct.setwhd or function(n,w,h,d)
+  setfield(n,'width',w); setfield(n,'height',h); setfield(n,'depth',d) end
+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)
+  return getfield(n,'xoffset'), getfield(n,'yoffset')  end
+
+local node_traverse_id = node.direct.traverse_id
+local node_traverse = node.direct.traverse
+local node_new = node.direct.new
+local node_copy = node.direct.copy
+local node_remove = node.direct.remove
+local node_tail = node.direct.tail
+local node_next = node.direct.getnext
+local has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
+local node_insert_before = node.direct.insert_before
+local node_insert_after = node.direct.insert_after
 local round = tex.round
 
 local id_glyph = node.id('glyph')
@@ -29,112 +49,263 @@ local id_hlist = node.id('hlist')
 local id_vlist = node.id('vlist')
 local id_rule = node.id('rule')
 local id_math = node.id('math')
+local id_whatsit = node.id('whatsit')
+local sid_save = node.subtype('pdf_save')
+local sid_restore = node.subtype('pdf_restore')
+local sid_matrix = node.subtype('pdf_setmatrix')
+local dir_tate = luatexja.dir_table.dir_tate
 
-local attr_jchar_class = luatexbase.attributes['ltj@charclass']
-local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
-local attr_yablshift = luatexbase.attributes['ltj@yablshift']
+local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
+local attr_tkblshift = luatexbase.attributes['ltj@tkblshift']
 local attr_icflag = luatexbase.attributes['ltj@icflag']
-local attr_uniqid = luatexbase.attributes['ltj@uniqid']
+local attr_vert_ori = luatexbase.attributes['ltj@vert@ori']
 
-local ltjf_font_metric_table = ltjf.font_metric_table
+local ltjf_font_extra_info = ltjf.font_extra_info
 
-local PACKED = 2
+local PACKED       = luatexja.icflag_table.PACKED
+local PROCESSED    = luatexja.icflag_table.PROCESSED
 
-char_data = {}
-head = nil
-
--- 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)
+local get_pr_begin_flag
+do
+   local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
+   local floor = math.floor
+   get_pr_begin_flag = function (p)
+      local i = has_attr(p, attr_icflag) or 0
+      return i - i%PROCESSED_BEGIN_FLAG
+   end
 end
 
-luatexbase.create_callback("luatexja.set_width", "data", 
-			   function (fstable, fmtable, jchar_class) 
-			      return fstable 
+local ltjw = {} --export
+luatexja.setwidth = ltjw
+
+luatexbase.create_callback("luatexja.set_width", "data",
+			   function (fstable, fmtable, char_data)
+			      return fstable
 			   end)
+local call_callback = luatexbase.call_callback
+
+local fshift =  { down = 0, left = 0 }
+
+local min, max = math.min, math.max
+
+local rule_subtype = (status.luatex_version>=85) and 3 or 0
 
-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 h, box, q, fwidth
-   if char_data.width ~= 'prop' then
-      fwidth = char_data.width
-   else fwidth = p.width end
-   local fheight = char_data.height
-   local fdepth = char_data.depth
+-- 和文文字の位置補正（横）
+local function capsule_glyph_yoko(p, met, char_data, head, dir)
+   if not char_data then return node_next(p), head, p end
    fshift.down = char_data.down; fshift.left = char_data.left
-   fshift = luatexbase.call_callback("luatexja.set_width", fshift, met, class)
---   local ti = 
-   p.xoffset= p.xoffset - fshift.left
-   if mode or p.width ~= fwidth or p.height ~= fheight or p.depth ~= fdepth then
-      local y_shift = - p.yoffset + (has_attr(p,attr_yablshift) or 0)
-      p.yoffset = -fshift.down
-      head, q = node.remove(head, p)
-      local total = fwidth - p.width
-      if total == 0 then
-	 h = p; p.next = nil
-      else
-	 h = node_new(id_kern); h.subtype = 0
-	 if char_data.align=='right' then
-	    h.kern = total; p.next = nil; h.next = p
-	 elseif char_data.align=='middle' then
-	    h.kern = round(total/2); p.next = h
-	    h = node_new(id_kern); h.subtype = 0
-	    h.kern = total - round(total/2); h.next = p
-	 else -- left
-	    h.kern = total; p.next = h; h = p
-	 end
+   fshift = call_callback("luatexja.set_width", fshift, met, char_data)
+   local kbl = has_attr(p, attr_ykblshift) 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
+   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 - pheight
+      local dp_diff = fdepth  + kbl - pdepth - min(kbl + fshift.down, 0)
+      if ht_diff == 0 and dp_diff ==0 then -- offset only
+         set_attr(p, attr_icflag, PROCESSED)
+         local xo, yo = getoffsets(p)
+	 setoffsets(p, xo - fshift.left, yo - 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,rule_subtype)
+         local xo, yo = getoffsets(p)
+	 setoffsets(p, xo, yo - kbl - fshift.down)
+	 setwhd(box, 0, fheight - kbl, fdepth + kbl)
+	 setdir(box, dir)
+	 set_attr(box, attr_icflag, PACKED)
+	 set_attr(p, attr_icflag, PROCESSED)
+	 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
       end
-      box = node_new(id_hlist); 
-      box.width = fwidth; box.height = fheight; box.depth = fdepth
-      box.glue_set = 0; box.glue_order = 0; box.head = h
-      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
+
+   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);
+   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
+
+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, 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] and (has_attr(p, attr_vert_ori) or 0)<=0 then
+	    return capsule_glyph_tate_rot(p, met, char_data, head, dir, 0.5*(ascent-descent))
+	 end
       end
-      return q
-   else
-      p.yoffset = p.yoffset - (has_attr(p, attr_yablshift) or 0) - fshift.down
-      return node_next(p)
+      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
+   fshift = call_callback("luatexja.set_width", fshift, met, char_data)
+   local fheight = char_data.height or 0
+   local fdepth  = char_data.depth or 0
+   local xo, yo = getoffsets(p)
+   local y_shift = xo + (has_attr(p,attr_tkblshift) or 0)
+   local q
+   head, q = node_remove(head, p)
+   local box = node_new(id_hlist)
+   setwhd(box, fwidth, fheight, fdepth)
+   setfield(box, 'shift', y_shift)
+   setdir(box, dir)
+
+   setoffsets(p, -fshift.down,
+              yo -(ascent + char_data.align*(fwidth-pwidth) - fshift.left) )
+   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*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);
+   setnext(k2, p);   setnext(p,  k3);
+   setnext(k3, wr);
+
+   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
+luatexja.setwidth.capsule_glyph_tate = capsule_glyph_tate
 
-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 then
-	 if is_japanese_glyph_node(p) then
-	    local met = ltjf_font_metric_table[p.font]
-	    local class = has_attr(p, attr_jchar_class)
-	    char_data = ltjf.metrics[met.jfm].size_cache[met.size].char_type[class]
-            if char_data then
-               p = capsule_glyph(p, dir, false, met, class)
-            else
-               p = node_next(p)
-            end
-	 else 
-	    p.yoffset = p.yoffset - (has_attr(p,attr_yablshift) or 0); p = node_next(p)
+local function capsule_glyph_math(p, met, char_data)
+   if not char_data then return nil end
+   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)
+   local fheight, fdepth = char_data.height, char_data.depth
+   local y_shift
+      = - getfield(p, 'yoffset') + (has_attr(p,attr_ykblshift) or 0)
+   setfield(p, 'yoffset', -fshift.down)
+   setfield(p, 'xoffset', getfield(p, 'xoffset') + char_data.align*(fwidth-pwidth) - fshift.left)
+   local box = node_new(id_hlist);
+   setwhd(box, fwidth, fheight, fdepth)
+   setfield(box, 'head', p)
+   setfield(box, 'shift', y_shift)
+   setdir(box, tex.mathdir)
+   set_attr(box, attr_icflag, PACKED)
+   return box
+end
+luatexja.setwidth.capsule_glyph_math = capsule_glyph_math
+
+-- 数式の位置補正
+function luatexja.setwidth.apply_ashift_math(head, last, attr_ablshift)
+   for p in node_traverse(head) do
+      local pid = getid(p)
+      if p==last then
+	 return
+      elseif (has_attr(p, attr_icflag) or 0) ~= PROCESSED then
+	 if pid==id_hlist or pid==id_vlist then
+	    setfield(p, 'shift', getfield(p, 'shift') +  (has_attr(p,attr_ablshift) or 0)) 
+	 elseif pid==id_rule then
+	    local v = has_attr(p,attr_ablshift) or 0
+	    setfield(p, 'height', getfield(p, 'height')-v)
+	    setfield(p, 'depth', getdepth(p)+v)
+	    set_attr(p, attr_icflag, PROCESSED)
+	 elseif pid==id_glyph then
+	    -- 欧文文字; 和文文字は 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))
 	 end
-      elseif p.id==id_math then
-	 m = (p.subtype==0); p = node_next(p)
-      else
-	 if m then
-	    if p.id==id_hlist or p.id==id_vlist then
-	       p.shift = p.shift + (has_attr(p,attr_yablshift) or 0)
-	    elseif p.id==id_rule then
-	       local v = has_attr(p,attr_yablshift) or 0
-	       p.height = p.height - v; p.depth = p.depth + v 
-	    end
+         set_attr(p, attr_icflag, PROCESSED)
+      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
+	 local ld = getdepth(lp)
+	 node_depth = max(ld + min(y_adjust, 0), node_depth)
+	 adj_depth = (y_adjust>0) and max(ld + 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,rule_subtype)
+	 setwhd(r, 0, 0, adj_depth); setdir(r, 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
-	 p = node_next(p)
       end
    end
-   -- adjust attr_icflag
-   tex.attribute[attr_icflag] = -(0x7FFFFFFF)
-   return head
+   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