X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-charrange.lua;h=96fbd885abba9da264296538e381a38646c066e1;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=79002cb19297a80ce1052a07a18804fe23f8afc4;hpb=7098bdc2e3608c04ea4142085f3b7feaa04ae452;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-charrange.lua b/src/ltj-charrange.lua
index 79002cb..96fbd88 100644
--- a/src/ltj-charrange.lua
+++ b/src/ltj-charrange.lua
@@ -3,49 +3,50 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.charrange',
-  date = '2014/01/19',
+  date = '2019/04/01',
   description = 'Handling the range of Japanese characters',
 })
-module('luatexja.charrange', package.seeall)
-local err, warn, info, log = luatexbase.errwarinf(_NAME)
-
+luatexja.charrange = {}
 luatexja.load_module('base');      local ltjb = luatexja.base
 
-local Dnode = node.direct or node
-local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
-local has_attr = Dnode.has_attribute
+local getchar = node.direct.getchar
+local has_attr = node.direct.has_attribute
 local has_attr_node = node.has_attribute
 local tex_getattr = tex.getattribute
 
-ATTR_RANGE = 7
+local ATTR_RANGE = 7
+luatexja.charrange.ATTR_RANGE = ATTR_RANGE
+local jcr_cjk, jcr_noncjk = 0, 1
 local floor = math.floor
-local pow = math.pow
 local kcat_attr_table = {}
 local pow_table = {}
 local fn_table = {} -- used in is_ucs_in_japanese_char_direct
+local nfn_table = {} -- used in is_ucs_in_japanese_char_node
 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)
-   fn_table[i] = function(p)
-      return floor(has_attr(p, kcat_attr_table[i])/pow_table[i])%2 ~= jcr_noncjk
-   end
+   local ka, pw = luatexbase.attributes['ltj@kcat'..floor(i/31)], 1/(2^(i%31))
+   local jcr_noncjk = jcr_noncjk
+   kcat_attr_table[i], pow_table[i] = ka, 2^(i%31)
+   fn_table[i] = function(p) return floor(has_attr(p, ka)*pw)%2 ~= jcr_noncjk end
+   nfn_table[i] = function(p) return floor(has_attr_node(p, ka)*pw)%2 ~= jcr_noncjk end
 end
-pow_table[31*ATTR_RANGE] = pow(2, 31)
+fn_table[-1] = function() return false end -- for char --U+007F
+nfn_table[-1] = function() return false end -- for char --U+007F
+pow_table[31*ATTR_RANGE] = 2^31
 
 -- jcr_table_main[chr_code] = index
 -- index : internal 0,   1, 2, ..., 216               0: 'other'
 --         external 217, 1  2       216, 217 and (out of range): 'other'
 
 -- initialize
-jcr_table_main = {}
-local jcr_table_main = jcr_table_main
-local jcr_cjk = 0; local jcr_noncjk = 1; local ucs_out = 0x110000
+local jcr_table_main = {}
+local ucs_out = 0x110000
 
+for i=0x0 ,0x7F       do jcr_table_main[i]=-1 end
 for i=0x80 ,0xFF      do jcr_table_main[i]=1 end
 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
+function luatexja.charrange.add_char_range(b,e,ind) -- ind: external range number
    if not ind or ind<0 or ind>31*ATTR_RANGE then -- 0 はエラーにしない（隠し）
       ltjb.package_error('luatexja',
 			 "invalid character range number (" .. ind .. ")",
@@ -66,48 +67,30 @@ function add_char_range(b,e,ind) -- ind: external range number
    end
 end
 
-function char_to_range(c) -- return the external range number
-   c=ltjb.in_unicode(c, false)
-   if c<0x80 then return -1
-   else 
-      local r = jcr_table_main[c] or 217
-      return (r and r~=0) and r or 217 
-   end
+function luatexja.charrange.char_to_range(c) -- return the external range number
+   local r = jcr_table_main[ltjb.in_unicode(c, false)] or 217
+   return (r~=0) and r or 217
 end
 
-function get_range_setting(i) -- i: internal range number
+local function get_range_setting(i) -- i: internal range number
    return floor(tex_getattr(kcat_attr_table[i])/pow_table[i])%2
 end
 
 --  glyph_node p は和文文字か？
-function is_ucs_in_japanese_char_node(p)
-   local c = p.char
-   if c<0x80 then
-      return false
-   else
-      local i=jcr_table_main[c]
-      return (floor(
-		 has_attr_node(p, kcat_attr_table[i])/pow_table[i])%2 ~= jcr_noncjk)
-   end
+function luatexja.charrange.is_ucs_in_japanese_char(p)
+   return nfn_table[jcr_table_main[c or p.char]](p)
 end
-is_ucs_in_japanese_char = is_ucs_in_japanese_char_node
 
-function is_ucs_in_japanese_char_direct(p)
-   local c = getchar(p)
-   if c<0x80 then
-      return false
-   else
-      return fn_table[jcr_table_main[c]](p)
-   end
+function luatexja.charrange.is_ucs_in_japanese_char_direct(p ,c)
+   return fn_table[jcr_table_main[c or getchar(p)]](p)
 end
 
-function is_japanese_char_curlist(c) -- assume that c>=0x80
-   local i=jcr_table_main[c]
-   return get_range_setting(i)~= jcr_noncjk
+function luatexja.charrange.is_japanese_char_curlist(c) -- assume that c>=0x80
+   return get_range_setting(jcr_table_main[c])~= jcr_noncjk
 end
 
 -- EXT
-function toggle_char_range(g, i) -- i: external range number
+function luatexja.charrange.toggle_char_range(g, i) -- i: external range number
    if type(i)~='number' then
 	      ltjb.package_error('luatexja',
 				 "invalid character range number (" .. tostring(i).. ")",
@@ -119,8 +102,11 @@ function toggle_char_range(g, i) -- i: external range number
       if i>=7*ATTR_RANGE then i=0 end
       local attr = kcat_attr_table[i]
       local a = tex_getattr(attr)
-      tex.setattribute(g,attr,(floor(a/pow_table[i+1])*2+kc)*pow_table[i]+a%pow_table[i])
+      tex.setattribute(g, attr,
+		       (floor(a/pow_table[i+1])*2+kc)*pow_table[i]+a%pow_table[i])
    end
 end
 
+luatexja.charrange.get_range_setting=get_range_setting
+
 -- EOF