X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fltj-stack.lua;h=c9f80c4686fa8e59d6a03125a86f8cf9a67d879e;hb=87d07213621eaff3e533fd67d574d3fdeba4104d;hp=aec2a7b3eca7a4b4d360ec66d8d3db1db6355f68;hpb=65ac86095b89ee2459d34462905366271d133c32;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua
index aec2a7b..c9f80c4 100644
--- a/src/ltj-stack.lua
+++ b/src/ltj-stack.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.stack',
-  date = '2014/05/08',
+  date = '2017/05/05',
   description = 'LuaTeX-ja stack system',
 })
 module('luatexja.stack', package.seeall)
@@ -20,6 +20,7 @@ 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 = token.scan_int, token.scan_keyword
 hmode = 0 -- dummy
 
 charprop_stack_table={};
@@ -62,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) .. '..' ..
@@ -111,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
@@ -131,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