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

diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua
index 5c0a781..db85d8f 100644
--- a/src/ltj-adjust.lua
+++ b/src/ltj-adjust.lua
@@ -1,54 +1,48 @@
 --
 -- luatexja/otf.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.adjust',
-  date = '2014/02/02',
-  description = 'Advanced line adjustment for LuaTeX-ja',
-})
-module('luatexja.adjust', package.seeall)
-
 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
 
-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
+local to_node = node.direct.tonode
+local to_direct = node.direct.todirect
 
-local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
-local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end
-local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end
-local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
-local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end
-local getsubtype = (Dnode ~= node) and Dnode.getsubtype or function(n) return n.subtype end
+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
+local getsubtype = node.direct.getsubtype
 
-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 ~= node) and Dnode.getnext or node.next
-local node_free = Dnode.free
-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
-local insert_after = Dnode.insert_after
+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
+local node_tail = node.direct.tail
+local has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
+local insert_after = node.direct.insert_after
 
 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 id_whatsit = node.id('whatsit')
 local attr_icflag = luatexbase.attributes['ltj@icflag']
 local attr_jchar_class = luatexbase.attributes['ltj@charclass']
-local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
+local lang_ja = luatexja.lang_ja
 
 local ltjf_font_metric_table = ltjf.font_metric_table
-local spec_zero_glue = ltjj.spec_zero_glue
 local round, pairs = tex.round, pairs
 
 local PACKED       = luatexja.icflag_table.PACKED
@@ -79,15 +73,15 @@ end
 -- box 内で伸縮された glue の合計値を計算
 
 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(q, 'stretch_order') == go then
+	 return getfield(q, 'stretch')
+      else return 0
       end
    else -- shrinking
-      if getfield(qs, 'shrink_order') == go then 
-	 return getfield(qs, 'shrink')
+      if getfield(q, 'shrink_order') == go then
+	 return getfield(q, 'shrink')
+      else return 0
       end
    end
 end
@@ -95,7 +89,7 @@ end
 local res = {}
 local gs_used_line = {}
 local function get_total_stretched(p, line)
-   local go, gf, gs 
+   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'
@@ -104,7 +98,10 @@ local function get_total_stretched(p, line)
    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 ic == KANJI_SKIP_JFM  then ic = KANJI_SKIP
+      elseif ic == XKANJI_SKIP_JFM  then ic = XKANJI_SKIP
+      end
+      if   type(res[ic]) == 'number' then
 	 -- kanjiskip, xkanjiskip は段落内で spec を共有しているが，
 	 -- それはここでは望ましくないので，各 glue ごとに異なる spec を使う．
 	 -- 本当は各行ごとに glue_spec を共有させたかったが，安直にやると
@@ -112,7 +109,7 @@ local function get_total_stretched(p, line)
 	 -- JFM グルーはそれぞれ異なる glue_spec を用いているので，問題ない．
 	 if (ic == KANJI_SKIP or ic == XKANJI_SKIP) and getsubtype(q)==0 then
 	    local qs = getfield(q, 'spec')
-	    if qs ~= spec_zero_glue then
+	    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)
@@ -121,11 +118,9 @@ local function get_total_stretched(p, line)
 		  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
 	 res[ic], total = res[ic] + a, total + a
-      else 
+      else
 	 res[0], total = res[0]  + a, total + a
       end
    end
@@ -134,7 +129,9 @@ end
 
 local function clear_stretch(p, ic, name)
    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 = getfield(q, 'spec')
          if getfield(qs, 'writable') then
             setfield(qs, name..'_order', 0)
@@ -153,14 +150,14 @@ local function set_stretch(p, after, before, ic, name)
       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)) 
+         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)
+               setfield(q, name, getfield(qs, name)*ratio)
                set_stretch_table[#set_stretch_table+1] = qs
             end
          end
@@ -169,35 +166,35 @@ local function set_stretch(p, after, before, ic, name)
 end
 
 -- step 1: 行末に kern を挿入（句読点，中点用）
+local ltjd_glyph_from_packed = ltjd.glyph_from_packed
 local function aw_step1(p, res, total)
    local head = getlist(p)
    local x = node_tail(head); 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 
+   local xi, xc = getid(x)
+   if xi == id_glue and getsubtype(x) == 15 then
       -- 段落最終行のときは，\penalty10000 \parfillskip が入るので，
       -- その前の node が本来の末尾文字となる
-      x = node_prev(node_prev(x)) 
+      x = node_prev(node_prev(x)); xi = getid(x)
    end
    -- local xi = getid(x)
-   -- while (get_attr_icflag(x) == PACKED) 
+   -- 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
+   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 = getlist(x)
-      while getid(xc) == id_whatsit do xc = node_next(xc) end
+      xc = ltjd_glyph_from_packed(x)
+      while getid(xc) == id_whatsit do xc = node_next(xc) end -- これはなんのために？
    else
      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
+     .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
@@ -253,12 +250,12 @@ end
 
 
 local ltjs_fast_get_stack_skip = ltjs.fast_get_stack_skip
-local function adjust_width(head) 
+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) 
+      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)
@@ -272,15 +269,16 @@ local function adjust_width(head)
 end
 
 do
+   luatexja.adjust = luatexja.adjust or {}
    local is_reg = false
-   function enable_cb()
+   function luatexja.adjust.enable_cb()
       if not is_reg then
-	 luatexbase.add_to_callback('post_linebreak_filter', 
+	 luatexbase.add_to_callback('post_linebreak_filter',
 				    adjust_width, 'Adjust width', 100)
 	 is_reg = true
       end
    end
-   function disable_cb()
+   function luatexja.adjust.disable_cb()
       if is_reg then
 	 luatexbase.remove_from_callback('post_linebreak_filter', 'Adjust width')
 	 is_reg = false