X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-direction.lua;h=c05d0ed6c35550f64022505ac5e97242fdc7c5a3;hb=b5ae2980b79b069dd439c80b784c10e1b4f86d2f;hp=9dc8fbfa57fc0bcc0d31136023c4b5e675da7ccc;hpb=79e952ea40e3ac4ebd79a2b1c65c3a3745b0289a;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua
index 9dc8fbf..c05d0ed 100644
--- a/src/ltj-direction.lua
+++ b/src/ltj-direction.lua
@@ -45,7 +45,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 +63,21 @@ end
 
 local page_direction
 --
+local dir_pool
+do
+   local node_copy = Dnode.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
@@ -166,15 +181,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 +221,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 +236,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 +263,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
@@ -274,13 +280,11 @@ 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',
@@ -312,7 +316,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
@@ -589,8 +593,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))
@@ -751,6 +755,7 @@ 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
@@ -927,15 +932,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')
@@ -1011,10 +1011,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')
@@ -1034,16 +1032,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 +1058,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
@@ -1086,6 +1083,7 @@ do
    end
    local getbox = tex.getbox
    local setbox, copy = Dnode.setbox, Dnode.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)
@@ -1095,8 +1093,14 @@ do
       end
       setfield(shipout_temp, 'head', a)
       finalize_inner(shipout_temp)
-      --luatexja.ext_show_node(to_node(shipout_temp), '> ', print,4)
       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