Fixed several bugs caused by the previous commit

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

diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua
index c7f52c9..2a2d73a 100644 (file)
--- a/src/ltj-stack.lua
+++ b/src/ltj-stack.lua
@@ -15,30 +15,12 @@ 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
+hmode = 0 -- dummy 
 
-local charprop_stack_table={}; charprop_stack_table[0]={}
+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')
@@ -52,7 +34,7 @@ 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
@@ -96,14 +78,11 @@ function set_stack_table(g,m,c,p,lb,ub)
                         "(-1 is used for denoting `math boundary')\n" ..
                         'So I changed this one to zero.')
       c=0
-   elseif not charprop_stack_table[i][m] then 
-      charprop_stack_table[i][m] = {} 
    end
-   charprop_stack_table[i][m][c] = p
+   charprop_stack_table[i][c+m] = p
   if g=='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][c] = p
+       charprop_stack_table[j][c+m] = p
      end
   end
 end
@@ -117,14 +96,11 @@ function set_stack_font(g,m,c,p)
                         "The family number should in the range 0 .. 255.\n" ..
                          "I'm going to use 0 instead of that illegal family number.")
       c=0
-   elseif not charprop_stack_table[i][m] then 
-      charprop_stack_table[i][m] = {} 
    end
-   charprop_stack_table[i][m][c] = p
+   charprop_stack_table[i][c+m] = p
    if g=='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][c] = p
+       charprop_stack_table[j][c+m] = p
      end
   end
 end
@@ -154,7 +130,6 @@ function set_stack_skip(g,m,sp)
 end
 
 -- These three functions are used in ltj-jfmglue.lua.
-local table_current_stack
 function report_stack_level(bsl)
    table_current_stack = charprop_stack_table[bsl]
 end
@@ -162,19 +137,15 @@ function fast_get_skip_table(m)
    return table_current_stack[m] 
       or { width = 0, stretch = 0, shrink = 0, stretch_order = 0, shrink_order = 0 }
 end
-function fast_get_penalty_table(m,c)
-   local i = table_current_stack[m]
-   return (i and i[c])
-end
 
 -- For other situations, use the following instead:
 function get_skip_table(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(m,c,d, idx)
-   local i = charprop_stack_table[idx][m]
-   return (i and i[c]) or d
+function get_penalty_table(mc, d, idx)
+   local i = charprop_stack_table[idx][mc]
+   return i or d
 end