Fix errors: ltjb.package_error() is called with a table argument in ltj-charrange...

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

diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua
index 1434fa4..6c554c9 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')
@@ -21,8 +22,12 @@ local set_attr = node.set_attribute
 local attr_icflag = luatexbase.attributes['ltj@icflag']
 local attr_jchar_class = luatexbase.attributes['ltj@charclass']
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
+local node_copy = node.copy
+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
@@ -30,12 +35,12 @@ local KANJI_SKIP = 9
 local XKANJI_SKIP = 10
 
 local priority_table = {
-   XKANJI_SKIP,
    FROM_JFM + 2,
    FROM_JFM + 1,
    FROM_JFM,
    FROM_JFM - 1,
    FROM_JFM - 2,
+   XKANJI_SKIP,
    KANJI_SKIP
 }
 
@@ -58,6 +63,7 @@ end
 
 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'
@@ -65,13 +71,49 @@ 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
-   for q in node.traverse_id(id_glue, p.head) do
-      local a, ic = get_stretched(q, go, gs), get_attr_icflag(q)
-      --print(ic)
-      if   type(res[ic]) == 'number' then res[ic] = res[ic] + a
-      else                                res[0]  = res[0]  + a
+   local head = p.head
+   q = p.head
+   --luatexja.ext_show_node_list(p.head, '>>> ', print)
+   while q do 
+      if q.id==id_glue then
+         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
+               if q.spec ~= spec_zero_glue then
+                  if not new_ks then
+                     local ts; q.spec, ts = node_copy(q.spec), q.spec
+                     new_ks, q.spec = node.copy(q), ts
+                  end
+                  local g = node.copy(new_ks)
+                  node.insert_before(head, q, g);
+                  head = node.remove(head, q); node.free(q); q = g
+               end
+            elseif ic == XKANJI_SKIP then
+               if q.spec ~= spec_zero_glue then
+                  if not new_xs then
+                     local ts; q.spec, ts = node_copy(q.spec), q.spec
+                     new_xs, q.spec = node.copy(q), ts
+                  end
+                  local g =node.copy(new_xs)
+                  node.insert_before(head, q, g);
+                  head = node.remove(head, q); node.free(q); q = g
+               end
+            end
+         else 
+            res[0]  = res[0]  + a
+         end
       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
 
@@ -113,11 +155,11 @@ local function aw_step1(p, res, total)
       x = node.prev(node.prev(x)) 
    end
 
-   local xc
-   if x.id == id_glyph and has_attr(x, attr_curjfnt) == x.font then
+   local xi, xc = x.id
+   if xi == id_glyph and has_attr(x, attr_curjfnt) == x.font then
       -- 和文文字
       xc = x
-   elseif x.id == id_hlist and get_attr_icflag(x) == PACKED then
+   elseif xi == id_hlist and get_attr_icflag(x) == PACKED then
       -- packed JAchar
       xc = x.head
    else
@@ -192,6 +234,7 @@ function adjust_width(head)
             end
          end; total = tex.round(total * res.glue_set)
          local added_flag = aw_step1(p, res, total)
+         --print(total, res[0], res[KANJI_SKIP], res[FROM_JFM])
          aw_step2(p, res, total, added_flag)
       end
    end
@@ -210,4 +253,4 @@ function disable_cb()
       luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width')
       is_reg = false
    end
-end
\ No newline at end of file
+end