X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-adjust.lua;h=49a4334498f70d33db43fbf3f850dc3b12c0fcee;hb=ae77474c1513fdada9dde1a239c0c11fc9c112c0;hp=db85d8f326083f1638c009eb58965e1462212fb1;hpb=eb59520e788ac74973832590042d9a4efef79fcb;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua
index db85d8f..49a4334 100644
--- a/src/ltj-adjust.lua
+++ b/src/ltj-adjust.lua
@@ -1,5 +1,5 @@
 --
--- luatexja/otf.lua
+-- ltj-adjust.lua
 --
 luatexja.load_module('jfont');     local ltjf = luatexja.jfont
 luatexja.load_module('jfmglue');   local ltjj = luatexja.jfmglue
@@ -12,10 +12,7 @@ local to_direct = node.direct.todirect
 local setfield = node.direct.setfield
 local setglue = luatexja.setglue
 local getfield = node.direct.getfield
-local is_zero_glue = node.direct.is_zero_glue or
-   function(g)
-      return (getfield(g,'width')==0)and (getfield(g,'stretch')==0)and(getfield(g,'shrink')==0)
-   end
+local is_zero_glue = node.direct.is_zero_glue
 local getlist = node.direct.getlist
 local getid = node.direct.getid
 local getfont = node.direct.getfont
@@ -72,59 +69,45 @@ end
 
 -- box 内で伸縮された glue の合計値を計算
 
-local function get_stretched(q, go, gs)
-   if gs == 1 then -- stretching
-      if getfield(q, 'stretch_order') == go then
-	 return getfield(q, 'stretch')
-      else return 0
-      end
-   else -- shrinking
-      if getfield(q, 'shrink_order') == go then
-	 return getfield(q, 'shrink')
-      else return 0
-      end
-   end
-end
-
-local res = {}
-local gs_used_line = {}
+local total_stsh = {{},{}}
+local total_st, total_sh = total_stsh[1], total_stsh[2]
 local function get_total_stretched(p, line)
+-- return value: <補正値(sp)>
    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 gs ~= 1 and gs ~= 2 then return res, 0 end
-   local total = 0
+     = getfield(p, 'glue_order'), getfield(p, 'glue_set'), getfield(p, 'glue_sign')
+   for i,_ in pairs(total_st) do total_st[i]=nil; total_sh[i]=nil end
+   for i=1,#priority_table do 
+      total_st[priority_table[i]]=0; total_sh[priority_table[i]]=0; 
+   end
+   for i=0,4 do total_st[i*65536]=0; total_sh[i*65536]=0 end
+   total_st[-1]=0; total_sh[-1]=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 ic == KANJI_SKIP_JFM  then ic = KANJI_SKIP
-      elseif ic == XKANJI_SKIP_JFM  then ic = XKANJI_SKIP
+       local a = getfield(q, 'stretch_order')
+      if a>0 then a=a*65536 else 
+         total_st[0] = total_st[0]+getfield(q, 'stretch')
+         a = get_attr_icflag(q)
+         if a == KANJI_SKIP_JFM  then a = KANJI_SKIP
+	 elseif a == XKANJI_SKIP_JFM  then a = XKANJI_SKIP
+	 elseif type(total_st[a])~='number' then a = -1 end
       end
-      if   type(res[ic]) == 'number' then
-	 -- kanjiskip, xkanjiskip は段落内で spec を共有しているが，
-	 -- それはここでは望ましくないので，各 glue ごとに異なる spec を使う．
-	 -- 本当は各行ごとに glue_spec を共有させたかったが，安直にやると
-	 -- ref_count が 0 なので Double-free が発生する．どうする？
-	 -- JFM グルーはそれぞれ異なる glue_spec を用いているので，問題ない．
-	 if (ic == KANJI_SKIP or ic == XKANJI_SKIP) and getsubtype(q)==0 then
-	    local qs = getfield(q, 'spec')
-	    if is_zero_glue(q) 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
-	 end
-	 res[ic], total = res[ic] + a, total + a
-      else
-	 res[0], total = res[0]  + a, total + a
+      total_st[a] = total_st[a]+getfield(q, 'stretch')
+      local a = getfield(q, 'shrink_order')
+      if a>0 then a=a*65536 else 
+         total_sh[0] = total_sh[0]+getfield(q, 'shrink')
+         a = get_attr_icflag(q)
+         if a == KANJI_SKIP_JFM  then a = KANJI_SKIP
+         elseif a == XKANJI_SKIP_JFM  then a = XKANJI_SKIP
+	 elseif type(total_sh[a])~='number' then a = -1 end
       end
+      total_sh[a] = total_sh[a]+getfield(q, 'shrink')
+   end
+   for i=4,0,-1 do if total_st[i*65536]~=0 then total_st.order=i; break end; end
+   for i=4,0,-1 do if total_sh[i*65536]~=0 then total_sh.order=i; break end; end
+   if gs==0 then
+      return 0, gf
+   else 
+      return round((3-2*gs)*total_stsh[gs][go*65536]*gf), gf
    end
-   return res, total
 end
 
 local function clear_stretch(p, ic, name)
@@ -132,33 +115,21 @@ local function clear_stretch(p, ic, name)
       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 = getfield(q, 'spec')
-         if getfield(qs, 'writable') then
-            setfield(qs, name..'_order', 0)
-            setfield(qs, name, 0)
-         end
+         setfield(q, name..'_order', 0)
+         setfield(q, name, 0)
       end
    end
 end
 
-local set_stretch_table = {}
 local function set_stretch(p, after, before, ic, name)
    if before > 0 then
       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
 	 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
-            end
-            if getfield(qs, 'writable') and getfield(qs, name..'_order')==0 and do_flag then
-               setfield(q, name, getfield(qs, name)*ratio)
-               set_stretch_table[#set_stretch_table+1] = qs
+            if getfield(q, name..'_order')==0 then
+               setfield(q, name, getfield(q, name)*ratio)
             end
          end
       end
@@ -166,23 +137,19 @@ local function set_stretch(p, after, before, ic, name)
 end
 
 -- step 1: 行末に kern を挿入（句読点，中点用）
+local abs = math.abs
 local ltjd_glyph_from_packed = ltjd.glyph_from_packed
-local function aw_step1(p, res, total)
+local function aw_step1(p, total, ntr)
    local head = getlist(p)
-   local x = node_tail(head); if not x then return false end
+   local x = node_tail(head); if not x then return total, false end
    -- x: \rightskip
-   x = node_prev(x); if not x then return false end
+   x = node_prev(x); if not x then return total, false end
    local xi, xc = getid(x)
    if xi == id_glue and getsubtype(x) == 15 then
       -- 段落最終行のときは，\penalty10000 \parfillskip が入るので，
       -- その前の node が本来の末尾文字となる
       x = node_prev(node_prev(x)); xi = getid(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
    if xi == id_glyph and getfield(x, 'lang')==lang_ja then
       -- 和文文字
       xc = x
@@ -191,25 +158,58 @@ local function aw_step1(p, res, total)
       xc = ltjd_glyph_from_packed(x)
       while getid(xc) == id_whatsit do xc = node_next(xc) end -- これはなんのために？
    else
-     return false-- それ以外は対象外．
+      return total, false-- それ以外は対象外．
    end
-   local xk = ltjf_font_metric_table[getfont(xc)]
-     .char_type[has_attr(xc, attr_jchar_class) or 0]['end_' .. res.name] or 0
-
-   if xk>0 and total>=xk then
-      total = total - xk
+   local eadt = ltjf_font_metric_table[getfont(xc)]
+      .char_type[has_attr(xc, attr_jchar_class) or 0].end_adjust
+   if not eadt then 
+      return total, false
+   end
+   local eadt_ratio = {}
+   for i, v in ipairs(eadt) do
+      local t = total - v
+      if t>0 then
+	 eadt_ratio[i] = {i, t/total_st[65536*total_st.order], t, v}
+      else
+	 eadt_ratio[i] = {i, t/total_sh[65536*total_sh.order], t, v}
+      end
+   end
+   table.sort(eadt_ratio, 
+   function (a,b) 
+       for i=2,4 do
+	   local at, bt = abs(a[i]), abs(b[i])
+	   if at~=bt then return at<bt end
+       end
+       return a[4]<b[4]
+   end)
+   --print('min', eadt[eadt_ratio[1][1]], eadt_ratio[1][3])
+   if eadt[eadt_ratio[1][1]]~=0 then
       local kn = node_new(id_kern)
-      setfield(kn, 'kern', (res.name=='shrink' and -1 or 1) * xk)
-      set_attr(kn, attr_icflag, FROM_JFM)
+      setfield(kn, 'kern', eadt[eadt_ratio[1][1]]); set_attr(kn, attr_icflag, FROM_JFM)
       insert_after(head, x, kn)
-      return true
-   else return false
+      return eadt_ratio[1][3], true
+   else
+      return total, false
    end
 end
 
 -- step 2: 行中の glue を変える
-local function aw_step2(p, res, total, added_flag)
-   if total == 0 then -- もともと伸縮の必要なし
+local function aw_step2_dummy(p, _, added_flag)
+   if added_flag then -- 行末に kern 追加したので，それによる補正
+      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)
+      return
+   end
+end
+local function aw_step2(p, total, added_flag)
+   local name = (total>0) and 'stretch' or 'shrink'
+   local res = total_stsh[(total>0) and 1 or 2]
+   if total==0 or res.order > 0 then 
+      -- もともと伸縮の必要なしか，残りの伸縮量は無限大
       if added_flag then -- 行末に kern 追加したので，それによる補正
 	 local f = node_hpack(getlist(p), getfield(p, 'width'), 'exactly')
 	 setfield(f, 'head', nil)
@@ -219,8 +219,10 @@ local function aw_step2(p, res, total, added_flag)
 	 node_free(f)
 	 return
       end
-   elseif total <= res[0] then -- 和文処理グルー以外で足りる
-      for _,v in pairs(priority_table) do clear_stretch(p, v, res.name) end
+   end
+   total = math.abs(total)
+   if total <= res[-1] then -- 和文処理グルー以外で足りる
+      for _,v in pairs(priority_table) do clear_stretch(p, v, name) end
       local f = node_hpack(getlist(p), getfield(p, 'width'), 'exactly')
       setfield(f, 'head', nil)
       setfield(p, 'glue_set', getfield(f, 'glue_set'))
@@ -228,14 +230,14 @@ local function aw_step2(p, res, total, added_flag)
       setfield(p, 'glue_sign', getfield(f, 'glue_sign'))
       node_free(f)
    else
-      total = total - res[0]
+      total = total - res[-1];
       for i = 1, #priority_table do
-         local v = priority_table[i]
+	 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)
+               clear_stretch(p, priority_table[j], name)
             end
-            set_stretch(p, total, res[v], v, res.name); break
+            set_stretch(p, total, res[v], v, name); break
          end
          total = total - res[v]
       end
@@ -249,41 +251,36 @@ local function aw_step2(p, res, total, added_flag)
 end
 
 
-local ltjs_fast_get_stack_skip = ltjs.fast_get_stack_skip
-local function adjust_width(head)
-   if not head then return head end
-   local line = 1
-   for p in node_traverse_id(id_hlist, to_direct(head)) do
-      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))
+do
+   local myaw_atep1, myaw_step2
+   local dummy =  function(p,t,n) return t, false end
+   local ltjs_fast_get_stack_skip = ltjs.fast_get_stack_skip
+   local function adjust_width(head)
+      if not head then return head end
+      local line = 1
+      for p in node_traverse_id(id_hlist, to_direct(head)) do
+         line = line + 1
+         myaw_step2(p, myaw_step1(p, get_total_stretched(p, line)))
       end
+      return to_node(head)
    end
-   for i,_ in pairs(gs_used_line) do
-      gs_used_line[i]  = nil
-   end
-   return to_node(head)
-end
-
-do
-   luatexja.adjust = luatexja.adjust or {}
    local is_reg = false
-   function luatexja.adjust.enable_cb()
-      if not is_reg then
+   function enable_cb(status)
+      if status>0 and (not is_reg) then
 	 luatexbase.add_to_callback('post_linebreak_filter',
 				    adjust_width, 'Adjust width', 100)
 	 is_reg = true
-      end
-   end
-   function luatexja.adjust.disable_cb()
-      if is_reg then
+      elseif is_reg and status==0 then
 	 luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width')
 	 is_reg = false
       end
+      myaw_step1 = (status%2>0) and aw_step1 or dummy
+      myaw_step2 = (status>=2) and aw_step2 or aw_step2_dummy
+   end
+   function disable_cb() -- only for compatibility
+       enable_cs(0)
    end
+   luatexja.adjust = luatexja.adjust or {enable_cb=enable_cb, disable_cb=disable_cb}  
 end
 
 luatexja.unary_pars.adjust = function(t)