Fix errors: ltjb.package_error() is called with a table argument in ltj-charrange...

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

diff --git a/src/luatexja.lua b/src/luatexja.lua
index 98b0ae7..2f83b48 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -79,14 +79,15 @@ local cat_lp = luatexbase.catcodetables['latex-package']
 local ITALIC = 1
 local PACKED = 2
 local KINSOKU = 3
-local FROM_JFM = 4
-local LINE_END = 5
-local KANJI_SKIP = 6
-local XKANJI_SKIP = 7
-local PROCESSED = 8
-local IC_PROCESSED = 9
+local FROM_JFM = 6
+-- FROM_JFM: 4, 5, 6, 7, 8 →優先度高
+-- 6 が標準
+local KANJI_SKIP = 9
+local XKANJI_SKIP = 10
+local PROCESSED = 11
+local IC_PROCESSED = 12
 local BOXBDD = 15
-local PROCESSED_BEGIN_FLAG = 16
+local PROCESSED_BEGIN_FLAG = 32
 
 
 -- Three aux. functions, bollowed from tex.web
@@ -180,14 +181,16 @@ function luatexja.ext_get_parameter_binary(k,c)
       c=0
    end
    if k == 'jacharrange' then
-      if c<0 or c>216 then 
+      if c>=7*ltjc.ATTR_RANGE then 
         ltjb.package_error('luatexja',
                            'invalid character range number (' .. c .. ')',
-                           'A character range number should be in the range 0..216,\n'..
+                           'A character range number should be in the range 0..'
+                               .. 7+ATTR_RANGE-1 .. ",\n"..
                             'So I changed this one to zero.')
         c=0
       end
-      tex.write(ltjc.get_range_setting(c))
+      -- 負の値は <U+0080 の文字の文字範囲，として出てくる．この時はいつも欧文文字なので 1 を返す
+      tex.write( (c<0) and -1 or ltjc.get_range_setting(c))
    else
       if c<0 or c>0x10FFFF then
         ltjb.package_error('luatexja',
@@ -287,8 +290,8 @@ local function debug_show_node_X(p,print_fn)
       debug_depth=k
    elseif pt == 'glue' then
       s = base .. ' ' ..  print_spec(p.spec)
-      if get_attr_icflag(p)==FROM_JFM then
-         s = s .. ' (from JFM)'
+      if get_attr_icflag(p)>KINSOKU and get_attr_icflag(p)<KANJI_SKIP then
+         s = s .. ' (from JFM: priority ' .. get_attr_icflag(p)-FROM_JFM .. ')'
       elseif get_attr_icflag(p)==KANJI_SKIP then
         s = s .. ' (kanjiskip)'
       elseif get_attr_icflag(p)==XKANJI_SKIP then
@@ -303,10 +306,8 @@ local function debug_show_node_X(p,print_fn)
         s = s .. ' (italic correction)'
          -- elseif get_attr_icflag(p)==ITALIC then
          --    s = s .. ' (italic correction)'
-      elseif get_attr_icflag(p)==FROM_JFM then
-        s = s .. ' (from JFM)'
-      elseif get_attr_icflag(p)==LINE_END then
-        s = s .. " (from 'lineend' in JFM)"
+      elseif get_attr_icflag(p)>KINSOKU and get_attr_icflag(p)<KANJI_SKIP then
+        s = s .. ' (from JFM: priority ' .. get_attr_icflag(p)-FROM_JFM .. ')'
       end
       print_fn(s)
    elseif pt == 'penalty' then