diff options
author | Karl Berry <karl@freefriends.org> | 2017-07-30 22:20:15 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-07-30 22:20:15 +0000 |
commit | ab0137d0a3f9f8fc686c8804fb910eb99ca9cd75 (patch) | |
tree | 27c7e9685f74b7bcf70e1ce738faa684a4826067 /Master/texmf-dist/tex/luatex/luatexja/luatexja.lua | |
parent | ee2ba58b71acb3f3395797014cae26262b39771e (diff) |
luatexja (30jul17)
git-svn-id: svn://tug.org/texlive/trunk@44924 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/luatexja.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/luatexja.lua | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua index 28c1a98d913..d6d83e61437 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/luatexja.lua @@ -177,18 +177,23 @@ end -- 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) - return print_scaled(tex.getattribute('ltj@yablshift'))..'pt' + return print_scaled(getattr('ltj@yablshift'))..'pt' end, yjabaselineshift = function(t) - return print_scaled(tex.getattribute('ltj@ykblshift'))..'pt' + return print_scaled(getattr('ltj@ykblshift'))..'pt' end, talbaselineshift = function(t) - return print_scaled(tex.getattribute('ltj@tablshift'))..'pt' + return print_scaled(getattr('ltj@tablshift'))..'pt' 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)) @@ -200,10 +205,10 @@ do 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) - return tex.getattribute('ltj@autoxspc') + return getattr('ltj@autoxspc') end, differentjfm = function(t) local f, r = luatexja.jfmglue.diffmet_rule, '???' @@ -409,8 +414,10 @@ local function debug_show_node_X(p,print_fn, limit) .. tostring(p.font) .. ' (' .. print_scaled(p.height) .. '+' .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) - .. ' off: (' .. print_scaled(p.xoffset) - .. ',' .. print_scaled(p.yoffset) .. ')' + if p.xoffset~=0 or p.yoffset~=0 then + s = s .. ' off: (' .. print_scaled(p.xoffset) + .. ',' .. print_scaled(p.yoffset) .. ')' + end print_fn(s) elseif pt=='hlist' or pt=='vlist' or pt=='unset'or pt=='ins' then if pt=='ins' then |