X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfmglue.lua;h=8946027d9eb9fdc90f5b2a681d1a48226e451155;hb=a693b63eadfcabe5f4f513a4cc90302f2360b18b;hp=30068a699a4e2555fe385e37d87bb54468fe6a24;hpb=1664271cd29e52a9e40de133aa611908e4a6415c;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua
index 30068a6..8946027 100644
--- a/src/ltj-jfmglue.lua
+++ b/src/ltj-jfmglue.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfmglue',
-  date = '2014/1/21',
+  date = '2014/02/01',
   description = 'Insertion process of JFM glues and kanjiskip',
 })
 module('luatexja.jfmglue', package.seeall)
@@ -37,7 +37,7 @@ local ltjf_font_metric_table = ltjf.font_metric_table
 local ltjf_find_char_class = ltjf.find_char_class
 local node_new = Dnode.new
 local node_copy = Dnode.copy
-local node_remove = Dnode.remove
+local node_remove = luatexja.Dnode_remove -- Dnode.remove
 local node_tail = Dnode.tail
 local node_free = Dnode.free
 local node_end_of_math = Dnode.end_of_math
@@ -73,8 +73,6 @@ local ITALIC       = luatexja.icflag_table.ITALIC
 local PACKED       = luatexja.icflag_table.PACKED
 local KINSOKU      = luatexja.icflag_table.KINSOKU
 local FROM_JFM     = luatexja.icflag_table.FROM_JFM
-local KANJI_SKIP   = luatexja.icflag_table.KANJI_SKIP
-local XKANJI_SKIP  = luatexja.icflag_table.XKANJI_SKIP
 local PROCESSED    = luatexja.icflag_table.PROCESSED
 local IC_PROCESSED = luatexja.icflag_table.IC_PROCESSED
 local BOXBDD       = luatexja.icflag_table.BOXBDD
@@ -191,7 +189,9 @@ local function check_box(box_ptr, box_end)
 	 pid = getid(p) -- p must be non-nil
       end
       if pid==id_kern then
-	 if get_attr_icflag(p)==IC_PROCESSED then
+	 local pa = get_attr_icflag(p)
+	 --if pa==IC_PROCESSED or pa == PACKED then
+	 if pa==IC_PROCESSED then
 	    -- do nothing
 	 elseif getsubtype(p)==2 then
 	    p = node_next(node_next(p)); 
@@ -218,6 +218,7 @@ local function check_box(box_ptr, box_end)
 	    first_char = p; find_first_char = false
 	 end
 	 last_char = p; found_visible_node = true
+	 --elseif pid==id_rule and get_attr_icflag(p)==PACKED then -- do nothing
       elseif not (pid==id_ins   or pid==id_mark
 		  or pid==id_adjust or pid==id_whatsit
 		  or pid==id_penalty) then
@@ -581,41 +582,45 @@ end
 
 -- get kanjiskip
 local get_kanjiskip
-
-local function get_kanjiskip_normal()
-   if Np.auto_kspc or Nq.auto_kspc then
-      return node_copy(kanji_skip)
-   else
-      local g = node_copy(zero_glue)
-      set_attr(g, attr_icflag, KANJI_SKIP)
-      return g
+local get_kanjiskip_normal, get_kanjiskip_jfm
+do
+   local KANJI_SKIP   = luatexja.icflag_table.KANJI_SKIP
+   local KANJI_SKIP_JFM   = luatexja.icflag_table.KANJI_SKIP_JFM
+   get_kanjiskip_normal = function ()
+      if Np.auto_kspc or Nq.auto_kspc then
+	 return node_copy(kanji_skip)
+      else
+	 local g = node_copy(zero_glue)
+	 set_attr(g, attr_icflag, KANJI_SKIP)
+	 return g
+      end
    end
-end
 
-local function get_kanjiskip_jfm()
-   local g
-   if Np.auto_kspc or Nq.auto_kspc then
-      g = node_new(id_glue); --copy_attr(g, Nq.nuc)
-      local gx = node_new(id_glue_spec);
-      setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
-      local pm, qm = Np.met, Nq.met
-      local bk = qm.kanjiskip or {0, 0, 0}
-      if (pm.char_type==qm.char_type) and (qm.var==pm.var) then
-	 setfield(gx, 'width', bk[1])
-	 setfield(gx, 'stretch', bk[2])
-	 setfield(gx, 'shrink', bk[3])
+   get_kanjiskip_jfm = function ()
+      local g
+      if Np.auto_kspc or Nq.auto_kspc then
+	 g = node_new(id_glue); --copy_attr(g, Nq.nuc)
+	 local gx = node_new(id_glue_spec);
+	 setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
+	 local pm, qm = Np.met, Nq.met
+	 local bk = qm.kanjiskip or {0, 0, 0}
+	 if (pm.char_type==qm.char_type) and (qm.var==pm.var) then
+	    setfield(gx, 'width', bk[1])
+	    setfield(gx, 'stretch', bk[2])
+	    setfield(gx, 'shrink', bk[3])
+	 else
+	    local ak = pm.kanjiskip or {0, 0, 0}
+	    setfield(gx, 'width', round(diffmet_rule(bk[1], ak[1])))
+	    setfield(gx, 'stretch', round(diffmet_rule(bk[2], ak[2])))
+	    setfield(gx, 'shrink', -round(diffmet_rule(-bk[3], -ak[3])))
+	 end
+	 setfield(g, 'spec', gx)
       else
-         local ak = pm.kanjiskip or {0, 0, 0}
-	 setfield(gx, 'width', round(diffmet_rule(bk[1], ak[1])))
-	 setfield(gx, 'stretch', round(diffmet_rule(bk[2], ak[2])))
-	 setfield(gx, 'shrink', -round(diffmet_rule(-bk[3], -ak[3])))
+	 g =  node_copy(zero_glue)
       end
-      setfield(g, 'spec', gx)
-   else
-      g =  node_copy(zero_glue)
+      set_attr(g, attr_icflag, KANJI_SKIP_JFM)
+      return g
    end
-   set_attr(g, attr_icflag, KANJI_SKIP)
-   return g
 end
 
 local calc_ja_ja_aux
@@ -708,32 +713,37 @@ end
 
 -- get xkanjiskip
 local get_xkanjiskip
-local function get_xkanjiskip_normal(Nn)
-   if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then
-      local f = node_copy(xkanji_skip)
-      return f
-   else
-      local g = node_copy(zero_glue)
-      set_attr(g, attr_icflag, XKANJI_SKIP)
-      return g
+local get_xkanjiskip_normal, get_xkanjiskip_jfm
+do
+   local XKANJI_SKIP   = luatexja.icflag_table.XKANJI_SKIP
+   local XKANJI_SKIP_JFM   = luatexja.icflag_table.XKANJI_SKIP_JFM
+   get_xkanjiskip_normal = function (Nn)
+      if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then
+	 local f = node_copy(xkanji_skip)
+	 return f
+      else
+	 local g = node_copy(zero_glue)
+	 set_attr(g, attr_icflag, XKANJI_SKIP)
+	 return g
+      end
    end
-end
-local function get_xkanjiskip_jfm(Nn)
-   local g
-   if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then
-      g = node_new(id_glue)
-      local gx = node_new(id_glue_spec);
-      setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
-      local bk = Nn.met.xkanjiskip or {0, 0, 0}
-      setfield(gx, 'width', bk[1])
-      setfield(gx, 'stretch', bk[2])
-      setfield(gx, 'shrink', bk[3])
-      setfield(g, 'spec', gx)
-   else
-      g = node_copy(zero_glue)
+   get_xkanjiskip_jfm = function (Nn)
+      local g
+      if (Nq.xspc>=2) and (Np.xspc%2==1) and (Nq.auto_xspc or Np.auto_xspc) then
+	 g = node_new(id_glue)
+	 local gx = node_new(id_glue_spec);
+	 setfield(gx, 'stretch_order', 0); setfield(gx, 'shrink_order', 0)
+	 local bk = Nn.met.xkanjiskip or {0, 0, 0}
+	 setfield(gx, 'width', bk[1])
+	 setfield(gx, 'stretch', bk[2])
+	 setfield(gx, 'shrink', bk[3])
+	 setfield(g, 'spec', gx)
+      else
+	 g = node_copy(zero_glue)
+      end
+      set_attr(g, attr_icflag, XKANJI_SKIP_JFM)
+      return g
    end
-   set_attr(g, attr_icflag, XKANJI_SKIP)
-   return g
 end
 
 -------------------- 隣接した「塊」間の処理
@@ -891,46 +901,51 @@ end
 
 -- initialize
 -- return value: (the initial cursor lp), (last node)
-local function init_var(mode)
-   -- 1073741823: max_dimen
-   Bp, widow_Bp, widow_Np = {}, {}, {first = nil}
-   table_current_stack = ltjs.table_current_stack
-
-   kanji_skip = node_new(id_glue)
-   setfield(kanji_skip, 'spec', skip_table_to_spec('kanjiskip'))
-   set_attr(kanji_skip, attr_icflag, KANJI_SKIP)
-   get_kanjiskip = (getfield(getfield(kanji_skip, 'spec'), 'width') == 1073741823)
-      and get_kanjiskip_jfm or get_kanjiskip_normal
-
-   xkanji_skip = node_new(id_glue)
-   setfield(xkanji_skip, 'spec', skip_table_to_spec('xkanjiskip'))
-   set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP)
-   get_xkanjiskip = (getfield(getfield(xkanji_skip, 'spec'), 'width') == 1073741823)
-      and get_xkanjiskip_jfm or get_xkanjiskip_normal
-
-   Np = {
-      auto_kspc=nil, auto_xspc=nil, char=nil, class=nil, 
-      first=nil, id=nil, last=nil, met=nil, nuc=nil, 
-      post=nil, pre=nil, xspc=nil, 
-   }
-   Nq = {
-      auto_kspc=nil, auto_xspc=nil, char=nil, class=nil, 
-      first=nil, id=nil, last=nil, met=nil, nuc=nil, 
-      post=nil, pre=nil, xspc=nil, 
-   }
-   if mode then 
-      -- the current list is to be line-breaked:
-      -- hbox from \parindent is skipped.
-      local lp, par_indented, lpi, lps  = head, 'boxbdd', getid(head), getsubtype(head)
-      while lp and ((lpi==id_whatsit and lps~=sid_user) 
-		 or ((lpi==id_hlist) and (lps==3))) do
-	 if (lpi==id_hlist) and (lps==3) then par_indented = 'parbdd' end
-	 lp=node_next(lp); lpi, lps = getid(lp), getsubtype(lp) end
-     return lp, par_indented
-     -- return lp, node_tail(head), par_indented
-   else 
-      -- the current list is the contents of a hbox:
-      return head, 'boxbdd'
+local init_var
+do
+   local KANJI_SKIP   = luatexja.icflag_table.KANJI_SKIP
+   local XKANJI_SKIP   = luatexja.icflag_table.XKANJI_SKIP
+   local KSK  = luatexja.stack_table_index.KSK
+   local XSK  = luatexja.stack_table_index.XSK
+   init_var = function (mode)
+      -- 1073741823: max_dimen
+      Bp, widow_Bp, widow_Np = {}, {}, {first = nil}
+      table_current_stack = ltjs.table_current_stack
+      
+      kanji_skip = node_new(id_glue)
+      setfield(kanji_skip, 'spec', skip_table_to_spec(KSK))
+      set_attr(kanji_skip, attr_icflag, KANJI_SKIP)
+      get_kanjiskip = (getfield(getfield(kanji_skip, 'spec'), 'width') == 1073741823)
+	 and get_kanjiskip_jfm or get_kanjiskip_normal
+      
+      xkanji_skip = node_new(id_glue)
+      setfield(xkanji_skip, 'spec', skip_table_to_spec(XSK))
+      set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP)
+      get_xkanjiskip = (getfield(getfield(xkanji_skip, 'spec'), 'width') == 1073741823)
+	 and get_xkanjiskip_jfm or get_xkanjiskip_normal
+      
+      Np = {
+	 auto_kspc=nil, auto_xspc=nil, char=nil, class=nil, 
+	 first=nil, id=nil, last=nil, met=nil, nuc=nil, 
+	 post=nil, pre=nil, xspc=nil, 
+      }
+      Nq = {
+	 auto_kspc=nil, auto_xspc=nil, char=nil, class=nil, 
+	 first=nil, id=nil, last=nil, met=nil, nuc=nil, 
+	 post=nil, pre=nil, xspc=nil, 
+      }
+      if mode then 
+	 -- the current list is to be line-breaked:
+	 -- hbox from \parindent is skipped.
+	 local lp, par_indented, lpi, lps  = head, 'boxbdd', getid(head), getsubtype(head)
+	 while lp and ((lpi==id_whatsit and lps~=sid_user) 
+		       or ((lpi==id_hlist) and (lps==3))) do
+	    if (lpi==id_hlist) and (lps==3) then par_indented = 'parbdd' end
+	    lp=node_next(lp); lpi, lps = getid(lp), getsubtype(lp) end
+	 return lp, par_indented
+      else 
+	 return head, 'boxbdd'
+      end
    end
 end