X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-adjust.lua;h=46d1e027b1ac8a597f82b53d10aa10243d1ad491;hb=79e952ea40e3ac4ebd79a2b1c65c3a3745b0289a;hp=09125a153f5f7e280f94b70fe61f2c3a0f5a54b8;hpb=a693b63eadfcabe5f4f513a4cc90302f2360b18b;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua
index 09125a1..46d1e02 100644
--- a/src/ltj-adjust.lua
+++ b/src/ltj-adjust.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.adjust',
-  date = '2014/02/01',
+  date = '2014/09/30',
   description = 'Advanced line adjustment for LuaTeX-ja',
 })
 module('luatexja.adjust', package.seeall)
@@ -11,6 +11,7 @@ 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
 
@@ -29,9 +30,9 @@ 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.getnext
+local node_next = (Dnode ~= node) and Dnode.getnext or node.next
 local node_free = Dnode.free
-local node_prev = Dnode.getprev
+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
@@ -82,12 +83,14 @@ 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(qs, 'stretch_order') == go then
+	 return getfield(qs, 'stretch')
+      else return 0
       end
    else -- shrinking
-      if getfield(qs, 'shrink_order') == go then 
+      if getfield(qs, 'shrink_order') == go then
 	 return getfield(qs, 'shrink')
+      else return 0
       end
    end
 end
@@ -95,7 +98,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 +107,7 @@ 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   type(res[ic]) == 'number' then
 	 -- kanjiskip, xkanjiskip は段落内で spec を共有しているが，
 	 -- それはここでは望ましくないので，各 glue ごとに異なる spec を使う．
 	 -- 本当は各行ごとに glue_spec を共有させたかったが，安直にやると
@@ -125,7 +128,7 @@ local function get_total_stretched(p, line)
 	 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
@@ -153,11 +156,11 @@ 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)
@@ -169,35 +172,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
       -- 和文文字
       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 +256,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)
@@ -275,7 +278,7 @@ do
    local is_reg = false
    function 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