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 'kitagawa_test' into cjascale
[luatex-ja/luatexja.git]
/
src
/
luatexja.lua
diff --git
a/src/luatexja.lua
b/src/luatexja.lua
index
3aae0c9
..
422035e
100644
(file)
--- a/
src/luatexja.lua
+++ b/
src/luatexja.lua
@@
-177,18
+177,23
@@
end
-- EXT: print parameters that don't need arguments
do
-- EXT: print parameters that don't need arguments
do
+ local tex_getattr = tex.getattribute
+ local function getattr(a)
+ local r = tex.getattribute(a)
+ return (r==-0x7FFFFFFF) and 0 or r
+ end
luatexja.unary_pars = {
yalbaselineshift = function(t)
luatexja.unary_pars = {
yalbaselineshift = function(t)
- return print_scaled(
tex.getattribute
('ltj@yablshift'))..'pt'
+ return print_scaled(
getattr
('ltj@yablshift'))..'pt'
end,
yjabaselineshift = function(t)
end,
yjabaselineshift = function(t)
- return print_scaled(
tex.getattribute
('ltj@ykblshift'))..'pt'
+ return print_scaled(
getattr
('ltj@ykblshift'))..'pt'
end,
talbaselineshift = function(t)
end,
talbaselineshift = function(t)
- return print_scaled(
tex.getattribute
('ltj@tablshift'))..'pt'
+ return print_scaled(
getattr
('ltj@tablshift'))..'pt'
end,
tjabaselineshift = function(t)
end,
tjabaselineshift = function(t)
- return print_scaled(
tex.getattribute
('ltj@tkblshift'))..'pt'
+ return print_scaled(
getattr
('ltj@tkblshift'))..'pt'
end,
kanjiskip = function(t)
return print_spec(ltjs.get_stack_skip(stack_table_index.KSK, t))
end,
kanjiskip = function(t)
return print_spec(ltjs.get_stack_skip(stack_table_index.KSK, t))
@@
-200,10
+205,10
@@
do
return ltjs.get_stack_table(stack_table_index.JWP, 0, t)
end,
autospacing = function(t)
return ltjs.get_stack_table(stack_table_index.JWP, 0, t)
end,
autospacing = function(t)
- return
tex.getattribute
('ltj@autospc')
+ return
getattr
('ltj@autospc')
end,
autoxspacing = function(t)
end,
autoxspacing = function(t)
- return
tex.getattribute
('ltj@autoxspc')
+ return
getattr
('ltj@autoxspc')
end,
differentjfm = function(t)
local f, r = luatexja.jfmglue.diffmet_rule, '???'
end,
differentjfm = function(t)
local f, r = luatexja.jfmglue.diffmet_rule, '???'
@@
-405,9
+410,9
@@
local function debug_show_node_X(p,print_fn, limit)
local base = prefix .. string.format('%X', get_attr_icflag(p))
.. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' '
if pt == 'glyph' then
local base = prefix .. string.format('%X', get_attr_icflag(p))
.. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' '
if pt == 'glyph' then
- s = base .. ' ' ..
utf.char(p.char) .. ' '
- .. tostring(p.font)
- .. ' (' .. print_scaled(p.height) .. '+'
+ s = base .. ' ' ..
+ (p.char>=0xF0000 and string.format('(U+%X)', p.char) or utf.char(p.char)) .. ' '
+ ..
tostring(p.font) ..
' (' .. print_scaled(p.height) .. '+'
.. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
if p.xoffset~=0 or p.yoffset~=0 then
s = s .. ' off: (' .. print_scaled(p.xoffset)
.. print_scaled(p.depth) .. ')x' .. print_scaled(p.width)
if p.xoffset~=0 or p.yoffset~=0 then
s = s .. ' off: (' .. print_scaled(p.xoffset)
@@
-530,13
+535,13
@@
local function debug_show_node_X(p,print_fn, limit)
elseif pt=='noad' then
s = base ; print_fn(s)
if p.nucleus then
elseif pt=='noad' then
s = base ; print_fn(s)
if p.nucleus then
- prefix = k .. 'N'; debug_show_node_X(p.nucleus, print_fn);
+ prefix = k .. 'N'; debug_show_node_X(p.nucleus, print_fn
, limit
);
end
if p.sup then
end
if p.sup then
- prefix = k .. '^'; debug_show_node_X(p.sup, print_fn);
+ prefix = k .. '^'; debug_show_node_X(p.sup, print_fn
, limit
);
end
if p.sub then
end
if p.sub then
- prefix = k .. '_'; debug_show_node_X(p.sub, print_fn);
+ prefix = k .. '_'; debug_show_node_X(p.sub, print_fn
, limit
);
end
prefix = k;
elseif pt=='math_char' then
end
prefix = k;
elseif pt=='math_char' then