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

diff --git a/src/ltj-math.lua b/src/ltj-math.lua
index 6bf7031..abb50ec 100644
--- a/src/ltj-math.lua
+++ b/src/ltj-math.lua
@@ -3,32 +3,34 @@
 --
 
 luatexja.load_module('base');      local ltjb = luatexja.base
+luatexja.load_module('direction'); local ltjd = luatexja.direction
 luatexja.load_module('charrange'); local ltjc = luatexja.charrange
 luatexja.load_module('jfont');     local ltjf = luatexja.jfont
 luatexja.load_module('stack');     local ltjs = luatexja.stack
 luatexja.load_module('setwidth');  local ltjw = luatexja.setwidth
 
-local Dnode = node.direct or node
-
-local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end
-local getfield = (Dnode ~= node) and Dnode.getfield or function(n, i) return n[i] end
-local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end
-local getlist = (Dnode ~= node) and Dnode.getlist or function(n) return n.head end
-local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end
-
-local nullfunc = function(n) return n end
-local to_node = (Dnode ~= node) and Dnode.tonode or nullfunc
-local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc
-
-local node_traverse = Dnode.traverse
-local node_new = Dnode.new
-local node_next = Dnode.getnext
-local node_free = Dnode.free
-local has_attr = Dnode.has_attribute
-local set_attr = Dnode.set_attribute
+local setfield = node.direct.setfield
+local getfield = node.direct.getfield
+local getid = node.direct.getid
+local getsubtype = node.direct.getsubtype
+local getlist = node.direct.getlist
+-- getlist cannot be used for sub_box nodes. Use instead λp. getfield(p, 'head')
+local getchar = node.direct.getchar
+
+local to_node = node.direct.tonode
+local to_direct = node.direct.todirect
+
+local node_traverse = node.direct.traverse
+local node_new = node.direct.new
+local node_next = node.direct.getnext
+local node_remove = node.direct.remove
+local node_free = node.direct.free
+local has_attr = node.direct.has_attribute
+local set_attr = node.direct.set_attribute
 local tex_getcount = tex.getcount
 
 local attr_jchar_class = luatexbase.attributes['ltj@charclass']
+local attr_dir = luatexbase.attributes['ltj@dir']
 local attr_icflag = luatexbase.attributes['ltj@icflag']
 local attr_curjfnt = luatexbase.attributes['ltj@curjfnt']
 local attr_jfam = luatexbase.attributes['jfam']
@@ -46,14 +48,35 @@ local id_style   = node.id('style')
 local id_frac    = node.id('fraction')
 local id_simple  = node.id('noad')
 local id_sub_mlist = node.id('sub_mlist')
+local id_whatsit = node.id('whatsit')
+local sid_user = node.subtype('user_defined')
+local DIR  = luatexja.userid_table.DIR
+local dir_node_auto   = luatexja.dir_table.dir_node_auto
 
 local PROCESSED  = luatexja.icflag_table.PROCESSED
 
 local ltjf_font_metric_table = ltjf.font_metric_table
 local ltjf_find_char_class = ltjf.find_char_class
+local ltjd_get_dir_count = ltjd.get_dir_count
+local ltjd_make_dir_whatsit = ltjd.make_dir_whatsit
 
 -- table of mathematical characters
 local is_math_letters = {}
+local list_dir
+
+local function conv_vcenter(sb)
+   local h = getfield(sb, 'head');local hd = getlist(h)
+   if getid(hd)==id_whatsit and 
+   getsubtype(hd)==sid_user and getfield(hd, 'user_id')==DIR then
+      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
+      end
+   end
+   set_attr(h, attr_icflag, PROCESSED)
+   return sb
+end
 
 local conv_jchar_to_hbox_A
 
@@ -62,7 +85,11 @@ local function conv_jchar_to_hbox(head, sty)
    for p in node_traverse(head) do
       local pid = getid(p)
       if pid == id_simple or pid == id_accent then
-	 setfield(p, 'nucleus', conv_jchar_to_hbox_A(getfield(p, 'nucleus'), sty))
+	 if getsubtype(p)==12 then
+	    conv_vcenter(getfield(p, 'nucleus'))
+	 else
+	    setfield(p, 'nucleus', conv_jchar_to_hbox_A(getfield(p, 'nucleus'), sty))
+	 end
 	 setfield(p, 'sub', conv_jchar_to_hbox_A(getfield(p, 'sub'), sty+1))
 	 setfield(p, 'sup', conv_jchar_to_hbox_A(getfield(p, 'sup'), sty+1))
       elseif pid == id_choice then
@@ -90,9 +117,9 @@ local function conv_jchar_to_hbox(head, sty)
 	 else sty = 2
 	 end
        end
-   end 
+   end
    return head
-end 
+end
 
 local MJT  = luatexja.stack_table_index.MJT
 local MJS  = luatexja.stack_table_index.MJS
@@ -100,14 +127,14 @@ local MJSS = luatexja.stack_table_index.MJSS
 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 = 
+conv_jchar_to_hbox_A =
 function (p, sty)
    if not p then return nil
    else
       local pid = getid(p)
       if pid == id_sub_mlist then
-         if getlist(p) then
-            setfield(p, 'head', conv_jchar_to_hbox(getlist(p), sty))
+         if getfield(p, 'head') then
+            setfield(p, 'head', conv_jchar_to_hbox(getfield(p, 'head'), sty))
          end
       elseif pid == id_mchar then
          local fam = has_attr(p, attr_jfam) or -1
@@ -118,28 +145,37 @@ function (p, sty)
                local q = node_new(id_sub_box)
                local r = node_new(id_glyph); setfield(r, 'next', nil)
                setfield(r, 'char', pc); setfield(r, 'font', f); setfield(r, 'subtype', 256)
-               local k = has_attr(r,attr_ykblshift) or 0 
+               local k = has_attr(r,attr_ykblshift) or 0
                set_attr(r, attr_ykblshift, 0)
                -- ltj-setwidth 内で実際の位置補正はおこなうので，補正量を退避
                local met = ltjf_font_metric_table[f]
-               r = capsule_glyph_math(r, met, ltjf_find_char_class(pc, met));
+               r = capsule_glyph_math(r, met, met.char_type[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
+      elseif pid == id_sub_box and getfield(p, 'head') then
          -- \hbox で直に与えられた内容は上下位置を補正する必要はない
-         set_attr(getlist(p), attr_icflag, PROCESSED)
+	 local h = getfield(p, 'head')
+	 h = ltjd_make_dir_whatsit(h, h, list_dir, 'math')
+	 setfield(p, 'head', h)
+         set_attr(h, attr_icflag, PROCESSED)
       end
    end
    return p
 end
 
-luatexbase.add_to_callback('mlist_to_hlist', 
+luatexbase.add_to_callback('mlist_to_hlist',
    function (n, display_type, penalties)
-      local head = to_node(conv_jchar_to_hbox(to_direct(n), 0))
-      head = node.mlist_to_hlist(head, display_type, penalties)
-      return head
+      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
+	 local old_n = n; n = node_remove(n, n)
+	 node_free(old_n)
+      end
+      return node.mlist_to_hlist(
+	 to_node(conv_jchar_to_hbox(n, 0)),
+	 display_type, penalties)
    end,'ltj.mlist_to_hlist', 1)
 
 luatexja.math = { is_math_letters = is_math_letters }