ltj-adjust.lua was broken

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

diff --git a/src/ltj-stack.lua b/src/ltj-stack.lua
index 88d2a67..7b50cd4 100644 (file)
--- a/src/ltj-stack.lua
+++ b/src/ltj-stack.lua
@@ -3,8 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.stack',
-  date = '2011/04/01',
-  version = '0.1',
+  date = '2013/04/13',
   description = 'LuaTeX-ja stack system',
 })
 module('luatexja.stack', package.seeall)
@@ -15,30 +14,13 @@ 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
+local STCK = luatexja.userid_table.STCK
+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')
@@ -46,19 +28,19 @@ 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
         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 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)
-        g.user_id=30112; g.type=100; g.value=j; node.write(g)
+        g.user_id=STCK; g.type=100; g.value=j; node.write(g)
       end
    end
    return i
@@ -89,21 +71,12 @@ function set_stack_table(g,m,c,p,lb,ub)
                         tostring(ub) .. ".\n" ..
                      "I'm going to use 0 instead of that illegal code value.")
       p=0
-   elseif type(c)~='number' or c<-1 or c>0x10ffff then
-      ltjb.package_error('luatexja',
-                        'bad character code (' .. tostring(c) .. ')',
-                        'A character number must be between -1 and 0x10ffff.\n' ..
-                        "(-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
+   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 
-       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 +90,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
-  if g=='global' then
+   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
@@ -153,17 +123,24 @@ function set_stack_skip(g,m,sp)
   end
 end
 
--- mode: nil iff it is called in callbacks
-function get_skip_table(m, idx)
-   local i = charprop_stack_table[idx][m]
-   return i or { width = 0, stretch = 0, shrink = 0,
-                stretch_order = 0, shrink_order = 0 }
+-- These three functions are used in ltj-jfmglue.lua.
+function report_stack_level(bsl)
+   table_current_stack = charprop_stack_table[bsl]
+end
+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 get_penalty_table(m,c,d, idx)
-   local i = charprop_stack_table[idx][m]
-   if i then i=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(mc, d, idx)
+   local i = charprop_stack_table[idx][mc]
    return i or d
 end
 
+
 -- EOF