X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-stack.lua;h=9602939fdbf388fd001624615851fc7f5d1d1dcc;hb=3c2f5346fa635e1423ccd51441927a754e26a392;hp=3dfe2bb130c09704d58e9adbd9271f96c4c1110b;hpb=ae6b66530a4e01e6f76819b86f748e46eb6bcb78;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua
index 3dfe2bb..9602939 100644
--- a/src/ltj-stack.lua
+++ b/src/ltj-stack.lua
@@ -3,8 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.stack',
-  date = '2011/04/01',
-  version = '0.1',
+  date = '2013/04/13',
   description = 'LuaTeX-ja stack system',
 })
 module('luatexja.stack', package.seeall)
@@ -15,32 +14,13 @@ luatexja.load_module('base');      local ltjb = luatexja.base
 local node_new = node.new
 local id_whatsit = node.id('whatsit')
 local sid_user = node.subtype('user_defined')
-local hmode = 118 -- in luatexref-t.pdf, this must be 127
+local STCK = luatexja.userid_table.STCK
+hmode = 0 -- dummy 
 
 charprop_stack_table={}; 
 local charprop_stack_table = charprop_stack_table
 charprop_stack_table[0]={}
 
--- modified from table.fastcopy
-local next = next
-local function stack_table_copy_aux(old) 
-   local new = {}
-   for i,v in next, old do
-      new[i] = v
-   end
-   return new
-end
-local function stack_table_copy(old) 
-   if old then 
-      local new = {}
-      for i,v in next, old do
-	 new[i] = stack_table_copy_aux(v)
-      end
-      return new
-   else
-      return {}
-   end 
-end
 
 function get_stack_level()
    local i = tex.getcount('ltj@@stack')
@@ -54,13 +34,13 @@ function get_stack_level()
       for k,v in pairs(charprop_stack_table) do -- clear the stack above i
 	 if k>=i then charprop_stack_table[k]=nil end
       end
-      charprop_stack_table[i] = stack_table_copy(charprop_stack_table[i-1])
+      charprop_stack_table[i] = table.fastcopy(charprop_stack_table[i-1])
       tex.setcount('ltj@@stack', i)
       if gd>0 then tex.globaldefs = gd end
       if tex.nest[tex.nest.ptr].mode == hmode or
 	 tex.nest[tex.nest.ptr].mode == -hmode then
 	 local g = node_new(id_whatsit, sid_user)
-	 g.user_id=30112; g.type=100; g.value=j; node.write(g)
+	 g.user_id=STCK; g.type=100; g.value=j; node.write(g)
       end
    end
    return i
@@ -83,7 +63,6 @@ end
 
 -- EXT
 function set_stack_table(g,m,c,p,lb,ub)
-   print(g,m,c)
    local i = get_stack_level()
    if type(p)~='number' or p<lb or p>ub then
       ltjb.package_error('luatexja',