Added luatexja.node_remove and luatexja.Dnode_remove ("safe node.remove")

[luatex-ja/luatexja.git] / src / ltj-pretreat.lua

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 0c7ac3d..387fcc8 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -6,14 +6,28 @@ luatexja.load_module('charrange'); local ltjc = luatexja.charrange
 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 id_glyph = node.id('glyph')
@@ -24,7 +38,7 @@ local sid_user = node.subtype('user_defined')
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 local attr_icflag = luatexbase.attributes['ltj@icflag']
 
-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
@@ -35,39 +49,35 @@ local STCK = luatexja.userid_table.STCK
 local wt
 do
    local head
-   local end_math = node.end_of_math or 
-      function(p)
-        while p and p.id~=id_math do p = node_next(p) end
-        return p
-      end
 
    local suppress_hyphenate_ja_aux = {}
    suppress_hyphenate_ja_aux[id_glyph] = function(p)
-      if (has_attr(p, attr_icflag) or 0)<=0 and ltjc_is_ucs_in_japanese_char(p) then
-        local pc = p.char
-        local pf = ltjf_replace_altfont(has_attr(p, attr_curjfnt) or p.font, pc)
-        p.font = pf;  set_attr(p, attr_curjfnt, pf)
-        p.subtype = floor(p.subtype*0.5)*2
+      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 end_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[id_whatsit] = function(p)
-      if p.subtype==sid_user and p.user_id==STCK then
+      if getsubtype(p)==sid_user and getfield(p, 'user_id')==STCK then
         wt[#wt+1] = p; head = node_remove(head, p)
       end
       return p
    end
 
    local function suppress_hyphenate_ja (h)
-      local p = h
-      wt, head = {}, h
+      local p = to_direct(h)
+      wt, head = {}, p
       while p do
-        local pfunc = suppress_hyphenate_ja_aux[p.id]
+        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
@@ -82,7 +92,7 @@ end
 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