Cherry-picked several commits from kitagawa_tfont branch

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

diff --git a/src/luatexja.lua b/src/luatexja.lua
index 153bd7a..0e9f64e 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -43,6 +43,8 @@ stack_table_index.PRE  = 0x200000 -- characterごと
 stack_table_index.POST = 0x400000 -- characterごと
 stack_table_index.KCAT = 0x600000 -- characterごと
 stack_table_index.XSP  = 0x800000 -- characterごと
+stack_table_index.RIPRE  = 0xA00000 -- characterごと，ruby pre
+stack_table_index.RIPOST = 0xC00000 -- characterごと，ruby post
 stack_table_index.JWP  = 0 -- これだけ
 stack_table_index.KSK  = 1 -- これだけ
 stack_table_index.XSK  = 2 -- これだけ
@@ -57,44 +59,42 @@ userid_table.IHB  = luatexbase.newuserwhatsitid('inhibitglue',  'luatexja') -- \
 userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- スタック管理
 userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par',    'luatexja') -- 「段落始め」
 
+------------------------------------------------------------------------
+-- FIX node.remove
+------------------------------------------------------------------------
 do
    local node_remove, node_next, node_prev = node.remove, node.next, node.prev
    function luatexja.node_remove (head, current)
       if head==current then
-        local q, r = node_next(current), node_prev(current)
-        current.next = nil
-        if q then q.prev = r end
-        if r and node_next(r)==current then -- r is "real prev"
-           r.next = q
-        end
-        return q, q
+         local q, r = node_next(current), node_prev(current)
+         if q then q.prev = r end
+         if r and node_next(r)==current then 
+            r.next = q
+         end
+         return q, q
       else
-        return node_remove(head, current)
+         return node_remove(head, current)
       end
    end
-
    local Dnode = node.direct or node
    if Dnode~=node then
-      local Dnode_remove = Dnode.remove
-      local Dnode_next, Dnode_prev = Dnode.getnext, node.getprev
-      local getfield, setfield = Dnode.getfield, Dnode.setfield
+      local Dnode_remove, setfield = Dnode.remove, Dnode.setfield
+      local Dnode_next, Dnode_prev = Dnode.getnext, Dnode.getprev
       function luatexja.Dnode_remove (head, current)
-        if head==current then
-           local q, r = Dnode_next(current), Dnode_prev(current)
-           setfield(current, 'next', nil)
-           if q then setfield(q, 'prev', r) end
-           if r and Dnode_next(r) == current then -- r is "real prev"
-              setfield(r, 'next', q)
-           end
-           return q, q
-        else
-           return Dnode_remove(head, current)
-        end
+         if head==current then
+            local q, r = Dnode_next(current), Dnode_prev(current)
+            if q then setfield(q, 'prev', r) end
+            if r and Dnode_next(r) == current then
+               setfield(r, 'next', q)
+            end
+            return q, q
+         else
+            return Dnode_remove(head, current)
+         end
       end
    else
       luatexja.Dnode_remove = luatexja.node_remove 
    end
-
 end
 
 --- 定義終わり
@@ -119,10 +119,6 @@ local attr_icflag = luatexbase.attributes['ltj@icflag']
 local attr_uniqid = luatexbase.attributes['ltj@uniqid']
 local cat_lp = luatexbase.catcodetables['latex-package']
 
-
----- table: charprop_stack_table [stack_level].{pre|post|xsp}[chr_code]
-
-
 -- Three aux. functions, bollowed from tex.web
 
 local unity=65536
@@ -281,12 +277,20 @@ do
    local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
    -- mode = true iff main_process is called from pre_linebreak_filter
    local function main_process(head, mode, dir)
+      tex.setattribute('global', attr_icflag, 0)
       local p = to_direct(head)
       p = ltjj.main(p,mode)
       if p then p = ltjw.set_ja_width(p, dir) end
       return to_node(p)
    end
-   
+
+   local function adjust_icflag(h)
+      -- kern from luaotfload will have icflag = 1
+      -- (same as italic correction)
+      tex.setattribute('global', attr_icflag, 1)
+      return h
+   end
+
    -- callbacks
    
    luatexbase.add_to_callback(
@@ -303,6 +307,9 @@ do
       end,'ltj.hpack_filter',
       luatexbase.priority_in_callback('hpack_filter',
                                      'luaotfload.node_processor') + 1)
+   luatexbase.add_to_callback('pre_linebreak_filter', adjust_icflag, 'adjust_icflag', 1)
+   luatexbase.add_to_callback('hpack_filter', adjust_icflag, 'adjust_icflag', 1)
+
 end
 
 -- define_font