luatexja (21apr16)

git-svn-id: svn://tug.org/texlive/trunk@40661 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 35 insertions, 79 deletions

diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
index 84f75b9509d..821099da607 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-adjust.lua
@@ -1,55 +1,45 @@
 --
--- luatexja/otf.lua
+-- ltj-adjust.lua
 --
-luatexbase.provides_module({
-  name = 'luatexja.adjust',
-  date = '2014/09/30',
-  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 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 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 to_node = node.direct.tonode
+local to_direct = node.direct.todirect
+
+local setfield = node.direct.setfield
+local setglue = luatexja.setglue
+local getfield = node.direct.getfield
+local is_zero_glue = node.direct.is_zero_glue
+local getlist = node.direct.getlist
+local getid = node.direct.getid
+local getfont = node.direct.getfont
+local getsubtype = node.direct.getsubtype
+
+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 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
@@ -80,23 +70,20 @@ 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
 
 local res = {}
-local gs_used_line = {}
 local function get_total_stretched(p, line)
    local go, gf, gs
       = getfield(p, 'glue_order'), getfield(p, 'glue_set'), getfield(p, 'glue_sign')
@@ -111,23 +98,6 @@ local function get_total_stretched(p, line)
       elseif ic == XKANJI_SKIP_JFM  then ic = XKANJI_SKIP
       end
       if   type(res[ic]) == 'number' then
-	 -- kanjiskip, xkanjiskip は段落内で spec を共有しているが，
-	 -- それはここでは望ましくないので，各 glue ごとに異なる spec を使う．
-	 -- 本当は各行ごとに glue_spec を共有させたかったが，安直にやると
-	 -- ref_count が 0 なので Double-free が発生する．どうする？
-	 -- 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 (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)
-		  -- decrese qs's reference count
-	       else
-		  gs_used_line[qs] = line
-	       end
-	    end
-	 end
 	 res[ic], total = res[ic] + a, total + a
       else
 	 res[0], total = res[0]  + a, total + a
@@ -141,33 +111,21 @@ local function clear_stretch(p, ic, name)
       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)
-            setfield(qs, name, 0)
-         end
+         setfield(q, name..'_order', 0)
+         setfield(q, name, 0)
       end
    end
 end
 
-local set_stretch_table = {}
 local function set_stretch(p, after, before, ic, name)
    if before > 0 then
       local ratio = after/before
-      for i,_ in pairs(set_stretch_table) do
-         set_stretch_table[i] = nil
-      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))
 	   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
-            end
-            if getfield(qs, 'writable') and getfield(qs, name..'_order')==0 and do_flag then
-               setfield(qs, name, getfield(qs, name)*ratio)
-               set_stretch_table[#set_stretch_table+1] = qs
+            if getfield(q, name..'_order')==0 then
+               setfield(q, name, getfield(q, name)*ratio)
             end
          end
       end
@@ -271,22 +229,20 @@ local function adjust_width(head)
          aw_step2(p, res, total, aw_step1(p, res, total))
       end
    end
-   for i,_ in pairs(gs_used_line) do
-      gs_used_line[i]  = nil
-   end
    return to_node(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',
 				    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