X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-charrange.lua;h=73435cd21d4a4d2ff01f927ab864182d4c94fe0f;hb=3fae82d64b193c794fdf2f1262d80bddc98ce5a8;hp=ea862976e9c639be8eff63296a1f314b7c508829;hpb=3b5740195ec14370e61387c642b8551a9af05a5b;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-charrange.lua b/src/ltj-charrange.lua
index ea86297..73435cd 100644
--- a/src/ltj-charrange.lua
+++ b/src/ltj-charrange.lua
@@ -3,21 +3,19 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.charrange',
-  date = '2014/05/08',
+  date = '2018/02/18',
   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
@@ -26,11 +24,11 @@ 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
-   local ka, pw = luatexbase.attributes['ltj@kcat'..floor(i/31)], pow(2, i%31)
+   local ka, pw = luatexbase.attributes['ltj@kcat'..floor(i/31)], 1/pow(2, i%31)
    local jcr_noncjk = jcr_noncjk
-   kcat_attr_table[i], pow_table[i] = ka, pw
-   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
+   kcat_attr_table[i], pow_table[i] = ka, pow(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
 fn_table[-1] = function() return false end -- for char --U+007F
 nfn_table[-1] = function() return false end -- for char --U+007F
@@ -41,8 +39,7 @@ pow_table[31*ATTR_RANGE] = pow(2, 31)
 --         external 217, 1  2       216, 217 and (out of range): 'other'
 
 -- initialize
-jcr_table_main = {}
-local jcr_table_main = jcr_table_main
+local jcr_table_main = {}
 local ucs_out = 0x110000
 
 for i=0x0 ,0x7F       do jcr_table_main[i]=-1 end
@@ -50,7 +47,7 @@ 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 .. ")",
@@ -71,32 +68,30 @@ function add_char_range(b,e,ind) -- ind: external range number
    end
 end
 
-function char_to_range(c) -- return the external range number
+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)
+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
--- only ltj-otf.lua uses this version
 
-function is_ucs_in_japanese_char_direct(p ,c)
+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
+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).. ")",
@@ -113,4 +108,6 @@ function toggle_char_range(g, i) -- i: external range number
    end
 end
 
+luatexja.charrange.get_range_setting=get_range_setting
+
 -- EOF