OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kmaeda_fontspec' into kitagawa_test
[luatex-ja/luatexja.git]
/
src
/
ltj-charrange.lua
diff --git
a/src/ltj-charrange.lua
b/src/ltj-charrange.lua
index
f913787
..
e2d97de
100644
(file)
--- a/
src/ltj-charrange.lua
+++ b/
src/ltj-charrange.lua
@@
-11,15
+11,25
@@
local err, warn, info, log = luatexbase.errwarinf(_NAME)
luatexja.load_module('base'); local ltjb = luatexja.base
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
ATTR_RANGE = 7
+local jcr_cjk, jcr_noncjk = 0, 1
local floor = math.floor
local pow = math.pow
local floor = math.floor
local pow = math.pow
-local has_attr = node.has_attribute
local kcat_attr_table = {}
local pow_table = {}
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)
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)
end
pow_table[31*ATTR_RANGE] = pow(2, 31)
@@
-30,7
+40,7
@@
pow_table[31*ATTR_RANGE] = pow(2, 31)
-- initialize
jcr_table_main = {}
local jcr_table_main = jcr_table_main
-- 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
for i=0x80 ,0xFF do jcr_table_main[i]=1 end
for i=0x100,ucs_out-1 do jcr_table_main[i]=0 end
@@
-67,21
+77,36
@@
function char_to_range(c) -- return the external range number
end
function get_range_setting(i) -- i: internal range number
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 は和文文字か?
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(
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
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
if type(i)~='number' then
-- EXT
function toggle_char_range(g, i) -- i: external range number
if type(i)~='number' then
@@
-94,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]
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
tex.setattribute(g,attr,(floor(a/pow_table[i+1])*2+kc)*pow_table[i]+a%pow_table[i])
end
end