X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-stack.lua;h=2a90fd2c89fe0a09c2353a77d35325dff8ac7823;hb=e5aeb15c211866e3911c84337af5e6d85ef79043;hp=ed8ae07e74a1aa8a941158907d2ce5e3a900d05c;hpb=745d0f80115b7401a87fc8fa0318d539016272b9;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua
index ed8ae07..2a90fd2 100644
--- a/src/ltj-stack.lua
+++ b/src/ltj-stack.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.stack',
-  date = '2013/04/13',
+  date = '2014/01/24',
   description = 'LuaTeX-ja stack system',
 })
 module('luatexja.stack', package.seeall)
@@ -28,7 +28,7 @@ function get_stack_level()
    if j > tex.getcount('ltj@@group@level') then
       i = i+1 -- new stack level
       local gd = tex.globaldefs
-      if gd>0 then tex.globaldefs = 0 end
+      if gd~=0 then tex.globaldefs = 0 end
       --  'tex.globaldefs = 0' is local even if \globaldefs > 0.
       tex.setcount('ltj@@group@level', j)
       for k,v in pairs(charprop_stack_table) do -- clear the stack above i
@@ -36,7 +36,7 @@ function get_stack_level()
       end
       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 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)
@@ -60,10 +60,19 @@ end
 --    end
 -- end
 
+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 
+         charprop_stack_table[j][m] = p
+      end
+   end
+end
+local set_stack_table = set_stack_table
 
 -- EXT
-function set_stack_table(g,m,c,p,lb,ub)
-   local i = get_stack_level()
+function set_stack_perchar(m,c,p,lb,ub)
    if type(p)~='number' or p<lb or p>ub then
       ltjb.package_error('luatexja',
 			 "invalid code (".. tostring(p) .. ")",
@@ -72,18 +81,11 @@ function set_stack_table(g,m,c,p,lb,ub)
 		      "I'm going to use 0 instead of that illegal code value.")
       p=0
    end
-   c = ltjb.in_unicode(c, true)
-   charprop_stack_table[i][c+m] = p
-  if g=='global' then
-     for j,v in pairs(charprop_stack_table) do 
-	charprop_stack_table[j][c+m] = p
-     end
-  end
+   set_stack_table(m+ltjb.in_unicode(c, true), p)
 end
 
 -- EXT
-function set_stack_font(g,m,c,p)
-   local i = get_stack_level()
+function set_stack_font(m,c,p)
    if type(c)~='number' or c<0 or c>255 then 
       ltjb.package_error('luatexja',
 			 "invalid family number (".. tostring(c) .. ")",
@@ -91,16 +93,11 @@ function set_stack_font(g,m,c,p)
 			  "I'm going to use 0 instead of that illegal family number.")
       c=0
    end
-   charprop_stack_table[i][c+m] = p
-   if g=='global' then
-     for j,v in pairs(charprop_stack_table) do 
-	charprop_stack_table[j][c+m] = p
-     end
-  end
+   set_stack_table(m+c, p)
 end
 
 -- EXT: store \ltj@tempskipa
-function set_stack_skip(g,m,sp)
+function set_stack_skip(m,sp)
   local i = get_stack_level()
   if not sp then return end
   if not charprop_stack_table[i][m] then 
@@ -111,7 +108,7 @@ function set_stack_skip(g,m,sp)
   charprop_stack_table[i][m].shrink  = sp.shrink
   charprop_stack_table[i][m].stretch_order = sp.stretch_order
   charprop_stack_table[i][m].shrink_order  = sp.shrink_order
-  if g=='global' then
+  if luatexja.isglobal=='global' then
      for j,v in pairs(charprop_stack_table) do 
 	if not charprop_stack_table[j][m] then charprop_stack_table[j][m] = {} end
 	charprop_stack_table[j][m].width   = sp.width
@@ -127,17 +124,17 @@ end
 function report_stack_level(bsl)
    table_current_stack = charprop_stack_table[bsl]
 end
-function fast_get_skip_table(m)
+function fast_get_stack_skip(m)
    return table_current_stack[m] 
       or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 }
 end
 
 -- For other situations, use the following instead:
-function get_skip_table(m, idx)
+function get_stack_skip(m, idx)
    return charprop_stack_table[idx][m] 
       or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 }
 end
-function get_penalty_table(mc, d, idx)
+function get_stack_table(mc, d, idx)
    local i = charprop_stack_table[idx][mc]
    return i or d
 end