Dnode -> node.direct (WIP)

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

diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua
index 9c53425..d357231 100644 (file)
--- a/src/ltj-jfont.lua
+++ b/src/ltj-jfont.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfont',
-  date = '2015/09/19',
+  date = '2016/04/03',
   description = 'Loader for Japanese fonts',
 })
 module('luatexja.jfont', package.seeall)
@@ -13,19 +13,14 @@ luatexja.load_module('charrange'); local ltjc = luatexja.charrange
 luatexja.load_module('rmlgbm');    local ltjr = luatexja.rmlgbm
 luatexja.load_module('direction'); local ltjd = luatexja.direction
 
+local setfield = node.direct.setfield
+local getid = node.direct.getid
+local to_direct = node.direct.todirect
 
-local Dnode = node.direct or node
-
-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 nullfunc = function(n) return n end
-local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
-
-local node_new = Dnode.new
-local node_free = Dnode.free
-local has_attr = Dnode.has_attribute
-local set_attr = Dnode.set_attribute
+local node_new = node.direct.new
+local node_free = node.direct.free
+local has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
 local round = tex.round
 local font_getfont = font.getfont
 
@@ -34,8 +29,6 @@ local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 local attr_curtfnt = luatexbase.attributes['ltj@curtfnt']
 local id_glyph = node.id('glyph')
 local id_kern = node.id('kern')
-local id_glue_spec = node.id('glue_spec')
-local id_glue = node.id('glue')
 local cat_lp = luatexbase.catcodetables['latex-package']
 local FROM_JFM     = luatexja.icflag_table.FROM_JFM
 local tokenlib = luatexja.token
@@ -165,27 +158,22 @@ do
            ((v.align=='right') and 1 or 0.5)
         if type(i) == 'number' then -- char_type
            for k,w in pairs(v.glue) do
-              local h = node_new(id_glue_spec)
               v[k] = {
-                 true, h,
+                 nil,
                  ratio=w.ratio/sz,
                  priority=FROM_JFM + w.priority/sz,
+                 width = w[1], stretch = w[2], shrink = w[3],
                  kanjiskip_natural = w.kanjiskip_natural and w.kanjiskip_natural/sz,
                  kanjiskip_stretch = w.kanjiskip_stretch and w.kanjiskip_stretch/sz,
                  kanjiskip_shrink =  w.kanjiskip_shrink  and w.kanjiskip_shrink/sz,
               }
-              setfield(h, 'width', w[1])
-              setfield(h, 'stretch', w[2])
-              setfield(h, 'shrink', w[3])
-              setfield(h, 'stretch_order', 0)
-              setfield(h, 'shrink_order', 0)
            end
            for k,w in pairs(v.kern) do
               local g = node_new(id_kern)
               setfield(g, 'kern', w[1])
               setfield(g, 'subtype', 1)
               set_attr(g, attr_icflag, FROM_JFM)
-              v[k] = {false, g, ratio=w[2]/sz}
+              v[k] = {g, ratio=w[2]/sz}
            end
         end
         v.glue, v.kern = nil, nil
@@ -661,14 +649,13 @@ do
               for k,w in pairs(v) do
                  if type(k)=='number' then
                     --if w[1] then gs = gs + 1 else ke = ke + 1 end
-                    node_free(w[2])
+                    if w[1] then node_free(w[1]) end
                  end
               end
            end
            n.size_cache[i]=nil
         end
       end
-      --print('glue spec: ', gs, 'kern: ', ke)
    end
 end
 
@@ -943,12 +930,12 @@ end
 -- MISC
 ------------------------------------------------------------------------
 do
-   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 getfont = node.direct.getfont
+   local getchar = node.direct.getchar
    local get_dir_count = ltjd.get_dir_count
    local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
    local ensure_tex_attr = ltjb.ensure_tex_attr
-   local node_write = Dnode.write
+   local node_write = node.direct.write
    local font = font
    local new_ic_kern
    if status.luatex_version>=89 then