Revert 1b1d3c3 and 3b2bba1.

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

diff --git a/src/ltj-charrange.lua b/src/ltj-charrange.lua
index d69d74f..6d13c91 100644 (file)
--- a/src/ltj-charrange.lua
+++ b/src/ltj-charrange.lua
@@ -10,16 +10,25 @@ luatexbase.provides_module({
 module('luatexja.charrange', package.seeall)
 local err, warn, info, log = luatexbase.errwarinf(_NAME)
 
-require('luatexja.base');      local ltjb = luatexja.base
+luatexja.load_module('base');      local ltjb = luatexja.base
 
+ATTR_RANGE = 7
 local floor = math.floor
+local pow = math.pow
 local has_attr = node.has_attribute
+local kcat_attr_table = {}
+local pow_table = {}
+for i = 0, 31*ATTR_RANGE-1 do
+   kcat_attr_table[i] = luatexbase.attributes['ltj@kcat'..floor(i/31)]
+   pow_table[i] =  pow(2, i%31)
+end
+pow_table[31*ATTR_RANGE] = pow(2, 31)
 
 -- jcr_table_main[chr_code] = index
 -- index : internal 0, 1, 2, ..., 216               0: 'other'
 --         external    1  2       216, (out of range): 'other'
 
--- initialize 
+-- initialize
 local jcr_table_main = {}
 local jcr_cjk = 0; local jcr_noncjk = 1; local ucs_out = 0x110000
 
@@ -28,11 +37,12 @@ for i=0x100,ucs_out-1 do jcr_table_main[i]=0 end
 
 -- EXT: add characters to a range
 function add_char_range(b,e,ind) -- ind: external range number
-   if not ind or ind<0 or ind>216 then 
+   if not ind or ind<0 or ind>=7*ATTR_RANGE then -- 0 は error にしない（隠し）
       ltjb.package_error('luatexja',
                         "invalid character range number (" .. ind .. ")",
-                        {"A character range number should be in the range 1..216,",
-                         "ignored."})
+                        "A character range number should be in the range 1.."
+                          .. 7+ATTR_RANGE-1 .. ",\n" ..
+                         "ignored.")
       return
    elseif b<0x80 or e>=ucs_out then
       ltjb.package_warning('luatexja',
@@ -40,56 +50,54 @@ function add_char_range(b,e,ind) -- ind: external range number
                           'I take the intersection with [0x80, 0x10ffff].')
    elseif b>e then
       local j=b; e=b; b=j
-   end 
+   end
    for i=math.max(0x80,b),math.min(ucs_out-1,e) do
       jcr_table_main[i]=ind
    end
 end
 
 function char_to_range(c) -- return the (external) range number
-   if c<0 or c>0x10FFFF then
+   if not c or c<0 or c>0x10FFFF then
         ltjb.package_error('luatexja',
-                           'bad character code (' .. c .. ')',
-                           {'A character number must be between 0 and 0x10ffff.',
-                            'So I changed this one to zero.'})
+                           'bad character code (' .. tostring(c) .. ')',
+                           'A character number must be between 0 and 0x10ffff.\n' ..
+                            'So I changed this one to zero.')
         c=0
    elseif c<0x80 then return -1
-   else 
-      local i = jcr_table_main[c] or 0
-      if i==0 then return 217 else return i end
-   end
+   else return  jcr_table_main[c] or 0 end
 end
 
 function get_range_setting(i) -- i: internal range number
-   return floor(tex.getattribute(
-                       luatexbase.attributes['ltj@kcat'..floor(i/31)])
-                    /math.pow(2, i%31))%2
+   return floor(tex.getattribute(kcat_attr_table[i])/pow_table[i])%2
 end
 
 --  glyph_node p は和文文字か？
 function is_ucs_in_japanese_char(p)
    local c = p.char
-   if c<0x80 then return false 
-   else 
-      local i=jcr_table_main[c] 
+   if c<0x80 then
+      return false
+   else
+      local i=jcr_table_main[c]
       return (floor(
-                has_attr(p, luatexbase.attributes['ltj@kcat'..floor(i/31)])
-                /math.pow(2, i%31))%2 ~= jcr_noncjk) 
+                has_attr(p, kcat_attr_table[i])/pow_table[i])%2 ~= jcr_noncjk)
    end
 end
 
 -- EXT
 function toggle_char_range(g, i) -- i: external range number
-   if i==0 then return 
+   if type(i)~='number' then
+             ltjb.package_error('luatexja',
+                                "invalid character range number (" .. tostring(i).. ")",
+                                "A character range number must be a number, ignored.")
+   elseif i==0 then return
    else
       local kc
       if i>0 then kc=0 else kc=1; i=-i end
-      if i>216 then i=0 end
-      local attr = luatexbase.attributes['ltj@kcat'..floor(i/31)]
+      if i>=7*ATTR_RANGE then i=0 end
+      local attr = kcat_attr_table[i]
       local a = tex.getattribute(attr)
-      local k = math.pow(2, i%31)
-      tex.setattribute(g,attr,(floor(a/k/2)*2+kc)*k+a%k)
+      tex.setattribute(g,attr,(floor(a/pow_table[i+1])*2+kc)*pow_table[i]+a%pow_table[i])
    end
 end
 
--- EOF
\ No newline at end of file
+-- EOF