X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-pretreat.lua;h=d0ea84da1be2d4bf6fe8a2244775ed82d39fcf03;hb=8fbe1d2f31602bacb8cb42633482a8587fbdfcd4;hp=ad9182145b6d3b86c5312078b5da1890d58ce73a;hpb=ae1314aae218985b5db11fb08f143476ce5df3e3;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-pretreat.lua b/src/ltj-pretreat.lua
index ad91821..d0ea84d 100644
--- a/src/ltj-pretreat.lua
+++ b/src/ltj-pretreat.lua
@@ -39,24 +39,23 @@ local attr_orig_char = luatexbase.attributes['ltj@origchar']
 ------------------------------------------------------------------------
 -- MAIN PROCESS STEP 1: replace fonts
 ------------------------------------------------------------------------
-box_stack_level = 0
--- This is used in jfmglue.lua.
 local wt
 
 local function suppress_hyphenate_ja(head)
    local non_math, p = true, head
    wt = {}
    while p do
-   --for p in node_traverse(head) 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 
-	 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
+      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 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)
@@ -71,7 +70,7 @@ function set_box_stack_level(head, mode)
    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
+   ltjs.report_stack_level(tex_getcount('ltj@@stack') + box_set)
    return head
 end