luatexja-preset: use CJKShape=NLC/JIS1990.

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

diff --git a/src/luatexja.lua b/src/luatexja.lua
index de9da60..9a09db9 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -1,5 +1,5 @@
 
-require('lualibs-table')
+require('lualibs')
 
 ------------------------------------------------------------------------
 -- naming:
@@ -49,11 +49,10 @@ stack_table_index.KSJ  = 0x400 -- 0--9
 
 local userid_table = {}
 luatexja.userid_table = userid_table
-userid_table.IHB  = 30111 -- \inhibitglue
-userid_table.STCK = 30112 -- スタック管理
-userid_table.OTF  = 30113 -- luatexja-otf
-userid_table.BPAR = 30114 -- 「段落始め」
-
+userid_table.IHB  = luatexbase.newuserwhatsitid('inhibitglue',  'luatexja') -- \inhibitglue
+userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- スタック管理
+userid_table.OTF  = luatexbase.newuserwhatsitid('char_by_cid',  'luatexja') -- luatexja-otf
+userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par',    'luatexja') -- 「段落始め」
 
 --- 定義終わり
 
@@ -181,11 +180,11 @@ function luatexja.ext_get_parameter_binary(k,c)
       c=0
    end
    if k == 'jacharrange' then
-      if c>=7*ltjc.ATTR_RANGE then 
+      if c>=31*ltjc.ATTR_RANGE then 
         ltjb.package_error('luatexja',
                            'invalid character range number (' .. c .. ')',
                            'A character range number should be in the range 0..'
-                               .. 7+ATTR_RANGE-1 .. ",\n"..
+                               .. 31*ltjc.ATTR_RANGE-1 .. ",\n"..
                             'So I changed this one to zero.')
         c=0
       end
@@ -263,6 +262,10 @@ luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_c
 
 do
 
+local node_type = node.type
+local node_next = node.next
+local has_attr = node.has_attribute
+
 local id_penalty = node.id('penalty')
 local id_glyph = node.id('glyph')
 local id_glue_spec = node.id('glue_spec')