X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=src%2Fltj-stack.lua;h=72e8b8222f582d51c97adefd8eb44d77641ce802;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=e2dea10b219ce87a33a96ee49215c896ce56c9be;hpb=c070210761498be04e1929b25dd379de42f70c53;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua
index e2dea10..72e8b82 100644
--- a/src/ltj-stack.lua
+++ b/src/ltj-stack.lua
@@ -18,6 +18,9 @@ local node_new = node.new
 local id_whatsit = node.id('whatsit')
 local sid_user = node.subtype('user_defined')
 local STCK = luatexja.userid_table.STCK
+local fastcopy = table.fastcopy
+local setcount = tex.setcount
+local scan_int, scan_keyword = luatexja.token.scan_int, luatexja.token.scan_keyword
 hmode = 0 -- dummy
 
 charprop_stack_table={};
@@ -25,7 +28,7 @@ local charprop_stack_table = charprop_stack_table
 charprop_stack_table[0]={}
 
 
-function get_stack_level(is_v)
+function get_stack_level()
    local i = tex.getcount('ltj@@stack')
    local j = tex.currentgrouplevel
    if j > tex.getcount('ltj@@group@level') then
@@ -33,15 +36,14 @@ function get_stack_level(is_v)
       local gd = tex.globaldefs
       if gd~=0 then tex.globaldefs = 0 end
       --  'tex.globaldefs = 0' is local even if \globaldefs > 0.
-      tex.setcount('ltj@@group@level', j)
+      setcount('ltj@@group@level', j)
       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] = table.fastcopy(charprop_stack_table[i-1])
-      tex.setcount('ltj@@stack', i)
+      charprop_stack_table[i] = fastcopy(charprop_stack_table[i-1])
+      setcount('ltj@@stack', i)
       if gd~=0 then tex.globaldefs = gd end
-      if  is_v or tex.nest[tex.nest.ptr].mode == hmode or
-          tex.nest[tex.nest.ptr].mode == -hmode then
+      if  tex.nest[tex.nest.ptr].mode == -hmode then -- rest. hmode のみ
 	 local g = node_new(id_whatsit, sid_user)
 	 g.user_id=STCK; g.type=100; g.value=j; node.write(g)
       end
@@ -49,8 +51,8 @@ function get_stack_level(is_v)
    return i
 end
 
-function set_stack_table(m,p, is_v)
-   local i = get_stack_level(is_v)
+function set_stack_table(m, p)
+   local i = get_stack_level()
    charprop_stack_table[i][m] = p
    if luatexja.isglobal=='global' then
       for j,v in pairs(charprop_stack_table) do
@@ -61,8 +63,11 @@ end
 local set_stack_table = set_stack_table
 
 -- EXT
-function set_stack_perchar(m,c,p,lb,ub)
-   if type(p)~='number' or p<lb or p>ub then
+function set_stack_perchar(m,lb,ub, getter)
+   local c = scan_int()
+   scan_keyword(',')
+   local p = tonumber((getter or scan_int)())
+   if p<lb or p>ub then
       ltjb.package_error('luatexja',
 			 "invalid code (".. tostring(p) .. ")",
 			 "The code should in the range "..tostring(lb) .. '..' ..
@@ -110,6 +115,10 @@ function set_stack_skip(m,sp)
 end
 
 -- These three functions are used in ltj-jfmglue.lua.
+-- list_dir and orig_char_table are used in other lua files.
+orig_char_table = {}
+list_dir = nil -- dummy
+table_current_stack = nil -- dummy
 function report_stack_level(bsl)
    table_current_stack = charprop_stack_table[bsl]
    return bsl
@@ -130,11 +139,4 @@ function get_stack_table(mc, d, idx)
 end
 
 
---------------------------------------------------------------------------------
--- nest table (obeys TeX's semantic nest)
---------------------------------------------------------------------------------
-nest_table = {}
-local nest_table = nest_table
-
-
 -- EOF