Moved changes of 1b1d3c3 and 3b2bba1 into luatexja-fontspec.sty (#30335).

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

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index 18a1df0..d0ea84d 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -45,16 +45,17 @@ local function suppress_hyphenate_ja(head)
    local non_math, p = true, head
    wt = {}
    while p do
-      if p.id == id_glyph then
+      local pid = p.id
+      if pid == id_glyph then
         if (has_attr(p, attr_icflag) or 0)<=0 and ltjc_is_ucs_in_japanese_char(p) then
            p.font = has_attr(p, attr_curjfnt) or p.font
            p.subtype = floor(p.subtype*0.5)*2
            set_attr(p, attr_orig_char, p.char)
         end
-      elseif p.id == id_math then 
+      elseif pid == id_math then 
         p = node_next(p) -- skip math on
         while p and p.id~=id_math do p = node_next(p) end
-      elseif p.id == id_whatsit and p.subtype==sid_user and p.user_id==30112 then
+      elseif pid == id_whatsit and p.subtype==sid_user and p.user_id==30112 then
         wt[#wt+1] = p; head = node_remove(head, p)
       end
       p = node_next(p)