X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=d3572312b97cff7d874aa5b783fba93c2c22ceb5;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=9c8c987561fe38193c17fcd258a4ef41066f9da9;hpb=5a135960d843aa5b8363c84f7fcf194061902bcf;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua index 9c8c987..d357231 100644 --- a/src/ltj-jfont.lua +++ b/src/ltj-jfont.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfont', - date = '2014/10/03', + date = '2016/04/03', description = 'Loader for Japanese fonts', }) module('luatexja.jfont', package.seeall) @@ -13,22 +13,14 @@ luatexja.load_module('charrange'); local ltjc = luatexja.charrange luatexja.load_module('rmlgbm'); local ltjr = luatexja.rmlgbm luatexja.load_module('direction'); local ltjd = luatexja.direction +local setfield = node.direct.setfield +local getid = node.direct.getid +local to_direct = node.direct.todirect -local Dnode = node.direct or node - -local setfield = (Dnode ~= node) and Dnode.setfield or function(n, i, c) n[i] = c end -local getid = (Dnode ~= node) and Dnode.getid or function(n) return n.id end -local getfont = (Dnode ~= node) and Dnode.getfont or function(n) return n.font end -local getchar = (Dnode ~= node) and Dnode.getchar or function(n) return n.char end - -local nullfunc = function(n) return n end -local to_direct = (Dnode ~= node) and Dnode.todirect or nullfunc - -local node_new = Dnode.new -local node_free = Dnode.free -local has_attr = Dnode.has_attribute -local set_attr = Dnode.set_attribute -local node_write = Dnode.write +local node_new = node.direct.new +local node_free = node.direct.free +local has_attr = node.direct.has_attribute +local set_attr = node.direct.set_attribute local round = tex.round local font_getfont = font.getfont @@ -37,12 +29,9 @@ local attr_curjfnt = luatexbase.attributes['ltj@curjfnt'] local attr_curtfnt = luatexbase.attributes['ltj@curtfnt'] local id_glyph = node.id('glyph') local id_kern = node.id('kern') -local id_glue_spec = node.id('glue_spec') -local id_glue = node.id('glue') local cat_lp = luatexbase.catcodetables['latex-package'] -local ITALIC = luatexja.icflag_table.ITALIC local FROM_JFM = luatexja.icflag_table.FROM_JFM - +local tokenlib = luatexja.token ------------------------------------------------------------------------ -- LOADING JFM ------------------------------------------------------------------------ @@ -52,9 +41,19 @@ font_metric_table={} -- [font number] -> jfm_name, jfm_var, size luatexbase.create_callback("luatexja.load_jfm", "data", function (ft, jn) return ft end) -local jfm_file_name, jfm_var +local jfm_file_name, jfm_var, jfm_ksp local defjfm_res -local jfm_dir +local jfm_dir, is_def_jfont, is_vert_enabled + +local function norm_val(a) + if (not a) or (a==0.) then + return nil + elseif a==true then + return 1 + else + return a + end +end function define_jfm(t) local real_char -- Does current character class have the 'real' character? @@ -68,21 +67,13 @@ function define_jfm(t) if type(i) == 'number' then -- char_type if not v.chars then if i ~= 0 then defjfm_res= nil; return end - real_char = true else - real_char = false for j,w in pairs(v.chars) do if type(w) == 'number' and w~=-1 then - real_char = true; elseif type(w) == 'string' and utf.len(w)==1 then - real_char = true; w = utf.byte(w) + w = utf.byte(w) elseif type(w) == 'string' and utf.len(w)==2 and utf.sub(w,2) == '*' then - real_char = true; w = utf.byte(utf.sub(w,1,1)) - if not t.chars[-w] then - t.chars[-w] = i - else - defjfm_res= nil; return - end + w = utf.byte(utf.sub(w,1,1)) end if not t.chars[w] then t.chars[w] = i @@ -90,44 +81,43 @@ function define_jfm(t) defjfm_res= nil; return end end - if type(v.align)~='string' then - v.align = 'left' -- left - end - if real_char then - if type(v.width)~='number' and v.width~='prop' then - defjfm_res= nil; return - else - if v.width=='prop' and jfm_dir=='tate' then - v.width = 1.0 - end - if type(v.height)~='number' then - v.height = 0.0 - end - if type(v.depth)~='number' then - v.depth = 0.0 - end - if type(v.italic)~='number' then - v.italic = 0.0 - end - if type(v.left)~='number' then - v.left = 0.0 - end - if type(v.down)~='number' then - v.down = 0.0 - end - end - end v.chars = nil end + if type(v.align)~='string' then + v.align = 'left' -- left + end + if type(v.width)~='number' then + v.width = (jfm_dir=='tate') and 1.0 + end + if type(v.height)~='number' then + v.height = (jfm_dir=='tate') and 0.0 + end + if type(v.depth)~='number' then + v.depth = (jfm_dir=='tate') and 0.0 + end + if type(v.italic)~='number' then + v.italic = 0.0 + end + if type(v.left)~='number' then + v.left = 0.0 + end + if type(v.down)~='number' then + v.down = 0.0 + end v.kern = v.kern or {}; v.glue = v.glue or {} - for j in pairs(v.glue) do + for j,x in pairs(v.glue) do if v.kern[j] then defjfm_res= nil; return end + x.ratio, x[5] = (x.ratio or (x[5] and 0.5*(1+x[5]) or 0.5)), nil + x.priority, x[4] = (x.priority or x[4] or 0), nil + x.kanjiskip_natural = norm_val(x.kanjiskip_natural) + x.kanjiskip_stretch = norm_val(x.kanjiskip_stretch) + x.kanjiskip_shrink = norm_val(x.kanjiskip_shrink) end for j,x in pairs(v.kern) do if type(x)=='number' then - v.kern[j] = {x, 0} + v.kern[j] = {x, 0.5} elseif type(x)=='table' then - v.kern[j] = {x[1], x[2] or 0} + v.kern[j] = { x[1], ratio=x.ratio or (x[2] and 0.5*(1+x[2]) or 0.5) } end end t.char_type[i] = v @@ -156,9 +146,9 @@ do return new else return nil end end - update_jfm_cache = function (j,sz) if metrics[j].size_cache[sz] then return end + --local TEMP = node_new(id_kern) local t = {} metrics[j].size_cache[sz] = t t.chars = metrics[j].chars @@ -168,20 +158,22 @@ do ((v.align=='right') and 1 or 0.5) if type(i) == 'number' then -- char_type for k,w in pairs(v.glue) do - local h = node_new(id_glue_spec) - v[k] = {true, h, (w[5] and w[5]/sz or 0), FROM_JFM + (w[4] and w[4]/sz or 0)} - setfield(h, 'width', w[1]) - setfield(h, 'stretch', w[2]) - setfield(h, 'shrink', w[3]) - setfield(h, 'stretch_order', 0) - setfield(h, 'shrink_order', 0) + v[k] = { + nil, + ratio=w.ratio/sz, + priority=FROM_JFM + w.priority/sz, + width = w[1], stretch = w[2], shrink = w[3], + kanjiskip_natural = w.kanjiskip_natural and w.kanjiskip_natural/sz, + kanjiskip_stretch = w.kanjiskip_stretch and w.kanjiskip_stretch/sz, + kanjiskip_shrink = w.kanjiskip_shrink and w.kanjiskip_shrink/sz, + } end for k,w in pairs(v.kern) do local g = node_new(id_kern) setfield(g, 'kern', w[1]) setfield(g, 'subtype', 1) set_attr(g, attr_icflag, FROM_JFM) - v[k] = {false, g, w[2]/sz} + v[k] = {g, ratio=w[2]/sz} end end v.glue, v.kern = nil, nil @@ -191,6 +183,7 @@ do t.zw = round(metrics[j].zw*sz) t.zh = round(metrics[j].zh*sz) t.size = sz + --node_free(TEMP) end end @@ -249,20 +242,22 @@ do end -- EXT - function jfontdefX(g) - local t = token.get_next() - cstemp=token.csname_name(t) + local utf8 = unicode.utf8 + function jfontdefX(g, dir, csname) + jfm_dir, is_def_jfont = dir, true + cstemp = csname:sub( (utf8.byte(csname,1,1) == tex.escapechar) and 2 or 1, -1) + cstemp = cstemp:sub(1, ((cstemp:sub(-1,-1)==' ') and (cstemp:len()>=2)) and -2 or -1) global_flag = g and '\\global' or '' - tex.sprint(cat_lp, '\\expandafter\\font\\csname ', cstemp, '\\endcsname') + tex.sprint(cat_lp, '\\expandafter\\font\\csname ', + (cstemp==' ') and '\\space' or cstemp, '\\endcsname') end luatexbase.create_callback("luatexja.define_jfont", "data", function (ft, fn) return ft end) -- EXT local identifiers = fonts.hashes.identifiers - function jfontdefY(dir) - jfm_dir = dir - local j = load_jfont_metric(dir) + function jfontdefY() + local j = load_jfont_metric(jfm_dir) local fn = font.id(cstemp) local f = font_getfont(fn) if not j then @@ -270,7 +265,8 @@ do "bad JFM `" .. jfm_file_name .. "'", 'The JFM file you specified is not valid JFM file.\n'.. 'So defining Japanese font is cancelled.') - tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', cstemp, + tex.sprint(cat_lp, global_flag, '\\expandafter\\let\\csname ', + (cstemp==' ') and '\\space' or cstemp, '\\endcsname=\\relax') return end @@ -278,19 +274,21 @@ do local ad = identifiers[fn].parameters local sz = metrics[j].size_cache[f.size] local fmtable = { jfm = j, size = f.size, var = jfm_var, + with_kanjiskip = jfm_ksp, zw = sz.zw, zh = sz.zh, ascent = ad.ascender, descent = ad.descender, chars = sz.chars, char_type = sz.char_type, kanjiskip = sz.kanjiskip, xkanjiskip = sz.xkanjiskip, chars_cbcache = {}, + vert_activated = is_vert_enabled, } fmtable = luatexbase.call_callback("luatexja.define_jfont", fmtable, fn) font_metric_table[fn]=fmtable tex.sprint(cat_lp, global_flag, '\\protected\\expandafter\\def\\csname ', - cstemp , '\\endcsname{\\ltj@cur'.. - (dir == 'yoko' and 'j' or 't') .. 'fnt', fn, '\\relax}') + (cstemp==' ') and '\\space' or cstemp, '\\endcsname{\\ltj@cur'.. + (jfm_dir == 'yoko' and 'j' or 't') .. 'fnt', fn, '\\relax}') end end @@ -315,7 +313,9 @@ do -- extract jfm_file_name and jfm_var -- normalize position of 'jfm=' and 'jfmvar=' keys local function extract_metric(name) - jfm_file_name = ''; jfm_var = '' + local is_braced = name:match('^{(.*)}$') + name= is_braced or name + jfm_file_name = ''; jfm_var = ''; jfm_ksp = true local tmp, index = name:sub(1, 5), 1 if tmp == 'file:' or tmp == 'name:' or tmp == 'psft:' then index = 6 @@ -353,16 +353,30 @@ do name = name .. 'jfmvar=' .. jfm_var end end - return name + for x in string.gmatch (name, "[:;]([+%%-]?)ltjks") do + jfm_ksp = not (x=='-') + end + if jfm_dir == 'tate' then + is_vert_enabled = (not name:match('[:;]%-vert')) and (not name:match('[:;]%-vrt2')) + if not name:match('vert') and not name:match('vrt2') then + name = name .. ';+vert;+vrt2' + end + else + is_vert_enabled = nil + end + return is_braced and ('{' .. name .. '}') or name end -- define_font callback local otfl_fdr = fonts.definers.read local ltjr_font_callback = ltjr.font_callback function luatexja.font_callback(name, size, id) - local new_name = extract_metric(name) + local new_name = is_def_jfont and extract_metric(name) or name + is_def_jfont = false + --local res = otfl_fdr(new_name, size, id) local res = ltjr_font_callback(new_name, size, id, otfl_fdr) luatexbase.call_callback('luatexja.define_font', res, new_name, size, id) + -- this callback processes variation selector, so we execute it always return res end luatexbase.create_callback('luatexja.define_font', 'simple', function (n) return n end) @@ -374,7 +388,8 @@ end ------------------------------------------------------------------------ do -- these function are called from ltj-latex.sty - local kyenc_list, ktenc_list = {}, {} + local fenc_list, kyenc_list, ktenc_list = {}, {}, {} + function add_fenc_list(enc) fenc_list[enc] = 'true ' end function add_kyenc_list(enc) kyenc_list[enc] = 'true ' end function add_ktenc_list(enc) ktenc_list[enc] = 'true ' end function is_kyenc(enc) @@ -389,36 +404,57 @@ do end local kfam_list, Nkfam_list = {}, {} - function add_kfam_list(enc, fam) - if not kfam_list[enc] then kfam_list[enc] = {} end - kfam_list[enc][fam] = 'true ' - end - function add_Nkfam_list(enc, fam) - if not Nkfam_list[enc] then Nkfam_list[enc] = {} end - Nkfam_list[enc][fam] = 'true ' + function add_kfam(fam) + kfam_list[fam]=true + end + function search_kfam(fam, use_fd) + if kfam_list[fam] then + tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return + elseif Nkfam_list[fam] then + tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return + elseif use_fd then + for i,_ in pairs(kyenc_list) do + if kpse.find_file(string.lower(i)..fam..'.fd') then + tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return + end + end + for i,_ in pairs(ktenc_list) do + if kpse.find_file(string.lower(i)..fam..'.fd') then + tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return + end + end + Nkfam_list[fam]=true; tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return + else + tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return + end end - function is_kfam(enc, fam) - tex.sprint(cat_lp, '\\let\\ifin@\\if' - .. (kfam_list[enc] and kfam_list[enc][fam] or 'false ')) end - function is_Nkfam(enc, fam) - tex.sprint(cat_lp, '\\let\\ifin@\\if' - .. (Nkfam_list[enc] and Nkfam_list[enc][fam] or 'false ')) end - local ffam_list, Nffam_list = {}, {} - function add_ffam_list(enc, fam) - if not ffam_list[enc] then ffam_list[enc] = {} end - ffam_list[enc][fam] = 'true ' - end - function add_Nffam_list(enc, fam) - if not Nffam_list[enc] then Nffam_list[enc] = {} end - Nffam_list[enc][fam] = 'true ' + function is_ffam(fam) + tex.sprint(cat_lp, '\\let\\ifin@\\if' .. (ffam_list[fam] or 'false ')) + end + function add_ffam(fam) + ffam_list[fam]='true ' + end + function search_ffam_declared() + local s = '' + for i,_ in pairs(fenc_list) do + s = s .. '\\cdp@elt{' .. i .. '}' + end + tex.sprint(cat_lp, s) + end + function search_ffam_fd(fam) + if Nffam_list[fam] then + tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return + else + for i,_ in pairs(fenc_list) do + if kpse.find_file(string.lower(i)..fam..'.fd') then + tex.sprint(cat_lp, '\\let\\ifin@\\iftrue '); return + end + end + Nffam_list[fam]=true; tex.sprint(cat_lp, '\\let\\ifin@\\iffalse '); return + end end - function is_ffam(enc, fam) - tex.sprint(cat_lp, '\\let\\ifin@\\if' - .. (ffam_list[enc] and ffam_list[enc][fam] or 'false ')) end - function is_Nffam(enc, fam) - tex.sprint(cat_lp, '\\let\\ifin@\\if' - .. (Nffam_list[enc] and Nffam_list[enc][fam] or 'false ')) end + end ------------------------------------------------------------------------ -- ALTERNATE FONTS @@ -601,6 +637,27 @@ do end end +------------------------------------------------------------------------ +-- 終了時に各種ノードを破棄 +------------------------------------------------------------------------ +do + function cleanup_size_cache() + --local gs, ke = 0, 0 + for _,n in pairs(metrics) do + for i,t in pairs(n.size_cache) do + for _,v in pairs(t.char_type) do + for k,w in pairs(v) do + if type(k)=='number' then + --if w[1] then gs = gs + 1 else ke = ke + 1 end + if w[1] then node_free(w[1]) end + end + end + end + n.size_cache[i]=nil + end + end + end +end ------------------------------------------------------------------------ -- 追加のフォント情報 @@ -624,10 +681,14 @@ do end return vw, tsb, vk end - + local sort = table.sort - local function add_fl_table(dest, tg, unitable, glyphmax, asc_des, units) - for i = 0, glyphmax-1 do + local function add_fl_table(dest, glyphs, unitable, asc_des, units) + local tg, glyphmin, glyphmax = glyphs.glyphs, 0, glyphs.glyphmax + for _,v in pairs(fields(glyphs)) do + if v=='glyphmin' then glyphmin, glyphmax = glyphs.glyphmin, glyphmax+1; break end + end + for i = glyphmin, glyphmax-1 do local gv = tg[i] if gv then if gv.altuni then @@ -649,7 +710,7 @@ do -- vertical metric local vw, tsb, vk = glyph_vmetric(gv) local gi = unitable[gv.name] - if vw and vw~=asc_des then + if gi and vw and vw~=asc_des then -- We do not use tsidebearing, since (1) fontloader does not read VORG table -- and (2) 'tsidebearing' doea not appear in the returned table by fontloader.fields. -- Hence, we assume that vertical origin == ascender @@ -658,147 +719,125 @@ do dest[gi].vwidth = vw/units end -- vertical kern - if vk then - dest = dest or {}; + if gi and vk then + dest = dest or {}; local dest_vk = dest.vkerns or {}; dest.vkerns = dest_vk for _,v in pairs(vk) do - dest_vk[v.lookup] = dest_vk[v.lookup] or {} - dest_vk[v.lookup][gi] = dest_vk[v.lookup][gi] or {} - dest_vk[v.lookup][gi][unitable[v.char]] = v.off + if unitable[v.char] then + local vl = v.lookup + if type(vl)=='table' then + for _,vlt in pairs(vl) do + dest_vk[vlt] = dest_vk[vlt] or {} + dest_vk[vlt][gi] = dest_vk[vlt][gi] or {} + dest_vk[vlt][gi][unitable[v.char]] = v.off + end + else + dest_vk[vl] = dest_vk[vl] or {} + dest_vk[vl][gi] = dest_vk[vl][gi] or {} + dest_vk[vl][gi][unitable[v.char]] = v.off + end + end end end end end return dest end - prepare_fl_data = function (dest, id, fname) - local fl = fontloader.open(fname) + prepare_fl_data = function (dest, id) + local fl = fontloader.open(id.filename) local unicodes = id.resources.unicodes if fl.glyphs then - dest = add_fl_table(dest, fl.glyphs, id.resources.unicodes, fl.glyphmax, + dest = add_fl_table(dest, fl, unicodes, fl.ascent + fl.descent, fl.units_per_em) end if fl.subfonts then for _,v in pairs(fl.subfonts) do - dest = add_fl_table(dest, v.glyphs, id.resources.unicodes, v.glyphmax, + dest = add_fl_table(dest, v, unicodes, fl.ascent + fl.descent, fl.units_per_em) end end - fontloader.close(fl) + fontloader.close(fl); collectgarbage("collect") return dest end - -- supply vkern table: TODO - supply_vkern_table = function(id) - -- if not id then return end - -- local fname = id.filename - -- if not fname then return end - -- local bx = font_extra_basename[file.basename(fname)].vkerns - -- local desc = id.shared.rawdata.descriptions - -- if bx then - -- for i,v in pairs(bx) do - -- print(i) - -- id.shared.rawdata.resources.lookuphash[i] - -- =id.shared.rawdata.resources.lookuphash[i] or v - -- for j,w in pairs(v) do - -- desc[j].kerns = desc[j].kerns or {} - -- desc[j].kerns[i] = w - -- end - -- end - -- end + -- supply vkern table + supply_vkern_table = function(id, bname) + local bx = font_extra_basename[bname].vkerns + local lookuphash = id.resources.lookuphash + local desc = id.shared.rawdata.descriptions + if bx and lookuphash then + for i,v in pairs(bx) do + lookuphash[i] = lookuphash[i] or v + for j,w in pairs(v) do + desc[j].kerns = desc[j].kerns or {} + desc[j].kerns[i] = w + end + end + end end end --- 縦書き用字形への変換テーブル -local prepare_vert_data +-- do - local function add_feature_table(tname, src, dest) - for i,v in pairs(src) do - if type(v.slookups)=='table' then - local s = v.slookups[tname] - if s then - dest = dest or {} - dest[i] = dest[i] or {} - dest[i].vert = dest[i].vert or s - end + local cache_ver = 6 + local checksum = file.checksum + + local function prepare_extra_data_base(id) + if not id then return end + local bname = file.nameonly(id.filename or '') + if not font_extra_basename[bname] then + -- if the cache is present, read it + local newsum = checksum(id.filename) -- MD5 checksum of the fontfile + local v = "extra_" .. string.lower(file.nameonly(id.filename)) + local dat = ltjb.load_cache( + v, + function (t) return (t.version~=cache_ver) or (t.chksum~=newsum) end + ) + -- if the cache is not found or outdated, save the cache + if dat then + font_extra_basename[bname] = dat[1] or {} + else + local dat = nil + dat = prepare_fl_data(dat, id) + font_extra_basename[bname] = dat or {} + ltjb.save_cache( v, + { + chksum = checksum(id.filename), + version = cache_ver, + dat, + }) end + return bname end - return dest end - prepare_vert_data = function (dest, id) - local a = id.resources.sequences - if a then - local s = id.shared.rawdata.descriptions - for i,v in pairs(a) do - if v.features.vert or v.features.vrt2 then - dest= add_feature_table(v.subtables[1], s, dest) - end - end + local function prepare_extra_data_font(id, res) + if type(res)=='table' and res.shared then + font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)] end - return dest - end - -- 縦書き用字形への変換 - function get_vert_glyph(n, chr) - local fn = font_extra_info[n] - return (fn and fn[chr] and fn[chr].vert) or chr end -end + luatexbase.add_to_callback( + 'luaotfload.patch_font', + function (tfmdata) + -- these function is executed one time per one fontfile + local bname = prepare_extra_data_base(tfmdata) + if bname then supply_vkern_table(tfmdata, bname) end + return tfmdata + end, + 'ltj.prepare_extra_data', 1) + luatexbase.add_to_callback( + 'luatexja.define_font', + function (res, name, size, id) + prepare_extra_data_font(id, res) + end, + 'ltj.prepare_extra_data', 1) --- -do - local cache_ver = 3 - local checksum = file.checksum - - local function prepare_extra_data(n, id) - -- test if already loaded - if (not id) or font_extra_info[n] then return - end - local fname = id.filename - local bname = file.basename(fname) - if not fname then - font_extra_info[n] = {}; return - elseif font_extra_basename[bname] then - font_extra_info[n] = font_extra_basename[bname]; return - end - -- if the cache is present, read it - local newsum = checksum(fname) -- MD5 checksum of the fontfile - local v = "extra_" .. string.lower(file.nameonly(fname)) - local dat = ltjb.load_cache(v, - function (t) return (t.version~=cache_ver) or (t.chksum~=newsum) end - ) - -- if the cache is not found or outdated, save the cache - if dat then - font_extra_basename[bname] = dat[1] or {} - else - local dat = nil - dat = prepare_vert_data(dat, id) - dat = prepare_fl_data(dat, id, fname) - font_extra_basename[bname] = dat or {} - ltjb.save_cache( v, - { - chksum = checksum(fname), - version = cache_ver, - dat, - }) - end - font_extra_info[n] = font_extra_basename[bname] - end - luatexbase.add_to_callback('luatexja.define_font', - function (res, name, size, id) - if type(res)~='number' then - prepare_extra_data(id, res) - supply_vkern_table(res) - end - end, - 'ltj.prepare_extra_data', 1) - - local function a (n, dat) font_extra_info[n] = dat end - ltjr.vert_addfunc = a + local nulltable = {} -- dummy + ltjr.vert_addfunc = function (n) font_extra_info[n] = nulltable end local identifiers = fonts.hashes.identifiers for i=1,font.nextid()-1 do - if identifiers[i] then - prepare_extra_data(i, identifiers[i]) - supply_vkern_table(identifiers[i]) + if identifiers[i] then + prepare_extra_data_base(identifiers[i]) + prepare_extra_data_font(i,identifiers[i]) end end end @@ -808,13 +847,19 @@ end -- calculate vadvance ------------------------------------------------------------------------ do - local function acc_feature(table_vadv, subtables, ft) + local function acc_feature(table_vadv, table_vorg, subtables, ft, already_vert) for char_num,v in pairs(ft.shared.rawdata.descriptions) do if v.slookups then for sn, sv in pairs(v.slookups) do - if subtables[sn] and type(sv)=='table' and sv[4]~=0 then - table_vadv[char_num] - = (table_vadv[char_num] or 0) + sv[4] + if subtables[sn] and type(sv)=='table' then + if sv[4]~=0 then + table_vadv[char_num] + = (table_vadv[char_num] or 0) + sv[4] + end + if sv[2]~=0 and not already_vert then + table_vorg[char_num] + = (table_vorg[char_num] or 0) + sv[2] + end end end end @@ -822,62 +867,124 @@ do end luatexbase.add_to_callback( - "luatexja.define_jfont", + "luatexja.define_jfont", function (fmtable, fnum) local vadv = {}; fmtable.v_advance = vadv + local vorg = {}; fmtable.v_origin = vorg local ft = font_getfont(fnum) local subtables = {} - for feat_name,v in pairs(ft.specification.features.normal) do - if v then - for _,i in pairs(ft.resources.sequences) do - if i.order[1]== feat_name and i.type == 'gpos_single' then - for _,st in pairs(i.subtables) do - subtables[st] = true + if ft.specification then + for feat_name,v in pairs(ft.specification.features.normal) do + if v==true then + for _,i in pairs(ft.resources.sequences) do + if i.order[1]== feat_name and i.type == 'gpos_single' then + for _,st in pairs(i.subtables) do + subtables[st] = true + end end end - end - end - end - acc_feature(vadv, subtables, ft) - for i,v in pairs(vadv) do - vadv[i]=vadv[i]/ft.units_per_em*fmtable.size + end + end + acc_feature(vadv, vorg, subtables, ft, + ft.specification.features.normal.vrt2 or ft.specification.features.normal.vert) + for i,v in pairs(vadv) do + vadv[i]=vadv[i]/ft.units_per_em*fmtable.size + end + for i,v in pairs(vorg) do + vorg[i]=vorg[i]/ft.units_per_em*fmtable.size + end end - return fmtable + return fmtable end, 1, 'ltj.v_advance' ) end + +------------------------------------------------------------------------ +-- supply tounicode entries +------------------------------------------------------------------------ +do + local ltjr_prepare_cid_font = ltjr.prepare_cid_font + luatexbase.add_to_callback( + 'luaotfload.patch_font', + function (tfmdata) + if tfmdata.cidinfo then + local rd = ltjr_prepare_cid_font(tfmdata.cidinfo.registry, tfmdata.cidinfo.ordering) + if rd then + local ru, rc = rd.resources.unicodes, rd.characters + for i,v in pairs(tfmdata.characters) do + local w = ru["Japan1." .. tostring(v.index)] + if w then + v.tounicode = v.tounicode or rc[w]. tounicode + end + end + end + end + + return tfmdata + end, + 'ltj.supply_tounicode', 1) +end + + ------------------------------------------------------------------------ -- MISC ------------------------------------------------------------------------ do + local getfont = node.direct.getfont + local getchar = node.direct.getchar local get_dir_count = ltjd.get_dir_count local is_ucs_in_japanese_char = ltjc.is_ucs_in_japanese_char_direct - local tex_set_attr = tex.setattribute + local ensure_tex_attr = ltjb.ensure_tex_attr + local node_write = node.direct.write local font = font + local new_ic_kern + if status.luatex_version>=89 then + new_ic_kern = function(g) return node_new(id_kern,3) end + else + local ITALIC = luatexja.icflag_table.ITALIC + new_ic_kern = function() + local g = node_new(id_kern) + setfield(g, 'subtype', 1); set_attr(g, attr_icflag, ITALIC) + return g + end + end -- EXT: italic correction function append_italic() local p = to_direct(tex.nest[tex.nest.ptr].tail) + local TEMP = node_new(id_kern) if p and getid(p)==id_glyph then - local f = getfont(p) - local g = node_new(id_kern) - setfield(g, 'subtype', 1) - set_attr(g, attr_icflag, ITALIC) if is_ucs_in_japanese_char(p) then - f = has_attr(p, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt) - local j = font_metric_table[f] + local j = font_metric_table[ + has_attr(p, (get_dir_count()==dir_tate) and attr_curtfnt or attr_curjfnt) + ] + local g = new_ic_kern() setfield(g, 'kern', j.char_type[find_char_class(getchar(p), j)].italic) + node_write(g); ensure_tex_attr(attr_icflag, 0) else + local f = getfont(p) local h = font_getfont(f) or font.fonts[f] if h then - setfield(g, 'kern', h.characters[getchar(p)].italic) - else - tex_set_attr(attr_icflag, 0) - return node_free(g) + local g = new_ic_kern() + if h.characters[getchar(p)] and h.characters[getchar(p)].italic then + setfield(g, 'kern', h.characters[getchar(p)].italic) + node_write(g); ensure_tex_attr(attr_icflag, 0) + end end end - node_write(g) - tex_set_attr(attr_icflag, 0) end + node_free(TEMP) end end +------------------------------------------------------------------------ +-- VERT VARIANT TABLE +------------------------------------------------------------------------ +vert_form_table = { + [0x2013]=0xFE32, [0x2014]=0xFE31, [0x2025]=0xFE30, + [0xFF08]=0xFE35, [0xFF09]=0xFE36, [0xFF5B]=0xFE37, [0xFF5D]=0xFE38, + [0x3014]=0xFE39, [0x3015]=0xFE3A, [0x3010]=0xFE3B, [0x3011]=0xFE3C, + [0x300A]=0xFE3D, [0x300B]=0xFE3E, [0x3008]=0xFE3F, [0x3009]=0xFE40, + [0x300C]=0xFE41, [0x300D]=0xFE42, [0x300E]=0xFE43, [0x300F]=0xFE44, + [0xFF3B]=0xFE47, [0xFF3D]=0xFE48, [0xFF3F]=0xFE33, +} +setmetatable(vert_form_table, {__index=function(t,k) return k end});