local has_attr = Dnode.has_attribute
local set_attr = Dnode.set_attribute
local node_traverse = Dnode.traverse
-local node_traverse_id = Dnode.traverse_id
-local node_remove =luatexja.Dnode_remove -- Dnode.remove
+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_get_vert_glyph = ltjf.get_vert_glyph
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
- local is_dir_tate
- local suppress_hyphenate_ja_aux_glyph = function(p)
+ 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 pof, pcj = getfont(p), has_attr(p, attr_curjfnt)
- local pf = ltjf_replace_altfont(pcj or pof, pc)
- if pof~=pf then setfield(p, 'font', pf) end
- if pcj~=pf then set_attr(p, attr_curjfnt, pf) end
- setfield(p, 'subtype', floor(getsubtype(p)*0.5)*2)
- set_attr(p, attr_orig_char, pc)
+ local pf = ltjf_replace_altfont(has_attr(p, attr_curjfnt) or getfont(p), pc)
+ setfield(p, 'font', pf); setfield(p, 'lang', lang_ja)
+ ltjs_orig_char_table[p] = pc
end
+ return p
end
- local suppress_hyphenate_ja_aux_whatsit = function(p)
- if getsubtype(p)==sid_user then
+ 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
+ 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
- wtd[#wtd+1] = p
end
end
+ return p
end
- local function suppress_hyphenate_ja (h)
+ local function suppress_hyphenate_ja (h,t)
start_time_measure('ltj_hyphenate')
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()
- for p in node_traverse_id(id_glyph, head) do --while p do
- suppress_hyphenate_ja_aux_glyph(p)
- end
- for p in node_traverse_id(id_whatsit, head) do --while p do
- suppress_hyphenate_ja_aux_whatsit(p)
+ local p = head
+ for i = 1,#wt do wt[i]=nil end
+ for i = 1,#wtd do wtd[i]=nil end
+ for i,_ in pairs(ltjs_orig_char_table) do
+ ltjs_orig_char_table[i] = nil
end
- for i=1,#wt do head = node_remove(head, wt[i]) end
- for i=1,#wtd do
- local q = wtd[i]; head = node_remove(head, q); node_free(q)
+ ltjs.list_dir=ltjd_get_dir_count()
+ while p and p~=t do
+ local pfunc = suppress_hyphenate_ja_aux[getid(p)]
+ p = node_next(pfunc and pfunc(p) or p)
end
- head = to_node(head)
stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate')
- lang.hyphenate(head)
+ lang.hyphenate(h, t)
stop_time_measure('tex_hyphenate')
- return head
+ return h
end
luatexbase.add_to_callback('hyphenate',
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 i=1,#wt do
- local p = wt[i]
+ 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)
- is_dir_tate = ltjs.list_dir == dir_tate
- if is_dir_tate then
- for p in node_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
+ 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 Dnode.traverse_id(id_glyph,to_direct(head)) do
+ 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 pc = ltjs_orig_char_table[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
+ ltjs_orig_char_table[p] = { pc, ltjs_orig_char_table[p] }
+ local xc = ltjf_get_vert_glyph(pf, pc) or pc
+ setfield(p, 'char', xc); setfield(p, 'font', pf);
+ ltjs_orig_char_table[p] = { pc, xc }
+ 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
