X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-math.lua;h=abb50ece53becb7b53b8025f7fd5e7811b4af6bd;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=5f9e650c5caa176e9b1aac07586cd001fa63e87a;hpb=31bb879ddc03322840ec981cfcf31eea31bb7517;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-math.lua b/src/ltj-math.lua index 5f9e650..abb50ec 100644 --- a/src/ltj-math.lua +++ b/src/ltj-math.lua @@ -3,19 +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 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 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'] @@ -33,99 +48,134 @@ 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 -- 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 + 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 + 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 + end return head -end +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 = +conv_jchar_to_hbox_A = function (p, sty) if not p then return nil else - local pid = p.id + local pid = getid(p) if pid == id_sub_mlist then - if p.head then - p.head = conv_jchar_to_hbox(p.head, 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 - 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')) + 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); r.next = nil - r.char = p.char; r.font = f; r.subtype = 256 - local k = has_attr(r,attr_ykblshift) or 0 + 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 内で実際の位置補正はおこなうので，補正量を退避 - ltjw.head = r; local met = ltjf_font_metric_table[f] - ltjw.capsule_glyph(r, tex.mathdir , true, met, ltjf_find_char_class(p.char, met)); - q.head = ltjw.head; node_free(p); p=q; - set_attr(q.head, attr_yablshift, k) + 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 p.head then + elseif pid == id_sub_box and getfield(p, 'head') then -- \hbox で直に与えられた内容は上下位置を補正する必要はない - set_attr(p.head, 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 = conv_jchar_to_hbox(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 }