X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-direction.lua;h=42f1cb095f0677b8866a93f076fd0b7bcae24976;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=e29503bef4ad5a6f0034e9e69041114a5cebf066;hpb=89845b5c5116bf7fc9ebb54bdfc373b554acf5e0;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index e29503b..42f1cb0 100644
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -10,26 +10,24 @@ local attr_dir = luatexbase.attributes['ltj@dir']
 local attr_icflag = luatexbase.attributes['ltj@icflag']
 
 local cat_lp = luatexbase.catcodetables['latex-package']
-local Dnode = node.direct or node
-local nullfunc = function (n) return n end
-local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc
-local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
-local has_attr = Dnode.has_attribute
-local set_attr = Dnode.set_attribute
-local insert_before = Dnode.insert_before
-local insert_after = Dnode.insert_after
-local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
-local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end
-local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end
-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 node_new = Dnode.new
-local node_tail = Dnode.tail
-local node_free = Dnode.free
-local node_remove = Dnode.remove
-local node_next = (Dnode ~= node) and Dnode.getnext or node.next
-local traverse = Dnode.traverse
-local traverse_id = Dnode.traverse_id
+local to_node = node.direct.tonode
+local to_direct = node.direct.todirect
+local has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
+local insert_before = node.direct.insert_before
+local insert_after = node.direct.insert_after
+local getid = node.direct.getid
+local getsubtype = node.direct.getsubtype
+local getlist = node.direct.getlist
+local setfield = node.direct.setfield
+local getfield = node.direct.getfield
+local node_new = node.direct.new
+local node_tail = node.direct.tail
+local node_free = node.direct.free
+local node_remove = node.direct.remove
+local node_next = node.direct.getnext
+local traverse = node.direct.traverse
+local traverse_id = node.direct.traverse_id
 local start_time_measure, stop_time_measure
    = ltjb.start_time_measure, ltjb.stop_time_measure
 local abs = math.abs
@@ -45,7 +43,7 @@ local sid_user = node.subtype('user_defined')
 
 local tex_nest = tex.nest
 local tex_getcount = tex.getcount
-local tex_set_attr = tex.setattribute
+local ensure_tex_attr = ltjb.ensure_tex_attr
 local PROCESSED    = luatexja.icflag_table.PROCESSED
 local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
 local PACKED       = luatexja.icflag_table.PACKED
@@ -63,6 +61,21 @@ end
 
 local page_direction
 --
+local dir_pool
+do
+   local node_copy = node.direct.copy
+   dir_pool = {}
+   for _,i in pairs({dir_tate, dir_yoko, dir_dtou, dir_utod}) do
+      local w = node_new(id_whatsit, sid_user)
+      set_attr(w, attr_dir, i)
+      setfield(w, 'user_id', DIR)
+      setfield(w, 'type', 110)
+      setfield(w, 'next', nil)
+      dir_pool[i] = function () return node_copy(w) end
+   end
+end
+
+--
 local function adjust_badness(hd)
    if not node_next(hd) and getid(hd)==id_whatsit and getsubtype(hd)==sid_user
    and getfield(hd, 'user_id')==DIR then
@@ -125,6 +138,8 @@ do
    local node_traverse = node.traverse
    local STCK = luatexja.userid_table.STCK
    local IHB = luatexja.userid_table.IHB
+   local sid_local = node.subtype('local_par')
+   local id_local = node.id('local_par')
 
    local function test_list(h, lv)
       if not h then
@@ -134,17 +149,18 @@ do
 	 local w
 	 for p in node_traverse(h) do
 	    if p.id==id_whatsit then
-	       if p.subtype==sid_user then
+	       local ps = p.subtype
+	       if ps==sid_user then
 		  local uid= p.user_id
 		  if uid==DIR then
 		     flag = 1; w = w or p -- found
 		  elseif not(uid==IHB or uid==STCK) then
 		     flag = 0; break -- error
 		  end
-	       else
+	       elseif ps~=sid_local then
 		  flag = 0; break
 	       end
-	    else
+	    elseif p.id~=id_local then
 	       flag = 0; break
 	    end
 	 end
@@ -166,15 +182,11 @@ do
          v = get_adjust_dir_count()
       end
       local h = to_direct(tex_nest[lv].head)
-      local w = node_new(id_whatsit, sid_user)
-      setfield(w, 'next', nil)
-      setfield(w, 'user_id', DIR)
-      setfield(w, 'type', 110)
-      set_attr(w, attr_dir, v)
+      local w = dir_pool[v]()
       insert_after(h, h, w)
       tex_nest[lv].tail = to_node(node_tail(w))
-      tex_set_attr('global', attr_icflag, 0)
-      tex_set_attr('global', attr_dir, 0)
+      ensure_tex_attr(attr_icflag, 0)
+      ensure_tex_attr(attr_dir, 0)
    end
 
    local function set_list_direction(v, name)
@@ -210,17 +222,11 @@ do
 	    node_set_attr(w, attr_dir, v)
 	    if lv==0 then page_direction = v end
 	 else
-	    local w = node_new(id_whatsit, sid_user)
-	    setfield(w, 'next', nil)
-	    setfield(w, 'user_id', DIR)
-	    setfield(w, 'type', 110)
-	    set_attr(w, attr_dir, v)
-	    Dnode.write(w)
 	    if lv==0 then page_direction = v end
 	 end
-         tex_set_attr('global', attr_icflag, 0)
+         ensure_tex_attr(attr_icflag, 0)
       end
-      tex_set_attr('global', attr_dir, 0)
+      ensure_tex_attr(attr_dir, 0)
    end
    luatexja.direction.set_list_direction = set_list_direction
 end
@@ -231,20 +237,21 @@ local function create_dir_whatsit(hd, gc, new_dir)
 	    getsubtype(hd)==sid_user and getfield(hd, 'user_id')==DIR then
       set_attr(hd, attr_icflag,
 	       get_attr_icflag(hd) + PROCESSED_BEGIN_FLAG)
-      tex_set_attr('global', attr_icflag, 0)
+      local n = node_next(hd)
+      if n then
+	 set_attr(n, attr_icflag,
+		  get_attr_icflag(n) + PROCESSED_BEGIN_FLAG)
+      end
+      ensure_tex_attr(attr_icflag, 0)
       return hd
    else
-      local w = node_new(id_whatsit, sid_user)
+      local w = dir_pool[new_dir]()
       setfield(w, 'next', hd)
-      setfield(w, 'user_id', DIR)
-      setfield(w, 'type', 110)
-      set_attr(w, attr_dir, new_dir)
       set_attr(w, attr_icflag, PROCESSED_BEGIN_FLAG)
       set_attr(hd, attr_icflag,
-	       (has_attr(hd, attr_icflag) or 0)%PROCESSED_BEGIN_FLAG
-		  + PROCESSED_BEGIN_FLAG)
-      tex_set_attr('global', attr_dir, 0)
-      tex_set_attr('global', attr_icflag, 0)
+	       get_attr_icflag(hd) + PROCESSED_BEGIN_FLAG)
+      ensure_tex_attr(attr_icflag, 0)
+      ensure_tex_attr(attr_dir, 0)
       return w
    end
 end
@@ -257,7 +264,7 @@ do
       if gc=='fin_row' or gc == 'preamble'  then
 	 if hd  then
 	    set_attr(hd, attr_icflag, PROCESSED_BEGIN_FLAG)
-	    tex_set_attr('global', attr_icflag, 0)
+	    ensure_tex_attr(attr_icflag, 0)
 	 end
 	 return h
       else
@@ -266,7 +273,7 @@ do
       end
    end
 
-   luatexbase.add_to_callback('hpack_filter',
+   ltjb.add_to_callback('hpack_filter',
 			      create_dir_whatsit_hpack, 'ltj.create_dir_whatsit', 10000)
 end
 
@@ -274,16 +281,14 @@ do
    local function create_dir_whatsit_parbox(h, gc)
       stop_time_measure('tex_linebreak')
       -- start 側は ltj-debug.lua に
-      local new_dir, hd = ltjs.list_dir, to_direct(h)
-      for line in traverse_id(id_hlist, hd) do
-         local nh = getlist(line)
-	 setfield(line, 'head', create_dir_whatsit(nh, gc, new_dir) )
-	 --set_attr(line, attr_dir, new_dir)
+      local new_dir = ltjs.list_dir
+      for line in traverse_id(id_hlist, to_direct(h)) do
+	 setfield(line, 'head', create_dir_whatsit(getlist(line), gc, new_dir) )
       end
-      tex_set_attr('global', attr_dir, 0)
+      ensure_tex_attr(attr_dir, 0)
       return h
    end
-   luatexbase.add_to_callback('post_linebreak_filter',
+   ltjb.add_to_callback('post_linebreak_filter',
 			      create_dir_whatsit_parbox, 'ltj.create_dir_whatsit', 10000)
 end
 
@@ -312,7 +317,7 @@ do
       if gc=='fin_row' then -- gc == 'preamble' case is treated in dir_adjust_vpack
 	 if hd  then
 	    set_attr(hd, attr_icflag, PROCESSED_BEGIN_FLAG)
-	    tex_set_attr('global', attr_icflag, 0)
+	    ensure_tex_attr(attr_icflag, 0)
 	 end
 	 return hd
       else
@@ -483,10 +488,12 @@ local function get_box_dir(b, default)
    local bh = getfield(b,'head')
    -- b は insert node となりうるので getlist() は使えない
    local c
-   for bh in traverse_id(id_whatsit, bh) do
-      if getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
-	 c = bh
-    	 dir = (dir==0) and has_attr(bh, attr_dir) or dir
+   if bh~=0 then -- bh != nil
+      for bh in traverse_id(id_whatsit, bh) do
+         if getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then
+            c = bh
+           dir = (dir==0) and has_attr(bh, attr_dir) or dir
+         end
       end
    end
    -- for i=1,2 do
@@ -572,7 +579,7 @@ local function unwrap_dir_node(b, head, box_dir)
    end
    local shift_old, b_dir, wh = nil, get_box_dir(bh, 0)
    if wh then
-      Dnode.flush_list(getfield(wh, 'value'))
+      node.direct.flush_list(getfield(wh, 'value'))
       setfield(wh, 'value', nil)
    end
    return nh, nb, bh, b_dir
@@ -589,8 +596,8 @@ local function create_dir_node(b, b_dir, new_dir, is_manual)
 	    new_dir + (is_manual and dir_node_manual or dir_node_auto))
    set_attr(db, attr_icflag, PROCESSED)
    set_attr(b, attr_icflag, PROCESSED)
-   tex_set_attr('global', attr_dir, 0)
-   tex_set_attr('global', attr_icflag, 0)
+   ensure_tex_attr(attr_dir, 0)
+   ensure_tex_attr(attr_icflag, 0)
    setfield(db, 'dir', getfield(b, 'dir'))
    setfield(db, 'shift', 0)
    setfield(db, 'width',  info.width(w,h,d))
@@ -617,7 +624,7 @@ do
 	    -- dir_node としてカプセル化されている
 	    local _, dnc = get_box_dir(b, 0)
 	    if dnc then -- free all other dir_node
-	       Dnode.flush_list(getfield(dnc, 'value'))
+	       node.direct.flush_list(getfield(dnc, 'value'))
 	       setfield(dnc, 'value', nil)
 	    end
 	    set_attr(b, attr_dir, box_dir%dir_math_mod + dir_node_auto)
@@ -647,7 +654,7 @@ do
 	       db=x; break
 	    end
 	 end
-	 Dnode.flush_list(getfield(dn, 'value'))
+	 node.direct.flush_list(getfield(dn, 'value'))
 	 setfield(dn, 'value', nil)
 	 db = db or create_dir_node(b, box_dir, new_dir, false)
 	 local w = getfield(b, 'width')
@@ -678,7 +685,7 @@ do
    end
 
    -- lastbox
-   local node_prev = (Dnode~=node) and Dnode.getprev or node.prev
+   local node_prev = (node.direct~=node) and node.direct.getprev or node.prev
    local function lastbox_hook()
       start_time_measure('box_primitive_hook')
       local bn = tex_nest[tex_nest.ptr].tail
@@ -696,7 +703,7 @@ do
 	    end
 	    local _, wh =  get_box_dir(b, 0) -- clean dir_node attached to the box
 	    if wh then
-	       Dnode.flush_list(getfield('value', wh))
+	       node.direct.flush_list(getfield('value', wh))
 	       setfield(wh, 'value', nil)
 	    end
 	 end
@@ -751,11 +758,14 @@ do
       else
          setdimen('ltj@tempdima', 0)
       end
+      tex.sprint(cat_lp, '\\ltj@tempdima')
       tex.globaldefs = gt
    end
    luatexja.direction.get_box_dim = get_box_dim
 
    -- return value: (changed dimen of box itself?)
+   local scan_dimen, scan_int = luatexja.token.scan_dimen, luatexja.token.scan_int
+   local scan_keyword = luatexja.token.scan_keyword
    local function set_box_dim_common(key, s, l_dir)
       local s_dir, wh = get_box_dir(s, dir_yoko)
       s_dir = s_dir%dir_math_mod
@@ -776,10 +786,10 @@ do
             setfield(db, 'next', dnh)
             setfield(wh, 'value',to_node(db))
          end
-         setfield(db, key, tex.getdimen('ltj@tempdima'))
+         setfield(db, key, scan_dimen())
 	 return false
       else
-         setfield(s, key, tex.getdimen('ltj@tempdima'))
+         setfield(s, key, scan_dimen())
 	 if wh then
 	    -- change dimension of dir_nodes which are created "automatically"
 	       local bw, bh, bd
@@ -798,8 +808,7 @@ do
       end
    end
    local function set_box_dim(key)
-      local n = tex_getcount('ltj@tempcnta')
-      local s = getbox(n)
+      local s = getbox(scan_int()); scan_keyword('=')
       if s then
 	 local l_dir = (get_dir_count())%dir_math_mod
 	 s = to_direct(s)
@@ -808,7 +817,7 @@ do
             set_box_dim_common(key, s, l_dir)
 	 elseif b_dir%dir_math_mod == l_dir then
 	    -- s is dir_node
-	    setfield(s, key, tex.getdimen('ltj@tempdima'))
+	    setfield(s, key, scan_dimen())
 	    if b_dir<dir_node_manual then
 	       set_attr(s, attr_dir, b_dir%dir_node_auto + dir_node_manual)
 	    end
@@ -855,7 +864,7 @@ do
 end
 
 do
-   local getbox, setbox, copy_list = tex.getbox, tex.setbox, Dnode.copy_list
+   local getbox, setbox, copy_list = tex.getbox, tex.setbox, node.direct.copy_list
    -- raise, lower
    function luatexja.direction.raise_box()
       start_time_measure('box_primitive_hook')
@@ -902,7 +911,7 @@ do
 	       'luatexja',
 	       'Direction Incompatible',
 	       "\\vadjust's argument and outer vlist must have same direction.")
-	    Dnode.last_node()
+	    node.direct.last_node()
 	 end
       end
       stop_time_measure('box_primitive_hook')
@@ -927,15 +936,10 @@ do
 	 end
 	 for box_rule in traverse(h) do
 	    if getid(box_rule)<id_rule then
-	       local w = node_new(id_whatsit, sid_user)
-	       setfield(w, 'next', nil)
-	       setfield(w, 'user_id', DIR)
-	       setfield(w, 'type', 110)
-	       set_attr(w, attr_dir, list_dir)
-	       h = insert_before(h, box_rule, w)
+	       h = insert_before(h, box_rule, dir_pool[list_dir]())
 	    end
 	 end
-	 tex_set_attr('global', attr_dir, 0)
+	 ensure_tex_attr(attr_dir, 0)
 	 setfield(ad, 'head', h)
       end
       stop_time_measure('box_primitive_hook')
@@ -981,7 +985,7 @@ do
       stop_time_measure('direction_vpack')
       return to_node(hd)
    end
-   luatexbase.add_to_callback('vpack_filter',
+   ltjb.add_to_callback('vpack_filter',
 			      dir_adjust_vpack,
 			      'ltj.direction', 10000)
 end
@@ -991,7 +995,7 @@ do
    local function dir_adjust_pre_output(h, gc)
       return to_node(create_dir_whatsit_vbox(to_direct(h), gc))
    end
-   luatexbase.add_to_callback('pre_output_filter',
+   ltjb.add_to_callback('pre_output_filter',
 			      dir_adjust_pre_output,
 			      'ltj.direction', 10000)
 
@@ -1011,10 +1015,8 @@ do
    local function dir_adjust_buildpage(info)
       if info=='box' then
 	 local head = to_direct(tex.lists.contrib_head)
-	 local nb
 	 if head then
-	    head, _, nb
-	       = make_dir_whatsit(head,
+	    head = make_dir_whatsit(head,
 				  node_tail(head),
 				  get_dir_count(),
 				  'buildpage')
@@ -1022,7 +1024,7 @@ do
 	 end
       end
    end
-   luatexbase.add_to_callback('buildpage_filter',
+   ltjb.add_to_callback('buildpage_filter',
 			      dir_adjust_buildpage,
 			      'ltj.direction', 10000)
 end
@@ -1034,16 +1036,15 @@ do
    local function finalize_dir_node(db,new_dir)
       local b = getlist(db)
       finalize_inner(b)
-      local box_dir = get_box_dir(b, dir_yoko)%dir_math_mod
-      setfield(db, 'head', nil)
       local w = getfield(b, 'width')
       local h = getfield(b, 'height')
       local d = getfield(b, 'depth')
       local dn_w = getfield(db, 'width')
       local dn_h = getfield(db, 'height')
       local dn_d = getfield(db, 'depth')
-      local db_head, db_tail  = nil
-      for _,v in ipairs(dir_node_aux[box_dir][new_dir][getid(b)]) do
+      local db_head, db_tail
+      for _,v in ipairs(dir_node_aux
+			[get_box_dir(b, dir_yoko)%dir_math_mod][new_dir][getid(b)]) do
          local cmd, arg, nn = v[1], v[2]
          if cmd=='kern' then
             nn = node_new(id_kern)
@@ -1061,15 +1062,15 @@ do
             insert_after(db_head, db_tail, nn)
             db_tail = nn
          else
-            db_head, db_tail = nn, nn
+            setfield(db, 'head', nn)
+	    db_head, db_tail = nn, nn
          end
-         setfield(db, 'head', db_head)
       end
    end
 
+   tex.setattribute(attr_dir, dir_yoko)
    local shipout_temp =  node_new(id_hlist)
-   set_attr(shipout_temp, attr_dir, dir_yoko)
-   tex_set_attr('global', attr_dir, 0)
+   tex.setattribute(attr_dir, 0)
 
    finalize_inner = function (box)
       for n in traverse(getlist(box)) do
@@ -1085,7 +1086,8 @@ do
       end
    end
    local getbox = tex.getbox
-   local setbox, copy = Dnode.setbox, Dnode.copy
+   local setbox, copy = node.direct.setbox, node.direct.copy
+   local lua_mem_kb = 0
    function luatexja.direction.finalize()
       local a = to_direct(tex.getbox("AtBeginShipoutBox"))
       local a_dir = get_box_dir(a, dir_yoko)
@@ -1097,5 +1099,12 @@ do
       finalize_inner(shipout_temp)
       setbox('global', "AtBeginShipoutBox", copy(getlist(shipout_temp)))
       setfield(shipout_temp, 'head',nil)
+
+      -- garbage collect
+      --local m = collectgarbage('count')
+      --if m>lua_mem_kb+20480 then
+      --   collectgarbage(); lua_mem_kb = collectgarbage('count')
+      --end
+      --print('Lua Memory Usage', lua_mem_kb)
    end
 end