X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-setwidth.lua;h=d92a4c667d65ab2f0c6d2f6e272bf2bf1daef4bf;hb=1379fbf6aae445cdce3906e7b83cc1c8550e78d5;hp=457ecd806ca4dbfe5f8d649a5a6385f9aba2b0b7;hpb=880636d81e9819b31dec8a5f897bbfaf1732d18b;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua
index 457ecd8..d92a4c6 100644
--- a/src/ltj-setwidth.lua
+++ b/src/ltj-setwidth.lua
@@ -1,26 +1,30 @@
 --
--- 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 Dnode = node.direct or node
+local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
+local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end
+local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
+local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
+local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end
+local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
+local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end
+
+local node_traverse = Dnode.traverse
+local node_new = Dnode.new
+local node_remove = luatexja.Dnode_remove -- Dnode.remove
+local node_tail = Dnode.tail
+local node_next = (Dnode ~= node) and Dnode.getnext or node.next
+local has_attr = Dnode.has_attribute
+local set_attr = Dnode.set_attribute
+local node_insert_before = Dnode.insert_before
+local node_insert_after = Dnode.insert_after
 local round = tex.round
 
 local id_glyph = node.id('glyph')
@@ -29,112 +33,197 @@ 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_tablshift = luatexbase.attributes['ltj@tablshift']
+local attr_tkblshift = luatexbase.attributes['ltj@tkblshift']
 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
-
-char_data = {}
-head = nil
+local PACKED       = luatexja.icflag_table.PACKED
+local PROCESSED    = luatexja.icflag_table.PROCESSED
+local IC_PROCESSED = luatexja.icflag_table.IC_PROCESSED
+local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
 
--- 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 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 head, dir
+local ltjw = {} --export
+luatexja.setwidth = ltjw
+
+luatexbase.create_callback("luatexja.set_width", "data",
+			   function (fstable, fmtable, jchar_class)
+			      return fstable
 			   end)
+local call_callback = luatexbase.call_callback
 
 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, class)
+   local char_data = met.char_type[class]
+   if not char_data then return node_next(p) end
+   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 = 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
-      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'
+   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 q
+      head, q = node_remove(head, p)
+      setfield(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)
+      setfield(box, 'width', fwidth)
+      setfield(box, 'height', fheight)
+      setfield(box, 'depth', fdepth)
+      setfield(box, 'head', p)
+      setfield(box, 'shift', y_shift)
+      setfield(box, 'dir', dir)
       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
+      head = q and node_insert_before(head, q, box)
+               or node_insert_after(head, node_tail(head), box)
       return q
    else
-      p.yoffset = p.yoffset - (has_attr(p, attr_yablshift) or 0) - fshift.down
+      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)
    end
 end
+local function capsule_glyph_tate(p, met, class)
+   local char_data = met.char_type[class]
+   if not char_data then return node_next(p) end
+   local ascent, descent = met.ascent, met.descent
+   local fwidth, pwidth = char_data.width, ascent + descent
+   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', ltjd.get_vert_glyph(getfont(p), getchar(p)))
+
+   local y_shift
+      = - getfield(p, 'yoffset') + (has_attr(p,attr_tkblshift) or 0)
+   local q
+   head, q = node_remove(head, p)
+   local box = node_new(id_hlist)
+   setfield(box, 'width', fwidth)
+   setfield(box, 'height', fheight)
+   setfield(box, 'depth', fdepth)
+   setfield(box, 'shift', y_shift)
+   setfield(box, 'dir', dir)
+
+   local k1 = node_new(id_kern)
+   setfield(k1, 'kern',
+	    getfield(p, 'xoffset') + 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 k2 = node_new(id_kern)
+   setfield(k2, 'kern', -fshift.down - fdepth)
+   local k3 = node_new(id_kern)
+   setfield(k3, 'kern', - getfield(p, 'width') +fshift.down + fdepth)
+   local wr = node_new(id_whatsit, sid_restore)
+   setfield(box, 'head', k1); setfield(k1, 'next', ws)
+   setfield(ws, 'next', wm);  setfield(wm, 'next', k2);
+   setfield(k2, 'next', p);   setfield(p, 'next', k3);
+   setfield(k3, 'next', 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
+end
 
-function set_ja_width(ahead, dir)
-   local p = ahead; head  = ahead
+local function capsule_glyph_math(p, met, class)
+   local char_data = met.char_type[class]
+   if not char_data then return nil end
+   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
+   local y_shift, ca
+      = - getfield(p, 'yoffset') + (has_attr(p,attr_ykblshift) or 0), char_data.align
+   setfield(p, 'yoffset', -fshift.down)
+   setfield(p, 'xoffset', getfield(p, 'xoffset') + char_data.align*(fwidth-pwidth) - fshift.left)
+   local box = node_new(id_hlist);
+   setfield(box, 'width', fwidth)
+   setfield(box, 'height', fheight)
+   setfield(box, 'depth', fdepth)
+   setfield(box, 'head', p)
+   setfield(box, 'shift', y_shift)
+   setfield(box, 'dir', tex.mathdir)
+   set_attr(box, attr_icflag, PACKED)
+   return box
+end
+luatexja.setwidth.capsule_glyph_math = capsule_glyph_math
+
+function luatexja.setwidth.set_ja_width(ahead, adir)
+   local p = ahead; head  = p; dir = adir or 'TLT'
    local m = false -- is in math mode?
+   local is_dir_tate = ltjs.list_dir==dir_tate
+   local capsule_glyph = is_dir_tate and capsule_glyph_tate or capsule_glyph_yoko
+   local attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift
    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 pid = getid(p)
+      if (pid==id_glyph)
+      and ((has_attr(p, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG)<=0 then
+         local pf = getfont(p)
+	 if pf == has_attr(p, attr_curjfnt) then
+	    p = capsule_glyph(p, ltjf_font_metric_table[pf],
+			      has_attr(p, attr_jchar_class))
+	 else
+	    -- TODO: neg. offset does not increase depth
+	    --local d = getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0)
+	    set_attr(p, attr_icflag, PROCESSED)
+	    setfield(p, 'yoffset',
+		     getfield(p, 'yoffset') - (has_attr(p,attr_ablshift) or 0))
+	    p = node_next(p)
 	 end
-      elseif p.id==id_math then
-	 m = (p.subtype==0); p = node_next(p)
+      elseif pid==id_math then
+	 m = (getsubtype(p)==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 
+            -- 数式の位置補正
+	    if pid==id_hlist or pid==id_vlist then
+               if (has_attr(p, attr_icflag) or 0) ~= PROCESSED then
+                  setfield(p, 'shift', getfield(p, 'shift') +  (has_attr(p,attr_ablshift) or 0))
+               end
+	    elseif pid==id_rule then
+	       if (has_attr(p, attr_icflag) or 0) ~= PROCESSED then
+		  local v = has_attr(p,attr_yablshift) or 0
+                  setfield(p, 'height', getfield(p, 'height')-v)
+                  setfield(p, 'depth', getfield(p, 'depth')+v)
+		  set_attr(p, attr_icflag, PROCESSED)
+	       end
 	    end
 	 end
 	 p = node_next(p)
       end
    end
    -- adjust attr_icflag
-   tex.attribute[attr_icflag] = -(0x7FFFFFFF)
+   tex.setattribute('global', attr_icflag, 0)
    return head
 end
+