local node_traverse = Dnode.traverse
local node_remove = Dnode.remove
local node_next = (Dnode ~= node) and Dnode.getnext or node.next
-local node_prev = (Dnode ~= node) and Dnode.getprev or node.prev
local node_free = Dnode.free
local node_end_of_math = Dnode.end_of_math
local tex_getcount = tex.getcount
local attr_icflag = luatexbase.attributes['ltj@icflag']
local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
-local ltjd_get_vert_glyph = ltjd.get_vert_glyph
+local ltjs_orig_char_table = ltjs.orig_char_table
local ltjf_replace_altfont = ltjf.replace_altfont
local attr_orig_char = luatexbase.attributes['ltj@origchar']
local STCK = luatexja.userid_table.STCK
local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
local dir_tate = luatexja.dir_table.dir_tate
-
+local lang_ja = token.create('ltj@@japanese')[2]
------------------------------------------------------------------------
-- MAIN PROCESS STEP 1: replace fonts
------------------------------------------------------------------------
local wt, wtd = {}, {}
do
- local start_time_measure, stop_time_measure
+ 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, real_head
- local is_dir_tate
- local suppress_hyphenate_ja_aux = {}
- suppress_hyphenate_ja_aux[id_glyph] = function(p)
- if (has_attr(p, attr_icflag) or 0)<=0 and is_ucs_in_japanese_char(p) then
- local pc = getchar(p)
- local pf = ltjf_replace_altfont(has_attr(p, attr_curjfnt) or getfont(p), pc)
- setfield(p, 'font', pf); set_attr(p, attr_curjfnt, pf)
- setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2)
- set_attr(p, attr_orig_char, pc)
- end
- return p
- end
- suppress_hyphenate_ja_aux[id_math] = function(p)
- return node_end_of_math(node_next(p)) end
- suppress_hyphenate_ja_aux[50] = function(p) return p end
- suppress_hyphenate_ja_aux[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)<PROCESSED_BEGIN_FLAG then
- ltjs.list_dir = has_attr(p, attr_dir)
- if not node_next(p) and real_head==p then
- return p, true
+ 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)<PROCESSED_BEGIN_FLAG then
+ ltjs.list_dir = has_attr(p, attr_dir)
+ else -- こっちのケースは通常使用では起こらない
+ wtd[#wtd+1] = p; node_remove(head, p)
end
end
- wtd[#wtd+1] = p; node_remove(head, p)
- end
- end
- return p
- end
-
+ end
+ return node_next(p)
+ end,
+ }
+ setmetatable(suppress_hyphenate_ja_aux,
+ {
+ __index = function() return node_next end,
+ })
local function suppress_hyphenate_ja (h)
start_time_measure('ltj_hyphenate')
- head = to_direct(h); real_head = node_next(head)
- local p = head
+ head = to_direct(h)
for i = 1,#wt do wt[i]=nil end
for i = 1,#wtd do wtd[i]=nil end
- ltjs.list_dir=ltjd.get_dir_count()
- while p do
- local flag
- local pfunc = suppress_hyphenate_ja_aux[getid(p)]
- if pfunc then p, flag = pfunc(p) end
- if flag then
- stop_time_measure('ltj_hyphenate')
- return h
+ for i,_ in pairs(ltjs_orig_char_table) do
+ ltjs_orig_char_table[i] = nil
+ end
+ ltjs.list_dir=ltjd_get_dir_count()
+ do
+ local p = head
+ while p do
+ local pid = getid(p)
+ while pid==id_glyph do
+ local pc = getchar(p)
+ if (has_attr(p, attr_icflag) or 0)<=0 and is_ucs_in_japanese_char(p, pc) then
+ setfield(p, 'font',
+ ltjf_replace_altfont(has_attr(p, attr_curjfnt) or getfont(p), pc))
+ setfield(p, 'lang', 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
- p = node_next(p)
end
stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate')
- lang.hyphenate(h)
+ lang.hyphenate(h, nil)
stop_time_measure('tex_hyphenate')
return h
end
end
-- mode: true iff this function is called from hpack_filter
+local ltjs_report_stack_level = ltjs.report_stack_level
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 getfield(p, 'value')==cl then box_set = 1 end; node_free(p)
end
- ltjs.report_stack_level(tex_getcount('ltj@@stack') + box_set)
+ ltjs_report_stack_level(tex_getcount('ltj@@stack') + box_set)
for _,p in pairs(wtd) do
node_free(p)
end
- is_dir_tate = ltjs.list_dir == dir_tate
- if is_dir_tate then
+ if ltjs.list_dir == dir_tate then
for p in Dnode.traverse_id(id_glyph,to_direct(head)) do
- if (has_attr(p, attr_icflag) or 0)<=0 and has_attr(p, attr_curjfnt)==getfont(p) then
+ if (has_attr(p, attr_icflag) or 0)<=0 and getfield(p, 'lang')==lang_ja then
local pfn = has_attr(p, attr_curtfnt) or getfont(p)
- local pc = getchar(p)
- local pf = ltjf_replace_altfont(pfn, pc)
- set_attr(p, attr_dir, pc)
- pc = ltjd_get_vert_glyph(pf, pc) or pc
- setfield(p, 'char', pc); set_attr(p, attr_orig_char, pc)
- setfield(p, 'font', pf); set_attr(p, attr_curjfnt, pf)
- end
+ local pc = ltjs_orig_char_table[p]
+ setfield(p, 'font', ltjf_replace_altfont(pfn, pc))
+ end
end
end
+ --luatexja.ext_show_node_list(head, 'S> ', print)
return head
end
luatexja.pretreat = {
set_box_stack_level = set_box_stack_level,
+ orig_char_table = orig_char_table,
}
OSDN Git Service
