Import from old kitagawa_ruby branch (may not work now)

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

diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua
index 8946027..3678027 100644 (file)
--- a/src/ltj-jfmglue.lua
+++ b/src/ltj-jfmglue.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfmglue',
-  date = '2014/02/01',
+  date = '2014/02/02',
   description = 'Insertion process of JFM glues and kanjiskip',
 })
 module('luatexja.jfmglue', package.seeall)
@@ -31,7 +31,7 @@ local has_attr = Dnode.has_attribute
 local set_attr = Dnode.set_attribute
 local insert_before = Dnode.insert_before
 local insert_after = Dnode.insert_after
-local node_next = Dnode.getnext
+local node_next = (Dnode ~= node) and Dnode.getnext or node.next
 local round = tex.round
 local ltjf_font_metric_table = ltjf.font_metric_table
 local ltjf_find_char_class = ltjf.find_char_class
@@ -271,7 +271,7 @@ local function set_attr_icflag_processed(p)
 end
 
 local function check_next_ickern(lp)
-   if getid(lp) == id_kern and ITALIC == get_attr_icflag(lp) then
+   if lp and getid(lp) == id_kern and ITALIC == get_attr_icflag(lp) then
       set_attr(lp, attr_icflag, IC_PROCESSED)
       Np.last = lp; return node_next(lp)
    else 
@@ -279,12 +279,12 @@ local function check_next_ickern(lp)
    end
 end
 
-local function calc_np_pbox(lp)
+local function calc_np_pbox(lp, last)
    Np.first = Np.first or lp; Np.id = id_pbox
    local lpa, nc = KINSOKU, nil
    set_attr(lp, attr_icflag, get_attr_icflag(lp));
-   while lp and (lpa>=PACKED) and (lpa<BOXBDD) do
-      nc, lp = lp, node_next(lp); lpa = has_attr(lp, attr_icflag) or 0
+   while lp ~=last and (lpa>=PACKED) and (lpa<BOXBDD) do
+      nc, lp = lp, node_next(lp); lpa = lp and has_attr(lp, attr_icflag) or 0
      -- get_attr_icflag() ではいけない！
    end
    Np.nuc = nc
@@ -384,7 +384,7 @@ calc_np_auxtable[id_adjust] = calc_np_auxtable.skip
 calc_np_auxtable[id_disc]   = calc_np_auxtable.discglue
 calc_np_auxtable[id_glue]   = calc_np_auxtable.discglue
 
-function calc_np(lp)
+function calc_np(lp, last)
    local k
    -- We assume lp = node_next(Np.last)
    Np, Nq, ihb_flag = Nq, Np, nil
@@ -396,14 +396,14 @@ function calc_np(lp)
    for k in pairs(Np) do Np[k] = nil end
 
    for k = 1,#Bp do Bp[k] = nil end
-   while lp  do
+   while lp ~= last  do
       local lpa = has_attr(lp, attr_icflag) or 0
        -- unbox 由来ノードの検出
       if lpa>=PACKED then
          if lpa%PROCESSED_BEGIN_FLAG == BOXBDD then
            local lq = node_next(lp) 
             head = node_remove(head, lp); node_free(lp); lp = lq
-         else return calc_np_pbox(lp)
+         else return calc_np_pbox(lp, last)
          end -- id_pbox
       else
         k, lp = calc_np_auxtable[getid(lp)](lp)
@@ -942,9 +942,9 @@ do
                       or ((lpi==id_hlist) and (lps==3))) do
            if (lpi==id_hlist) and (lps==3) then par_indented = 'parbdd' end
            lp=node_next(lp); lpi, lps = getid(lp), getsubtype(lp) end
-        return lp, par_indented
+        return lp, node_tail(head), par_indented
       else 
-        return head, 'boxbdd'
+        return head, nil, 'boxbdd'
       end
    end
 end
@@ -974,14 +974,14 @@ end
 function main(ahead, mode)
    if not ahead then return ahead end
    head = ahead;
-   local lp, par_indented = init_var(mode); 
+   local lp, last, par_indented = init_var(mode)
    lp = calc_np(lp, last)
    if Np then 
       extract_np(); handle_list_head(par_indented)
    else
-      return cleanup(mode, last)
+      return cleanup(mode)
    end
-   lp = calc_np(lp)
+   lp = calc_np(lp, last)
    while Np do
       extract_np();
       adjust_nq(); 
@@ -996,7 +996,7 @@ function main(ahead, mode)
          if Nq.id==id_hlist then handle_nq_ja_hlist()
          else handle_nq_jachar() end
       end
-      lp = calc_np(lp)
+      lp = calc_np(lp, last)
    end
    handle_list_tail(mode)
    return cleanup(mode)
@@ -1006,7 +1006,7 @@ end
 do
    local IHB  = luatexja.userid_table.IHB
    local BPAR = luatexja.userid_table.BPAR
-   local node_prev = Dnode.getprev
+   local node_prev = (Dnode ~= node) and Dnode.getprev or node.prev
    local node_write = Dnode.write
 
    -- \inhibitglue