X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fltj-pretreat.lua;h=073cc1ee398ed4c50ced41fd5904786e14e1329b;hb=f39f9c3eb111c562e0127e423f64bfc88886f9ce;hp=ad9182145b6d3b86c5312078b5da1890d58ce73a;hpb=ae1314aae218985b5db11fb08f143476ce5df3e3;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua index ad91821..073cc1e 100644 --- a/src/ltj-pretreat.lua +++ b/src/ltj-pretreat.lua @@ -1,27 +1,33 @@ -- --- luatexja/pretreat.lua +-- ltj-pretreat.lua -- -luatexbase.provides_module({ - name = 'luatexja.pretreat', - date = '2012/07/19', - version = '0.2', - description = '', -}) -module('luatexja.pretreat', package.seeall) -local err, warn, info, log = luatexbase.errwarinf(_NAME) -luatexja.load_module('charrange'); local ltjc = luatexja.charrange -luatexja.load_module('jfont'); local ltjf = luatexja.jfont -luatexja.load_module('stack'); local ltjs = luatexja.stack +luatexja.load_module 'base'; local ltjb = luatexja.base +luatexja.load_module 'charrange'; local ltjc = luatexja.charrange +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 to_node = node.direct.tonode +local to_direct = node.direct.todirect + +local setfield = node.direct.setfield +local getid = node.direct.getid +local getfont = node.direct.getfont +local getchar = node.direct.getchar +local getfield = node.direct.getfield +local getsubtype = node.direct.getsubtype +local getlang = node.direct.getlang or function (n) return getfield(n,'lang') end + +local pairs = pairs local floor = math.floor -local has_attr = node.has_attribute -local set_attr = node.set_attribute -local node_traverse = node.traverse -local node_type = node.type -local node_remove = node.remove -local node_next = node.next -local node_free = node.free +local has_attr = node.direct.has_attribute +local set_attr = node.direct.set_attribute +local node_traverse = node.direct.traverse +local node_remove = node.direct.remove +local node_next = node.direct.getnext +local node_free = node.direct.free +local node_end_of_math = node.direct.end_of_math local tex_getcount = tex.getcount local id_glyph = node.id('glyph') @@ -29,62 +35,146 @@ local id_math = node.id('math') local id_whatsit = node.id('whatsit') local sid_user = node.subtype('user_defined') +local attr_dir = luatexbase.attributes['ltj@dir'] local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] +local attr_curtfnt = luatexbase.attributes['ltj@curtfnt'] local attr_icflag = luatexbase.attributes['ltj@icflag'] -local ltjf_font_metric_table = ltjf.font_metric_table -local ltjc_is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char -local attr_orig_char = luatexbase.attributes['ltj@origchar'] +local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct +local ltjs_orig_char_table = ltjs.orig_char_table +local ltjf_replace_altfont = ltjf.replace_altfont +local STCK = luatexja.userid_table.STCK +local DIR = luatexja.userid_table.DIR +local JA_AL_BDD = luatexja.userid_table.JA_AL_BDD +local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG + +local dir_tate = luatexja.dir_table.dir_tate +local lang_ja = luatexja.lang_ja + +local setlang = node.direct.setlang or function(n,l) setfield(n,'lang',l) end +local setfont = node.direct.setfont or function(n,l) setfield(n,'font',l) end +local setchar = node.direct.setchar or function(n,l) setfield(n,'char',l) end ------------------------------------------------------------------------ -- MAIN PROCESS STEP 1: replace fonts ------------------------------------------------------------------------ -box_stack_level = 0 --- This is used in jfmglue.lua. -local wt - -local function suppress_hyphenate_ja(head) - local non_math, p = true, head - wt = {} - while p do - --for p in node_traverse(head) do - if p.id == id_glyph then - if (has_attr(p, attr_icflag) or 0)<=0 and ltjc_is_ucs_in_japanese_char(p) then - p.font = has_attr(p, attr_curjfnt) or p.font - p.subtype = floor(p.subtype*0.5)*2 - set_attr(p, attr_orig_char, p.char) - end - elseif p.id == id_math then - while p.id~=id_math do p = node_next(p) end - elseif p.id == id_whatsit and p.subtype==sid_user and p.user_id==30112 then - wt[#wt+1] = p; head = node_remove(head, p) +local wt, wtd = {}, {} +do + local ltjd_get_dir_count = ltjd.get_dir_count + local start_time_measure, stop_time_measure + = ltjb.start_time_measure, ltjb.stop_time_measure + local head + local suppress_hyphenate_ja_aux = { + [id_math] = function(p) return node_next(node_end_of_math(node_next(p))) end, + [id_whatsit] = function(p) + if getsubtype(p)==sid_user then + local uid = getfield(p, 'user_id') + if uid==STCK then + wt[#wt+1] = p; node_remove(head, p) + elseif uid==DIR then + if has_attr(p, attr_icflag)0 and pf) or getfont(p) + setfont(p, ltjf_replace_altfont(pf, pc)) + setlang(p, lang_ja) + ltjs_orig_char_table[p], prev_chartype = pc, 2 + elseif prev_chartype==2 then + local b = node_new(id_whatsit,sid_user); + setfield(b, 'type', 100); setfield(b, 'user_id', JA_AL_BDD); + insert_before(head, p, b); prev_chartype = 1 + else prev_chartype = 1 + end + p = node_next(p); pid = getid(p) + end + p = (suppress_hyphenate_ja_aux[pid])(p) + end end - p = node_next(p) + stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate') + lang.hyphenate(h, nil) + stop_time_measure('tex_hyphenate') + return h end - lang.hyphenate(head) - return head + + ltjb.add_to_callback('hyphenate', suppress_hyphenate_ja, 'ltj.hyphenate') end -- mode: true iff this function is called from hpack_filter -function set_box_stack_level(head, mode) +local ltjs_report_stack_level = ltjs.report_stack_level +local ltjf_font_metric_table = ltjf.font_metric_table +local font_getfont = font.getfont +local function set_box_stack_level(head, mode) local box_set, cl = 0, tex.currentgrouplevel + 1 - for _,p in pairs(wt) do - if mode and p.value==cl then box_set = 1 end; node_free(p) + if mode then + for _,p in pairs(wt) do + if getfield(p, 'value')==cl then box_set = 1 end; node_free(p) + end + else + for _,p in pairs(wt) do node_free(p) end + end + ltjs_report_stack_level(tex_getcount('ltj@@stack') + box_set) + for _,p in pairs(wtd) do node_free(p) end + if ltjs.list_dir == dir_tate then + for p in node.direct.traverse_id(id_glyph,to_direct(head)) do + if has_attr(p, attr_icflag, 0) and getlang(p)==lang_ja then + local nf = ltjf_replace_altfont( has_attr(p, attr_curtfnt) or getfont(p) , ltjs_orig_char_table[p]) + setfont(p, nf) + if ltjf_font_metric_table[nf].vert_activated then + local pc = getchar(p); pc = ltjf_font_metric_table[nf].vform[pc] + if pc then setchar(p, pc) end + end + end + end end - box_stack_level = tex_getcount('ltj@@stack') + box_set return head end -- CALLBACKS -luatexbase.add_to_callback('hpack_filter', +ltjb.add_to_callback('hpack_filter', function (head) return set_box_stack_level(head, true) - end,'ltj.hpack_filter_pre',1) -luatexbase.add_to_callback('pre_linebreak_filter', - function (head) - return set_box_stack_level(head, false) - end,'ltj.pre_linebreak_filter_pre',1) -luatexbase.add_to_callback('hyphenate', - function (head,tail) - return suppress_hyphenate_ja(head) - end,'ltj.hyphenate') + end, 'ltj.set_stack_level', 1) +ltjb.add_to_callback('pre_linebreak_filter', + function (head) + return set_box_stack_level(head, false) + end, 'ltj.set_stack_level', 1) + +luatexja.pretreat = { + set_box_stack_level = set_box_stack_level, + orig_char_table = orig_char_table, +}