Added luatexja.node_remove and luatexja.Dnode_remove ("safe node.remove")

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

diff --git a/src/ltj-math.lua b/src/ltj-math.lua
index 54cdaf5..6bf7031 100644 (file)
--- a/src/ltj-math.lua
+++ b/src/ltj-math.lua
@@ -97,7 +97,7 @@ end
 local MJT  = luatexja.stack_table_index.MJT
 local MJS  = luatexja.stack_table_index.MJS
 local MJSS = luatexja.stack_table_index.MJSS
-local capsule_glyph = ltjw.capsule_glyph
+local capsule_glyph_math = ltjw.capsule_glyph_math
 local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct
 
 conv_jchar_to_hbox_A = 
@@ -113,7 +113,7 @@ function (p, sty)
          local fam = has_attr(p, attr_jfam) or -1
         local pc = getchar(p)
          if (not is_math_letters[pc]) and is_ucs_in_japanese_char(p) and fam>=0 then
-            local f = ltjs.get_penalty_table(MJT + 0x100 * sty + fam, -1, tex_getcount('ltj@@stack'))
+            local f = ltjs.get_stack_table(MJT + 0x100 * sty + fam, -1, tex_getcount('ltj@@stack'))
             if f ~= -1 then
                local q = node_new(id_sub_box)
                local r = node_new(id_glyph); setfield(r, 'next', nil)
@@ -121,11 +121,10 @@ function (p, sty)
                local k = has_attr(r,attr_ykblshift) or 0 
                set_attr(r, attr_ykblshift, 0)
                -- ltj-setwidth 内で実際の位置補正はおこなうので，補正量を退避
-               ltjw.head = r; 
                local met = ltjf_font_metric_table[f]
-               capsule_glyph(r, tex.mathdir , true, met, ltjf_find_char_class(pc, met));
-               setfield(q, 'head', ltjw.head); node_free(p); p=q;
-               set_attr(getlist(q), attr_yablshift, k)
+               r = capsule_glyph_math(r, met, ltjf_find_char_class(pc, met));
+               setfield(q, 'head', r); node_free(p); p=q;
+               set_attr(r, attr_yablshift, k)
             end
          end
       elseif pid == id_sub_box and getlist(p) then