--
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
+
+local Dnode = node.direct or node
+
+local nullfunc = function(n) return n end
+local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc
+local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
+local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
+local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
+local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
+local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
+local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end
+local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype 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 = Dnode.has_attribute
+local set_attr = Dnode.set_attribute
+local node_traverse = Dnode.traverse
+local node_remove =luatexja.Dnode_remove -- Dnode.remove
+local node_next = Dnode.getnext
+local node_free = Dnode.free
+local node_end_of_math = Dnode.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 attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
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 ltjf_replace_altfont = ltjf.replace_altfont
local attr_orig_char = luatexbase.attributes['ltj@origchar']
local STCK = luatexja.userid_table.STCK
-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,
- }
-}
-
-
------------------------------------------------------------------------
-- MAIN PROCESS STEP 1: replace fonts
------------------------------------------------------------------------
local wt
+do
+ local head
-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
- end
- end
- end
- elseif pid == id_math then
- p = node_next(p) -- skip math on
- while p and p.id~=id_math do p = node_next(p) end
- elseif pid == id_whatsit and p.subtype==sid_user and p.user_id==STCK then
+ 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[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)
end
- p = node_next(p)
+ return p
end
- lang.hyphenate(head)
- return head
+
+ local function suppress_hyphenate_ja (h)
+ local p = to_direct(h)
+ wt, head = {}, p
+ 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)
+ lang.hyphenate(head)
+ return head
+ end
+
+ luatexbase.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 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 and getfield(p, 'value')==cl then box_set = 1 end; node_free(p)
end
ltjs.report_stack_level(tex_getcount('ltj@@stack') + box_set)
return head
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')
luatexja.pretreat = {
set_box_stack_level = set_box_stack_level,
-}
\ No newline at end of file
+}