ltj-base.{sty,lua}: cleanup

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

diff --git a/src/luatexja.lua b/src/luatexja.lua
index 8cabf87..491454c 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -1,5 +1,6 @@
 
 require('lualibs')
+tableunpack = table.unpack
 
 ------------------------------------------------------------------------
 -- naming:
@@ -19,6 +20,16 @@ function luatexja.load_lua(fn)
    end
 end
 
+-- check token library
+if newtoken then
+   luatexja.token = newtoken
+else
+   local luatex_version = status.list().luatex_version
+   if luatex_version >80 then
+      luatexja.token = token
+   end
+end
+
 --- 以下は全ファイルで共有される定数
 local icflag_table = {}
 luatexja.icflag_table = icflag_table
@@ -311,14 +322,14 @@ do
       'pre_linebreak_filter',
       function (head,groupcode)
         return main_process(head, true, tex.textdir, groupcode)
-      end,'ltj.pre_linebreak_filter',
+      end,'ltj.main',
       luatexbase.priority_in_callback('pre_linebreak_filter',
-                                     'luaotfload.node_processor') + 1)
+                                     'luaotfload.node_processor')+1)
    luatexbase.add_to_callback(
       'hpack_filter',
       function (head,groupcode,size,packtype, dir)
         return main_process(head, false, dir, groupcode)
-      end,'ltj.hpack_filter',
+      end,'ltj.main',
       luatexbase.priority_in_callback('hpack_filter',
                                      'luaotfload.node_processor') + 1)
    luatexbase.add_to_callback('pre_linebreak_filter', adjust_icflag, 'ltj.adjust_icflag', 1)
@@ -326,6 +337,13 @@ do
 
 end
 
+-- cleanup process
+function luatexja.ext_cleanup()
+   ltjf.cleanup_size_cache()
+   ltjd.remove_end_whatsit()
+end
+
+
 -- debug
 
 do
@@ -463,12 +481,12 @@ local function debug_show_node_X(p,print_fn, limit)
             prefix, inner_depth = k, bid
          end
       else
-         s = s .. node.subtype(p.subtype)
+         s = s .. (node.subtype(p.subtype) or '')
         if p.subtype==1 then
            s = s .. ' stream=' .. p.stream
            print_fn(s)
            for i=1,#p.data do
-              print_fn(s .. '  [' .. i .. '] = ' .. tostring(token.command_name(p.data[i])))
+              print_fn(s .. '  [' .. i .. '] = ' .. tostring(p.data[i].csname))
            end
         else
            print_fn(s)