X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfmglue.lua;h=9486c322ca6f544c5683fe8d15546b56f90e3436;hb=e5aeb15c211866e3911c84337af5e6d85ef79043;hp=307c68cc327d823eb65251666c018d9beb2d1ba2;hpb=8a1e0ce3e39f07de447d73c4ae6b312f8b13ccf3;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua index 307c68c..9486c32 100644 --- a/src/ltj-jfmglue.lua +++ b/src/ltj-jfmglue.lua @@ -3,12 +3,13 @@ -- luatexbase.provides_module({ name = 'luatexja.jfmglue', - date = '2014/1/21', + date = '2014/02/02', description = 'Insertion process of JFM glues and kanjiskip', }) module('luatexja.jfmglue', package.seeall) local err, warn, info, log = luatexbase .errwarinf(_NAME) +luatexja.load_module('base'); local ltjb = luatexja.base luatexja.load_module('stack'); local ltjs = luatexja.stack luatexja.load_module('jfont'); local ltjf = luatexja.jfont local pairs = pairs @@ -31,13 +32,13 @@ 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 ltjf_font_metric_table = ltjf.font_metric_table local ltjf_find_char_class = ltjf.find_char_class local node_new = Dnode.new local node_copy = Dnode.copy -local node_remove = Dnode.remove +local node_remove = luatexja.Dnode_remove -- Dnode.remove local node_tail = Dnode.tail local node_free = Dnode.free local node_end_of_math = Dnode.end_of_math @@ -73,8 +74,6 @@ local ITALIC = luatexja.icflag_table.ITALIC local PACKED = luatexja.icflag_table.PACKED local KINSOKU = luatexja.icflag_table.KINSOKU local FROM_JFM = luatexja.icflag_table.FROM_JFM -local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP -local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP local PROCESSED = luatexja.icflag_table.PROCESSED local IC_PROCESSED = luatexja.icflag_table.IC_PROCESSED local BOXBDD = luatexja.icflag_table.BOXBDD @@ -102,11 +101,16 @@ local function fast_find_char_class(c,m) end -- 文字クラスの決定 -local function slow_find_char_class(c, m, oc) - local xc = c or oc - local cls = ltjf_find_char_class(oc, m) - if xc ~= oc and cls==0 then cls = ltjf_find_char_class(-xc, m) end - return cls, xc +local slow_find_char_class +do + slow_find_char_class = function (c, m, oc) + local cls = ltjf_find_char_class(oc, m) + if not c and cls==0 then + return ltjf_find_char_class(-c, m), oc + else + return cls, oc + end + end end local zero_glue = node_new(id_glue) @@ -121,7 +125,7 @@ setfield(spec_zero_glue, 'shrink_order', 0) setfield(zero_glue, 'spec', spec_zero_glue) local function skip_table_to_spec(n) - local g, st = node_new(id_glue_spec), ltjs.fast_get_skip_table(n) + local g, st = node_new(id_glue_spec), ltjs.fast_get_stack_skip(n) setfield(g, 'width', st.width) setfield(g, 'stretch', st.stretch) setfield(g, 'shrink', st.shrink) @@ -191,18 +195,16 @@ local function check_box(box_ptr, box_end) pid = getid(p) -- p must be non-nil end if pid==id_kern then - if get_attr_icflag(p)==IC_PROCESSED then + local pa = get_attr_icflag(p) + --if pa==IC_PROCESSED or pa == PACKED then + if pa==IC_PROCESSED then -- do nothing elseif getsubtype(p)==2 then p = node_next(node_next(p)); -- Note that another node_next will be executed outside this if-statement. else found_visible_node = true - if find_first_char then - find_first_char = false - else - last_char = nil - end + find_first_char = false; last_char = nil end elseif pid==id_hlist then if PACKED == get_attr_icflag(p) then @@ -213,11 +215,8 @@ local function check_box(box_ptr, box_end) else if getfield(p, 'shift')==0 then if check_box(getlist(p), nil) then found_visible_node = true end - else if find_first_char then - find_first_char = false - else - last_char = nil - end + else + find_first_char = false; last_char = nil end end elseif pid==id_math then @@ -225,15 +224,12 @@ local function check_box(box_ptr, box_end) first_char = p; find_first_char = false end last_char = p; found_visible_node = true + --elseif pid==id_rule and get_attr_icflag(p)==PACKED then -- do nothing elseif not (pid==id_ins or pid==id_mark or pid==id_adjust or pid==id_whatsit or pid==id_penalty) then found_visible_node = true - if find_first_char then - find_first_char = false - else - last_char = nil - end + find_first_char = false; last_char = nil end p = node_next(p) end @@ -281,7 +277,7 @@ local function set_attr_icflag_processed(p) 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 @@ -291,13 +287,13 @@ end local function calc_np_pbox(lp, last) Np.first = Np.first or lp; Np.id = id_pbox - local lpa = KINSOKU -- dummy= + local lpa, nc = KINSOKU, nil set_attr(lp, attr_icflag, get_attr_icflag(lp)); - while lp~=last and lpa>=PACKED and lpa=PACKED) and (lpa=PACKED then @@ -430,7 +426,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 @@ -592,41 +589,45 @@ end -- get kanjiskip local get_kanjiskip - -local function get_kanjiskip_normal() - if Np.auto_kspc or Nq.auto_kspc then - return node_copy(kanji_skip) - else - local g = node_copy(zero_glue) - set_attr(g, attr_icflag, KANJI_SKIP) - return g +local get_kanjiskip_normal, get_kanjiskip_jfm +do + local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP + local KANJI_SKIP_JFM = luatexja.icflag_table.KANJI_SKIP_JFM + get_kanjiskip_normal = function () + if Np.auto_kspc or Nq.auto_kspc then + return node_copy(kanji_skip) + else + local g = node_copy(zero_glue) + set_attr(g, attr_icflag, KANJI_SKIP) + return g + end end -end -local function get_kanjiskip_jfm() - local g - if Np.auto_kspc or Nq.auto_kspc then - g = node_new(id_glue); --copy_attr(g, Nq.nuc) - local gx = node_new(id_glue_spec); - setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0) - local pm, qm = Np.met, Nq.met - local bk = qm.kanjiskip or {0, 0, 0} - if (pm.char_type==qm.char_type) and (qm.var==pm.var) then - setfield(gx, 'width', bk[1]) - setfield(gx, 'stretch', bk[2]) - setfield(gx, 'shrink', bk[3]) + get_kanjiskip_jfm = function () + local g + if Np.auto_kspc or Nq.auto_kspc then + g = node_new(id_glue); --copy_attr(g, Nq.nuc) + local gx = node_new(id_glue_spec); + setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0) + local pm, qm = Np.met, Nq.met + local bk = qm.kanjiskip or {0, 0, 0} + if (pm.char_type==qm.char_type) and (qm.var==pm.var) then + setfield(gx, 'width', bk[1]) + setfield(gx, 'stretch', bk[2]) + setfield(gx, 'shrink', bk[3]) + else + local ak = pm.kanjiskip or {0, 0, 0} + setfield(gx, 'width', round(diffmet_rule(bk[1], ak[1]))) + setfield(gx, 'stretch', round(diffmet_rule(bk[2], ak[2]))) + setfield(gx, 'shrink', -round(diffmet_rule(-bk[3], -ak[3]))) + end + setfield(g, 'spec', gx) else - local ak = pm.kanjiskip or {0, 0, 0} - setfield(gx, 'width', round(diffmet_rule(bk[1], ak[1]))) - setfield(gx, 'stretch', round(diffmet_rule(bk[2], ak[2]))) - setfield(gx, 'shrink', -round(diffmet_rule(-bk[3], -ak[3]))) + g = node_copy(zero_glue) end - setfield(g, 'spec', gx) - else - g = node_copy(zero_glue) + set_attr(g, attr_icflag, KANJI_SKIP_JFM) + return g end - set_attr(g, attr_icflag, KANJI_SKIP) - return g end local calc_ja_ja_aux @@ -719,32 +720,37 @@ end -- get xkanjiskip local get_xkanjiskip -local function get_xkanjiskip_normal(Nn) - if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then - local f = node_copy(xkanji_skip) - return f - else - local g = node_copy(zero_glue) - set_attr(g, attr_icflag, XKANJI_SKIP) - return g +local get_xkanjiskip_normal, get_xkanjiskip_jfm +do + local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP + local XKANJI_SKIP_JFM = luatexja.icflag_table.XKANJI_SKIP_JFM + get_xkanjiskip_normal = function (Nn) + if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then + local f = node_copy(xkanji_skip) + return f + else + local g = node_copy(zero_glue) + set_attr(g, attr_icflag, XKANJI_SKIP) + return g + end end -end -local function get_xkanjiskip_jfm(Nn) - local g - if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then - g = node_new(id_glue) - local gx = node_new(id_glue_spec); - setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0) - local bk = Nn.met.xkanjiskip or {0, 0, 0} - setfield(gx, 'width', bk[1]) - setfield(gx, 'stretch', bk[2]) - setfield(gx, 'shrink', bk[3]) - setfield(g, 'spec', gx) - else - g = node_copy(zero_glue) + get_xkanjiskip_jfm = function (Nn) + local g + if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then + g = node_new(id_glue) + local gx = node_new(id_glue_spec); + setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0) + local bk = Nn.met.xkanjiskip or {0, 0, 0} + setfield(gx, 'width', bk[1]) + setfield(gx, 'stretch', bk[2]) + setfield(gx, 'shrink', bk[3]) + setfield(g, 'spec', gx) + else + g = node_copy(zero_glue) + end + set_attr(g, attr_icflag, XKANJI_SKIP_JFM) + return g end - set_attr(g, attr_icflag, XKANJI_SKIP) - return g end -------------------- 隣接した「塊」間の処理 @@ -855,6 +861,7 @@ end -------------------- 開始・終了時の処理 +do -- リスト末尾の処理 local JWP = luatexja.stack_table_index.JWP @@ -901,52 +908,58 @@ end -- initialize -- return value: (the initial cursor lp), (last node) -local function init_var(mode) - -- 1073741823: max_dimen - Bp, widow_Bp, widow_Np = {}, {}, {first = nil} - table_current_stack = ltjs.table_current_stack - - kanji_skip = node_new(id_glue) - setfield(kanji_skip, 'spec', skip_table_to_spec('kanjiskip')) - 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('xkanjiskip')) - 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, - } - 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, - } - 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) - or ((lpi==id_hlist) and (lps==3))) do - if (lpi==id_hlist) and (lps==3) then par_indented = 'parbdd' end - lp=node_next(lp); lpi, lps = getid(lp), getsubtype(lp) end - return lp, node_tail(head), par_indented - else - -- the current list is the contents of a hbox: - -- insert a sentinel - local g = node_new(id_kern) - insert_after(head, node_tail(head), g); last = g - return head, g, 'boxbdd' +local init_var +do + local KANJI_SKIP = luatexja.icflag_table.KANJI_SKIP + local XKANJI_SKIP = luatexja.icflag_table.XKANJI_SKIP + local KSK = luatexja.stack_table_index.KSK + local XSK = luatexja.stack_table_index.XSK + init_var = function (mode) + -- 1073741823: max_dimen + Bp, widow_Bp, widow_Np = {}, {}, {first = nil} + table_current_stack = ltjs.table_current_stack + + 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, + } + 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, + } + 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) + or ((lpi==id_hlist) and (lps==3))) do + 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, node_tail(head), par_indented + else + return head, nil, 'boxbdd' + end end end -local function cleanup(mode, last) +local function cleanup(mode) -- adjust attr_icflag for avoiding error tex.setattribute('global', attr_icflag, 0) node_free(kanji_skip); node_free(xkanji_skip) @@ -960,7 +973,6 @@ local function cleanup(mode, last) end return head else - head = node_remove(head, last); node_free(last);-- remove the sentinel set_attr(head, attr_icflag, get_attr_icflag(head) + PROCESSED_BEGIN_FLAG); return head @@ -972,12 +984,12 @@ end function main(ahead, mode) if not ahead then return ahead end head = ahead; - local lp, last, par_indented = init_var(mode); + local lp, last, par_indented = init_var(mode) lp = calc_np(lp, last) if Np then extract_np(); handle_list_head(par_indented) else - return cleanup(mode, last) + return cleanup(mode) end lp = calc_np(lp, last) while Np do @@ -997,13 +1009,14 @@ function main(ahead, mode) lp = calc_np(lp, last) end handle_list_tail(mode) - return cleanup(mode, last) + return cleanup(mode) +end 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