Try to solve 'negative yoffset' problem ...

[luatex-ja/luatexja.git] / src / ltj-stack.lua

diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua
index e2dea10..aec2a7b 100644 (file)
--- a/src/ltj-stack.lua
+++ b/src/ltj-stack.lua
@@ -18,6 +18,8 @@ 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
 hmode = 0 -- dummy
 
 charprop_stack_table={};
@@ -25,7 +27,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 +35,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 +50,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