X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-charrange.lua;h=e2d97de71347bbf4b3cfda729bd0ba3a2ec23384;hb=67291f7f1dee7f7ace5c41e9b881eb3ca8b727c3;hp=e3478ab81802641d1c5e0a067d29aca9f85c6532;hpb=e9e03ab63bb21484ffecb25bbd5fe88eac4aca3c;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-charrange.lua b/src/ltj-charrange.lua
index e3478ab..e2d97de 100644
--- a/src/ltj-charrange.lua
+++ b/src/ltj-charrange.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.charrange',
-  date = '2012/10/21',
+  date = '2014/01/19',
   description = 'Handling the range of Japanese characters',
 })
 module('luatexja.charrange', package.seeall)
@@ -11,37 +11,47 @@ local err, warn, info, log = luatexbase.errwarinf(_NAME)
 
 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 has_attr_node = node.has_attribute
+local tex_getattr = tex.getattribute
+
 ATTR_RANGE = 7
+local jcr_cjk, jcr_noncjk = 0, 1
 local floor = math.floor
 local pow = math.pow
-local has_attr = node.has_attribute
 local kcat_attr_table = {}
 local pow_table = {}
+local fn_table = {} -- used in is_ucs_in_japanese_char_direct
 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
 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'
+-- 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 ucs_out = 0x110000
 
 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
-   if not ind or ind<0 or ind>=31*ATTR_RANGE then -- 0 は error にしない（隠し）
+   if not ind or ind<0 or ind>31*ATTR_RANGE then -- 0 はエラーにしない（隠し）
       ltjb.package_error('luatexja',
 			 "invalid character range number (" .. ind .. ")",
 			 "A character range number should be in the range 1.."
-                          .. 31*ATTR_RANGE-1 .. ",\n" ..
+                          .. 31*ATTR_RANGE .. ",\n" ..
 			  "ignored.")
       return
    elseif b<0x80 or e>=ucs_out then
@@ -51,37 +61,51 @@ function add_char_range(b,e,ind) -- ind: external range number
    elseif b>e then
       local j=b; e=b; b=j
    end
+   if ind == 31*ATTR_RANGE then ind=0 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 not c or c<0 or c>0x10FFFF then
-	 ltjb.package_error('luatexja',
-			    '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 return  jcr_table_main[c] or 0 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
 end
 
 function get_range_setting(i) -- i: internal range number
-   return floor(tex.getattribute(kcat_attr_table[i])/pow_table[i])%2
+   return floor(tex_getattr(kcat_attr_table[i])/pow_table[i])%2
 end
 
 --  glyph_node p は和文文字か？
-function is_ucs_in_japanese_char(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(p, kcat_attr_table[i])/pow_table[i])%2 ~= jcr_noncjk)
+		 has_attr_node(p, kcat_attr_table[i])/pow_table[i])%2 ~= jcr_noncjk)
    end
 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
+end
+
+function is_japanese_char_curlist(c) -- assume that c>=0x80
+   local i=jcr_table_main[c]
+   return get_range_setting(i)~= jcr_noncjk
+end
 
 -- EXT
 function toggle_char_range(g, i) -- i: external range number
@@ -95,7 +119,7 @@ function toggle_char_range(g, i) -- i: external range number
       if i>0 then kc=0 else kc=1; i=-i end
       if i>=7*ATTR_RANGE then i=0 end
       local attr = kcat_attr_table[i]
-      local a = tex.getattribute(attr)
+      local a = tex_getattr(attr)
       tex.setattribute(g,attr,(floor(a/pow_table[i+1])*2+kc)*pow_table[i]+a%pow_table[i])
    end
 end