X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-adjust.lua;h=bec34353aa012255f76989421bf211538ee5e2e5;hb=db94e608b0fe848b08a050d4226f7fae8be1f87d;hp=885a649e41400b34249f1ff0131e377b1c8e8393;hpb=1664271cd29e52a9e40de133aa611908e4a6415c;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua
index 885a649..bec3435 100644
--- a/src/ltj-adjust.lua
+++ b/src/ltj-adjust.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.adjust',
-  date = '2014/01/24',
+  date = '2014/05/08',
   description = 'Advanced line adjustment for LuaTeX-ja',
 })
 module('luatexja.adjust', package.seeall)
@@ -29,9 +29,9 @@ local node_traverse_id = Dnode.traverse_id
 local node_new = Dnode.new
 local node_copy = Dnode.copy
 local node_hpack = Dnode.hpack
-local node_next = Dnode.getnext
+local node_next = (Dnode ~= node) and Dnode.getnext or node.next
 local node_free = Dnode.free
-local node_prev = Dnode.getprev
+local node_prev = (Dnode ~= node) and Dnode.getprev or node.prev
 local node_tail = Dnode.tail
 local has_attr = Dnode.has_attribute
 local set_attr = Dnode.set_attribute
@@ -49,12 +49,14 @@ local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 
 local ltjf_font_metric_table = ltjf.font_metric_table
 local spec_zero_glue = ltjj.spec_zero_glue
-local round = tex.round
+local round, pairs = tex.round, pairs
 
 local PACKED       = luatexja.icflag_table.PACKED
 local FROM_JFM     = luatexja.icflag_table.FROM_JFM
 local KANJI_SKIP   = luatexja.icflag_table.KANJI_SKIP
+local KANJI_SKIP_JFM = luatexja.icflag_table.KANJI_SKIP_JFM
 local XKANJI_SKIP  = luatexja.icflag_table.XKANJI_SKIP
+local XKANJI_SKIP_JFM  = luatexja.icflag_table.XKANJI_SKIP_JFM
 
 local priority_table = {
    FROM_JFM + 2,
@@ -66,9 +68,12 @@ local priority_table = {
    KANJI_SKIP
 }
 
-local PROCESSED_BEGIN_FLAG = 32
-local function get_attr_icflag(p)
-   return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
+local get_attr_icflag
+do
+   local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
+   get_attr_icflag = function(p)
+      return (has_attr(p, attr_icflag) or 0) % PROCESSED_BEGIN_FLAG
+   end
 end
 
 -- box 内で伸縮された glue の合計値を計算
@@ -77,44 +82,54 @@ local function get_stretched(q, go, gs)
    local qs = getfield(q, 'spec')
    if not getfield(qs, 'writable') then return 0 end
    if gs == 1 then -- stretching
-      if getfield(qs, 'stretch_order') == go then 
-	 return getfield(qs, 'stretch') 
+      if getfield(qs, 'stretch_order') == go then
+	 return getfield(qs, 'stretch')
       end
    else -- shrinking
-      if getfield(qs, 'shrink_order') == go then 
+      if getfield(qs, 'shrink_order') == go then
 	 return getfield(qs, 'shrink')
       end
    end
 end
 
 local res = {}
-local is_skip_normal = {}
-local function get_total_stretched(p)
-   local go, gf, gs 
+local gs_used_line = {}
+local function get_total_stretched(p, line)
+   local go, gf, gs
       = getfield(p, 'glue_order'), getfield(p, 'glue_set'), getfield(p, 'glue_sign')
+   if go ~= 0 then return nil end
    res[0], res.glue_set, res.name = 0, gf, (gs==1) and 'stretch' or 'shrink'
    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
+   if gs ~= 1 and gs ~= 2 then return res, 0 end
+   local total = 0
    for q in node_traverse_id(id_glue, getlist(p)) do
       local a, ic = get_stretched(q, go, gs), get_attr_icflag(q)
-      if   type(res[ic]) == 'number' then 
+      if   type(res[ic]) == 'number' then
 	 -- kanjiskip, xkanjiskip は段落内で spec を共有しているが，
 	 -- それはここでは望ましくないので，各 glue ごとに異なる spec を使う．
-	 -- （この仮定でメモリリークを起こしている！）
+	 -- 本当は各行ごとに glue_spec を共有させたかったが，安直にやると
+	 -- ref_count が 0 なので Double-free が発生する．どうする？
 	 -- JFM グルーはそれぞれ異なる glue_spec を用いているので，問題ない．
-	 res[ic] = res[ic] + a
 	 if (ic == KANJI_SKIP or ic == XKANJI_SKIP) and getsubtype(q)==0 then
 	    local qs = getfield(q, 'spec')
-	    if is_skip_normal[ic] and qs ~= spec_zero_glue then
-	       setfield(q, 'spec', node_copy(qs))
+	    if qs ~= spec_zero_glue then
+	       if (gs_used_line[qs] or 0)<line  then
+		  setfield(q, 'spec', node_copy(qs))
+		  local f = node_new(id_glue); setfield(f, 'spec', qs); node_free(f)
+		  -- decrese qs's reference count
+	       else
+		  gs_used_line[qs] = line
+	       end
 	    end
+	 elseif ic == KANJI_SKIP_JFM  then ic = KANJI_SKIP
+	 elseif ic == XKANJI_SKIP_JFM  then ic = XKANJI_SKIP
 	 end
-      else 
-	 res[0]  = res[0]  + a
+	 res[ic], total = res[ic] + a, total + a
+      else
+	 res[0], total = res[0]  + a, total + a
       end
    end
-   return res
+   return res, total
 end
 
 local function clear_stretch(p, ic, name)
@@ -132,16 +147,17 @@ 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, getlist(p)) do
-         if get_attr_icflag(q) == ic then
+	 local f = get_attr_icflag(q)
+         if (f == ic) or ((ic ==KANJI_SKIP) and (f == KANJI_SKIP_JFM))
+	   or ((ic ==XKANJI_SKIP) and (f == XKANJI_SKIP_JFM)) then
             local qs, do_flag = getfield(q, 'spec'), true
-            for i=1,#set_stretch_table do 
-               if set_stretch_table[i]==qs then do_flag = false end 
+            for i=1,#set_stretch_table do
+               if set_stretch_table[i]==qs then do_flag = false end
             end
             if getfield(qs, 'writable') and getfield(qs, name..'_order')==0 and do_flag then
                setfield(qs, name, getfield(qs, name)*ratio)
@@ -154,15 +170,19 @@ end
 
 -- step 1: 行末に kern を挿入（句読点，中点用）
 local function aw_step1(p, res, total)
-   local head = getlist(p)
-   local x = node_tail(head); if not x then return false end
+   local x = node_tail(getlist(p)); if not x then return false end
+   -- x: \rightskip
    x = node_prev(x); if not x then return false end
-   -- 本当の行末の node を格納
-   if getid(x) == id_glue and getsubtype(x) == 15 then 
+   if getid(x) == id_glue and getsubtype(x) == 15 then
       -- 段落最終行のときは，\penalty10000 \parfillskip が入るので，
       -- その前の node が本来の末尾文字となる
-      x = node_prev(node_prev(x)) 
+      x = node_prev(node_prev(x))
    end
+   -- local xi = getid(x)
+   -- while (get_attr_icflag(x) == PACKED)
+   --    and  ((xi == id_penalty) or (xi == id_kern) or (xi == id_kern)) do
+   --       x = node_prev(x); xi = getid(x)
+   -- end
    local xi, xc = getid(x)
    if xi == id_glyph and has_attr(x, attr_curjfnt) == getfont(x) then
       -- 和文文字
@@ -175,8 +195,8 @@ local function aw_step1(p, res, total)
      return false-- それ以外は対象外．
    end
    local xk = ltjf_font_metric_table[getfont(xc)]
-     xk = xk.char_type[has_attr(xc, attr_jchar_class) or 0]
-     xk = xk['end_' .. res.name] or 0
+   xk = xk.char_type[has_attr(xc, attr_jchar_class) or 0]
+   xk = xk['end_' .. res.name] or 0
 
    if xk>0 and total>=xk then
       total = total - xk
@@ -205,70 +225,65 @@ local function aw_step2(p, res, total, added_flag)
       for _,v in pairs(priority_table) do clear_stretch(p, v, res.name) end
       local f = node_hpack(getlist(p), getfield(p, 'width'), 'exactly')
       setfield(f, 'head', nil)
-	 setfield(p, 'glue_set', getfield(f, 'glue_set'))
-	 setfield(p, 'glue_order', getfield(f, 'glue_order'))
-	 setfield(p, 'glue_sign', getfield(f, 'glue_sign'))
+      setfield(p, 'glue_set', getfield(f, 'glue_set'))
+      setfield(p, 'glue_order', getfield(f, 'glue_order'))
+      setfield(p, 'glue_sign', getfield(f, 'glue_sign'))
       node_free(f)
    else
-      local orig_total, avail = total, res[0]
-      total, i = total - res[0], 1
-      while i <= #priority_table do
+      total = total - res[0]
+      for i = 1, #priority_table do
          local v = priority_table[i]
          if total <= res[v] then
             for j = i+1,#priority_table do
                clear_stretch(p, priority_table[j], res.name)
             end
-            set_stretch(p, total, res[v], v, res.name)
-	    avail = avail + total
-            i = #priority_table + 9 -- ループから抜けさせたいため
+            set_stretch(p, total, res[v], v, res.name); break
          end
-         total, i, avail = total - res[v], i+1, avail + res[v]
-      end
-      if i == #priority_table + 10 or added_flag then
-	 local f = node_hpack(getlist(p), getfield(p, 'width'), 'exactly')
-	 setfield(f, 'head', nil)
-	 setfield(p, 'glue_set', getfield(f, 'glue_set'))
-	 setfield(p, 'glue_order', getfield(f, 'glue_order'))
-	 setfield(p, 'glue_sign', getfield(f, 'glue_sign'))
-	 node_free(f)
+         total = total - res[v]
       end
+      local f = node_hpack(getlist(p), getfield(p, 'width'), 'exactly')
+      setfield(f, 'head', nil)
+      setfield(p, 'glue_set', getfield(f, 'glue_set'))
+      setfield(p, 'glue_order', getfield(f, 'glue_order'))
+      setfield(p, 'glue_sign', getfield(f, 'glue_sign'))
+      node_free(f)
    end
 end
 
 
-function adjust_width(head) 
+local ltjs_fast_get_stack_skip = ltjs.fast_get_stack_skip
+local function adjust_width(head)
    if not head then return head end
-   is_skip_normal[KANJI_SKIP] = (ltjs.fast_get_stack_skip('kanjiskip').width ~= 1073741823)
-   is_skip_normal[XKANJI_SKIP] = (ltjs.fast_get_stack_skip('xkanjiskip').width ~= 1073741823)
+   local line = 1
    for p in node_traverse_id(id_hlist, to_direct(head)) do
-      local res = get_total_stretched(p)
-      if res then
-         -- 調整量の合計
-         local total = 0
-         for i,v in pairs(res) do 
-            if type(i)=='number' then
-               total = total + v
-            end
-         end; total = 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)
+      line = line + 1
+      local res, total = get_total_stretched(p, line)
+        -- this is the same table as the table which is def'd in l. 92
+      if res and res.glue_set<1 then
+	 total = round(total * res.glue_set)
+         aw_step2(p, res, total, aw_step1(p, res, total))
       end
    end
+   for i,_ in pairs(gs_used_line) do
+      gs_used_line[i]  = nil
+   end
    return to_node(head)
 end
 
-local is_reg = false
-function enable_cb()
-   if not is_reg then
-      luatexbase.add_to_callback('post_linebreak_filter', adjust_width, 'Adjust width', 100)
-      is_reg = true
+do
+   local is_reg = false
+   function enable_cb()
+      if not is_reg then
+	 luatexbase.add_to_callback('post_linebreak_filter',
+				    adjust_width, 'Adjust width', 100)
+	 is_reg = true
+      end
    end
-end
-function disable_cb()
-   if is_reg then
-      luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width')
-      is_reg = false
+   function disable_cb()
+      if is_reg then
+	 luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width')
+	 is_reg = false
+      end
    end
 end