Reduced 'global variables' in ltj-jfmglue.lua.

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

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index d2b22fe..ad91821 100644 (file)
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -41,19 +41,25 @@ local attr_orig_char = luatexbase.attributes['ltj@origchar']
 ------------------------------------------------------------------------
 box_stack_level = 0
 -- This is used in jfmglue.lua.
+local wt
 
 local function suppress_hyphenate_ja(head)
-   local non_math, p = true, nil
-   for p in node_traverse(head) do
-      if p.id == id_glyph and non_math then
+   local non_math, p = true, head
+   wt = {}
+   while p do
+   --for p in node_traverse(head) do
+      if p.id == 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 
-        non_math = (p.subtype ~= 0)
+        while 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
+        wt[#wt+1] = p; head = node_remove(head, p)
       end
+      p = node_next(p)
    end
    lang.hyphenate(head)
    return head
@@ -61,17 +67,11 @@ end
 
 -- mode: true iff this function is called from hpack_filter
 function set_box_stack_level(head, mode)
-   local box_set = false
-   local p = head
-   local cl = tex.currentgrouplevel + 1
-   for p in node.traverse_id(id_whatsit, head) do
-      if p.subtype==sid_user and p.user_id==30112 then
-        local g = p
-        if mode and g.value==cl then box_set = true end
-        head, p = node_remove(head, g); node_free(g); break
-      end
+   local box_set, cl = 0, tex.currentgrouplevel + 1
+   for _,p  in pairs(wt) do
+      if mode and p.value==cl then box_set = 1 end; node_free(p)
    end
-   box_stack_level = tex_getcount('ltj@@stack') + (box_set and 1 or 0)
+   box_stack_level = tex_getcount('ltj@@stack') + box_set
    return head
 end