X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-pretreat.lua;h=1729c9e7f03f663c043d93fbdd30acc249fdb2af;hb=3fae82d64b193c794fdf2f1262d80bddc98ce5a8;hp=21f0076558ca7b106dc62a98989a3f56dbd72239;hpb=0c68dbd01bde529de4c2a340f7579826694d5203;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua index 21f0076..1729c9e 100644 --- a/src/ltj-pretreat.lua +++ b/src/ltj-pretreat.lua @@ -2,142 +2,174 @@ -- luatexja/ltj-pretreat.lua -- +luatexja.load_module('base'); local ltjb = luatexja.base 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('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 fonts_ids = fonts.ids local id_glyph = node.id('glyph') 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 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 ltjf_font_extra_info = ltjf.font_extra_info local attr_orig_char = luatexbase.attributes['ltj@origchar'] -local STCK = luatexja.userid_table.STCK +local STCK = luatexja.userid_table.STCK +local DIR = luatexja.userid_table.DIR +local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG -local fwglyph = { - ["Japan1"] = { - [0x00A4] = 16280, - [0x00A9] = 8059, - [0x00AC] = 8008, - [0x00AE] = 8060, - [0x00B5] = 12093, - [0x00BC] = 8185, - [0x00BD] = 8184, - [0x00BE] = 9783, - [0x2012] = 16206, - [0x201C] = 672, - [0x201D] = 673, - [0x201E] = 8280, - [0x2022] = 12256, - [0x2026] = 668, - [0x20AC] = 9779, - [0x2122] = 11853, - [0x2127] = 16204, - [0x2153] = 9781, - [0x2154] = 9782, - [0x2155] = 9784, - [0x215B] = 9796, - [0x215C] = 9797, - [0x215D] = 9798, - [0x215E] = 9799, - [0x2209] = 16299, - [0x2225] = 16196, - [0x2226] = 16300, - [0x2245] = 16301, - [0x2248] = 16302, - [0x2262] = 16303, - [0x2276] = 16304, - [0x2277] = 16305, - [0x2284] = 16306, - [0x2285] = 16307, - [0x228A] = 16308, - [0x228B] = 16309, - [0x22DA] = 16310, - [0x22DB] = 16311, - [0x2318] = 16271, - } -} +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 ------------------------------------------------------------------------ -local wt - -local function suppress_hyphenate_ja(head) - local non_math, p = true, head - wt = {} - while p do - local pid = p.id - if pid == id_glyph then - if (has_attr(p, attr_icflag) or 0)<=0 and ltjc_is_ucs_in_japanese_char(p) then - local pf = has_attr(p, attr_curjfnt) or p.font - p.font = pf - p.subtype = floor(p.subtype*0.5)*2 - set_attr(p, attr_orig_char, p.char) - if ltjf_font_metric_table[pf] and ltjf_font_metric_table[pf].mono_flag then - local pco = fonts_ids[pf].cidinfo.ordering - for i,v in pairs(fwglyph) do - if pco == i then - local fwc = fonts_ids[pf].unicodes[pco .. '.'.. tostring(v[p.char])] - if fwc then p.char = fwc end - break - end +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] = pc + end + p = node_next(p); pid = getid(p) + end + p = (suppress_hyphenate_ja_aux[pid])(p) + end + end + 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', + function (head,tail) + return suppress_hyphenate_ja(head) + end,'ltj.hyphenate') end -- mode: true iff this function is called from hpack_filter +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 - ltjs.report_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', + end,'ltj.set_stack_level',1) +ltjb.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) luatexja.pretreat = { set_box_stack_level = set_box_stack_level, -} \ No newline at end of file + orig_char_table = orig_char_table, +}