X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-math.lua;h=6bf7031da1f61597350657699dfd840daa60611b;hb=a693b63eadfcabe5f4f513a4cc90302f2360b18b;hp=52548a76907db974c31cf509d48f8edc7195575f;hpb=c81e014b81eeafff107001530d4d3380b3d810a0;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-math.lua b/src/ltj-math.lua index 52548a7..6bf7031 100644 --- a/src/ltj-math.lua +++ b/src/ltj-math.lua @@ -8,11 +8,24 @@ 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 node_new = node.new -local node_next = node.next -local node_free = node.free -local has_attr = node.has_attribute -local set_attr = node.set_attribute +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 tex_getcount = tex.getcount local attr_jchar_class = luatexbase.attributes['ltj@charclass'] @@ -34,7 +47,7 @@ local id_frac = node.id('fraction') local id_simple = node.id('noad') local id_sub_mlist = node.id('sub_mlist') -local PROCESSED = luatexja.icflag_table.PROCESSED +local PROCESSED = luatexja.icflag_table.PROCESSED local ltjf_font_metric_table = ltjf.font_metric_table local ltjf_find_char_class = ltjf.find_char_class @@ -46,38 +59,37 @@ local conv_jchar_to_hbox_A -- sty : 0 (display or text), 1 (script), >=2 (scriptscript) local function conv_jchar_to_hbox(head, sty) - local p = head - local bhead = head - while p do - if p.id == id_simple or p.id == id_accent then - p.nucleus = conv_jchar_to_hbox_A(p.nucleus, sty) - p.sub = conv_jchar_to_hbox_A(p.sub, sty + 1) - p.sup = conv_jchar_to_hbox_A(p.sup, sty + 1) - elseif p.id == id_choice then - p.display = conv_jchar_to_hbox(p.display, 0) - p.text = conv_jchar_to_hbox(p.text, 0) - p.script = conv_jchar_to_hbox(p.script, 1) - p.scriptscript = conv_jchar_to_hbox(p.scriptscript, 2) - elseif p.id == id_frac then - p.num = conv_jchar_to_hbox_A(p.num, sty + 1) - p.denom = conv_jchar_to_hbox_A(p.denom, sty + 1) - elseif p.id == id_radical then - p.nucleus = conv_jchar_to_hbox_A(p.nucleus, sty) - p.sub = conv_jchar_to_hbox_A(p.sub, sty + 1) - p.sup = conv_jchar_to_hbox_A(p.sup, sty + 1) - if p.degree then - p.degree = conv_jchar_to_hbox_A(p.degree, sty + 1) + 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)) + 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 + setfield(p, 'display', conv_jchar_to_hbox_A(getfield(p, 'display'), 0)) + setfield(p, 'text', conv_jchar_to_hbox_A(getfield(p, 'text'), 0)) + setfield(p, 'script', conv_jchar_to_hbox_A(getfield(p, 'script'), 1)) + setfield(p, 'scriptscript', conv_jchar_to_hbox_A(getfield(p, 'scriptscript'), 2)) + elseif pid == id_frac then + setfield(p, 'num', conv_jchar_to_hbox_A(getfield(p, 'num'), sty+1)) + setfield(p, 'denom', conv_jchar_to_hbox_A(getfield(p, 'denom'), sty+1)) + elseif pid == id_radical then + setfield(p, 'nucleus', conv_jchar_to_hbox_A(getfield(p, 'nucleus'), sty)) + 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)) + if getfield(p, 'degree') then + setfield(p, 'degree', conv_jchar_to_hbox_A(getfield(p, 'degree'), sty + 1)) end - elseif p.id == id_style then - if p.style == "display'" or p.style == 'display' - or p.style == "text'" or p.style == 'text' then + elseif pid == id_style then + local ps = getfield(p, 'style') + if ps == "display'" or ps == 'display' + or ps == "text'" or ps == 'text' then sty = 0 - elseif p.style == "script'" or p.style == 'script' then + elseif ps == "script'" or ps == 'script' then sty = 1 else sty = 2 end end - p = node.next(p) end return head end @@ -85,28 +97,39 @@ 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_math = ltjw.capsule_glyph_math +local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct conv_jchar_to_hbox_A = function (p, sty) if not p then return nil - elseif p.id == id_sub_mlist then - if p.head then - p.head = conv_jchar_to_hbox(p.head, sty) - end - elseif p.id == id_mchar then - local fam = has_attr(p, attr_jfam) or -1 - if (not is_math_letters[p.char]) and ltjc.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')) - if f ~= -1 then - local q = node_new(id_sub_box) - local r = node_new(id_glyph); r.next = nil - r.char = p.char; r.font = f; r.subtype = 256 - set_attr(r, attr_ykblshift, 0) - set_attr(r, attr_icflag, PROCESSED) - local met = ltjf_font_metric_table[f] - ltjw.head = r; ltjw.capsule_glyph(r, tex.mathdir , true, met, ltjf_find_char_class(p.char, met)); - q.head = ltjw.head; node_free(p); p=q; - end + 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)) + end + elseif pid == id_mchar then + 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_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) + setfield(r, 'char', pc); setfield(r, 'font', f); setfield(r, 'subtype', 256) + 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)); + 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 + -- \hbox で直に与えられた内容は上下位置を補正する必要はない + set_attr(getlist(p), attr_icflag, PROCESSED) end end return p @@ -114,7 +137,7 @@ end luatexbase.add_to_callback('mlist_to_hlist', function (n, display_type, penalties) - local head = conv_jchar_to_hbox(n, 0); + local head = to_node(conv_jchar_to_hbox(to_direct(n), 0)) head = node.mlist_to_hlist(head, display_type, penalties) return head end,'ltj.mlist_to_hlist', 1)