X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-setwidth.lua;h=ebd7393b55b1affce9b1989c60c206d15cfcd09d;hb=6d3b123b361683172e8d236fc8eb7cdb8b4117d8;hp=b3765dfbbd848de29d56b6077865bda303632ea7;hpb=f085560bb8c26829d23b3c20a3b628e8b0690c4b;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-setwidth.lua b/src/ltj-setwidth.lua
index b3765df..ebd7393 100644
--- a/src/ltj-setwidth.lua
+++ b/src/ltj-setwidth.lua
@@ -1,26 +1,28 @@
 --
--- luatexja/setwidth.lua
+-- src/ltj-setwidth.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.setwidth',
-  date = '2012/07/19',
-  version = '0.2',
-  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('jfont');     local ltjf = luatexja.jfont
 
-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.getnext
+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')
@@ -35,79 +37,134 @@ local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 local attr_yablshift = luatexbase.attributes['ltj@yablshift']
 local attr_ykblshift = luatexbase.attributes['ltj@ykblshift']
 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
-local PROCESSED = 8
-local IC_PROCESSED = 9
+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
+
+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
 
-head = nil
+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 char_data = met.size_cache.char_type[class]
+local function capsule_glyph(p, met, class)
+   local char_data = met.char_type[class]
    if not char_data then return node_next(p) end
-   local fwidth = (char_data.width ~= 'prop') and char_data.width or p.width
-   local fheight, fdepth = char_data.height, char_data.depth
+   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)
-   if (mode or p.width ~= fwidth or p.height ~= fheight or p.depth ~= fdepth) then
-      local y_shift, total = - p.yoffset + (has_attr(p,attr_ykblshift) or 0), fwidth - p.width
-      local q; head, q = node.remove(head, p)
-      p.yoffset, p.next = -fshift.down, nil
-      if total ~= 0 and char_data.align~='left' then
-	 p.xoffset = p.xoffset - fshift.left
-	    + (((char_data.align=='right') and total) or round(total*0.5))
-      else
-	 p.xoffset = p.xoffset - fshift.left
-      end
-      local box = node_new(id_hlist); 
-      box.width, box.height, box.depth = fwidth, fheight, fdepth
-      box.head, box.shift, box.dir = p, y_shift, (dir or 'TLT')
-      box.glue_set, box.glue_order = 0, 0
-      set_attr(box, attr_icflag, PACKED)
-      set_attr(box, attr_uniqid, has_attr(p, attr_uniqid) or 0)
+   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))
+      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 + get_pr_begin_flag(p))
       head = q and node_insert_before(head, q, box) 
                or node_insert_after(head, node_tail(head), box)
       return q
    else
-      p.xoffset = p.xoffset - fshift.left
-      p.yoffset = p.yoffset - (has_attr(p, attr_ykblshift) or 0) - fshift.down
+      set_attr(p, attr_icflag, PROCESSED + get_pr_begin_flag(p))
+      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
+luatexja.setwidth.capsule_glyph = capsule_glyph
 
-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)
+   if ca~='left'  then
+      setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left
+		  + (((ca=='right') and fwidth - pwidth) or round((fwidth - pwidth)*0.5)))
+   else
+      setfield(p, 'xoffset', getfield(p, 'xoffset') - fshift.left)
+   end
+   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 + get_pr_begin_flag(p))
+   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?
    while p do
-      if (p.id==id_glyph) and (has_attr(p, attr_icflag) or 0)<=0 then
-	 if p.font == has_attr(p, attr_curjfnt) then
-	    set_attr(p, attr_icflag, PROCESSED)
-	    p = capsule_glyph(p, dir, false, ltjf_font_metric_table[p.font], 
+      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
-	    set_attr(p, attr_icflag, PROCESSED) 
-	    p.yoffset = p.yoffset - (has_attr(p,attr_yablshift) or 0); p = node_next(p)
+	    set_attr(p, attr_icflag, PROCESSED + get_pr_begin_flag(p))
+	    setfield(p, 'yoffset',
+		     getfield(p, 'yoffset') - (has_attr(p,attr_yablshift) 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_yablshift) 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 + get_pr_begin_flag(p))
+	       end
 	    end
 	 end
 	 p = node_next(p)
@@ -117,3 +174,4 @@ function set_ja_width(ahead, dir)
    tex.setattribute('global', attr_icflag, 0)
    return head
 end
+