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

diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua
index db85d8f..3d7e31e 100644
--- a/src/ltj-adjust.lua
+++ b/src/ltj-adjust.lua
@@ -1,10 +1,13 @@
 --
--- luatexja/otf.lua
+-- ltj-adjust.lua
 --
+luatexja.load_module('base');      local ltjb = luatexja.base
 luatexja.load_module('jfont');     local ltjf = luatexja.jfont
 luatexja.load_module('jfmglue');   local ltjj = luatexja.jfmglue
 luatexja.load_module('stack');     local ltjs = luatexja.stack
 luatexja.load_module('direction'); local ltjd = luatexja.direction
+luatexja.load_module('lineskip');  local ltjl = luatexja.lineskip
+luatexja.adjust = luatexja.adjust or {}
 
 local to_node = node.direct.tonode
 local to_direct = node.direct.todirect
@@ -12,10 +15,6 @@ 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 getlist = node.direct.getlist
 local getid = node.direct.getid
 local getfont = node.direct.getfont
@@ -23,8 +22,6 @@ local getsubtype = node.direct.getsubtype
 
 local node_traverse_id = node.direct.traverse_id
 local node_new = node.direct.new
-local node_copy = node.direct.copy
-local node_hpack = node.direct.hpack
 local node_next = node.direct.getnext
 local node_free = node.direct.free
 local node_prev = node.direct.getprev
@@ -38,30 +35,22 @@ local id_kern = node.id('kern')
 local id_hlist = node.id('hlist')
 local id_glue  = node.id('glue')
 local id_whatsit = node.id('whatsit')
+local id_penalty = node.id('penalty')
 local attr_icflag = luatexbase.attributes['ltj@icflag']
 local attr_jchar_class = luatexbase.attributes['ltj@charclass']
 local lang_ja = luatexja.lang_ja
 
 local ltjf_font_metric_table = ltjf.font_metric_table
-local round, pairs = tex.round, pairs
+local ipairs, pairs = ipairs, pairs
 
 local PACKED       = luatexja.icflag_table.PACKED
+local LINEEND      = luatexja.icflag_table.LINEEND
 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,
-   FROM_JFM + 1,
-   FROM_JFM,
-   FROM_JFM - 1,
-   FROM_JFM - 2,
-   XKANJI_SKIP,
-   KANJI_SKIP
-}
-
 local get_attr_icflag
 do
    local PROCESSED_BEGIN_FLAG = luatexja.icflag_table.PROCESSED_BEGIN_FLAG
@@ -70,119 +59,99 @@ do
    end
 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
+local priority_num = { 0, 0 }
+local at2pr = { {}, {} }
+local at2pr_st, at2pr_sh = at2pr[1], at2pr[2]
+do
+   local priority_table = {{},{}}
+   luatexja.adjust.priority_table = priority_table
+   local tmp = {}
+   local function cmp(a,b) return a[1]>b[1] end -- 大きいほうが先！
+   local function make_priority_table(glue_sign)
+      for i,_ in pairs(tmp) do tmp[i]=nil end
+      if glue_sign==2 then -- shrink
+	 for i=0,63 do tmp[#tmp+1] = { (i%8)-4, FROM_JFM+i } end
+      else -- stretch
+	 for i=0,63 do tmp[#tmp+1] = { math.floor(i/8)-4, FROM_JFM+i } end
+      end    
+      local pt = priority_table[glue_sign]
+      tmp[#tmp+1] = { pt[2]/10, XKANJI_SKIP }
+      tmp[#tmp+1] = { pt[2]/10, XKANJI_SKIP_JFM }
+      tmp[#tmp+1] = { pt[1]/10, KANJI_SKIP }
+      tmp[#tmp+1] = { pt[1]/10, KANJI_SKIP_JFM }
+      tmp[#tmp+1] = { pt[3]/10, -1 }
+      table.sort(tmp, cmp)
+      local a, m, n = at2pr[glue_sign], 10000000, 0
+      for i=1,#tmp do
+	 if tmp[i][1]<m then n,m = n+1,tmp[i][1] end
+	 a[tmp[i][2]] = n
       end
+      local o = a[-1]
+      priority_num[glue_sign] = n
+      setmetatable(a, {__index = function () return o end })
    end
+   luatexja.adjust.make_priority_table = make_priority_table
 end
 
-local res = {}
-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 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 ic == KANJI_SKIP_JFM  then ic = KANJI_SKIP
-      elseif ic == XKANJI_SKIP_JFM  then ic = XKANJI_SKIP
+-- box 内で伸縮された glue の合計値を計算
+
+local total_stsh = {{},{}}
+local total_st, total_sh = total_stsh[1], total_stsh[2]
+local get_total_stretched
+do
+local dimensions = node.direct.dimensions
+function get_total_stretched(p)
+-- return value: <補正値(sp)>
+   local ph = getlist(p)
+   if not ph then return 0 end
+   for i,_ in pairs(total_st) do total_st[i]=nil; total_sh[i]=nil end
+   for i=1,priority_num[1] do total_st[i]=0 end
+   for i=1,priority_num[2] do total_sh[i]=0 end
+   for i=0,4 do total_st[i*65536]=0; total_sh[i*65536]=0 end
+   for q in node_traverse_id(id_glue, ph) do
+      local a = getfield(q, 'stretch_order')
+      if a==0 then
+	 local b = at2pr_st[get_attr_icflag(q)]; 
+	 total_st[b] = total_st[b]+getfield(q, 'stretch')
       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*65536] = total_st[a]+getfield(q, 'stretch')
+      local a = getfield(q, 'shrink_order')
+      if a==0 then
+	 local b = at2pr_sh[get_attr_icflag(q)]; 
+	 total_sh[b] = total_sh[b]+getfield(q, 'shrink')
       end
+      total_sh[a*65536] = total_sh[a]+getfield(q, 'shrink')
    end
-   return res, total
-end
-
-local function clear_stretch(p, ic, name)
-   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 = getfield(q, 'spec')
-         if getfield(qs, 'writable') then
-            setfield(qs, name..'_order', 0)
-            setfield(qs, name, 0)
-         end
-      end
+   for i=4,1,-1 do if total_st[i*65536]~=0 then total_st.order=i; break end; end
+   if not total_st.order then
+       total_st.order, total_st[-65536] = -1,0.1 -- dummy
    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
-            end
-         end
-      end
+   for i=4,1,-1 do if total_sh[i*65536]~=0 then total_sh.order=i; break end; end
+   if not total_sh.order then
+       total_sh.order, total_sh[-65536] = -1,0.1 -- dummy
    end
+   return getfield(p,'width') - dimensions(ph)
+end
 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)
    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)
+   -- x may be penalty
+   while xi==id_penalty do
+      x = node_prev(x); if not x then return total, false end
+      xi = getid(x)
+   end
+   if (total>0 and total_st.order>0) or (total<0 and total_sh.order>0) then
+       -- 無限大のグルーで処理が行われているときは処理中止．
+       return total, false
    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,101 +160,392 @@ 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 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 xk = ltjf_font_metric_table[getfont(xc)]
-     .char_type[has_attr(xc, attr_jchar_class) or 0]['end_' .. res.name] or 0
+   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)
+   if eadt[eadt_ratio[1][1]]~=0 then
+      local kn = node_new(id_kern, 1)
+      setfield(kn, 'kern', eadt[eadt_ratio[1][1]]); set_attr(kn, attr_icflag, LINEEND)
+      insert_after(head, x, kn)
+      return eadt_ratio[1][3], true
+   else
+      return total, false
+   end
+end
 
-   if xk>0 and total>=xk then
-      total = total - xk
-      local kn = node_new(id_kern)
-      setfield(kn, 'kern', (res.name=='shrink' and -1 or 1) * xk)
-      set_attr(kn, attr_icflag, FROM_JFM)
+-- step 1 最終行用
+local min, max = math.min, math.max
+local function aw_step1_last(p, total)
+   local head = getlist(p)
+   local x = node_tail(head); if not x then return total, false end
+   -- x: \rightskip
+   pf = node_prev(x); if not x then return total, false end
+   if getid(pf) ~= id_glue or getsubtype(pf) ~= 15 then return total, false end
+   x = node_prev(node_prev(pf)); xi = getid(x)
+   local xi, xc = getid(x)
+   if xi == id_glyph and getfield(x, 'lang')==lang_ja then
+      -- 和文文字
+      xc = x
+   elseif xi == id_hlist and get_attr_icflag(x) == PACKED then
+      -- packed JAchar
+      xc = ltjd_glyph_from_packed(x)
+      while getid(xc) == id_whatsit do xc = node_next(xc) end -- これはなんのために？
+   else
+      return total, false-- それ以外は対象外．
+   end
+   -- 続行条件1：無限の伸縮度を持つグルーは \parfillskipのみ
+   if total>0 and total_st.order>0 then
+      if total_st.order ~= getfield(pf, 'stretch_order') then return total, false end
+      if total_st[total_st.order*65536] ~= getfield(pf, 'stretch') then return total, false end
+      for i=total_st.order-1, 1, -1 do
+	 if total_st[i*65536] ~= 0 then return total, false end
+      end
+   end
+   if total<0 and total_sh.order>0 then
+      if total_sh.order ~= getfield(pf, 'shrink_order') then return total, false end
+      if total_sh[total_sh.order*65536] ~= getfield(pf, 'shrink') then return total, false end
+      for i=total_sh.order-1, 1, -1 do
+	 if total_sh[i*65536] ~= 0 then return total, false end
+      end
+   end
+   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
+   -- 続行条件2: min(eadt[1], 0)<= \parfillskip <= max(eadt[#eadt], 0)
+   local pfw = getfield(pf, 'width') 
+     + (total>0 and getfield(pf, 'stretch') or -getfield(pf, 'shrink')) *getfield(p, 'glue_set') 
+   if pfw<min(0,eadt[1]) or max(0,eadt[#eadt])<pfw then return total, false end
+   -- \parfillskip を 0 にする
+   total = total + getfield(pf, 'width') 
+   total_st.order, total_sh.order = 0, 0
+   if getfield(pf, 'stretch_order')==0 then 
+      local i = at2pr_st[-1] 
+      total_st[0] = total_st[0] - getfield(pf, 'stretch') 
+      total_st[i] = total_st[i] - getfield(pf, 'stretch') 
+      total_st.order = (total_st[0]==0) and -1 or 0
+   end
+   if getfield(pf, 'shrink_order')==0 then 
+      local i = at2pr_sh[-1] 
+      total_sh[0] = total_sh[0] - getfield(pf, 'shrink') 
+      total_sh[i] = total_sh[i] - getfield(pf, 'shrink') 
+      total_sh.order = (total_sh[0]==0) and -1 or 0
+   end
+   setfield(pf, 'subtype', 1); setglue(pf)
+   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)
+   if eadt[eadt_ratio[1][1]]~=0 then
+      local kn = node_new(id_kern, 1)
+      setfield(kn, 'kern', eadt[eadt_ratio[1][1]]); set_attr(kn, attr_icflag, LINEEND)
       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 -- もともと伸縮の必要なし
-      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
+local aw_step2, aw_step2_dummy
+do
+local node_hpack = node.direct.hpack
+local function repack(p)
+   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
+function aw_step2_dummy(p, _, added_flag)
+   if added_flag then return repack(p) end
+end
+
+local function clear_stretch(p, ind, ap, name)
+   for q in node_traverse_id(id_glue, getlist(p)) do
+      local f = ap[get_attr_icflag(q)]
+      if f == ind then
+         setfield(q, name..'_order', 0)
+         setfield(q, name, 0)
       end
-   elseif total <= res[0] then -- 和文処理グルー以外で足りる
-      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'))
-      node_free(f)
-   else
-      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); break
+   end
+end
+
+local function set_stretch(p, after, before, ind, ap, name)
+   if before > 0 then
+      local ratio = after/before
+      for q in node_traverse_id(id_glue, getlist(p)) do
+	 local f = ap[get_attr_icflag(q)]
+         if (f==ind) and getfield(q, name..'_order')==0 then
+            setfield(q, name, getfield(q, name)*ratio)
          end
-         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
 
-
-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))
+function aw_step2(p, total, added_flag)
+   local name = (total>0) and 'stretch' or 'shrink'
+   local id =  (total>0) and 1 or 2
+   local res = total_stsh[id]
+   local pnum = priority_num[id]
+   if total==0 or res.order > 0 then 
+      -- もともと伸縮の必要なしか，残りの伸縮量は無限大
+      if added_flag then return repack(p) end
+   end
+   total = abs(total)
+   for i = 1, pnum do
+      if total <= res[i] then
+	 local a = at2pr[id]  
+         for j = i+1,pnum do
+            clear_stretch(p, j, a, name)
+         end
+         set_stretch(p, total, res[i], i, a, name); break
       end
+      total = total - res[i]
    end
-   for i,_ in pairs(gs_used_line) do
-      gs_used_line[i]  = nil
+   return repack(p)
+end
+end
+
+-- step 1': lineend=extended の場合（行分割時に考慮））
+local insert_lineend_kern
+do
+   local insert_before = node.direct.insert_before
+   local KINSOKU      = luatexja.icflag_table.KINSOKU
+   function insert_lineend_kern(head, nq, np, Bp)
+      if nq.met then 
+         local eadt = nq.met.char_type[nq.class].end_adjust
+	 if not eadt then return end
+	 if eadt[1]~=0 then
+	    local x = node_new(id_kern, 1)
+	    setfield(x, 'kern', eadt[1]); set_attr(x, attr_icflag, LINEEND)
+	    insert_before(head, np.first, x)
+	 end
+	 local eadt_num = #eadt
+	 for i=2,eadt_num do
+	    local x = node_new(id_penalty)
+	    setfield(x, 'penalty', 0); set_attr(x, attr_icflag, KINSOKU)
+	    insert_before(head, np.first, x); Bp[#Bp+1] = x
+	    local x = node_new(id_kern, 1)
+	    setfield(x, 'kern', eadt[i]-eadt[i-1]); set_attr(x, attr_icflag, LINEEND)
+	    insert_before(head, np.first, x)
+	 end
+         if eadt_num>1 or eadt[1]~=0 then
+	    local x = node_new(id_penalty)
+	    setfield(x, 'penalty', 0); set_attr(x, attr_icflag, KINSOKU)
+	    insert_before(head, np.first, x); Bp[#Bp+1] = x
+	    local x = node_new(id_kern, 1)
+	    setfield(x, 'kern', -eadt[eadt_num]); set_attr(x, attr_icflag, LINEEND)
+	    insert_before(head, np.first, x)
+	    local x = node_new(id_penalty)
+	    setfield(x, 'penalty', 10000); set_attr(x, attr_icflag, KINSOKU)
+	    insert_before(head, np.first, x); Bp[#Bp+1] = x
+	 end
+      end
    end
-   return to_node(head)
 end
 
+local adjust_width
 do
-   luatexja.adjust = luatexja.adjust or {}
-   local is_reg = false
-   function luatexja.adjust.enable_cb()
-      if not is_reg then
-	 luatexbase.add_to_callback('post_linebreak_filter',
-				    adjust_width, 'Adjust width', 100)
-	 is_reg = true
+   local myaw_atep1, myaw_step2, myaw_step1_last
+   local dummy =  function(p,t,n) return t, false end
+   local ltjs_fast_get_stack_skip = ltjs.fast_get_stack_skip
+   function adjust_width(head)
+      if not head then return head end
+      local last_p
+      for p in node_traverse_id(id_hlist, to_direct(head)) do
+	 if last_p then
+	    myaw_step2(last_p, myaw_step1(last_p, get_total_stretched(last_p)))
+	 end
+         last_p = p
       end
+      if last_p then
+         myaw_step2(last_p, myaw_step1_last(last_p, get_total_stretched(last_p)))
+      end
+      return to_node(head)
    end
-   function luatexja.adjust.disable_cb()
-      if is_reg then
+   local is_reg = false
+   function enable_cb(status_le, status_pr, status_lp, status_ls)
+      if (status_le>0 or status_pr>0) and (not is_reg) then
+	 ltjb.add_to_callback('post_linebreak_filter',
+            adjust_width, 'Adjust width', 
+	    luatexbase.priority_in_callback('post_linebreak_filter', 'ltj.lineskip')-1)
+	 is_reg = true
+      elseif is_reg and (status_le==0 and status_pr==0) then
 	 luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width')
 	 is_reg = false
       end
+      if status_le==2 then
+	 if not luatexbase.in_callback('luatexja.adjust_jfmglue', 'luatexja.adjust') then
+	    ltjb.add_to_callback('luatexja.adjust_jfmglue', insert_lineend_kern, 'luatexja.adjust')
+	 end
+         myaw_step1, myaw_step1_last = dummy, aw_step1_last
+      else
+         if status_le==0 then
+            myaw_step1, myaw_step1_last = dummy, dummy
+         else
+            myaw_step1, myaw_step1_last = aw_step1, aw_step1_last
+         end
+         if luatexbase.in_callback('luatexja.adjust_jfmglue', 'luatexja.adjust') then
+   	    luatexbase.remove_from_callback('luatexja.adjust_jfmglue', 'luatexja.adjust')
+         end
+      end
+      myaw_step2 = (status_pr>0) and aw_step2 or aw_step2_dummy
+      luatexja.lineskip.setting(
+         status_lp>0 and 'profile' or 'dummy',
+	 status_ls>0 and 'step' or 'dummy'
+      )      
+   end
+   function disable_cb() -- only for compatibility
+       enable_cs(0,0,0,0)
    end
+   luatexja.adjust.enable_cb=enable_cb
+   luatexja.adjust.disable_cb=disable_cb
 end
 
 luatexja.unary_pars.adjust = function(t)
    return is_reg and 1 or 0
 end
+
+-- ----------------------------------
+do
+  local max, ins, sort = math.max, table.insert, table.sort
+  local function insert(package, ind, d, b, e)
+    local bound = package[2]
+    bound[b], bound[e]=true, true
+    ins(package[1], {b,e,[ind]=d})
+  end
+  local function flatten(package)
+    local bd={} for i,_ in pairs(package[2]) do ins(bd,{i}) end
+    sort(bd, function (a,b) return a[1]<b[1] end)
+    local bdc=#bd; local t = package[1]
+    sort(t, function (a,b) return a[1]<b[1] end)
+    local bdi =1
+    for i=1,#t do
+      while bd[bdi][1]<t[i][1] do bdi=bdi+1 end
+      local j = bdi
+      while j<bdc and bd[j+1][1]<=t[i][2] do
+        for k,w in pairs(t[i]) do
+          if k>=3 then
+            bd[j][k]=bd[j][k] and max(bd[j][k],w) or w
+          end
+        end
+        j=j+1
+      end
+    end
+    package[2]=nil; package[1]=nil; package.flatten, package.insert=nil, nil
+    bd[#bd]=nil
+    return bd
+  end
+  function init_range()
+    return {{},{}, insert=insert, flatten=flatten}
+  end
+end
+
+-- -----------------------------------
+luatexja.adjust.step_factor = 0.5
+luatexja.unary_pars.linestep_factor = function(t)
+   return luatexja.adjust.step_factor
+end
+luatexja.adjust.profile_hgap_factor = 1
+luatexja.unary_pars.profile_hgap_factor = function(t)
+   return luatexja.adjust.profile_hgap_factor
+end
+do
+  local insert = table.insert
+  local rangedimensions, max = node.direct.rangedimensions, math.max
+  local function profile_inner(box, range, ind, vmirrored, adj)
+    local w_acc, d_before = getfield(box,'shift'), 0
+    local x = getlist(box); local xn = node_next(x)
+    while x do
+      local w, h, d
+      if xn then w, h, d= rangedimensions(box,x,xn)
+      else w, h, d= rangedimensions(box,x) end
+      if vmirrored then h=d end
+      local w_new = w_acc + w
+      if w>=0 then
+        range:insert(ind, h, w_acc-adj, w_new)
+      else
+        range:insert(ind, h, w_new-adj, w_acc)
+      end
+      w_acc = w_new; x = xn; if x then xn = node_next(x) end
+    end
+  end  
+  function ltjl.p_profile(before, after, mirrored, bw)
+    local range, tls 
+      = init_range(), luatexja.adjust.profile_hgap_factor*tex.lineskip.width
+    profile_inner(before, range, 3, true,     tls)
+    profile_inner(after,  range, 4, mirrored, tls)
+    range = range:flatten()
+    do
+      local dmax, d, hmax, h, lmin = 0, 0, 0, 0, 1/0
+      for i,v in ipairs(range) do
+        d, h = (v[3] or 0), (v[4] or 0)
+        if d>dmax then dmax=d end
+        if h>hmax then hmax=h end
+        if bw-h-d<lmin then lmin=bw-h-d end
+      end
+      if lmin==1/0 then lmin = bw end
+      return lmin, 
+         bw - lmin - getfield(before, 'depth')
+             - getfield(after, mirrored and 'depth' or 'height')
+    end
+  end
+end
+
+do
+  local ltja = luatexja.adjust
+  local copy_glue = ltjl.copy_glue
+  local floor, max = math.floor, math.max
+  function ltjl.l_step(dist, g, adj, normal, bw, loc)
+    if loc=='alignment' then
+      return ltjl.l_dummy(dist, g, adj, normal, bw, loc)
+    end
+    if dist < tex.lineskiplimit then
+    local f = max(1, bw*ltja.step_factor)
+       copy_glue(g, tex.baselineskip, 1, normal - f * floor((dist-tex.lineskip.width)/f))
+    else
+       copy_glue(g, tex.baselineskip, 2, normal)
+    end
+  end
+end
+
+