X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-math.lua;h=53bcdb340ff56684912510936c2d3781470d42f4;hb=f078ac2f7998a102c7ec765e725f2269eed9f872;hp=abb50ece53becb7b53b8025f7fd5e7811b4af6bd;hpb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;p=luatex-ja%2Fluatexja.git

diff --git a/src/ltj-math.lua b/src/ltj-math.lua
index abb50ec..53bcdb3 100644
--- a/src/ltj-math.lua
+++ b/src/ltj-math.lua
@@ -64,6 +64,7 @@ local ltjd_make_dir_whatsit = ltjd.make_dir_whatsit
 local is_math_letters = {}
 local list_dir
 
+-- vcenter noad は軸に揃えるため，欧文ベースライン補正がかかる
 local function conv_vcenter(sb)
    local h = getfield(sb, 'head');local hd = getlist(h)
    if getid(hd)==id_whatsit and 
@@ -71,10 +72,9 @@ local function conv_vcenter(sb)
       local d = node_next(hd)
       if getid(d)==id_vlist and has_attr(d, attr_dir)>=dir_node_auto then
 	 node_free(hd); setfield(h, 'head', nil); node_free(h)
-	 setfield(sb, 'head', d); h = d
+	 setfield(sb, 'head', d);  set_attr(d, attr_icflag, 0)
       end
    end
-   set_attr(h, attr_icflag, PROCESSED)
    return sb
 end
 
@@ -169,9 +169,9 @@ luatexbase.add_to_callback('mlist_to_hlist',
    function (n, display_type, penalties)
       n = to_direct(n); list_dir = ltjd_get_dir_count()
       if getid(n)==id_whatsit and getsubtype(n)==sid_user and
-      getfield(n, 'user_id') == DIR then
+        getfield(n, 'user_id') == DIR then
 	 local old_n = n; n = node_remove(n, n)
-	 node_free(old_n)
+	 node_free(old_n); if not n then return nil end
       end
       return node.mlist_to_hlist(
 	 to_node(conv_jchar_to_hbox(n, 0)),