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
Fix errors: ltjb.package_error() is called with a table argument in ltj-charrange...
[luatex-ja/luatexja.git]
/
src
/
luatexja.lua
diff --git
a/src/luatexja.lua
b/src/luatexja.lua
index
1e00f47
..
2f83b48
100644
(file)
--- a/
src/luatexja.lua
+++ b/
src/luatexja.lua
@@
-79,13
+79,15
@@
local cat_lp = luatexbase.catcodetables['latex-package']
local ITALIC = 1
local PACKED = 2
local KINSOKU = 3
local ITALIC = 1
local PACKED = 2
local KINSOKU = 3
-local FROM_JFM = 4
-local LINE_END = 5
-local KANJI_SKIP = 6
-local XKANJI_SKIP = 7
-local PROCESSED = 8
-local IC_PROCESSED = 9
+local FROM_JFM = 6
+-- FROM_JFM: 4, 5, 6, 7, 8 →優先度高
+-- 6 が標準
+local KANJI_SKIP = 9
+local XKANJI_SKIP = 10
+local PROCESSED = 11
+local IC_PROCESSED = 12
local BOXBDD = 15
local BOXBDD = 15
+local PROCESSED_BEGIN_FLAG = 32
-- Three aux. functions, bollowed from tex.web
-- Three aux. functions, bollowed from tex.web
@@
-120,7
+122,7
@@
local function print_glue(d,order)
return out
end
return out
end
-
local
function print_spec(p)
+function print_spec(p)
local out=print_scaled(p.width)..'pt'
if p.stretch~=0 then
out=out..' plus '..print_glue(p.stretch,p.stretch_order)
local out=print_scaled(p.width)..'pt'
if p.stretch~=0 then
out=out..' plus '..print_glue(p.stretch,p.stretch_order)
@@
-131,8
+133,6
@@
local function print_spec(p)
return out
end
return out
end
-function math.two_add(a,b) return a+b end
-function math.two_average(a,b) return (a+b)/2 end
---- table: charprop_stack_table [stack_level].{pre|post|xsp}[chr_code]
---- table: charprop_stack_table [stack_level].{pre|post|xsp}[chr_code]
@@
-174,15
+174,23
@@
end
-- EXT: print parameters that need arguments
function luatexja.ext_get_parameter_binary(k,c)
-- EXT: print parameters that need arguments
function luatexja.ext_get_parameter_binary(k,c)
+ if type(c)~='number' then
+ ltjb.package_error('luatexja',
+ 'invalid the second argument (' .. tostring(c) .. ')',
+ 'I changed this one to zero.')
+ c=0
+ end
if k == 'jacharrange' then
if k == 'jacharrange' then
- if c
<0 or c>216
then
+ if c
>=7*ltjc.ATTR_RANGE
then
ltjb.package_error('luatexja',
'invalid character range number (' .. c .. ')',
ltjb.package_error('luatexja',
'invalid character range number (' .. c .. ')',
- 'A character range number should be in the range 0..216,\n'..
+ 'A character range number should be in the range 0..'
+ .. 7+ATTR_RANGE-1 .. ",\n"..
'So I changed this one to zero.')
c=0
end
'So I changed this one to zero.')
c=0
end
- tex.write(ltjc.get_range_setting(c))
+ -- 負の値は <U+0080 の文字の文字範囲,として出てくる.この時はいつも欧文文字なので 1 を返す
+ tex.write( (c<0) and -1 or ltjc.get_range_setting(c))
else
if c<0 or c>0x10FFFF then
ltjb.package_error('luatexja',
else
if c<0 or c>0x10FFFF then
ltjb.package_error('luatexja',
@@
-208,7
+216,7
@@
end
-- EXT: print \global if necessary
function luatexja.ext_print_global()
-- EXT: print \global if necessary
function luatexja.ext_print_global()
-
if
isglobal=='global' then tex.sprint(cat_lp, '\\global') end
+
if luatexja.
isglobal=='global' then tex.sprint(cat_lp, '\\global') end
end
-- main process
end
-- main process
@@
-236,16
+244,20
@@
luatexbase.add_to_callback('hpack_filter',
'luaotfload.hpack_filter') + 1)
-- debug
'luaotfload.hpack_filter') + 1)
-- debug
+local function get_attr_icflag(p)
+ return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
+end
+
local debug_depth
local function debug_show_node_X(p,print_fn)
local k = debug_depth
local s
local pt=node_type(p.id)
local debug_depth
local function debug_show_node_X(p,print_fn)
local k = debug_depth
local s
local pt=node_type(p.id)
- local base = debug_depth .. string.format('%X',
has_attr(p,attr_icflag) or 0
)
- .. ' ' .. tostring(p)
+ local base = debug_depth .. string.format('%X',
get_attr_icflag(p)
)
+ .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' '
if pt == 'glyph' then
if pt == 'glyph' then
- s = base .. ' ' .. utf.char(p.char) .. ' ' .. tostring(p.font)
+ s = base .. ' ' .. utf.char(p.char) .. ' '
.. tostring(p.font)
.. ' (' .. print_scaled(p.height) .. '+'
.. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
print_fn(s)
.. ' (' .. print_scaled(p.height) .. '+'
.. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
print_fn(s)
@@
-266,7
+278,7
@@
local function debug_show_node_X(p,print_fn)
for i = 2, p.glue_order do s = s .. 'l' end
end
end
for i = 2, p.glue_order do s = s .. 'l' end
end
end
- if
has_attr(p, attr_icflag, PACKED)
then
+ if
get_attr_icflag(p) == PACKED
then
s = s .. ' (packed)'
end
print_fn(s)
s = s .. ' (packed)'
end
print_fn(s)
@@
-278,11
+290,11
@@
local function debug_show_node_X(p,print_fn)
debug_depth=k
elseif pt == 'glue' then
s = base .. ' ' .. print_spec(p.spec)
debug_depth=k
elseif pt == 'glue' then
s = base .. ' ' .. print_spec(p.spec)
- if
has_attr(p, attr_icflag)==FROM_JFM
then
- s = s .. ' (from JFM)'
- elseif
has_attr(p, attr_icflag
)==KANJI_SKIP then
+ if
get_attr_icflag(p)>KINSOKU and get_attr_icflag(p)<KANJI_SKIP
then
+ s = s .. ' (from JFM
: priority ' .. get_attr_icflag(p)-FROM_JFM .. '
)'
+ elseif
get_attr_icflag(p
)==KANJI_SKIP then
s = s .. ' (kanjiskip)'
s = s .. ' (kanjiskip)'
- elseif
has_attr(p, attr_icflag
)==XKANJI_SKIP then
+ elseif
get_attr_icflag(p
)==XKANJI_SKIP then
s = s .. ' (xkanjiskip)'
end
print_fn(s)
s = s .. ' (xkanjiskip)'
end
print_fn(s)
@@
-290,19
+302,17
@@
local function debug_show_node_X(p,print_fn)
s = base .. ' ' .. print_scaled(p.kern) .. 'pt'
if p.subtype==2 then
s = s .. ' (for accent)'
s = base .. ' ' .. print_scaled(p.kern) .. 'pt'
if p.subtype==2 then
s = s .. ' (for accent)'
- elseif
has_attr(p, attr_icflag
)==IC_PROCESSED then
+ elseif
get_attr_icflag(p
)==IC_PROCESSED then
s = s .. ' (italic correction)'
s = s .. ' (italic correction)'
- -- elseif
has_attr(p, attr_icflag
)==ITALIC then
+ -- elseif
get_attr_icflag(p
)==ITALIC then
-- s = s .. ' (italic correction)'
-- s = s .. ' (italic correction)'
- elseif has_attr(p, attr_icflag)==FROM_JFM then
- s = s .. ' (from JFM)'
- elseif has_attr(p, attr_icflag)==LINE_END then
- s = s .. " (from 'lineend' in JFM)"
+ elseif get_attr_icflag(p)>KINSOKU and get_attr_icflag(p)<KANJI_SKIP then
+ s = s .. ' (from JFM: priority ' .. get_attr_icflag(p)-FROM_JFM .. ')'
end
print_fn(s)
elseif pt == 'penalty' then
s = base .. ' ' .. tostring(p.penalty)
end
print_fn(s)
elseif pt == 'penalty' then
s = base .. ' ' .. tostring(p.penalty)
- if
has_attr(p, attr_icflag
)==KINSOKU then
+ if
get_attr_icflag(p
)==KINSOKU then
s = s .. ' (for kinsoku)'
end
print_fn(s)
s = s .. ' (for kinsoku)'
end
print_fn(s)