Changed character range 8 to ALchar

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

diff --git a/src/ltj-jfmglue.lua b/src/ltj-jfmglue.lua
index 8d564dc..3a7101e 100644 (file)
--- a/src/ltj-jfmglue.lua
+++ b/src/ltj-jfmglue.lua
@@ -3,7 +3,7 @@
 --
 luatexbase.provides_module({
   name = 'luatexja.jfmglue',
-  date = '2015/01/13',
+  date = '2015/05/03',
   description = 'Insertion process of JFM glues and kanjiskip',
 })
 module('luatexja.jfmglue', package.seeall)
@@ -66,7 +66,7 @@ local id_box_like  = 256 -- vbox, shifted hbox
 local id_pbox      = 257 -- already processed nodes (by \unhbox)
 local id_pbox_w    = 258 -- cluster which consists of a whatsit
 local sid_user = node.subtype('user_defined')
-local lang_ja = token.create('ltj@@japanese')[2]
+local lang_ja = luatexja.lang_ja
 
 local sid_start_link = node.subtype('pdf_start_link')
 local sid_start_thread = node.subtype('pdf_start_thread')
@@ -222,6 +222,7 @@ local function check_box(box_ptr, box_end)
            last_char = s; found_visible_node = true
         else
            if getfield(p, 'shift')==0 then
+              last_char = nil
               if check_box(getlist(p), nil) then found_visible_node = true end
            else
               find_first_char = false; last_char = nil
@@ -281,12 +282,6 @@ local calc_np
 do
 
 local traverse = Dnode.traverse
-local function set_attr_icflag_processed(p)
-   if get_attr_icflag(p)<= ITALIC then
-      set_attr(p, attr_icflag, PROCESSED)
-   end
-end
-
 local function check_next_ickern(lp)
    if lp and getid(lp) == id_kern and ITALIC == get_attr_icflag(lp) then
       set_attr(lp, attr_icflag, IC_PROCESSED)
@@ -358,8 +353,8 @@ local function calc_np_aux_glyph_common(lp)
               local ls = getsubtype(lx)
               if ls==2 then -- アクセント用の kern
                  set_attr(lx, attr_icflag, PROCESSED)
-                 lx = node_next(lx) -- lp: アクセント本体
-                 setfield(lx, 'yoffset', getfield(lp, 'yoffset') - (has_attr(lx,attr_ablshift) or 0))
+                 lx = node_next(lx) -- lx: アクセント本体
+                 setfield(lx, 'yoffset', getfield(lx, 'yoffset') - (has_attr(lx,attr_ablshift) or 0))
                  lx = node_next(node_next(lx))
               elseif ls==0  then
                  Np.last = lx
@@ -389,7 +384,9 @@ local function calc_np_aux_glyph_common(lp)
         if r then
            local nf, nc = getfont(npn), getchar(npn)
            local ct = (font.getfont(nf) or font.fonts[nf] ).characters[nc]
-           if (ct.left_protruding or 0) == 0 then
+           if not ct then -- variation selector
+              node_free(r)
+           elseif (ct.left_protruding or 0) == 0 then
               head = insert_before(head, npn, r)
               Np.first = (Np.first==npn) and r or npn
            elseif (ct.right_protruding or 0) == 0 then
@@ -1049,16 +1046,25 @@ do
       local is_dir_tate = list_dir==dir_tate
       capsule_glyph = is_dir_tate and ltjw.capsule_glyph_tate or ltjw.capsule_glyph_yoko
       attr_ablshift = is_dir_tate and attr_tablshift or attr_yablshift
+      local TEMP = node_new(id_glue) 
+      -- TEMP is a dummy node, which will be freed at the end of the callback. 
+      -- ithout this node, set_attr(kanji_skip, ...) somehow creates an "orphaned"  attribute list.
+
+      do
+        kanji_skip = node_new(id_glue); set_attr(kanji_skip, attr_icflag, KANJI_SKIP)
+        local s = skip_table_to_spec(KSK)
+        setfield(kanji_skip, 'spec', s)
+        get_kanjiskip = (getfield(s, 'width') == 1073741823)
+           and get_kanjiskip_jfm or get_kanjiskip_normal
+      end
 
-      kanji_skip = node_new(id_glue); set_attr(kanji_skip, attr_icflag, KANJI_SKIP)
-      setfield(kanji_skip, 'spec', skip_table_to_spec(KSK))
-      get_kanjiskip = (getfield(getfield(kanji_skip, 'spec'), 'width') == 1073741823)
-        and get_kanjiskip_jfm or get_kanjiskip_normal
-
-      xkanji_skip = node_new(id_glue); set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP)
-      setfield(xkanji_skip, 'spec', skip_table_to_spec(XSK))
-      get_xkanjiskip = (getfield(getfield(xkanji_skip, 'spec'), 'width') == 1073741823)
-        and get_xkanjiskip_jfm or get_xkanjiskip_normal
+      do
+        xkanji_skip = node_new(id_glue); set_attr(xkanji_skip, attr_icflag, XKANJI_SKIP)
+        local s = skip_table_to_spec(XSK)
+        setfield(xkanji_skip, 'spec', s)
+        get_xkanjiskip = (getfield(s, 'width') == 1073741823)
+           and get_xkanjiskip_jfm or get_xkanjiskip_normal
+      end
 
       if mode then
         -- the current list is to be line-breaked:
@@ -1071,18 +1077,19 @@ do
                Np.width = getfield(lp, 'width')
             end
            lp=node_next(lp); lpi, lps = getid(lp), getsubtype(lp) end
-        return lp, node_tail(head), par_indented
+        return lp, node_tail(head), par_indented, TEMP
       else
-        return head, nil, 'boxbdd'
+        return head, nil, 'boxbdd', TEMP
       end
    end
 end
 
 local ensure_tex_attr = ltjb.ensure_tex_attr
-local function cleanup(mode)
+local function cleanup(mode, TEMP)
    -- adjust attr_icflag for avoiding error
-   if tex.getattribute(attr_icflag)~=0 then ensure_tex_attr('global', attr_icflag, 0) end
-   node_free(kanji_skip); node_free(xkanji_skip)
+   if tex.getattribute(attr_icflag)~=0 then ensure_tex_attr(attr_icflag, 0) end
+   node_free(kanji_skip); node_free(xkanji_skip); node_free(TEMP)
+   
    if mode then
       local h = node_next(head)
       if getid(h) == id_penalty and getfield(h, 'penalty') == 10000 then
@@ -1100,7 +1107,7 @@ end
 function main(ahead, mode, dir)
    if not ahead then return ahead end
    head = ahead;
-   local lp, last, par_indented = init_var(mode,dir)
+   local lp, last, par_indented, TEMP = init_var(mode,dir)
    lp = calc_np(last, lp)
    if Np then
       handle_list_head(par_indented)
@@ -1121,7 +1128,7 @@ function main(ahead, mode, dir)
       end
       handle_list_tail(mode)
    end
-   return cleanup(mode)
+   return cleanup(mode, TEMP)
 end
 end