diff options
Diffstat (limited to 'macros/luatex/generic/luatexja/src/luatexja.lua')
-rw-r--r-- | macros/luatex/generic/luatexja/src/luatexja.lua | 437 |
1 files changed, 196 insertions, 241 deletions
diff --git a/macros/luatex/generic/luatexja/src/luatexja.lua b/macros/luatex/generic/luatexja/src/luatexja.lua index 1b3bd81612..988f51955e 100644 --- a/macros/luatex/generic/luatexja/src/luatexja.lua +++ b/macros/luatex/generic/luatexja/src/luatexja.lua @@ -1,40 +1,30 @@ - -require('lualibs') - +require 'lualibs' ------------------------------------------------------------------------ local function load_lua(fn) local found = kpse.find_file(fn, 'tex') if not found then tex.error("LuaTeX-ja error: File `" .. fn .. "' not found") else - texio.write_nl('(' .. found .. ')') - dofile(found) + texio.write_nl('(' .. found .. ')'); dofile(found) end end luatexja.load_lua = load_lua -function luatexja.load_module(name) - require('ltj-' .. name.. '.lua') -end +function luatexja.load_module(name) require('ltj-' .. name.. '.lua') end do - local setfield = node.direct.setfield - luatexja.setglue = node.direct.setglue or - function(g,w,st,sh,sto,sho) - setfield(g,'width', w or 0) - setfield(g,'stretch',st or 0) - setfield(g,'shrink', sh or 0) - setfield(g,'stretch_order',sto or 0) - setfield(g,'shrink_order', sho or 0) - end - local getfield = node.direct.getfield - luatexja.getglue = node.direct.getglue or - function(g) - return getfield(g,'width'), - getfield(g,'stretch'), - getfield(g,'shrink'), - getfield(g,'stretch_order'), - getfield(g,'shrink_order') - end + local setfield = node.direct.setfield + luatexja.setglue = node.direct.setglue or + function(g,w,st,sh,sto,sho) + setfield(g,'width', w or 0); setfield(g,'stretch',st or 0); setfield(g,'shrink', sh or 0) + setfield(g,'stretch_order',sto or 0) + setfield(g,'shrink_order', sho or 0) + end + local getfield = node.direct.getfield + luatexja.getglue = node.direct.getglue or + function(g) + return getfield(g,'width'), getfield(g,'stretch'), getfield(g,'shrink'), + getfield(g,'stretch_order'), getfield(g,'shrink_order') + end end --- 以下は全ファイルで共有される定数 @@ -44,8 +34,6 @@ icflag_table.ITALIC = 1 icflag_table.PACKED = 2 icflag_table.KINSOKU = 3 icflag_table.FROM_JFM = 4 --- FROM_JFM: 4, 5, 6, 7, 8 →優先度高(伸びやすく,縮みやすい) --- 6 が標準 icflag_table.KANJI_SKIP = 68 -- = 4+64 icflag_table.KANJI_SKIP_JFM = 69 icflag_table.XKANJI_SKIP = 70 @@ -56,30 +44,30 @@ icflag_table.IC_PROCESSED = 74 icflag_table.BOXBDD = 75 icflag_table.PROCESSED_BEGIN_FLAG = 4096 -- sufficiently large power of 2 -local stack_table_index = {} -luatexja.stack_table_index = stack_table_index -stack_table_index.PRE = 0x200000 -- characterごと -stack_table_index.POST = 0x400000 -- characterごと -stack_table_index.KCAT = 0x600000 -- characterごと -stack_table_index.XSP = 0x800000 -- characterごと -stack_table_index.RIPRE = 0xA00000 -- characterごと,ruby pre -stack_table_index.RIPOST = 0xC00000 -- characterごと,ruby post -stack_table_index.JWP = 0 -- これだけ -stack_table_index.KSK = 1 -- これだけ -stack_table_index.XSK = 2 -- これだけ -stack_table_index.MJT = 0x100 -- 0--255 -stack_table_index.MJS = 0x200 -- 0--255 -stack_table_index.MJSS = 0x300 -- 0--255 -stack_table_index.KSJ = 0x400 -- 0--9 - -local userid_table = {} -luatexja.userid_table = userid_table -userid_table.IHB = luatexbase.newuserwhatsitid('inhibitglue', 'luatexja') -- \inhibitglue -userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- スタック管理 -userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」 -userid_table.DIR = luatexbase.newuserwhatsitid('direction', 'luatexja') -- 組方向 -userid_table.BOXB = luatexbase.newuserwhatsitid('box_boundary', 'luatexja') -- 「ボックス始め・終わり」 -userid_table.JA_AL_BDD = luatexbase.newuserwhatsitid('ja_al_boundary', 'luatexja') +local stack_ind = {} +luatexja.stack_table_index = stack_ind +stack_ind.PRE = 0x200000 -- characterごと +stack_ind.POST = 0x400000 -- characterごと +stack_ind.KCAT = 0x600000 -- characterごと +stack_ind.XSP = 0x800000 -- characterごと +stack_ind.RIPRE = 0xA00000 -- characterごと,ruby pre +stack_ind.RIPOST = 0xC00000 -- characterごと,ruby post +stack_ind.JWP = 0 -- これだけ +stack_ind.KSK = 1 -- これだけ +stack_ind.XSK = 2 -- これだけ +stack_ind.MJT = 0x100 -- 0--255 +stack_ind.MJS = 0x200 -- 0--255 +stack_ind.MJSS = 0x300 -- 0--255 +stack_ind.KSJ = 0x400 -- 0--9 + +local uid_table = {} +luatexja.userid_table = uid_table +uid_table.IHB = luatexbase.newuserwhatsitid('inhibitglue', 'luatexja') -- \inhibitglue +uid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- スタック管理 +uid_table.BPAR = luatexbase.newuserwhatsitid('begin_par', 'luatexja') -- 「段落始め」 +uid_table.DIR = luatexbase.newuserwhatsitid('direction', 'luatexja') -- 組方向 +uid_table.BOXB = luatexbase.newuserwhatsitid('box_boundary', 'luatexja') -- 「ボックス始め・終わり」 +uid_table.JA_AL_BDD = luatexbase.newuserwhatsitid('ja_al_boundary', 'luatexja') local dir_table = {} luatexja.dir_table = dir_table @@ -90,28 +78,25 @@ dir_table.dir_math_mod = 8 dir_table.dir_node_auto = 128 -- 組方向を合わせるために自動で作られたもの dir_table.dir_node_manual = 256 -- 寸法代入によって作られたもの dir_table.dir_utod = dir_table.dir_tate + dir_table.dir_math_mod - -- 「縦数式ディレクション」 in pTeX + -- 「縦数式ディレクション」 in pTeX --- 定義終わり local load_module = luatexja.load_module -load_module('base'); local ltjb = luatexja.base -load_module('rmlgbm'); local ltjr = luatexja.rmlgbm -- must be 1st - +load_module 'base'; local ltjb = luatexja.base +load_module 'rmlgbm'; local ltjr = luatexja.rmlgbm -- must be 1st if luatexja_debug then load_module('debug') end - -load_module('lotf_aux'); local ltju = luatexja.lotf_aux -load_module('charrange'); local ltjc = luatexja.charrange -load_module('stack'); local ltjs = luatexja.stack -load_module('direction'); local ltjd = luatexja.direction -- +1 hlist +1 attr_list -load_module('lineskip'); local ltjl = luatexja.lineskip -- +1 hlist +1 attr_list -load_module('jfont'); local ltjf = luatexja.jfont -load_module('inputbuf'); local ltji = luatexja.inputbuf -load_module('pretreat'); local ltjp = luatexja.pretreat -load_module('setwidth'); local ltjw = luatexja.setwidth -load_module('jfmglue'); local ltjj = luatexja.jfmglue -- +1 glue +1 gs +1 attr_list -load_module('math'); local ltjm = luatexja.math -load_module('base'); local ltjb = luatexja.base - +load_module 'lotf_aux'; local ltju = luatexja.lotf_aux +load_module 'charrange'; local ltjc = luatexja.charrange +load_module 'stack'; local ltjs = luatexja.stack +load_module 'direction'; local ltjd = luatexja.direction -- +1 hlist +1 attr_list +load_module 'lineskip'; local ltjl = luatexja.lineskip -- +1 hlist +1 attr_list +load_module 'jfont'; local ltjf = luatexja.jfont +load_module 'inputbuf'; local ltji = luatexja.inputbuf +load_module 'pretreat'; local ltjp = luatexja.pretreat +load_module 'setwidth'; local ltjw = luatexja.setwidth +load_module 'jfmglue'; local ltjj = luatexja.jfmglue -- +1 glue +1 gs +1 attr_list +load_module 'math'; local ltjm = luatexja.math +load_module 'base'; local ltjb = luatexja.base local attr_jchar_class = luatexbase.attributes['ltj@charclass'] local attr_jchar_code = luatexbase.attributes['ltj@charcode'] @@ -122,24 +107,18 @@ local attr_uniqid = luatexbase.attributes['ltj@uniqid'] local attr_dir = luatexbase.attributes['ltj@dir'] local cat_lp = luatexbase.catcodetables['latex-package'] --- Three aux. functions, bollowed from tex.web +-- Three aux. functions, borrowed from tex.web -local unity=65536 local floor = math.floor - local function print_scaled(s) - local out='' - local delta=10 - if s<0 then - out=out..'-'; s=-s - end - out=out..tostring(floor(s/unity)) .. '.' - s=10*(s%unity)+5 + local out, delta = '', 10 + if s<0 then s, out = -s, out..'-' end + out=out..tostring(floor(s/65536)) .. '.' + s=10*(s%65536)+5 repeat - if delta>unity then s=s+32768-50000 end - out=out .. tostring(floor(s/unity)) - s=10*(s%unity) - delta=delta*10 + if delta>65536 then s=s+32768-50000 end + out=out .. tostring(floor(s/65536)) + s=10*(s%65536); delta=delta*10 until s<=delta return out end @@ -149,11 +128,8 @@ local function print_glue(d,order) local out=print_scaled(d) if order>0 then out=out..'fi' - while order>1 do - out=out..'l'; order=order-1 - end - else - out=out..'pt' + while order>1 do out=out..'l'; order=order-1 end + else out=out..'pt' end return out end @@ -178,55 +154,55 @@ end do local tex_getattr = tex.getattribute local function getattr(a) - local r = tex.getattribute(a) + local r = tex_getattr(a) return (r==-0x7FFFFFFF) and 0 or r end luatexja.unary_pars = { yalbaselineshift = function(t) - return print_scaled(getattr('ltj@yablshift'))..'pt' + return print_scaled(getattr('ltj@yablshift'))..'pt' end, yjabaselineshift = function(t) - return print_scaled(getattr('ltj@ykblshift'))..'pt' + return print_scaled(getattr('ltj@ykblshift'))..'pt' end, talbaselineshift = function(t) - return print_scaled(getattr('ltj@tablshift'))..'pt' + return print_scaled(getattr('ltj@tablshift'))..'pt' end, tjabaselineshift = function(t) - return print_scaled(getattr('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)) + return print_spec(ltjs.get_stack_skip(stack_ind.KSK, t)) end, xkanjiskip = function(t) - return print_spec(ltjs.get_stack_skip(stack_table_index.XSK, t)) + return print_spec(ltjs.get_stack_skip(stack_ind.XSK, t)) end, jcharwidowpenalty = function(t) - return ltjs.get_stack_table(stack_table_index.JWP, 0, t) + return ltjs.get_stack_table(stack_ind.JWP, 0, t) end, autospacing = function(t) - return getattr('ltj@autospc') + return getattr('ltj@autospc') end, autoxspacing = function(t) - return getattr('ltj@autoxspc') + return getattr('ltj@autoxspc') end, differentjfm = function(t) - local f, r = luatexja.jfmglue.diffmet_rule, '???' - if f == math.max then r = 'large' - elseif f == math.min then r = 'small' - elseif f == math.two_average then r = 'average' - elseif f == math.two_paverage then r = 'paverage' - elseif f == math.two_pleft then r = 'pleft' - elseif f == math.two_pright then r = 'pright' - elseif f == math.two_add then r = 'both' - end - return r + local f, r = luatexja.jfmglue.diffmet_rule, '???' + if f == math.max then r = 'large' + elseif f == math.min then r = 'small' + elseif f == math.two_average then r = 'average' + elseif f == math.two_paverage then r = 'paverage' + elseif f == math.two_pleft then r = 'pleft' + elseif f == math.two_pright then r = 'pright' + elseif f == math.two_add then r = 'both' + end + return r end, direction = function() - local v = ltjd.get_dir_count() - if math.abs(tex.nest[tex.nest.ptr].mode) == ltjs.mmode and v == dir_table.dir_tate then - v = dir_table.dir_utod - end - return v + local v = ltjd.get_dir_count() + if math.abs(tex.nest[tex.nest.ptr].mode) == ltjs.mmode and v == dir_table.dir_tate then + v = dir_table.dir_utod + end + return v end, adjustdir = ltjd.get_adjust_dir_count, } @@ -236,7 +212,7 @@ do function luatexja.ext_get_parameter_unary() local k= scan_arg() if unary_pars[k] then - tex.write(tostring(unary_pars[k](tex.getcount('ltj@@stack')))) + tex.write(tostring(unary_pars[k](tex.getcount('ltj@@stack')))) end ltjb.stop_time_measure('get_par') end @@ -247,44 +223,40 @@ end do luatexja.binary_pars = { jacharrange = function(c, t) - if type(c)~='number' or c<-1 or c>31*ltjc.ATTR_RANGE then - -- 0, -1 はエラーにしない(隠し) - ltjb.package_error('luatexja', - 'invalid character range number (' .. tostring(c) .. ')', - 'A character range number should be in the range 1..' - .. 31*ltjc.ATTR_RANGE .. ",\n".. - 'So I changed this one to ' .. 31*ltjc.ATTR_RANGE .. ".") - c=0 -- external range 217 == internal range 0 - elseif c==31*ltjc.ATTR_RANGE then c=0 - end + if type(c)~='number' or c<-1 or c>31*ltjc.ATTR_RANGE then + -- 0, -1 はエラーにしない(隠し) + ltjb.package_error('luatexja', + 'invalid character range number (' .. tostring(c) .. ')', + 'A character range number should be in the range 1..' + .. 31*ltjc.ATTR_RANGE .. ",\n".. + 'So I changed this one to ' .. 31*ltjc.ATTR_RANGE .. ".") + c=0 -- external range 217 == internal range 0 + elseif c==31*ltjc.ATTR_RANGE then c=0 + end -- 負の値は <U+0080 の文字の文字範囲,として出てくる.この時はいつも欧文文字なので 1 を返す - return (c<0) and 1 or ltjc.get_range_setting(c) + return (c<0) and 1 or ltjc.get_range_setting(c) end, prebreakpenalty = function(c, t) - return ltjs.get_stack_table(stack_table_index.PRE - + ltjb.in_unicode(c, true), 0, t) + return ltjs.get_stack_table(stack_ind.PRE + ltjb.in_unicode(c, true), 0, t) end, postbreakpenalty = function(c, t) - return ltjs.get_stack_table(stack_table_index.POST - + ltjb.in_unicode(c, true), 0, t) + return ltjs.get_stack_table(stack_ind.POST + ltjb.in_unicode(c, true), 0, t) end, kcatcode = function(c, t) - return ltjs.get_stack_table(stack_table_index.KCAT - + ltjb.in_unicode(c, false), 0, t) + return ltjs.get_stack_table(stack_ind.KCAT + ltjb.in_unicode(c, false), 0, t) end, chartorange = function(c, t) - return ltjc.char_to_range(ltjb.in_unicode(c, false)) + return ltjc.char_to_range(ltjb.in_unicode(c, false)) end, jaxspmode = function(c, t) - return ltjs.get_stack_table(stack_table_index.XSP - + ltjb.in_unicode(c, true), 3, t) + return ltjs.get_stack_table(stack_ind.XSP + ltjb.in_unicode(c, true), 3, t) end, boxdir = function(c, t) - if type(c)~='number' or c<0 or c>65535 then + if type(c)~='number' or c<0 or c>65535 then ltjb.package_error('luatexja', 'Bad register code (' .. tostring(c) .. ')', 'A register must be between 0 and 65535.\n'.. - 'I changed this one to zero.') + 'I changed this one to zero.') c=0 end return ltjd.get_register_dir(c) @@ -295,7 +267,7 @@ do binary_pars.alxspmode = binary_pars.jaxspmode function luatexja.ext_get_parameter_binary(k, c) if binary_pars[k] then - tex.write(tostring(binary_pars[k](c,tex.getcount('ltj@@stack')))) + tex.write(tostring(binary_pars[k](c,tex.getcount('ltj@@stack')))) end ltjb.stop_time_measure('get_par') end @@ -321,11 +293,10 @@ do ensure_tex_attr(attr_icflag, 0) if gc == 'fin_row' then return head else - --luatexja.ext_show_node_list(head, 'T> ', print) - start_time_measure('jfmglue') - local p = ltjj.main(to_direct(head),mode, dir) - stop_time_measure('jfmglue') - return to_node(p) + start_time_measure('jfmglue') + local p = ltjj.main(to_direct(head),mode, dir) + stop_time_measure('jfmglue') + return to_node(p) end end @@ -340,27 +311,24 @@ do ltjb.add_to_callback( 'pre_linebreak_filter', function (head,groupcode) - return main_process(head, true, tex.textdir, groupcode) + return main_process(head, true, tex.textdir, groupcode) end,'ltj.main', luatexbase.priority_in_callback('pre_linebreak_filter', 'luaotfload.node_processor')+1) ltjb.add_to_callback( 'hpack_filter', function (head,groupcode,size,packtype, dir) - return main_process(head, false, dir, groupcode) + return main_process(head, false, dir, groupcode) end,'ltj.main', luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor')+1) ltjb.add_to_callback('pre_linebreak_filter', adjust_icflag, 'ltj.adjust_icflag', 1) ltjb.add_to_callback('hpack_filter', adjust_icflag, 'ltj.adjust_icflag', 1) - end -- cleanup process function luatexja.ext_cleanup() - ltjf.cleanup_size_cache() - ltjd.remove_end_whatsit() + ltjf.cleanup_size_cache(); ltjd.remove_end_whatsit() end - -- lastnodechar do local id_glyph = node.id('glyph') @@ -368,12 +336,12 @@ do local n = tex.nest[tex.nest.ptr].tail local r = '-1' if n then - if n.id==id_glyph then - while n.componetns and n.subtype and n.subtype%4 >= 2 do - n = node.tail(n) - end - r = tostring(n.char) - end + if n.id==id_glyph then + while n.componetns and n.subtype and n.subtype%4 >= 2 do + n = node.tail(n) + end + r = tostring(n.char) + end end tex.sprint(r) end @@ -398,24 +366,20 @@ local id_math = node.id('math') local id_whatsit = node.id('whatsit') local sid_user = node.subtype('user_defined') -local function get_attr_icflag(p) - return (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG -end - local prefix, inner_depth local utfchar = utf.char local function debug_show_node_X(p,print_fn, limit, inner_depth) local k = prefix local s - local pt=node_type(p.id) - local base = prefix .. string.format('%X', get_attr_icflag(p)) + local pt, pic = node_type(p.id), (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG + local base = prefix .. string.format('%X', pic) .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' if pt == 'glyph' then - s = base .. ' ' .. - (p.char<0xF0000 and utfchar(p.char) or '') - .. string.format(' (U+%X) ', p.char) - .. tostring(p.font) .. ' (' .. print_scaled(p.height) .. '+' - .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + s = base .. ' ' + .. (p.char<0xF0000 and utfchar(p.char) or '') + .. string.format(' (U+%X) ', 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.yoffset) .. ')' @@ -423,13 +387,13 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth) print_fn(s) elseif pt=='hlist' or pt=='vlist' or pt=='unset'or pt=='ins' then if pt=='ins' then - s = base .. '(' .. print_scaled(p.height) .. '+' - .. print_scaled(p.depth) .. ')' - .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + s = base .. '(' .. print_scaled(p.height) .. '+' + .. print_scaled(p.depth) .. ')' + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) else - s = base .. '(' .. print_scaled(p.height) .. '+' - .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) - .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + s = base .. '(' .. print_scaled(p.height) .. '+' + .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) end if (p.shift or 0)~=0 then s = s .. ', shifted ' .. print_scaled(p.shift) @@ -438,125 +402,116 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth) s = s .. ' glue set ' if p.glue_sign == 2 then s = s .. '-' end s = s .. tostring(floor(p.glue_set*10000)/10000) - if p.glue_order == 0 then - s = s .. 'pt' + if p.glue_order == 0 then s = s .. 'pt' else s = s .. 'fi' - for i = 2, p.glue_order do s = s .. 'l' end + for i = 2, p.glue_order do s = s .. 'l' end end end - if get_attr_icflag(p) == icflag_table.PACKED then - s = s .. ' (packed)' - end + if pic == icflag_table.PACKED then s = s .. ' (packed)' end print_fn(s); local bid = inner_depth prefix, inner_depth = prefix.. '.', inner_depth + 1 if inner_depth < limit then - for q in node.traverse(p.head) do - debug_show_node_X(q, print_fn, limit, inner_depth) - end + for q in node.traverse(p.head) do + debug_show_node_X(q, print_fn, limit, inner_depth) + end end prefix=k elseif pt=='rule' then s = base .. '(' .. print_scaled(p.height) .. '+' .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) - .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) print_fn(s) elseif pt=='disc' then print_fn(s) local bid = inner_depth if inner_depth < limit then prefix, inner_depth = k.. 'p.', inner_depth + 1 - for q in node.traverse(p.pre) do - debug_show_node_X(q, print_fn, limit, inner_depth) - end + for q in node.traverse(p.pre) do + debug_show_node_X(q, print_fn, limit, inner_depth) + end prefix = k.. 'P.' - for q in node.traverse(p.post) do - debug_show_node_X(q, print_fn, limit, inner_depth) - end + for q in node.traverse(p.post) do + debug_show_node_X(q, print_fn, limit, inner_depth) + end prefix = k.. 'R.' - for q in node.traverse(p.replace) do - debug_show_node_X(q, print_fn, limit, inner_depth) - end + for q in node.traverse(p.replace) do + debug_show_node_X(q, print_fn, limit, inner_depth) + end end prefix=k elseif pt == 'glue' then s = base .. ' ' .. print_spec(p) - if get_attr_icflag(p)>icflag_table.KINSOKU - and get_attr_icflag(p)<icflag_table.KANJI_SKIP then - s = s .. ' (from JFM: priority ' .. get_attr_icflag(p)-icflag_table.FROM_JFM .. ')' - elseif get_attr_icflag(p)==icflag_table.KANJI_SKIP then - s = s .. ' (kanjiskip)' - elseif get_attr_icflag(p)==icflag_table.KANJI_SKIP_JFM then - s = s .. ' (kanjiskip, JFM specified)' - elseif get_attr_icflag(p)==icflag_table.XKANJI_SKIP then - s = s .. ' (xkanjiskip)' - elseif get_attr_icflag(p)==icflag_table.XKANJI_SKIP_JFM then - s = s .. ' (xkanjiskip, JFM specified)' + if pic>icflag_table.KINSOKU and pic<icflag_table.KANJI_SKIP then + s = s .. ' (from JFM: priority ' .. pic-icflag_table.FROM_JFM .. ')' + elseif pic==icflag_table.KANJI_SKIP then + s = s .. ' (kanjiskip)' + elseif pic==icflag_table.KANJI_SKIP_JFM then + s = s .. ' (kanjiskip, JFM specified)' + elseif pic==icflag_table.XKANJI_SKIP then + s = s .. ' (xkanjiskip)' + elseif pic==icflag_table.XKANJI_SKIP_JFM then + s = s .. ' (xkanjiskip, JFM specified)' end print_fn(s) elseif pt == 'kern' then s = base .. ' ' .. print_scaled(p.kern) .. 'pt' if p.subtype==2 then - s = s .. ' (for accent)' - elseif get_attr_icflag(p)==icflag_table.IC_PROCESSED then - s = s .. ' (italic correction)' - elseif get_attr_icflag(p)==icflag_table.LINEEND then - s = s .. ' (end-of-line)' - -- elseif get_attr_icflag(p)==ITALIC then - -- s = s .. ' (italic correction)' - elseif get_attr_icflag(p)>icflag_table.KINSOKU - and get_attr_icflag(p)<icflag_table.KANJI_SKIP then - s = s .. ' (from JFM: priority ' .. get_attr_icflag(p)-icflag_table.FROM_JFM .. ')' + s = s .. ' (for accent)' + elseif pic==icflag_table.IC_PROCESSED then + s = s .. ' (italic correction)' + elseif pic==icflag_table.LINEEND then + s = s .. ' (end-of-line)' + elseif pic>icflag_table.KINSOKU + and pic<icflag_table.KANJI_SKIP then + s = s .. ' (from JFM: priority ' .. pic-icflag_table.FROM_JFM .. ')' end print_fn(s) elseif pt == 'penalty' then s = base .. ' ' .. tostring(p.penalty) - if get_attr_icflag(p)==icflag_table.KINSOKU then - s = s .. ' (for kinsoku)' - end + if pic==icflag_table.KINSOKU then s = s .. ' (for kinsoku)' end print_fn(s) elseif pt == 'dir' then - s = base .. ' ' .. tostring(p.dir) .. ' (level ' .. tostring(p.level) .. ')' - print_fn(s) + print_fn(base .. ' ' .. tostring(p.dir) .. ' (level ' .. tostring(p.level) .. ')') elseif pt == 'whatsit' then s = base if p.subtype==sid_user then - local t = tostring(p.user_id) .. ' (' .. - luatexbase.get_user_whatsit_name(p.user_id) .. ') ' + local t = tostring(p.user_id) .. ' (' .. + luatexbase.get_user_whatsit_name(p.user_id) .. ') ' if p.type ~= 110 then s = s .. ' userid:' .. t .. p.value print_fn(s) else s = s .. ' userid:' .. t .. '(node list)' - if p.user_id==userid_table.DIR then - s = s .. ' dir: ' .. tostring(node.has_attribute(p, attr_dir)) - end + if p.user_id==uid_table.DIR then + s = s .. ' dir: ' .. tostring(node.has_attribute(p, attr_dir)) + end print_fn(s) - local bid = inner_depth - prefix, inner_depth =prefix.. '.', inner_depth + 1 + local bid = inner_depth + prefix, inner_depth = prefix.. '.', inner_depth + 1 if inner_depth < limit then - for q in node.traverse(p.value) do - debug_show_node_X(q, print_fn, limit, inner_depth) - end - end + for q in node.traverse(p.value) do + debug_show_node_X(q, print_fn, limit, inner_depth) + end + end prefix, inner_depth = k, bid end else s = s .. (node.subtype(p.subtype) or '') - if p.subtype==1 then - s = s .. ' stream=' .. p.stream - print_fn(s) - for i=1,#p.data do - print_fn(s .. ' [' .. i .. '] = ' .. tostring(p.data[i].csname)) - end - else - print_fn(s) - end + if p.subtype==1 then + s = s .. ' stream=' .. p.stream + print_fn(s) + for i=1,#p.data do + print_fn(s .. ' [' .. i .. '] = ' .. tostring(p.data[i].csname)) + end + else + print_fn(s) + end end -------- math node -------- elseif pt=='noad' then - s = base ; print_fn(s) + print_fn(base) if p.nucleus then prefix = k .. 'N'; debug_show_node_X(p.nucleus, print_fn, limit, inner_depth); end @@ -574,9 +529,9 @@ local function debug_show_node_X(p,print_fn, limit, inner_depth) print_fn(base) if p.head then prefix = k .. '.'; - for q in node.traverse(p.head) do - debug_show_node_X(q, print_fn, limit, inner_depth) - end + for q in node.traverse(p.head) do + debug_show_node_X(q, print_fn, limit, inner_depth) + end end else print_fn(base) |