X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-adjust.lua;h=6c554c9c332dc40b544b6ee0c5353be9964fb19e;hb=c35bc9236b8c249d3089a824fe197d0d1cde7e78;hp=d2ba3aaab90aed739ef631545daf06e77bcc402b;hpb=8439af472e6d3e7ab7333f63d7d50d4ddfb47a57;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua
index d2ba3aa..6c554c9 100644
--- a/src/ltj-adjust.lua
+++ b/src/ltj-adjust.lua
@@ -9,10 +9,25 @@ 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')
 local id_hlist = node.id('hlist')
 local id_glue  = node.id('glue')
 local id_glue_spec = node.id('glue_spec')
+local has_attr = node.has_attribute
+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
@@ -20,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
 }
 
@@ -48,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'
@@ -55,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
 
@@ -92,6 +144,81 @@ local function set_stretch(p, after, before, ic, name)
    end
 end
 
+-- step 1: 行末に kern を挿入（句読点，中点用）
+local function aw_step1(p, res, total)
+   local x = node.tail(p.head); if not x then return false end
+   local x = node.prev(x)     ; if not x then return false end
+   -- 本当の行末の node を格納
+   if x.id == id_glue and x.subtype == 15 then 
+      -- 段落最終行のときは，\penalty10000 \parfillskip が入るので，
+      -- その前の node が本来の末尾文字となる
+      x = node.prev(node.prev(x)) 
+   end
+
+   local xi, xc = x.id
+   if xi == id_glyph and has_attr(x, attr_curjfnt) == x.font then
+      -- 和文文字
+      xc = x
+   elseif xi == id_hlist and get_attr_icflag(x) == PACKED then
+      -- packed JAchar
+      xc = x.head
+   else
+     return false-- それ以外は対象外．
+   end
+   local xk = ltjf_font_metric_table -- 
+     [xc.font].size_cache.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))
+
+   if xk>0 and total>=xk then
+      --print("ADDED")
+      total = total - xk
+      local kn = node.new(id_kern)
+      kn.kern = (res.name=='shrink' and -1 or 1) * xk
+      set_attr(kn, attr_icflag, FROM_JFM)
+      node.insert_after(p.head, x, kn)
+      return true
+   else return 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(p.head, p.width, 'exactly')
+	 f.head, p.glue_set, p.glue_sign, p.glue_order 
+	    = nil, f.glue_set, f.glue_sign, f.glue_order
+	 node.free(f); return
+      end
+   elseif total <= res[0] then -- 和文処理グルー以外で足りる
+      for _,v in pairs(priority_table) do clear_stretch(p, v, res.name) end
+      local f = node.hpack(p.head, p.width, 'exactly')
+      f.head, p.glue_set, p.glue_sign, p.glue_order 
+         = nil, f.glue_set, f.glue_sign, f.glue_order
+      node.free(f)
+   else
+      total, i = total - res[0], 1
+      while i <= #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)
+            i = #priority_table + 9 -- ループから抜けさせたいため
+         end
+         total, i= total - res[v], i+1
+      end
+      if i == #priority_table + 10 or added_flag then
+	 local f = node.hpack(p.head, p.width, 'exactly')
+	 f.head, p.glue_set, p.glue_sign, p.glue_order 
+	    = nil, f.glue_set, f.glue_sign, f.glue_order
+	 node.free(f)
+      end
+   end
+end
+
 
 function adjust_width(head) 
    if not head then return head end
@@ -106,33 +233,24 @@ function adjust_width(head)
                total = total + v
             end
          end; total = tex.round(total * res.glue_set)
-         if total <= res[0] then -- 和文処理グルー以外で足りる
-            for _,v in pairs(priority_table) do clear_stretch(p, v, res.name) end
-            local f = node.hpack(p.head, p.width, 'exactly')
-            f.head, p.glue_set, p.glue_sign, p.glue_order 
-               = nil, f.glue_set, f.glue_sign, f.glue_order
-            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)
-                  local f = node.hpack(p.head, p.width, 'exactly')
-                  f.head, p.glue_set, p.glue_sign, p.glue_order 
-                     = nil, f.glue_set, f.glue_sign, f.glue_order
-                  node.free(f)
-                  --print(p.glue_set, p.glue_sign, p.glue_order)
-                  return head
-               end
-               total = total - res[v]
-            end
-         end
+         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
    return 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
+   end
+end
+function disable_cb()
+   if is_reg then
+      luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width')
+      is_reg = false
+   end
+end