use new whatsit to support ligatures between right boundary

diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua
index ed06e29..574302a 100644 (file)
--- a/src/ltj-jfmglue.lua
+++ b/src/ltj-jfmglue.lua
@@ -469,6 +469,10 @@ calc_np_auxtable = {
            local lq = node_next(lp);
            head = node_remove(head, lp); node_free(lp); non_ihb_flag = false
            return false, lq;
+        elseif getfield(lp, 'user_id')==luatexja.userid_table.JA_AL_BDD then
+           local lq = node_next(lp);
+           head = node_remove(head, lp); node_free(lp)
+           return false, lq;
         else
            set_attr(lp, attr_icflag, PROCESSED)
            luatexbase.call_callback("luatexja.jfmglue.whatsit_getinfo",
@@ -1279,7 +1283,7 @@ end
 end
 
 do
-   local IHB  = luatexja.userid_table.IHB
+   local IHB  = luatexja.userid_table.IHB 
    local BPAR = luatexja.userid_table.BPAR
    local BOXB = luatexja.userid_table.BOXB
    local node_prev = node.direct.getprev

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 7d33257..3f37278 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -45,6 +45,7 @@ local ltjs_orig_char_table = ltjs.orig_char_table
 local ltjf_replace_altfont = ltjf.replace_altfont
 local STCK  = luatexja.userid_table.STCK
 local DIR   = luatexja.userid_table.DIR
+local JA_AL_BDD = luatexja.userid_table.JA_AL_BDD
 local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
 
 local dir_tate = luatexja.dir_table.dir_tate
@@ -85,6 +86,9 @@ do
                {
                   __index = function() return node_next end,
                })
+   local id_boundary = node.id('boundary')
+   local node_new, insert_before = node.direct.new, node.direct.insert_before
+   local setsubtype = node.direct.setsubtype or function(n,l) setfield(n,'subtype',l) end 
    local function suppress_hyphenate_ja (h)
       start_time_measure('ltj_hyphenate')
       head = to_direct(h)
@@ -97,15 +101,26 @@ do
       do
         local p = head
         while p do
-           local pid = getid(p)
+           local pid, prev_chartype = getid(p), 0
+           -- prev_chartype: 0: not char 1: ALchar 2: JAchar
            while pid==id_glyph do
               local pc = getchar(p)
               if has_attr(p, attr_icflag, 0) and is_ucs_in_japanese_char(p, pc) then
+                 if prev_chartype==1 then
+                     local b = node_new(id_whatsit,sid_user);
+                    setfield(b, 'type', 100); setfield(b, 'user_id', JA_AL_BDD);
+                    insert_before(head, p, b)
+                 end
                   local pf = has_attr(p, attr_curjfnt)
                   pf = (pf and pf>0 and pf) or getfont(p)
                  setfont(p, ltjf_replace_altfont(pf, pc))
                  setlang(p, lang_ja)
-                 ltjs_orig_char_table[p] = pc
+                 ltjs_orig_char_table[p], prev_chartype = pc, 2
+               elseif prev_chartype==2 then
+                 local b = node_new(id_whatsit,sid_user);
+                 setfield(b, 'type', 100); setfield(b, 'user_id', JA_AL_BDD);
+                 insert_before(head, p, b); prev_chartype = 1
+               else prev_chartype = 1
               end
               p = node_next(p); pid = getid(p)
            end

diff --git a/src/luatexja.lua b/src/luatexja.lua
index 9756ead..4a4de62 100644 (file)
--- a/src/luatexja.lua
+++ b/src/luatexja.lua
@@ -80,6 +80,7 @@ userid_table.STCK = luatexbase.newuserwhatsitid('stack_marker', 'luatexja') -- 
 userid_table.BPAR = luatexbase.newuserwhatsitid('begin_par',    'luatexja') -- 「段落始め」
 userid_table.DIR  = luatexbase.newuserwhatsitid('direction',    'luatexja') -- 組方向
 userid_table.BOXB = luatexbase.newuserwhatsitid('box_boundary', 'luatexja') -- 「ボックス始め・終わり」
+userid_table.JA_AL_BDD = luatexbase.newuserwhatsitid('ja_al_boundary', 'luatexja')
 
 local dir_table = {}
 luatexja.dir_table = dir_table