X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=src%2Fltj-ruby.lua;h=da638f5486d76856a46a1e8faaa362daf17f165e;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=2368b42388e8dcb1efd306b5b512573b3b1ff13a;hpb=924db550ede738f06fcccf39680d42d9733cf20d;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-ruby.lua b/src/ltj-ruby.lua
index 2368b42..da638f5 100644
--- a/src/ltj-ruby.lua
+++ b/src/ltj-ruby.lua
@@ -3,8 +3,8 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.ruby',
-  date = '2014/03/19',
-  description = 'Ruby',
+  date = '2015/09/18',
+  description = 'Ruby annotation',
 })
 module('luatexja.ruby', package.seeall)
 local err, warn, info, log = luatexbase.errwarinf(_NAME)
@@ -12,7 +12,6 @@ local err, warn, info, log = luatexbase.errwarinf(_NAME)
 luatexja.load_module('stack');     local ltjs = luatexja.stack
 
 local Dnode = node.direct or node
-
 local nullfunc = function(n) return n end
 local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc
 local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
@@ -26,7 +25,7 @@ local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char e
 local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end
 
 local node_new = Dnode.new
-local node_remove = luatexja.Dnode_remove -- Dnode.remove
+local node_remove = Dnode.remove
 local node_next = (Dnode ~= node) and Dnode.getnext or node.next
 local node_copy, node_free, node_tail = Dnode.copy, Dnode.free, Dnode.tail
 local has_attr, set_attr = Dnode.has_attribute, Dnode.set_attribute
@@ -91,27 +90,49 @@ local function gauss(coef)
    local deg = #coef
    for i = 1, deg do
       if coef[i][i]==0 then
-	 for j = i+1, deg do 
+	 for j = i+1, deg do
 	    if coef[j][i]~=0 then
                coef[i], coef[j] = coef[j], coef[i]; break
 	    end
 	 end
       end
-      for j = 1,deg do 
+      for j = 1,deg do
 	 local d = coef[i][i];
 	 if j~=i then
 	    local e = coef[j][i]
 	    for k = 1, deg+1 do coef[j][k] = coef[j][k] - e*coef[i][k]/d end
-	 else 
+	 else
 	    for k = 1, deg+1 do coef[i][k] = coef[i][k]/d end
 	 end
       end
    end
 end
 
+local function solve_1(coef)
+   local a, b, c = coef[1][4], coef[2][4], coef[3][4]
+   coef[1][4], coef[2][4], coef[3][4] = c-b, a+b-c, c-a
+   return coef
+end
+
+local function solve_2(coef)
+   local a, b, c, d, e = coef[1][6], coef[2][6], coef[3][6], coef[4][6], coef[5][6]
+   coef[1][6], coef[2][6], coef[3][6], coef[4][6], coef[5][6]
+      = e-c, a+c-e, e-a-d, b+d-e, e-b
+   return coef
+end
+
+
 -- 実行回数 + ルビ中身 から uniq_id を作る関数
--- 未実装．これを使えば 2 回目以降の組版に 1 回目の情報が使える
 old_break_info = {} -- public, 前 run 時の分割情報
+local cache_handle
+function read_old_break_info()
+   if  tex.jobname then
+      local fname = tex.jobname .. '.ltjruby'
+      local real_file = kpse.find_file(fname)
+      if real_file then dofile(real_file) end
+      cache_handle = io.open(fname, 'w')
+   end
+end
 local make_uniq_id
 do
    local exec_count = 0
@@ -124,29 +145,37 @@ end
 -- concatenation of boxes: reusing nodes
 -- ルビ組版が行われている段落/hboxでの設定が使われる．
 -- ルビ文字を格納しているボックスでの設定ではない！
-local function concat(f, b)
-   if f then
-      if b then
-         local h = getlist(f)
-         setfield(node_tail(h), 'next', getlist(b))
-	 setfield(f, 'head', nil); node_free(f)
-         setfield(b, 'head', nil); node_free(b)
-	 return Dnode.hpack(luatexja.jfmglue.main(h,false))
-      else 
-	 return f
+local concat
+do
+   local node_prev = (Dnode ~= node) and Dnode.getprev or node.prev
+   function concat(f, b)
+      if f then
+	 if b then
+	    local h, nh = getlist(f), getlist(b)
+	    if getid(nh)==id_whatsit and getsubtype(nh)==sid_user then
+	       nh=node_next(nh); node_free(node_prev(nh))
+	    end
+	    setfield(node_tail(h), 'next', nh)
+	    setfield(f, 'head', nil); node_free(f)
+	    setfield(b, 'head', nil); node_free(b)
+	    local g = luatexja.jfmglue.main(h,false)
+	    return Dnode.hpack(g)
+	 else
+	    return f
+	 end
+      elseif b then
+	 return b
+      else
+	 local h = node_new(id_hlist)
+	 setfield(h, 'subtype', 0)
+	 setfield(h, 'width', 0)
+	 setfield(h, 'height', 0)
+	 setfield(h, 'depth', 0)
+	 setfield(h, 'glue_set', 0)
+	 setfield(h, 'glue_order', 0)
+	 setfield(h, 'head', nil)
+	 return h
       end
-   elseif b then
-      return b
-   else
-      local h = node_new(id_hlist)
-      setfield(h, 'subtype', 0)
-      setfield(h, 'width', 0)
-      setfield(h, 'height', 0)
-      setfield(h, 'depth', 0)
-      setfield(h, 'glue_set', 0)
-      setfield(h, 'glue_order', 0)
-      setfield(h, 'head', nil)
-      return h
    end
 end
 
@@ -173,7 +202,7 @@ do
    enlarge = function (box, new_width, pre, middle, post, prenw, postnw)
       -- pre, middle, post: 伸縮比率
       -- prenw, postnw: 前後の自然長 (sp)
-      local h = getlist(box); 
+      local h = getlist(box);
       local hh, hd = getfield(box, 'height'), getfield(box, 'depth')
       local hx = h
       while hx do
@@ -301,17 +330,17 @@ local function enlarge_parent(r, p, ppre, pmid, ppost, mapre, mapost, intmode)
    local sumprot = rwidth - getfield(p, 'width') -- >0
    local pre_intrusion, post_intrusion
    if intmode == 0 then --  とりあえず組んでから決める
-      p = enlarge(p, rwidth, ppre, pmid, ppost, 0, 0) 
+      p = enlarge(p, rwidth, ppre, pmid, ppost, 0, 0)
       pre_intrusion  = min(mapre, round(ppre*getfield(p, 'glue_set')*65536))
       post_intrusion = min(mapost, round(ppost*getfield(p, 'glue_set')*65536))
    elseif intmode == 1 then
-      pre_intrusion = min(mapre, sumprot); 
+      pre_intrusion = min(mapre, sumprot);
       post_intrusion = min(mapost, max(sumprot-pre_intrusion, 0))
       p = enlarge(p, rwidth, ppre, pmid, ppost, pre_intrusion, post_intrusion)
    elseif intmode == 2 then
-      post_intrusion = min(mapost, sumprot); 
+      post_intrusion = min(mapost, sumprot);
       pre_intrusion = min(mapre, max(sumprot-post_intrusion, 0))
-      p = enlarge(p, rwidth, ppre, pmid, ppost, pre_intrusion, post_intrusion) 
+      p = enlarge(p, rwidth, ppre, pmid, ppost, pre_intrusion, post_intrusion)
    else --  intmode == 3
       local n = min(mapre, mapost)*2
       if n < sumprot then
@@ -319,7 +348,7 @@ local function enlarge_parent(r, p, ppre, pmid, ppost, mapre, mapost, intmode)
       else
 	 pre_intrusion = floor(sumprot/2); post_intrusion = sumprot - pre_intrusion
       end
-      p = enlarge(p, rwidth, ppre, pmid, ppost, pre_intrusion, post_intrusion) 
+      p = enlarge(p, rwidth, ppre, pmid, ppost, pre_intrusion, post_intrusion)
       pre_intrusion = min(mapre, pre_intrusion + round(ppre*getfield(p, 'glue_set')*65536))
       post_intrusion = min(mapost, post_intrusion + round(ppost*getfield(p, 'glue_set')*65536))
    end
@@ -335,7 +364,7 @@ end
 -- ルビボックスの生成（単一グループ）
 -- returned value: <new box>, <ruby width>, <post_intrusion>
 local max_margin
-local function new_ruby_box(r, p, ppre, pmid, ppost, 
+local function new_ruby_box(r, p, ppre, pmid, ppost,
 			    mapre, mapost, imode, rgap)
    local post_intrusion = 0
    local intmode = imode%4
@@ -347,7 +376,7 @@ local function new_ruby_box(r, p, ppre, pmid, ppost,
    if getfield(r, 'width') > getfield(p, 'width') then  -- change the width of p
       r, p, post_intrusion  = enlarge_parent(r, p, ppre, pmid, ppost, mapre, mapost, intmode)
    elseif getfield(r, 'width') < getfield(p, 'width') then -- change the width of r
-      r = enlarge(r, getfield(p, 'width'), rpre, rmid, rpost, 0, 0) 
+      r = enlarge(r, getfield(p, 'width'), rpre, rmid, rpost, 0, 0)
       post_intrusion = 0
       local need_repack = false
       -- margin が大きくなりすぎた時の処理
@@ -415,7 +444,7 @@ local function pre_low_cal_box(w, cmp)
       for j = 1, 2*i do coef[i][j] = 1 end
       for j = 2*i+1, 2*cmp+1 do coef[i][j] = 0 end
       kf[i], coef[i][2*cmp+2]
-	 = new_ruby_box(node_copy(nta), node_copy(ntb), 
+	 = new_ruby_box(node_copy(nta), node_copy(ntb),
 			rtb[6], rtb[5], rtb[4], max_allow_pre, 0, intmode, rgap)
    end
    node_free(nta); node_free(ntb)
@@ -428,7 +457,7 @@ local function pre_low_cal_box(w, cmp)
       for j = 2*i, 2*cmp+1 do coef[cmp+i][j] = 1 end
       nta = concat(node_copy(rb[i]), nta); ntb = concat(node_copy(pb[i]), ntb)
       kf[cmp+i], coef[cmp+i][2*cmp+2]
-	 = new_ruby_box(node_copy(nta), node_copy(ntb), 
+	 = new_ruby_box(node_copy(nta), node_copy(ntb),
 			rtb[9], rtb[8], rtb[7], 0, max_allow_post, intmode, rgap)
    end
 
@@ -437,7 +466,7 @@ local function pre_low_cal_box(w, cmp)
    coef[2*cmp+1] = {}
    for j = 1, 2*cmp+1 do coef[2*cmp+1][j] = 1 end
    kf[2*cmp+1], coef[2*cmp+1][2*cmp+2], post_intrusion_backup
-      = new_ruby_box(nta, ntb, rtb[3], rtb[2], rtb[1], 
+      = new_ruby_box(nta, ntb, rtb[3], rtb[2], rtb[1],
                      max_allow_pre, max_allow_post, intmode, rgap)
 
    -- w.value の node list 更新．
@@ -445,18 +474,26 @@ local function pre_low_cal_box(w, cmp)
    Dnode.flush_list(node_next(wv))
    for i = 1, 2*cmp+1 do setfield(nt, 'next', kf[i]); nt = kf[i]  end
 
-   gauss(coef) -- 掃きだし法で連立方程式形 coef を解く
+   if cmp==1 then     solve_1(coef)
+   elseif cmp==2 then solve_2(coef)
+   else
+      gauss(coef) -- 掃きだし法で連立方程式形 coef を解く
+   end
    return coef
 end
 
-
-local function first_whatsit(n) -- n 以後で最初の whatsit
-   for h in Dnode.traverse_id(id_whatsit, n) do
-      return h
+local first_whatsit
+do
+   local traverse_id = Dnode.traverse_id
+   function first_whatsit(n) -- n 以後で最初の whatsit
+      for h in traverse_id(id_whatsit, n) do
+         return h
+      end
+      return nil
    end
-   return nil
 end
 
+local next_cluster_array = {}
 -- ノード追加
 local function pre_low_app_node(head, w, cmp, coef, ht, dp)
    -- メインの node list 更新
@@ -470,24 +507,28 @@ local function pre_low_app_node(head, w, cmp, coef, ht, dp)
    nt = w
    for i = 1, cmp do
       -- rule
-      local nta = node_new(id_rule); 
+      local nta = node_new(id_rule);
       setfield(nta, 'width', coef[i*2][2*cmp+2])
       setfield(nta, 'height', ht); setfield(nta, 'depth', dp)
       setfield(nta, 'subtype', 0)
       insert_after(head, nt, nta)
       set_attr(nta, attr_ruby, 2*i+1)
       -- glue
-      nt = node_new(id_glue)
-      local ntb = node_new(id_glue_spec);
+       local ntb = node_new(id_glue_spec);
       setfield(ntb, 'width', coef[i*2+1][2*cmp+2])
       setfield(ntb, 'stretch_order', 0); setfield(ntb, 'stretch', 0)
       setfield(ntb, 'shrink_order', 0); setfield(ntb, 'shrink', 0)
+      if i~=cmp or not next_cluster_array[w] then
+	 nt = node_new(id_glue); insert_after(head, nta, nt)
+      else
+	 nt = next_cluster_array[w]
+      end
       setfield(nt, 'subtype', 0); setfield(nt, 'spec', ntb)
       set_attr(nt, attr_ruby, 2*i+2)
-      insert_after(head, nta, nt)
    end
    tex.setattribute('global', attr_ruby, -0x7FFFFFFF)
    setfield(w, 'user_id', RUBY_POST)
+   next_cluster_array[w]=nil
    return head, first_whatsit(node_next(nt))
 end
 
@@ -498,7 +539,7 @@ local function pre_high(ahead)
    local n = first_whatsit(head)
    while n do
       if getsubtype(n) == sid_user and getfield(n, 'user_id') == RUBY_PRE then
-         local nv = getfield(n, 'value')
+        local nv = getfield(n, 'value')
          max_allow_pre = has_attr(nv, attr_ruby_maxprep) or 0
          local atr = has_attr(n, attr_ruby) or 0
          if max_allow_pre < 0 then
@@ -518,7 +559,7 @@ local function pre_high(ahead)
          local coef = pre_low_cal_box(n, getfield(nv, 'value'))
          local s = node_tail(nv) --ルビ文字
          head, n = pre_low_app_node(
-            head, n, getfield(nv, 'value'), coef, 
+            head, n, getfield(nv, 'value'), coef,
             getfield(s, 'height'), getfield(s, 'depth')
          )
       else
@@ -526,7 +567,7 @@ local function pre_high(ahead)
       end
    end
    return to_node(head)
-end 
+end
 luatexbase.add_to_callback('pre_linebreak_filter', pre_high, 'ltj.ruby.pre', 100)
 luatexbase.add_to_callback('hpack_filter', pre_high, 'ltj.ruby.pre', 100)
 
@@ -537,11 +578,11 @@ local post_lown
 do
    local function write_aux(wv, num)
       local id = has_attr(wv, attr_ruby_id)
-      if id>0 then
-	 tex.sprint(cat_lp, 
-		    '\\write\\@mainaux{\\string\\directlua{luatexja.ruby.old_break_info[' 
-		       .. tostring(id) .. ']=' .. num 
-		       .. '}}')
+      if id>0 and cache_handle then
+	 cache_handle:write(
+		    'luatexja.ruby.old_break_info['
+		       .. tostring(id) .. ']=' .. num
+		       .. '\n')
       end
    end
 
@@ -551,35 +592,35 @@ do
       local hn = has_attr(rs[1], attr_ruby)
       local fn = has_attr(rs[#rs], attr_ruby)
       local wv = getfield(rw, 'value')
-      if hn==1 then 
+      if hn==1 then
 	 if fn==2*cmp+2 then
 	    local hn = node_tail(wv)
 	    node_remove(wv, hn)
-	    insert_after(ch, rs[#rs], hn)
+	    insert_after(ch, rs[1], hn)
 	    set_attr(hn, attr_icflag,  PROCESSED)
 	    write_aux(wv, has_attr(hn, attr_ruby))-- 行中形
 	 else
 	    local deg, hn = (fn-1)/2, wv
-	    for i = 1, deg do hn = node_next(hn) end; 
+	    for i = 1, deg do hn = node_next(hn) end;
 	    node_remove(wv, hn)
 	    setfield(hn, 'next', nil)
-	    insert_after(ch, rs[#rs], hn)
+	    insert_after(ch, rs[1], hn)
 	    set_attr(hn, attr_icflag,  PROCESSED)
 	    write_aux(wv, has_attr(hn, attr_ruby))
 	 end
       else
-	 local deg, hn = max((hn-1)/2,2), wv 
+	 local deg, hn = max((hn-1)/2,2), wv
 	 for i = 1, cmp+deg-1 do hn = node_next(hn) end
-	 -- -1 is needed except the case hn = 3, 
+	 -- -1 is needed except the case hn = 3,
 	 --   because a ending-line form is removed already from the list
 	 node_remove(wv, hn); setfield(hn, 'next', nil)
-	 insert_after(ch, rs[#rs], hn)
+	 insert_after(ch, rs[1], hn)
 	 set_attr(hn, attr_icflag,  PROCESSED)
 	 if fn == 2*cmp-1 then
 	    write_aux(wv, has_attr(hn, attr_ruby))
 	 end
       end
-      for i = 1,#rs do 
+      for i = 1,#rs do
 	 local ri = rs[i]
 	 ch = node_remove(ch, ri); node_free(ri);
       end
@@ -590,7 +631,7 @@ do
 end
 
 local function post_high_break(head)
-   local rs = {}   -- rs: sequence of ruby_nodes, 
+   local rs = {}   -- rs: sequence of ruby_nodes,
    local rw = nil  -- rw: main whatsit
    local cmp = -2  -- dummy
    for h in Dnode.traverse_id(id_hlist, to_direct(head)) do
@@ -598,55 +639,55 @@ local function post_high_break(head)
       local ha = getlist(h)
       while ha do
 	 local hai = getid(ha)
-	 local i = (((hai == id_glue and getsubtype(ha)==0) 
-			or (hai == id_rule and getsubtype(ha)==0)
-			or (hai == id_whatsit and getsubtype(ha)==sid_user 
-			       and getfield(ha, 'user_id')==RUBY_POST))
-		       and has_attr(ha, attr_ruby)) or 0
-	 if i==1 then 
+	 local i = ((hai == id_glue and getsubtype(ha)==0)
+                       or (hai == id_rule and getsubtype(ha)==0)
+                       or (hai == id_whatsit and getsubtype(ha)==sid_user
+                              and getfield(ha, 'user_id', RUBY_POST)))
+            and has_attr(ha, attr_ruby) or 0
+	 if i==0 then
+            ha = node_next(ha)
+         elseif i==1 then
 	    setfield(h, 'head', post_lown(rs, rw, cmp, getlist(h)))
 	    for i = 2, #rs do rs[i] = nil end -- rs[1] is set by the next statement
 	    rs[1], rw = ha, nil; ha = node_next(ha)
-	 elseif i>=3 then 
-	    rs[#rs+1] = ha; ha = node_next(ha)
-	 elseif i==2 then 
+	 elseif i==2 then
 	    rw = ha
 	    cmp = getfield(getfield(rw, 'value'), 'value')
 	    local hb, hc =  node_remove(getlist(h), rw)
 	    setfield(h, 'head', hb); ha = hc
-	 else
-	    ha = node_next(ha)
+	 else -- i>=3
+	    rs[#rs+1] = ha; ha = node_next(ha)
 	 end
       end
       setfield(h, 'head', post_lown(rs, rw, cmp, getlist(h)))
    end
    return head
-end 
+end
 
 local function post_high_hbox(ahead)
    local ha = to_direct(ahead); local head = ha
-   local rs = {};  -- rs: sequence of ruby_nodes, 
+   local rs = {};  -- rs: sequence of ruby_nodes,
    local rw = nil; -- rw: main whatsit
    local cmp
    while ha do
       local hai = getid(ha)
-      local i = (((hai == id_glue and getsubtype(ha)==0) 
-                     or (hai == id_rule and getsubtype(ha)==0)
-                     or (hai == id_whatsit and getsubtype(ha)==sid_user 
-                            and getfield(ha, 'user_id', RUBY_POST)))
-                    and has_attr(ha, attr_ruby)) or 0
-      if i==1 then 
+      local i = ((hai == id_glue and getsubtype(ha)==0)
+                    or (hai == id_rule and getsubtype(ha)==0)
+                    or (hai == id_whatsit and getsubtype(ha)==sid_user
+                           and getfield(ha, 'user_id', RUBY_POST)))
+         and has_attr(ha, attr_ruby) or 0
+      if i==0 then
+         ha = node_next(ha)
+      elseif i==1 then
          head = post_lown(rs, rw, cmp, head)
          for i = 2, #rs do rs[i] = nil end -- rs[1] is set by the next statement
 	 rs[1], rw = ha, nil; ha = node_next(ha)
-      elseif i>=3 then 
-         rs[#rs+1] = ha; ha = node_next(ha)
-      elseif i==2 then 
+      elseif i==2 then
          rw = ha
 	 cmp = getfield(getfield(rw, 'value'), 'value')
 	 head, ha = node_remove(head, rw)
-      else
-         ha = node_next(ha)
+      else -- i >= 3
+         rs[#rs+1] = ha; ha = node_next(ha)
       end
    end
    return to_node(post_lown(rs, rw, cmp, head))
@@ -661,8 +702,8 @@ luatexbase.add_to_callback('hpack_filter', post_high_hbox, 'ltj.ruby.post_hbox',
 ----------------------------------------------------------------
 do
    local RIPRE  = luatexja.stack_table_index.RIPRE
-   local function whatsit_callback(Np, lp, Nq, bsl) 
-      if Np.nuc then return Np 
+   local function whatsit_callback(Np, lp, Nq, bsl)
+      if Np.nuc then return Np
       elseif getfield(lp, 'user_id') == RUBY_PRE then
          Np.first, Np.nuc, Np.last = lp, lp, lp
          local lpv = getfield(lp, 'value')
@@ -707,8 +748,15 @@ end
 
 do
    local RIPOST = luatexja.stack_table_index.RIPOST
-   local function whatsit_after_callback(s, Nq, Np, bsl)
+   local function whatsit_after_callback(s, Nq, Np)
       if not s and  getfield(Nq.nuc, 'user_id') == RUBY_PRE then
+	 if Np then
+	    local last_glue = node_new(id_glue)
+	    set_attr(last_glue, attr_icflag, 0)
+	    insert_before(Nq.nuc, Np.first, last_glue)
+	    Np.first = last_glue
+	    next_cluster_array[Nq.nuc] = last_glue -- ルビ処理用のグルー
+	 end
          local nqnv = getfield(Nq.nuc, 'value')
          local x =  node_next(node_next(nqnv))
          for i = 2, getfield(nqnv, 'value') do x = node_next(node_next(x)) end