X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fluatexja.lua;h=70f576ad25e600e8aee062aea16d657185e698fb;hb=0526b27bf88ed7f2adedef267f4d9226f6f5a692;hp=cba73a37d67b54c5e9c278f7cf347e37ee98acb7;hpb=dc0021e373e16412b16c04c39f1e79825769c15c;p=luatex-ja%2Fluatexja.git diff --git a/src/luatexja.lua b/src/luatexja.lua index cba73a3..70f576a 100644 --- a/src/luatexja.lua +++ b/src/luatexja.lua @@ -65,8 +65,11 @@ luatexja.dir_table = dir_table dir_table.dir_dtou = 1 dir_table.dir_tate = 3 dir_table.dir_yoko = 4 -dir_table.dir_node_auto = 16 -- 組方向を合わせるために自動で作られたもの -dir_table.dir_node_manual = 32 -- 寸法代入によって作られたもの +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 ------------------------------------------------------------------------ @@ -116,32 +119,15 @@ load_module('rmlgbm'); local ltjr = luatexja.rmlgbm -- must be 1st if luatexja_debug then load_module('debug') end load_module('charrange'); local ltjc = luatexja.charrange +load_module('stack'); local ltjs = luatexja.stack +load_module('direction'); local ltjd = luatexja.direction load_module('jfont'); local ltjf = luatexja.jfont - --- define_font -do - local otfl_fdr = fonts.definers.read - local ltjr_font_callback = ltjr.font_callback - local ltjf_extract_metric = ltjf.extract_metric - function luatexja.font_callback(name, size, id) - local new_name = ltjf_extract_metric(name) - local res = ltjr_font_callback(new_name, size, id, otfl_fdr) - luatexbase.call_callback('luatexja.define_font', res, new_name, size, id) - return res - end - luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end) - luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1) -end - - load_module('inputbuf'); local ltji = luatexja.inputbuf -load_module('stack'); local ltjs = luatexja.stack load_module('pretreat'); local ltjp = luatexja.pretreat load_module('jfmglue'); local ltjj = luatexja.jfmglue load_module('setwidth'); local ltjw = luatexja.setwidth load_module('math'); local ltjm = luatexja.math load_module('tangle'); local ltjb = luatexja.base -load_module('direction'); local ltjd = luatexja.direction local attr_jchar_class = luatexbase.attributes['ltj@charclass'] local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] @@ -243,7 +229,15 @@ do elseif f == math.two_add then r = 'both' end return r - end + 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 + end, + adjustdir = ltjd.get_adjust_dir_count, } local unary_pars = luatexja.unary_pars @@ -251,6 +245,7 @@ do if unary_pars[k] then tex.write(tostring(unary_pars[k](tex.getcount('ltj@@stack')))) end + ltjb.stop_time_measure('get_par') end end @@ -291,6 +286,16 @@ do return ltjs.get_stack_table(stack_table_index.XSP + ltjb.in_unicode(c, true), 3, t) end, + boxdir = function(c, t) + 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.') + c=0 + end + return ltjd.get_register_dir(c) + end, } local binary_pars = luatexja.binary_pars @@ -299,6 +304,7 @@ do if binary_pars[k] then tex.write(tostring(binary_pars[k](c,tex.getcount('ltj@@stack')))) end + ltjb.stop_time_measure('get_par') end end @@ -322,12 +328,10 @@ do tex_set_attr('global', attr_icflag, 0) if gc == 'fin_row' then return head else - local p = to_direct(head) + --luatexja.ext_show_node_list(head, 'T> ', print) start_time_measure('jfmglue') - p = ltjj.main(p,mode) - stop_time_measure('jfmglue'); start_time_measure('setwidth') - if p then p = ltjw.set_ja_width(p, dir) end - stop_time_measure('setwidth') + local p = ltjj.main(to_direct(head),mode, dir) + stop_time_measure('jfmglue') return to_node(p) end end @@ -383,13 +387,13 @@ local function get_attr_icflag(p) return (has_attr(p, attr_icflag) or 0) % icflag_table.PROCESSED_BEGIN_FLAG end -local debug_depth +local prefix, inner_depth -local function debug_show_node_X(p,print_fn) - local k = debug_depth +local function debug_show_node_X(p,print_fn, limit) + local k = prefix local s local pt=node_type(p.id) - local base = debug_depth .. string.format('%X', get_attr_icflag(p)) + local base = prefix .. string.format('%X', get_attr_icflag(p)) .. ' ' .. pt .. ' ' .. tostring(p.subtype) .. ' ' if pt == 'glyph' then s = base .. ' ' .. utf.char(p.char) .. ' ' @@ -397,14 +401,20 @@ local function debug_show_node_X(p,print_fn) .. ' (' .. print_scaled(p.height) .. '+' .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) print_fn(s) - elseif pt=='hlist' or pt=='vlist' or pt=='unset' then - s = base .. '(' .. print_scaled(p.height) .. '+' - .. print_scaled(p.depth) .. ')x' .. print_scaled(p.width) - .. ', dir=' .. tostring(node.has_attribute(p, attr_dir)) + 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)) + else + 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) end - if p.glue_sign >= 1 then + if p.glue_set and p.glue_sign ==2 or ( p.glue_sign==1 and p.glue_set>0) then s = s .. ' glue set ' if p.glue_sign == 2 then s = s .. '-' end s = s .. tostring(floor(p.glue_set*10000)/10000) @@ -418,11 +428,20 @@ local function debug_show_node_X(p,print_fn) if get_attr_icflag(p) == icflag_table.PACKED then s = s .. ' (packed)' end - print_fn(s); debug_depth=debug_depth.. '.' - for q in node.traverse(p.head) do - debug_show_node_X(q, print_fn) + 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) + end end - debug_depth=k + 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)) + print_fn(s) elseif pt == 'glue' then s = base .. ' ' .. print_spec(p.spec) if get_attr_icflag(p)>icflag_table.KINSOKU @@ -471,35 +490,47 @@ local function debug_show_node_X(p,print_fn) s = s .. ' dir: ' .. tostring(node.has_attribute(p, attr_dir)) end print_fn(s) - debug_depth=debug_depth.. '.' - for q in node.traverse(p.value) do - debug_show_node_X(q, print_fn) - end - debug_depth=k + 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) + end + end + prefix, inner_depth = k, bid end else - s = s .. node.subtype(p.subtype); print_fn(s) + s = s .. node.subtype(p.subtype) + if p.subtype==1 then + s = s .. ' stream=' .. p.stream + print_fn(s) + for i=1,#p.data do + print_fn(base .. ' [' .. i .. '] = ' .. tostring(p.data[i])) + end + else + print_fn(s) + end end -------- math node -------- elseif pt=='noad' then s = base ; print_fn(s) if p.nucleus then - debug_depth = k .. 'N'; debug_show_node_X(p.nucleus, print_fn); + prefix = k .. 'N'; debug_show_node_X(p.nucleus, print_fn); end if p.sup then - debug_depth = k .. '^'; debug_show_node_X(p.sup, print_fn); + prefix = k .. '^'; debug_show_node_X(p.sup, print_fn); end if p.sub then - debug_depth = k .. '_'; debug_show_node_X(p.sub, print_fn); + prefix = k .. '_'; debug_show_node_X(p.sub, print_fn); end - debug_depth = k; + prefix = k; elseif pt=='math_char' then s = base .. ' fam: ' .. p.fam .. ' , char = ' .. utf.char(p.char) print_fn(s) elseif pt=='sub_box' or pt=='sub_mlist' then print_fn(base) if p.head then - debug_depth = k .. '.'; + prefix = k .. '.'; for q in node.traverse(p.head) do debug_show_node_X(q, print_fn) end @@ -509,22 +540,24 @@ local function debug_show_node_X(p,print_fn) end p=node_next(p) end -function luatexja.ext_show_node_list(head,depth,print_fn) - debug_depth = depth +function luatexja.ext_show_node_list(head,depth,print_fn, lim) + prefix = depth + inner_depth = 0 if head then while head do - debug_show_node_X(head, print_fn); head = node_next(head) + debug_show_node_X(head, print_fn, lim or 1/0); head = node_next(head) end else - print_fn(debug_depth .. ' (null list)') + print_fn(prefix .. ' (null list)') end end -function luatexja.ext_show_node(head,depth,print_fn) - debug_depth = depth +function luatexja.ext_show_node(head,depth,print_fn, lim) + prefix = depth + inner_depth = 0 if head then - debug_show_node_X(head, print_fn) + debug_show_node_X(head, print_fn, lim or 1/0) else - print_fn(debug_depth .. ' (null list)') + print_fn(prefix .. ' (null list)') end end