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]
+local lang_ja = luatexja.lang_ja
+
------------------------------------------------------------------------
-- MAIN PROCESS STEP 1: replace fonts
------------------------------------------------------------------------
= ltjb.start_time_measure, ltjb.stop_time_measure
local head
local suppress_hyphenate_ja_aux = {
- [id_glyph] = function(p)
- 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
- return node_next(p)
- end,
[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
elseif uid==DIR then
if has_attr(p, attr_icflag)<PROCESSED_BEGIN_FLAG then
ltjs.list_dir = has_attr(p, attr_dir)
- else
+ else -- こっちのケースは通常使用では起こらない
wtd[#wtd+1] = p; node_remove(head, p)
end
end
{
__index = function() return node_next end,
})
- local function suppress_hyphenate_ja_iter(_,p)
- return (suppress_hyphenate_ja_aux[getid(p)])(p) end
local function suppress_hyphenate_ja (h)
start_time_measure('ltj_hyphenate')
head = to_direct(h)
ltjs_orig_char_table[i] = nil
end
ltjs.list_dir=ltjd_get_dir_count()
- for p in suppress_hyphenate_ja_iter, nil, head do end
+ 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
+ end
stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate')
lang.hyphenate(h, nil)
stop_time_measure('tex_hyphenate')
-- mode: true iff this function is called from hpack_filter
local ltjs_report_stack_level = ltjs.report_stack_level
+local ltjf_vert_form_table = ltjf.vert_form_table
local function set_box_stack_level(head, mode)
local box_set, cl = 0, tex.currentgrouplevel + 1
for _,p in pairs(wt) 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 = ltjs_orig_char_table[p]
- setfield(p, 'font', ltjf_replace_altfont(pfn, pc))
+ local nf = ltjf_replace_altfont(pfn, pc)
+ setfield(p, 'font', nf)
+ pc = ltjf_vert_form_table [getchar(p)]
+ if font.getfont(nf).characters[pc] then setfield(p, 'char', pc) end
end
end
end