ltj-inputbuf.lua: add a close paren.

[luatex-ja/luatexja.git] / src / ltj-adjust.lua

diff --git a/src/ltj-adjust.lua b/src/ltj-adjust.lua
index 1a89408..84f75b9 100644 (file)
--- a/src/ltj-adjust.lua
+++ b/src/ltj-adjust.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.adjust',
-  date = '2014/05/08',
+  date = '2014/09/30',
   description = 'Advanced line adjustment for LuaTeX-ja',
 })
 module('luatexja.adjust', package.seeall)
@@ -46,7 +46,7 @@ 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
@@ -85,10 +85,12 @@ local function get_stretched(q, go, gs)
    if gs == 1 then -- stretching
       if getfield(qs, 'stretch_order') == go then
         return getfield(qs, 'stretch')
+      else return 0
       end
    else -- shrinking
       if getfield(qs, 'shrink_order') == go then
         return getfield(qs, 'shrink')
+      else return 0
       end
    end
 end
@@ -105,6 +107,9 @@ 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 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 を使う．
@@ -122,8 +127,6 @@ 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
@@ -135,7 +138,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)
@@ -172,33 +177,33 @@ end
 -- step 1: 行末に kern を挿入（句読点，中点用）
 local ltjd_glyph_from_packed = ltjd.glyph_from_packed
 local function aw_step1(p, res, total)
-   local x = node_tail(getlist(p)); if not x then return false end
+   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
-   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)
    --    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 = ltjd_glyph_from_packed(x)
-      while getid(xc) == id_whatsit do xc = node_next(xc) end
+      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