Revert "Regenerated manual PDFs."

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

diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua
index 8314f07..e8b5bdd 100644 (file)
--- a/src/ltj-adjust.lua
+++ b/src/ltj-adjust.lua
@@ -10,6 +10,7 @@ luatexbase.provides_module({
 module('luatexja.adjust', package.seeall)
 
 luatexja.load_module('jfont');     local ltjf = luatexja.jfont
+luatexja.load_module('jfmglue');   local ltjj = luatexja.jfmglue
 
 local id_glyph = node.id('glyph')
 local id_kern = node.id('kern')
@@ -26,11 +27,12 @@ local node_next = node.next
 local node_free = node.free
 
 local ltjf_font_metric_table = ltjf.font_metric_table
+local spec_zero_glue = ltjj.spec_zero_glue
 
-local PACKED = 2
-local FROM_JFM = 6
-local KANJI_SKIP = 9
-local XKANJI_SKIP = 10
+local PACKED       = luatexja.icflag_table.PACKED
+local FROM_JFM     = luatexja.icflag_table.FROM_JFM
+local KANJI_SKIP   = luatexja.icflag_table.KANJI_SKIP
+local XKANJI_SKIP  = luatexja.icflag_table.XKANJI_SKIP
 
 local priority_table = {
    FROM_JFM + 2,
@@ -59,9 +61,9 @@ local function get_stretched(q, go, gs)
    end
 end
 
+-- local new_ks, new_xs
 local function get_total_stretched(p)
    local go, gf, gs = p.glue_order, p.glue_set, p.glue_sign
-   local new_ks, new_xs
    local res = {
       [0] = 0,
       glue_set = gf, name = (gs==1) and 'stretch' or 'shrink'
@@ -69,6 +71,7 @@ local function get_total_stretched(p)
    for i=1,#priority_table do res[priority_table[i]]=0 end
    if go ~= 0 then return nil end
    if gs ~= 1 and gs ~= 2 then return res end
+   local head = p.head
    q = p.head
    --luatexja.ext_show_node_list(p.head, '>>> ', print)
    while q do 
@@ -76,14 +79,17 @@ local function get_total_stretched(p)
          local a, ic = get_stretched(q, go, gs), get_attr_icflag(q)
          if   type(res[ic]) == 'number' then 
             -- kanjiskip, xkanjiskip は段落内で spec を共有しているが，
-            -- それはここでは望ましくないので，
-            -- 各行ごとに異なる spec を使うようにする．
+            -- それはここでは望ましくないので，各 glue ごとに異なる spec を使う．
             -- JFM グルーはそれぞれ異なる glue_spec を用いているので，問題ない．
             res[ic] = res[ic] + a
-            if ic == KANJI_SKIP then
-               q.spec = node_copy(q.spec)
-            elseif ic == XKANJI_SKIP then
-               q.spec = node_copy(q.spec)
+            if ic == KANJI_SKIP or ic == XKANJI_SKIP  then
+               if q.spec ~= spec_zero_glue then
+                  local ts, g; 
+                  q.spec, ts = node_copy(q.spec), q.spec
+                  g = node.copy(q); q.spec = ts
+                  node.insert_before(head, q, g);
+                  head = node.remove(head, q); node.free(q); q = g
+               end
             end
          else 
             res[0]  = res[0]  + a
@@ -91,8 +97,6 @@ local function get_total_stretched(p)
       end
       q = node_next(q)
    end
-   if new_ks then node_free(new_ks); new_ks = nil end
-   if new_xs then node_free(new_xs); new_xs = nil end
    return res
 end
 
@@ -108,15 +112,23 @@ local function clear_stretch(p, ic, name)
    end
 end
 
+local set_stretch_table = {}
 local function set_stretch(p, after, before, ic, name)
    if before > 0 then
       --print (ic, before, after)
       local ratio = after/before
+      for i,_ in pairs(set_stretch_table) do
+         set_stretch_table[i] = nil
+      end
       for q in node.traverse_id(id_glue, p.head) do
          if get_attr_icflag(q) == ic then
-            local qs = q.spec
-            if qs.writable and qs[name..'_order'] == 0 then
-               qs[name] = qs[name]*ratio
+            local qs, do_flag = q.spec, true
+            for i=1,#set_stretch_table do 
+               if set_stretch_table[i]==qs then do_flag = false end 
+            end
+            if qs.writable and qs[name..'_order'] == 0 and do_flag then
+               qs[name] = qs[name]*ratio; 
+               set_stretch_table[#set_stretch_table+1] = qs
             end
          end
       end
@@ -145,7 +157,7 @@ local function aw_step1(p, res, total)
      return false-- それ以外は対象外．
    end
    local xk = ltjf_font_metric_table -- 
-     [xc.font].size_cache.char_type[has_attr(xc, attr_jchar_class) or 0]
+     [xc.font].char_type[has_attr(xc, attr_jchar_class) or 0]
      ['end_' .. res.name] or 0
      --print(res.name, total, xk, unicode.utf8.char(xc.char))