-- luatexja/ltj-pretreat.lua
--
+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 Dnode = node.direct or node
local has_attr = Dnode.has_attribute
local set_attr = Dnode.set_attribute
local node_traverse = Dnode.traverse
-local node_remove = Dnode.remove
-local node_next = Dnode.getnext
+local node_remove =luatexja.Dnode_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 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 is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
+local ltjd_get_vert_glyph = ltjd.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 STCK = luatexja.userid_table.STCK
+local DIR = luatexja.userid_table.DIR
+local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
+
+local dir_tate = luatexja.dir_table.dir_tate
------------------------------------------------------------------------
-- MAIN PROCESS STEP 1: replace fonts
------------------------------------------------------------------------
-local wt
+local wt, wtd
do
+ 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 = {}
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 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)
+ 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[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 and getfield(p, 'user_id')==STCK then
- wt[#wt+1] = p; head = node_remove(head, p)
+ if getsubtype(p)==sid_user then
+ local uid = getfield(p, 'user_id')
+ if uid==STCK then
+ wt[#wt+1] = p; head = 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)
+ end
+ wtd[#wtd+1] = p; head = node_remove(head, p)
+ end
end
return p
end
local function suppress_hyphenate_ja (h)
+ start_time_measure('ltj_hyphenate')
local p = to_direct(h)
- wt, head = {}, p
+ wt, wtd, head = {}, {}, p
+ ltjs.list_dir=ltjd.get_dir_count()
while p do
local pfunc = suppress_hyphenate_ja_aux[getid(p)]
if pfunc then p = pfunc(p) end
p = node_next(p)
end
head = to_node(head)
+ stop_time_measure('ltj_hyphenate'); start_time_measure('tex_hyphenate')
lang.hyphenate(head)
+ stop_time_measure('tex_hyphenate')
return head
end
-
- luatexbase.add_to_callback('hyphenate',
+
+ luatexbase.add_to_callback('hyphenate',
function (head,tail)
return suppress_hyphenate_ja(head)
end,'ltj.hyphenate')
for _,p in pairs(wt) do
if mode and getfield(p, 'value')==cl then box_set = 1 end; node_free(p)
end
+ for _,p in pairs(wtd) do
+ 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 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
+ 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
+ end
+ end
return head
end
-- CALLBACKS
-luatexbase.add_to_callback('hpack_filter',
+luatexbase.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',
+luatexbase.add_to_callback('pre_linebreak_filter',
function (head)
return set_box_stack_level(head, false)
end,'ltj.pre_linebreak_filter_pre',1)
OSDN Git Service
