X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfmglue.lua;h=a247bde0fb5769fa719506f40ee8b95892f789de;hb=2dc84e18ca89147ac3621c4848edc76e929fb681;hp=8946027d9eb9fdc90f5b2a681d1a48226e451155;hpb=a693b63eadfcabe5f4f513a4cc90302f2360b18b;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua index 8946027..a247bde 100644 --- a/src/ltj-jfmglue.lua +++ b/src/ltj-jfmglue.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfmglue', - date = '2014/02/01', + date = '2014/02/02', description = 'Insertion process of JFM glues and kanjiskip', }) module('luatexja.jfmglue', package.seeall) @@ -11,6 +11,7 @@ local err, warn, info, log = luatexbase .errwarinf(_NAME) luatexja.load_module('stack'); local ltjs = luatexja.stack luatexja.load_module('jfont'); local ltjf = luatexja.jfont +luatexja.load_module('direction'); local ltjd = luatexja.direction local pairs = pairs local Dnode = node.direct or node @@ -31,8 +32,9 @@ local has_attr = Dnode.has_attribute local set_attr = Dnode.set_attribute local insert_before = Dnode.insert_before local insert_after = Dnode.insert_after -local node_next = Dnode.getnext +local node_next = (Dnode ~= node) and Dnode.getnext or node.next local round = tex.round +local ltjd_make_dir_node = ltjd.make_dir_node local ltjf_font_metric_table = ltjf.font_metric_table local ltjf_find_char_class = ltjf.find_char_class local node_new = Dnode.new @@ -42,6 +44,8 @@ local node_tail = Dnode.tail local node_free = Dnode.free local node_end_of_math = Dnode.end_of_math +local dir_tate = 3 +local dir_yoko = 4 local id_glyph = node.id('glyph') local id_hlist = node.id('hlist') @@ -80,8 +84,10 @@ local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG local kanji_skip local xkanji_skip local table_current_stack +local list_dir local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] +local attr_dir = luatexbase.attributes['ltj@dir'] local attr_icflag = luatexbase.attributes['ltj@icflag'] local function get_attr_icflag(p) @@ -90,7 +96,7 @@ end -------------------- Helper functions -local function copy_attr(new, old) +local function copy_attr(new, old) -- 仕様が決まるまで off にしておく end @@ -164,10 +170,11 @@ local ihb_flag -- JFM グルー挿入抑止用 flag -------------------- hlist 内の文字の検索 local first_char, last_char, find_first_char - +do +local ltjd_glyph_from_packed = ltjd.glyph_from_packed local function check_box(box_ptr, box_end) local p = box_ptr; local found_visible_node = false - if not p then + if not p then find_first_char = false; last_char = nil return true end @@ -177,13 +184,13 @@ local function check_box(box_ptr, box_end) p = node_next(node_next(node_next(p))); pid = getid(p) -- p must be glyph_node end if pid==id_glyph then - repeat - if find_first_char then + repeat + if find_first_char then first_char = p; find_first_char = false end last_char = p; found_visible_node = true; p=node_next(p) - if (not p) or p==box_end then - return found_visible_node + if (not p) or p==box_end then + return found_visible_node end until getid(p)~=id_glyph pid = getid(p) -- p must be non-nil @@ -194,7 +201,7 @@ local function check_box(box_ptr, box_end) if pa==IC_PROCESSED then -- do nothing elseif getsubtype(p)==2 then - p = node_next(node_next(p)); + p = node_next(node_next(p)); -- Note that another node_next will be executed outside this if-statement. else found_visible_node = true @@ -202,19 +209,20 @@ local function check_box(box_ptr, box_end) end elseif pid==id_hlist then if PACKED == get_attr_icflag(p) then + local s = ltjd_glyph_from_packed(p) if find_first_char then - first_char = getlist(p); find_first_char = false + first_char = s; find_first_char = false end - last_char = getlist(p); found_visible_node = true + last_char = s; found_visible_node = true else if getfield(p, 'shift')==0 then if check_box(getlist(p), nil) then found_visible_node = true end - else + else find_first_char = false; last_char = nil end end elseif pid==id_math then - if find_first_char then + if find_first_char then first_char = p; find_first_char = false end last_char = p; found_visible_node = true @@ -228,7 +236,7 @@ local function check_box(box_ptr, box_end) p = node_next(p) end return found_visible_node -end +end function check_box_high(Nx, box_ptr, box_end) first_char = nil; last_char = nil; find_first_char = true @@ -236,7 +244,7 @@ function check_box_high(Nx, box_ptr, box_end) local first_char = first_char if first_char then if getid(first_char)==id_glyph then - if getfont(first_char) == (has_attr(first_char, attr_curjfnt) or -1) then + if getfont(first_char) == (has_attr(first_char, attr_curjfnt) or -1) then set_np_xspc_jachar(Nx, first_char) else set_np_xspc_alchar(Nx, getchar(first_char),first_char, 1) @@ -248,43 +256,43 @@ function check_box_high(Nx, box_ptr, box_end) end return last_char end - +end -------------------- Np の計算と情報取得 -luatexbase.create_callback("luatexja.jfmglue.whatsit_getinfo", "data", - function (Np, lp, Nq) - if Np.nuc then return Np - else +luatexbase.create_callback("luatexja.jfmglue.whatsit_getinfo", "data", + function (Np, lp, Nq) + if Np.nuc then return Np + else return Np -- your code end end) -luatexbase.create_callback("luatexja.jfmglue.whatsit_after", "data", +luatexbase.create_callback("luatexja.jfmglue.whatsit_after", "data", function (stat, Nq, Np) return false end) -- calc next Np do local function set_attr_icflag_processed(p) - if get_attr_icflag(p)<= ITALIC then - set_attr(p, attr_icflag, PROCESSED) + if get_attr_icflag(p)<= ITALIC then + set_attr(p, attr_icflag, PROCESSED) end end local function check_next_ickern(lp) - if getid(lp) == id_kern and ITALIC == get_attr_icflag(lp) then + if lp and getid(lp) == id_kern and ITALIC == get_attr_icflag(lp) then set_attr(lp, attr_icflag, IC_PROCESSED) Np.last = lp; return node_next(lp) - else + else Np.last = Np.nuc; return lp end end -local function calc_np_pbox(lp) +local function calc_np_pbox(lp, last) Np.first = Np.first or lp; Np.id = id_pbox local lpa, nc = KINSOKU, nil set_attr(lp, attr_icflag, get_attr_icflag(lp)); - while lp and (lpa>=PACKED) and (lpa=PACKED) and (lpa=PACKED then if lpa%PROCESSED_BEGIN_FLAG == BOXBDD then - local lq = node_next(lp) + local lq = node_next(lp) head = node_remove(head, lp); node_free(lp); lp = lq - else return calc_np_pbox(lp) + else return calc_np_pbox(lp, last) end -- id_pbox else k, lp = calc_np_auxtable[getid(lp)](lp) @@ -420,7 +435,8 @@ local calc_np = calc_np -- We think that "Np is a Japanese character" if Np.met~=nil, -- "Np is an alphabetic character" if Np.pre~=nil, -- "Np is not a character" otherwise. -local after_hlist, after_alchar, extract_np +after_hlist = nil -- global +local after_alchar, extract_np do local PRE = luatexja.stack_table_index.PRE local POST = luatexja.stack_table_index.POST @@ -434,15 +450,23 @@ do local attr_autoxspc = luatexbase.attributes['ltj@autoxspc'] function set_np_xspc_jachar(Nx, x) local m = ltjf_font_metric_table[getfont(x)] - local cls, c = slow_find_char_class(has_attr(x, attr_orig_char), m, getchar(x)) - Nx.met, Nx.char = m, c; Nx.class = cls; + local cls, c + if list_dir == dir_tate then + local c1, c2 = getchar(x), has_attr(x, attr_orig_char) + c = has_attr(x, attr_dir) or c1 or c2 + cls = ltjf_find_char_class(c, m) + if cls==0 then cls = slow_find_char_class(c2, m, c1) end + else + cls, c = slow_find_char_class(has_attr(x, attr_orig_char), m, getchar(x)) + end + Nx.met, Nx.char = m, c; Nx.class = cls; if cls~=0 then set_attr(x, attr_jchar_class, cls) end Nx.pre = table_current_stack[PRE + c] or 0 Nx.post = table_current_stack[POST + c] or 0 Nx.xspc = table_current_stack[XSP + c] or 3 Nx.kcat = table_current_stack[KCAT + c] or 0 Nx.auto_kspc, Nx.auto_xspc = (has_attr(x, attr_autospc)==1), (has_attr(x, attr_autoxspc)==1) - end + end local set_np_xspc_jachar = set_np_xspc_jachar -- 欧文文字のデータを取得 @@ -479,14 +503,14 @@ do elseif i == id_math then return set_np_xspc_alchar(Np, -1, x) end end - + -- change the information for the next loop -- (will be done if Nx is an alphabetic character or a hlist) after_hlist = function (Nx) local s = Nx.last_char if s then if getid(s)==id_glyph then - if getfont(s) == (has_attr(s, attr_curjfnt) or -1) then + if getfont(s) == (has_attr(s, attr_curjfnt) or -1) then set_np_xspc_jachar(Nx, s) else set_np_xspc_alchar(Nx, getchar(s), s, 2) @@ -498,7 +522,7 @@ do Nx.pre, Nx.met = nil, nil end end - + after_alchar = function (Nx) local x = Nx.nuc return set_np_xspc_alchar(Nx, getchar(x), x, 2) @@ -517,7 +541,7 @@ local function handle_penalty_normal(post, pre, g) if a<-10000 then a = -10000 elseif a>10000 then a = 10000 end setfield(p, 'penalty', a) head = insert_before(head, Np.first, p) - Bp[1]=p; + Bp[1]=p; set_attr(p, attr_icflag, KINSOKU) end else for _, v in pairs(Bp) do add_penalty(v,a) end @@ -559,7 +583,7 @@ local function new_jfm_glue(m, bc, ac) local n if g then n,d = node_copy(g[2]), g[3] - if g[1] then + if g[1] then local f = node_new(id_glue) set_attr(f, attr_icflag, g[4]) setfield(f, 'spec', n) @@ -633,18 +657,18 @@ do calc_ja_ja_aux = function (gb,ga, db, da) local rbb, rab = (1-db)/2, (1-da)/2 -- 「前の文字」由来のグルーの割合 local rba, raa = (1+db)/2, (1+da)/2 -- 「前の文字」由来のグルーの割合 - if diffmet_rule ~= math.two_pleft and diffmet_rule ~= math.two_pright + if diffmet_rule ~= math.two_pleft and diffmet_rule ~= math.two_pright and diffmet_rule ~= math.two_paverage then rbb, rab, rba, raa = 1,0,0,1 end - if not gb then - if ga then - gb = node_new(id_kern); setfield(gb, 'kern', 0) + if not gb then + if ga then + gb = node_new(id_kern); setfield(gb, 'kern', 0) else return nil end - elseif not ga then + elseif not ga then ga = node_new(id_kern); setfield(ga, 'kern', 0) end - + local k = 2*getid(gb) - getid(ga) if k == bg_ag then local bs, as = getfield(gb, 'spec'), getfield(ga, 'spec') @@ -663,7 +687,7 @@ do setfield(gb, 'kern', round(diffmet_rule(rbb*bd + rba*ad, rab*bd + raa*ad))) node_free(ga) return gb - elseif k == bk_ag then + elseif k == bk_ag then local as = getfield(ga, 'spec') -- gb: kern, ga: glue local bd, ad = getfield(gb, 'kern'), getfield(as, 'width') @@ -700,11 +724,11 @@ local function calc_ja_ja_glue() local gb, db = new_jfm_glue(qm, Nq.class, slow_find_char_class(has_attr(npn, attr_orig_char), qm, getchar(npn))) - local ga, da = new_jfm_glue(pm, + local ga, da = new_jfm_glue(pm, slow_find_char_class(has_attr(nqn, attr_orig_char), pm, getchar(nqn)), Np.class) - return calc_ja_ja_aux(gb, ga, db, da); + return calc_ja_ja_aux(gb, ga, db, da); end end end @@ -751,7 +775,7 @@ end local function get_OA_skip() if not ihb_flag then local pm = Np.met - return new_jfm_glue(pm, + return new_jfm_glue(pm, fast_find_char_class(((Nq.id == id_math and -1) or (type(Nq.char)=='string' and Nq.char or 'jcharbdd')), pm), Np.class) else return nil end @@ -759,7 +783,7 @@ end local function get_OB_skip() if not ihb_flag then local qm = Nq.met - return new_jfm_glue(qm, Nq.class, + return new_jfm_glue(qm, Nq.class, fast_find_char_class(((Np.id == id_math and -1) or'jcharbdd'), qm)) else return nil end @@ -768,13 +792,13 @@ end -- (anything) .. jachar local function handle_np_jachar(mode) local qid = Nq.id - if qid==id_jglyph or ((qid==id_pbox or qid==id_pbox_w) and Nq.met) then + if qid==id_jglyph or ((qid==id_pbox or qid==id_pbox_w) and Nq.met) then local g = calc_ja_ja_glue() or get_kanjiskip() -- M->K handle_penalty_normal(Nq.post, Np.pre, g); real_insert(g) elseif Nq.met then -- qid==id_hlist local g = get_OA_skip() or get_kanjiskip() -- O_A->K handle_penalty_normal(0, Np.pre, g); real_insert(g) - elseif Nq.pre then + elseif Nq.pre then local g = get_OA_skip() or get_xkanjiskip(Np) -- O_A->X handle_penalty_normal((qid==id_hlist and 0 or Nq.post), Np.pre, g); real_insert(g) else @@ -793,7 +817,7 @@ end -- jachar .. (anything) local function handle_nq_jachar() - if Np.pre then + if Np.pre then local g = get_OB_skip() or get_xkanjiskip(Nq) -- O_B->X handle_penalty_normal(Nq.post, (Np.id==id_hlist and 0 or Np.pre), g); real_insert(g) else @@ -809,13 +833,13 @@ end -- (anything) .. (和文文字で始まる hlist) local function handle_np_ja_hlist() local qid = Nq.id - if qid==id_jglyph or ((qid==id_pbox or Nq.id == id_pbox_w) and Nq.met) then + if qid==id_jglyph or ((qid==id_pbox or Nq.id == id_pbox_w) and Nq.met) then local g = get_OB_skip() or get_kanjiskip() -- O_B->K handle_penalty_normal(Nq.post, 0, g); real_insert(g) elseif Nq.met then -- Nq.id==id_hlist local g = get_kanjiskip() -- K handle_penalty_suppress(0, 0, g); real_insert(g) - elseif Nq.pre then + elseif Nq.pre then local g = get_xkanjiskip(Np) -- X handle_penalty_suppress(0, 0, g); real_insert(g) end @@ -823,7 +847,7 @@ end -- (和文文字で終わる hlist) .. (anything) local function handle_nq_ja_hlist() - if Np.pre then + if Np.pre then local g = get_xkanjiskip(Nq) -- X handle_penalty_suppress(0, 0, g); real_insert(g) end @@ -833,16 +857,16 @@ end -- Nq が前側のクラスタとなることによる修正 do local adjust_nq_aux = { - [id_glyph] = function() + [id_glyph] = function() local x = Nq.nuc return set_np_xspc_alchar(Nq, getchar(x),x, 2) end, -- after_alchar(Nq) [id_hlist] = function() after_hlist(Nq) end, [id_pbox] = function() after_hlist(Nq) end, [id_disc] = function() after_hlist(Nq) end, - [id_pbox_w] = function() + [id_pbox_w] = function() luatexbase.call_callback("luatexja.jfmglue.whatsit_after", - false, Nq, Np) + false, Nq, Np) end, } @@ -871,7 +895,7 @@ local function handle_list_tail(mode) else -- the current list is the contents of a hbox local npi, pm = Np.id, Np.met - if npi == id_jglyph or (npi==id_pbox and pm) then + if npi == id_jglyph or (npi==id_pbox and pm) then local g = new_jfm_glue(pm, Np.class, fast_find_char_class('boxbdd', pm)) if g then set_attr(g, attr_icflag, BOXBDD) @@ -884,7 +908,7 @@ end -- リスト先頭の処理 local function handle_list_head(par_indented) local npi, pm = Np.id, Np.met - if npi == id_jglyph or (npi==id_pbox and pm) then + if npi == id_jglyph or (npi==id_pbox and pm) then if not ihb_flag then local g = new_jfm_glue(pm, fast_find_char_class(par_indented, pm), Np.class) if g then @@ -907,44 +931,49 @@ do local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP local KSK = luatexja.stack_table_index.KSK local XSK = luatexja.stack_table_index.XSK + local DIR = luatexja.stack_table_index.DIR init_var = function (mode) -- 1073741823: max_dimen Bp, widow_Bp, widow_Np = {}, {}, {first = nil} table_current_stack = ltjs.table_current_stack - + + list_dir = table_current_stack[DIR] or dir_yoko kanji_skip = node_new(id_glue) setfield(kanji_skip, 'spec', skip_table_to_spec(KSK)) set_attr(kanji_skip, attr_icflag, KANJI_SKIP) get_kanjiskip = (getfield(getfield(kanji_skip, 'spec'), 'width') == 1073741823) and get_kanjiskip_jfm or get_kanjiskip_normal - + xkanji_skip = node_new(id_glue) setfield(xkanji_skip, 'spec', skip_table_to_spec(XSK)) set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP) get_xkanjiskip = (getfield(getfield(xkanji_skip, 'spec'), 'width') == 1073741823) and get_xkanjiskip_jfm or get_xkanjiskip_normal - + Np = { - auto_kspc=nil, auto_xspc=nil, char=nil, class=nil, - first=nil, id=nil, last=nil, met=nil, nuc=nil, - post=nil, pre=nil, xspc=nil, + auto_kspc=nil, auto_xspc=nil, char=nil, class=nil, + first=nil, id=nil, last=nil, met=nil, nuc=nil, + post=nil, pre=nil, xspc=nil, } Nq = { - auto_kspc=nil, auto_xspc=nil, char=nil, class=nil, - first=nil, id=nil, last=nil, met=nil, nuc=nil, - post=nil, pre=nil, xspc=nil, + auto_kspc=nil, auto_xspc=nil, char=nil, class=nil, + first=nil, id=nil, last=nil, met=nil, nuc=nil, + post=nil, pre=nil, xspc=nil, } - if mode then + if mode then -- the current list is to be line-breaked: -- hbox from \parindent is skipped. local lp, par_indented, lpi, lps = head, 'boxbdd', getid(head), getsubtype(head) - while lp and ((lpi==id_whatsit and lps~=sid_user) + while lp and ((lpi==id_whatsit and lps~=sid_user) or ((lpi==id_hlist) and (lps==3))) do - if (lpi==id_hlist) and (lps==3) then par_indented = 'parbdd' end + if (lpi==id_hlist) and (lps==3) then + Np.char, par_indented = 'parbdd', 'parbdd' + Np.width = getfield(lp, 'width') + end lp=node_next(lp); lpi, lps = getid(lp), getsubtype(lp) end - return lp, par_indented - else - return head, 'boxbdd' + return lp, node_tail(head), par_indented + else + return head, nil, 'boxbdd' end end end @@ -963,7 +992,7 @@ local function cleanup(mode) end return head else - set_attr(head, attr_icflag, + set_attr(head, attr_icflag, get_attr_icflag(head) + PROCESSED_BEGIN_FLAG); return head end @@ -974,29 +1003,29 @@ end function main(ahead, mode) if not ahead then return ahead end head = ahead; - local lp, par_indented = init_var(mode); + local lp, last, par_indented = init_var(mode) lp = calc_np(lp, last) - if Np then + if Np then extract_np(); handle_list_head(par_indented) else - return cleanup(mode, last) + return cleanup(mode) end - lp = calc_np(lp) + lp = calc_np(lp, last) while Np do extract_np(); - adjust_nq(); + adjust_nq(); local pid, pm = Np.id, Np.met -- 挿入部 - if pid == id_jglyph then + if pid == id_jglyph then handle_np_jachar(mode) - elseif pm then + elseif pm then if pid==id_hlist then handle_np_ja_hlist() else handle_np_jachar() end - elseif Nq.met then + elseif Nq.met then if Nq.id==id_hlist then handle_nq_ja_hlist() else handle_nq_jachar() end end - lp = calc_np(lp) + lp = calc_np(lp, last) end handle_list_tail(mode) return cleanup(mode) @@ -1006,7 +1035,7 @@ end do local IHB = luatexja.userid_table.IHB local BPAR = luatexja.userid_table.BPAR - local node_prev = Dnode.getprev + local node_prev = (Dnode ~= node) and Dnode.getprev or node.prev local node_write = Dnode.write -- \inhibitglue @@ -1029,7 +1058,7 @@ do end local function whatsit_callback(Np, lp, Nq) - if Np and Np.nuc then return Np + if Np and Np.nuc then return Np elseif Np and getfield(lp, 'user_id') == BPAR then Np.first = lp; Np.nuc = lp; Np.last = lp Np.char = 'parbdd'