X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-otf.lua;h=d13cff277b44c519f0580d18cd867a268a23feb6;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=ea92d60192e2fd1ba96509d0d1f3f46d3d85f0c8;hpb=8e5baa9c35d3bb21591f7b77fef9016fa6b64d94;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-otf.lua b/src/ltj-otf.lua
index ea92d60..d13cff2 100644
--- a/src/ltj-otf.lua
+++ b/src/ltj-otf.lua
@@ -15,30 +15,26 @@ local id_glyph = node.id('glyph')
 local id_whatsit = node.id('whatsit')
 local sid_user = node.subtype('user_defined')
 
-local Dnode = node.direct or node
+local setfield = node.direct.setfield
+local getfield = node.direct.getfield
+local getid = node.direct.getid
+local getfont = node.direct.getfont
+local getchar = node.direct.getchar
+local getsubtype = node.direct.getsubtype
 
-local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
-local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] 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 getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end
-local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
-local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end
+local to_node = node.direct.tonode
+local to_direct = node.direct.todirect
 
-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 node_new = Dnode.new
-local node_remove = Dnode.remove
-local node_next = (Dnode ~= node) and Dnode.getnext or node.next
-local node_free = Dnode.free
-local has_attr = Dnode.has_attribute
-local set_attr = Dnode.set_attribute
-local unset_attr = Dnode.unset_attribute
-local node_insert_after = Dnode.insert_after
-local node_write = Dnode.write
-local node_traverse_id = Dnode.traverse_id
+local node_new = node.direct.new
+local node_remove = node.direct.remove
+local node_next = node.direct.getnext
+local node_free = node.direct.free
+local has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
+local unset_attr = node.direct.unset_attribute
+local node_insert_after = node.direct.insert_after
+local node_write = node.direct.write
+local node_traverse_id = node.direct.traverse_id
 
 
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
@@ -158,15 +154,10 @@ local function extract(head)
    return to_node(head)
 end
 
-luatexbase.add_to_callback('hpack_filter', extract,
-			   'ltj.otf',
-   luatexbase.priority_in_callback('pre_linebreak_filter',
-				   'ltj.main'))
-luatexbase.add_to_callback('pre_linebreak_filter', extract,
-			   'ltj.otf',
-   luatexbase.priority_in_callback('pre_linebreak_filter',
-				   'ltj.main'))
-
+ltjb.add_to_callback('hpack_filter', extract,'ltj.otf',
+  luatexbase.priority_in_callback('hpack_filter', 'ltj.main'))
+ltjb.add_to_callback('pre_linebreak_filter', extract,'ltj.otf',
+  luatexbase.priority_in_callback('pre_linebreak_filter', 'ltj.main'))
 -- additional callbacks
 -- 以下は，LuaTeX-ja に用意された callback のサンプルになっている．
 --   JFM の文字クラスの指定の所で，"AJ1-xxx" 形式での指定を可能とした．
@@ -209,7 +200,7 @@ luatexbase.add_to_callback("luatexja.find_char_class",
 			   cid_set_char_class, "ltj.otf.find_char_class", 1)
 
 -------------------- IVS
-local enable_ivs
+local enable_ivs, disable_ivs
 do
    local is_ivs_enabled = false
 -- 組版時
@@ -231,13 +222,13 @@ do
       while p do
 	 local pid = getid(p)
 	 if pid==id_glyph then
-            local pf = getfont(p)
             local q = node_next(p) -- the next node of p
             if q and getid(q)==id_glyph then
                local qc = getchar(q)
                if (qc>=0xFE00 and qc<=0xFE0F) or (qc>=0xE0100 and qc<0xE01F0) then
 		   -- q is a variation selector
                   if qc>=0xE0100 then qc = qc - 0xE0100 end
+                  local pf = getfont(p)
                   local pt = ltjf_font_extra_info[pf]
                   pt = pt and pt[getchar(p)];  pt = pt and  pt[qc]
                   head, r = node_remove(head,q)
@@ -273,22 +264,26 @@ do
 	 ltjb.package_warning('luatexja-otf',
 			      'luatexja.otf.enable_ivs() was already called, so this call is ignored', '')
       else
-	 luatexbase.add_to_callback('hpack_filter',
-				    do_ivs_repr, 'ltj.do_ivs', 
-				    luatexbase.priority_in_callback('hpack_filter',
-								    'ltj.set_stack_level')+1)
-	 luatexbase.add_to_callback('pre_linebreak_filter',
-				    do_ivs_repr, 'ltj.do_ivs', 
-				    luatexbase.priority_in_callback('pre_linebreak_filter',
-								    'ltj.set_stack_level')+1)
+	 ltjb.add_to_callback('hpack_filter', do_ivs_repr, 'ltj.do_ivs',
+            luatexbase.priority_in_callback('hpack_filter', 'luaotfload.node_processor'))
+	 ltjb.add_to_callback('pre_linebreak_filter', do_ivs_repr, 'ltj.do_ivs',
+            luatexbase.priority_in_callback('pre_linebreak_filter', 'luaotfload.node_processor'))
 	 is_ivs_enabled = true
       end
    end
+   disable_ivs = function ()
+      if is_ivs_enabled then
+	 luatexbase.remove_from_callback('hpack_filter', 'ltj.do_ivs')
+	 luatexbase.remove_from_callback('pre_linebreak_filter', 'ltj.do_ivs')
+	 is_ivs_enabled = false
+      end
+   end
 end
 
 luatexja.otf = {
   append_jglyph = append_jglyph,
   enable_ivs = enable_ivs,  -- 隠し機能: IVS
+  disable_ivs = disable_ivs,  -- 隠し機能: IVS
   cid = cid,
 }