X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-direction.lua;h=089cc88bd81679f263945dd0ea92ad489a0840da;hb=1379fbf6aae445cdce3906e7b83cc1c8550e78d5;hp=042470a6ce73bbe6492b34b0b96315c0f21d1aee;hpb=72dd4273df6e03d84f45bb73e10c827d5742e0bd;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-direction.lua b/src/ltj-direction.lua index 042470a..089cc88 100644 --- a/src/ltj-direction.lua +++ b/src/ltj-direction.lua @@ -42,6 +42,8 @@ local sid_restore = node.subtype('pdf_restore') local sid_matrix = node.subtype('pdf_setmatrix') local sid_user = node.subtype('user_defined') +local tex_getcount = tex.getcount +local tex_set_attr = tex.setattribute local PROCESSED = luatexja.icflag_table.PROCESSED local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG local PACKED = luatexja.icflag_table.PACKED @@ -49,54 +51,56 @@ local STCK = luatexja.userid_table.STCK local DIR = luatexja.userid_table.DIR local dir_tate = luatexja.dir_table.dir_tate local dir_yoko = luatexja.dir_table.dir_yoko +local dir_dtou = luatexja.dir_table.dir_dtou +local dir_node_auto = luatexja.dir_table.dir_node_auto +local dir_node_manual = luatexja.dir_table.dir_node_manual -local get_dir_count -do - local gc = tex.getcount - get_dir_count = function() return gc('ltj@dir@count') end -end -luatexja.direction.get_dir_count = get_dir_count - +local get_dir_count -- \tate, \yoko do - local node_next = node.next - local node_set_attr = node.set_attribute - local function set_list_direction(v, name) - local lv, w = tex.nest[tex.nest.ptr], tex.lists.page_head - if lv.mode == 1 and w then - if w.id==id_whatsit and w.subtype==sid_user - and w.user_id==DIR then - node_set_attr(w, attr_dir, v) - - end - else - local w = node_next(to_direct(lv.head)) - if to_node(w) then - if getid(w)==id_whatsit and getsubtype(w)==sid_user - and getfield(w, 'user_id')==DIR then - set_attr(w, attr_dir, v) - tex.setattribute('global', attr_dir, 0) - else + local abs = math.abs + function get_dir_count() + return tex_getcount('ltj@dir@count') + end + luatexja.direction.get_dir_count = get_dir_count + + local node_next = node.next + local node_set_attr = node.set_attribute + local function set_list_direction(v, name) + local lv, w = tex.nest[tex.nest.ptr], tex.lists.page_head + if lv.mode == 1 and w then + if w.id==id_whatsit and w.subtype==sid_user + and w.user_id==DIR then + node_set_attr(w, attr_dir, v) + end + else + local w = node_next(to_direct(lv.head)) + if to_node(w) then + if getid(w)==id_whatsit and getsubtype(w)==sid_user + and getfield(w, 'user_id')==DIR then + set_attr(w, attr_dir, v) + tex_set_attr('global', attr_dir, 0) + else ltjb.package_error( 'luatexja', "Use `\\" .. name .. "' at top of list", 'Direction change command by LuaTeX-ja is available\n' - .. 'only while current list is null.') - end - else - local w = node_new(id_whatsit, sid_user) - setfield(w, 'next', hd) - setfield(w, 'user_id', DIR) - setfield(w, 'type', 110) - set_attr(w, attr_dir, v) - Dnode.write(w) - tex.setattribute('global', attr_dir, 0) - end - tex.setattribute('global', attr_icflag, 0) - end - end - luatexja.direction.set_list_direction = set_list_direction + .. 'only when the current list is null.') + end + else + local w = node_new(id_whatsit, sid_user) + setfield(w, 'next', hd) + setfield(w, 'user_id', DIR) + setfield(w, 'type', 110) + set_attr(w, attr_dir, v) + Dnode.write(w) + tex_set_attr('global', attr_dir, 0) + end + tex_set_attr('global', attr_icflag, 0) + end + end + luatexja.direction.set_list_direction = set_list_direction end -- ボックスに dir whatsit を追加 @@ -106,21 +110,22 @@ local function create_dir_whatsit(hd, gc, new_dir) setfield(w, 'user_id', DIR) setfield(w, 'type', 110) set_attr(w, attr_dir, new_dir) - tex.setattribute('global', attr_dir, 0) + tex_set_attr('global', attr_dir, 0) set_attr(w, attr_icflag, PROCESSED_BEGIN_FLAG) set_attr(hd, attr_icflag, (has_attr(hd, attr_icflag) or 0) + PROCESSED_BEGIN_FLAG) - tex.setattribute('global', attr_icflag, 0) + tex_set_attr('global', attr_icflag, 0) return w end +-- hpack_filter, vpack_filter, post_line_break_filter +-- の結果を組方向を明示するため，先頭に dir_node を設置 do - local tex_getcount = tex.getcount local function create_dir_whatsit_hpack(h, gc) local hd = to_direct(h) if gc=='fin_row' or gc == 'preamble' then if hd then set_attr(hd, attr_icflag, PROCESSED_BEGIN_FLAG) - tex.setattribute('global', attr_icflag, 0) + tex_set_attr('global', attr_icflag, 0) end return h else @@ -131,19 +136,37 @@ do luatexbase.add_to_callback('hpack_filter', create_dir_whatsit_hpack, 'ltj.create_dir_whatsit', 10000) + local wh = {} + local id_glue, sid_parskip = node.id('glue'), 3 local function create_dir_whatsit_vbox(h, gc) - local hd= to_direct(h) + local hd = to_direct(h) ltjs.list_dir = get_dir_count() - if getid(hd)==id_whatsit and getsubtype(hd)==sid_user - and getfield(hd, 'user_id')==DIR then - ltjs.list_dir = has_attr(hd, attr_dir) - return h - elseif gc=='fin_row' or gc == 'preamble' then + -- remove dir whatsit + for x in traverse_id(id_whatsit, hd) do + if getsubtype(x)==sid_user and getfield(x, 'user_id')==DIR then + wh[#wh+1]=x + end + end + if hd==wh[1] then + ltjs.list_dir = has_attr(hd,attr_dir) + local x = node_next(hd) + if getid(x)==id_glue and getsubtype(x)==sid_parskip then + node_remove(hd,x); node_free(x) + end + end + for i=1,#wh do hd = node_remove(hd, wh[i]); node_free(wh[i]); wh[i] = nil end + if gc=='fin_row' or gc == 'preamble' then if hd then set_attr(hd, attr_icflag, PROCESSED_BEGIN_FLAG) - tex.setattribute('global', attr_icflag, 0) + tex_set_attr('global', attr_icflag, 0) end - return h + return to_node(hd) + elseif gc=='vtop' then + local w = create_dir_whatsit(hd, gc, ltjs.list_dir) + -- move dir whatsit after hd + local n = getfield(hd, 'next') + setfield(hd, 'next', w); setfield(w, 'next', n) + return to_node(hd) else return to_node(create_dir_whatsit(hd, gc, ltjs.list_dir)) end @@ -158,25 +181,28 @@ do for line in traverse_id(id_hlist, hd) do set_attr(line, attr_dir, new_dir) end + tex_set_attr('global', attr_dir, 0) return to_node(create_dir_whatsit(hd, gc, new_dir)) end - luatexbase.add_to_callback('post_linebreak_filter', + luatexbase.add_to_callback('post_linebreak_filter', create_dir_whatsit_parbox, 'ltj.create_dir_whatsit', 10000) end - +-- dir_node に包む方法を書いたテーブル local dir_node_aux do local get_h =function (w,h,d) return h end local get_d =function (w,h,d) return d end local get_h_d =function (w,h,d) return h+d end + local get_h_d_neg =function (w,h,d) return -h-d end local get_h_neg =function (w,h,d) return -h end local get_d_neg =function (w,h,d) return -d end local get_w_half =function (w,h,d) return 0.5*w end local get_w_neg_half =function (w,h,d) return -0.5*w end local get_w_neg =function (w,h,d) return -w end local get_w =function (w,h,d) return w end + local zero = function() return 0 end dir_node_aux = { [dir_yoko] = { -- yoko を [dir_tate] = { -- tate 中で組む @@ -184,20 +210,38 @@ do height = get_w_half, depth = get_w_half, [id_hlist] = { - { 'kern', get_h }, { 'whatsit', sid_save }, { 'rotate', '0 1 -1 0' }, { 'kern', get_w_neg_half }, - { 'box' }, + { 'box' , get_h }, { 'kern', get_w_neg_half }, { 'whatsit', sid_restore }, }, [id_vlist] = { - { 'kern', get_w}, { 'whatsit', sid_save }, { 'rotate', '0 1 -1 0' }, - { 'box' }, - { 'kern', get_h_neg}, + { 'kern' , zero }, + { 'box' , get_w_neg }, + { 'kern', get_h_d_neg}, + { 'whatsit', sid_restore }, + }, + }, + [dir_dtou] = { -- dtou 中で組む + width = get_h_d, + height = get_w, + depth = zero, + [id_hlist] = { + { 'whatsit', sid_save }, + { 'rotate', '0 -1 1 0' }, + { 'kern', get_w_neg }, + { 'box', get_d_neg }, + { 'whatsit', sid_restore }, + }, + [id_vlist] = { + { 'whatsit', sid_save }, + { 'rotate', '0 -1 1 0' }, + { 'kern', get_h_d_neg }, + { 'box', zero }, { 'whatsit', sid_restore }, }, }, @@ -206,21 +250,80 @@ do [dir_yoko] = { -- yoko 中で組む width = get_h_d, height = get_w, - depth = function() return 0 end, + depth = zero, [id_hlist] = { - { 'kern', get_d }, { 'whatsit', sid_save }, { 'rotate', '0 -1 1 0' }, { 'kern', get_w_neg }, - { 'box' }, + { 'box' , get_d_neg }, { 'whatsit', sid_restore }, }, [id_vlist] = { { 'whatsit', sid_save }, { 'rotate', '0 -1 1 0' }, - { 'kern', get_h_neg }, - { 'kern', get_d_neg }, - { 'box' }, + { 'kern', get_h_d_neg }, + { 'box', zero }, + { 'whatsit', sid_restore }, + }, + }, + [dir_dtou] = { -- dtou 中で組む + width = get_w, + height = get_d, + depth = get_h, + [id_hlist] = { + { 'whatsit', sid_save }, + { 'rotate', '-1 0 0 -1' }, + { 'kern', get_w_neg }, + { 'box', zero }, + { 'whatsit', sid_restore }, + }, + [id_vlist] = { + { 'whatsit', sid_save }, + { 'rotate', '-1 0 0 -1' }, + { 'kern', get_h_d_neg }, + { 'box', get_w_neg }, + { 'whatsit', sid_restore }, + }, + }, + }, + [dir_dtou] = { -- dtou を + [dir_yoko] = { -- yoko 中で組む + width = get_h_d, + height = get_w, + depth = zero, + [id_hlist] = { + { 'whatsit', sid_save }, + { 'rotate', '0 1 -1 0' }, + { 'kern', zero }, + { 'box', get_h }, + { 'kern', get_w_neg }, + { 'whatsit', sid_restore }, + }, + [id_vlist] = { + { 'kern', zero }, + { 'whatsit', sid_save }, + { 'rotate', '0 1 -1 0' }, + { 'box', get_w_neg }, + { 'kern', get_h_d_neg }, + { 'whatsit', sid_restore }, + }, + }, + [dir_tate] = { -- tate 中で組む + width = get_w, + height = get_d, + depth = get_h, + [id_hlist] = { + { 'whatsit', sid_save }, + { 'rotate', '-1 0 0 -1' }, + { 'kern', get_w_neg }, + { 'box', zero }, + { 'whatsit', sid_restore }, + }, + [id_vlist] = { + { 'whatsit', sid_save }, + { 'rotate', ' -1 0 0 -1' }, + { 'kern', get_h_d_neg }, + { 'box', get_w_neg }, { 'whatsit', sid_restore }, }, }, @@ -228,97 +331,82 @@ do } end +-- b に DIR whatsit があればその内容を attr_dir にうつす (1st ret val) +-- 2nd ret val はその DIR whatsit local function get_box_dir(b, default) - -- b に DIR whatsit があればその内容を attr_dir にうつす (1st ret val) local dir = has_attr(b, attr_dir) or 0 local bh = getlist(b) local c - if bh and getid(bh)==id_whatsit - and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then - c = bh - if dir==0 then - dir = has_attr(bh, attr_dir) - set_attr(b, attr_dir, dir) - tex.setattribute('global', attr_dir, 0) + for i=1,2 do + if bh and getid(bh)==id_whatsit + and getsubtype(bh)==sid_user and getfield(bh, 'user_id')==DIR then + c = bh + if dir==0 then + dir = has_attr(bh, attr_dir) + set_attr(b, attr_dir, dir) + tex_set_attr('global', attr_dir, 0) + end end + bh = node_next(bh) end return (dir==0 and default or dir), c end -local function unwrap_dir_node(b, head) - -- head: nil or nil-nil - -- if head is non-nil, return values are (new head), (next of b), (contents) +-- dir_node に包まれている「本来の中身」を取り出し， +-- dir_node を全部消去 +local function unwrap_dir_node(b, head, box_dir) + -- b: dir_node, head: the head of list, box_dir: + -- return values are (new head), (next of b), (contents), (dir of contents) local bh = getlist(b) - local bc = node_next(node_next(node_next(node_next(bh)))) + local bc = node_next(node_next(node_next(bh))) local nh, nb node_remove(bh, bc); + Dnode.flush_list(bh) if head then nh = insert_before(head, b, bc) nh, nb = node_remove(nh, b) + setfield(b, 'next', nil) + setfield(b, 'head', nil) + node_free(b) end - setfield(b, 'list', nil); Dnode.flush_list(bh) - local d, wh = get_box_dir(bc, 0) - if not wh then - wh = create_dir_whatsit(getlist(bc), 'unwrap', d) + local shift_old, b_dir, wh = nil, get_box_dir(bc, 0) + if wh then + Dnode.flush_list(getfield(wh, 'value')) + setfield(wh, 'value', nil) end - local h = getfield(wh, 'value') - if h then setfield(b, 'next', h) end - setfield(wh, 'value', to_node(b)) - return nh, nb, bc -end - - --- \wd, \ht, \dp の代わり -do - local getbox = tex.getbox - local function get_box_dim(key, n) - local gt = tex.globaldefs; tex.globaldefs = 0 - local s = getbox(n) - if s then - s = to_direct(s) - local s_dir, wh = get_box_dir(s, dir_yoko) - local l_dir = get_dir_count() - if s_dir ~= l_dir then - local not_found = true - for x in traverse(getfield(wh, 'value')) do - if l_dir == -has_attr(x, attr_dir) then - tex.setdimen('ltj@tempdima', getfield(x, key)) - not_found = false; break - end - end - if not_found then - local w = getfield(s, 'width') - local h = getfield(s, 'height') - local d = getfield(s, 'depth') - tex.setdimen('ltj@tempdima', dir_node_aux[s_dir][l_dir][key](w,h,d)) - end - else - tex.setdimen('ltj@tempdima', getfield(s, key)) - end - else - tex.setdimen('ltj@tempdima', 0) - end - tex.globaldefs = gt - end - luatexja.direction.get_box_dim = get_box_dim - local function set_box_dim(key) - local n = tex.getcount('ltj@tempcnta') - local s = getbox(n) - if s then - s = to_direct(s) - local s_dir, wh = get_box_dir(s, dir_yoko) - local l_dir = get_dir_count() - if s_dir ~= l_dir then - print('setting ' .. key .. ' of different direction box is not supported') - -- TODO - else - setfield(s, key, tex.getdimen('ltj@tempdima')) - end + -- recalc. info + local info = dir_node_aux[b_dir][box_dir%dir_node_auto][getid(bc)] + for _,v in ipairs(info) do + if v[1]=='box' then + shift_old = v[2]( + getfield(bc,'width'), getfield(bc, 'height'), getfield(bc, 'depth')) + break end end - luatexja.direction.set_box_dim = set_box_dim + setfield(bc, 'shift', getfield(bc, 'shift') - shift_old) + return nh, nb, bc, b_dir +end + +-- is_manual: 寸法変更に伴うものか？ +local function create_dir_node(b, b_dir, new_dir, is_manual) + local info = dir_node_aux[b_dir][new_dir] + local w = getfield(b, 'width') + local h = getfield(b, 'height') + local d = getfield(b, 'depth') + local db = node_new(getid(b)) + set_attr(db, attr_dir, + new_dir + (is_manual and dir_node_manual or dir_node_auto)) + set_attr(db, attr_icflag, PROCESSED) + set_attr(b, attr_icflag, PROCESSED) + setfield(db, 'dir', getfield(b, 'dir')) + setfield(db, 'shift', 0) + setfield(db, 'width', info.width(w,h,d)) + setfield(db, 'height', info.height(w,h,d)) + setfield(db, 'depth', info.depth(w,h,d)) + return db end +-- 異方向のボックスの処理 local make_dir_whatsit do make_dir_whatsit = function (head, b, new_dir, origin) @@ -326,58 +414,67 @@ do -- origin: コール元 (for debug) -- return value: (new head), (next of b), (new b), (is_b_dir_node) -- (new b): b か dir_node に被せられた b - local box_dir = has_attr(b, attr_dir) or 0 local bh = getlist(b) local box_dir, dn = get_box_dir(b, ltjs.list_dir) -- 既に b の中身にあるwhatsit if box_dir==new_dir then return head, node_next(b), b, false - elseif -box_dir == new_dir then + elseif box_dir%dir_node_auto == new_dir then + local bc = node_next(node_next(node_next(bh))) + local _, dnc = get_box_dir(b, 0) + if dnc then -- free all other dir_node + Dnode.flush_list(getfield(dnc, 'value')) + setfield(dnc, 'value', nil) + end + set_attr(b, attr_dir, box_dir%dir_node_auto + dir_node_auto) return head, node_next(b), b, true else - local nh, nb, ret, flag - if box_dir < 0 then - -- b itself is a dir node; just unwrap - nh, nb, ret = unwrap_dir_node(b,head) - flag = false - else - local bid = getid(b) - local db = node_new(bid) -- dir node - nh, nb = insert_before(head, b, db), nil - nh, nb = node_remove(nh, b) - local w = getfield(b, 'width') - local h = getfield(b, 'height') - local d = getfield(b, 'depth') - local info = dir_node_aux[box_dir][new_dir] - set_attr(db, attr_dir, -new_dir) - set_attr(b, attr_icflag, PROCESSED) - set_attr(db, attr_icflag, PROCESSED) - setfield(db, 'dir', getfield(b, 'dir')) - setfield(db, 'shift', 0) - setfield(db, 'width', info.width(w,h,d)) - setfield(db, 'height', info.height(w,h,d)) - setfield(db, 'depth', info.depth(w,h,d)) - local db_head, db_tail = nil - for _,v in ipairs(info[bid]) do - local cmd, arg, nn = v[1], v[2] - if cmd=='kern' then - nn = node_new(id_kern) - setfield(nn, 'kern', arg(w, h, d)) - elseif cmd=='whatsit' then - nn = node_new(id_whatsit, arg) - elseif cmd=='rotate' then - nn = node_new(id_whatsit, sid_matrix) - setfield(nn, 'data', arg) - elseif cmd=='box' then - nn = b; setfield(b, 'next', nil) - end - if db_head then - insert_after(db_head, db_tail, nn) - db_tail = nn + local nh, nb, ret, flag + if box_dir>= dir_node_auto then -- unwrap + local b_dir + head, nb, b, b_dir = unwrap_dir_node(b, head, box_dir) + bh = getlist(b) + if b_dir==new_dir then -- no need to create new dir_node + return head, nb, b, false + else box_dir = b_dir end + end + local db + local dnh = getfield(dn, 'value') + for x in traverse(dnh) do + if has_attr(x, attr_dir)%dir_node_auto == new_dir then + setfield(dn, 'value', to_node(node_remove(dnh, x))) + db=x; break + end + end + Dnode.flush_list(dnh) + db = db or create_dir_node(b, box_dir, new_dir, false) + local w = getfield(b, 'width') + local h = getfield(b, 'height') + local d = getfield(b, 'depth') + nh, nb = insert_before(head, b, db), nil + nh, nb = node_remove(nh, b) + local db_head, db_tail = nil + for _,v in ipairs(dir_node_aux[box_dir][new_dir][getid(b)]) do + local cmd, arg, nn = v[1], v[2] + if cmd=='kern' then + nn = node_new(id_kern) + setfield(nn, 'kern', arg(w, h, d)) + elseif cmd=='whatsit' then + nn = node_new(id_whatsit, arg) + elseif cmd=='rotate' then + nn = node_new(id_whatsit, sid_matrix) + setfield(nn, 'data', arg) + elseif cmd=='box' then + nn = b; setfield(b, 'next', nil) + setfield(nn, 'shift', getfield(nn, 'shift') + arg(w,h,d)) + end + if db_head then + insert_after(db_head, db_tail, nn) + db_tail = nn else db_head, db_tail = nn, nn end - end + --end setfield(db, 'head', db_head) ret, flag = db, true end @@ -405,6 +502,169 @@ do process_dir_node, 'ltj.dir_whatsit', 10001) end +-- \wd, \ht, \dp の代わり +do + local getbox, setdimen = tex.getbox, tex.setdimen + local function get_box_dim_common(key, s, l_dir) + local s_dir, wh = get_box_dir(s, dir_yoko) + if s_dir ~= l_dir then + local not_found = true + for x in traverse(getfield(wh, 'value')) do + if l_dir == has_attr(x, attr_dir)%dir_node_auto then + setdimen('ltj@tempdima', getfield(x, key)) + not_found = false; break + end + end + if not_found then + local w = getfield(s, 'width') + local h = getfield(s, 'height') + local d = getfield(s, 'depth') + setdimen('ltj@tempdima', + dir_node_aux[s_dir][l_dir][key](w,h,d)) + end + else + setdimen('ltj@tempdima', getfield(s, key)) + end + end + local function get_box_dim(key, n) + local gt = tex.globaldefs; tex.globaldefs = 0 + local s = getbox(n) + if s then + local l_dir = get_dir_count() + s = to_direct(s) + local b_dir = has_attr(s, attr_dir) or 0 + if b_dir