X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=5b9cbe4db206c8d62c5b034428785e010efd6e6d;hb=0d0e4748aca67aa2294b3a8cdec575e1e414d918;hp=b193ee8c8a0ea304c2dbc54be04b021878debd66;hpb=eb59520e788ac74973832590042d9a4efef79fcb;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua index b193ee8..5b9cbe4 100644 --- a/src/ltj-jfont.lua +++ b/src/ltj-jfont.lua @@ -3,7 +3,7 @@ -- luatexbase.provides_module({ name = 'luatexja.jfont', - date = '2016/03/31', + date = '2016/04/03', description = 'Loader for Japanese fonts', }) module('luatexja.jfont', package.seeall) @@ -13,19 +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 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_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 @@ -36,7 +31,6 @@ local id_glyph = node.id('glyph') local id_kern = node.id('kern') local cat_lp = luatexbase.catcodetables['latex-package'] local FROM_JFM = luatexja.icflag_table.FROM_JFM -local tokenlib = luatexja.token ------------------------------------------------------------------------ -- LOADING JFM ------------------------------------------------------------------------ @@ -373,18 +367,18 @@ do end -- define_font callback - local otfl_fdr = fonts.definers.read + local otfl_fdr local ltjr_font_callback = ltjr.font_callback function luatexja.font_callback(name, size, id) 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) + otfl_fdr= luatexbase.remove_from_callback('define_font', 'luaotfload.define_font') luatexbase.add_to_callback('define_font',luatexja.font_callback,"luatexja.font_callback", 1) end @@ -689,11 +683,8 @@ do local sort = table.sort 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 tg, glyphmin, glyphmax = glyphs.glyphs, glyphs.glyphmin, glyphs.glyphmax + for i = glyphmin, glyphmax do local gv = tg[i] if gv then if gv.altuni then @@ -701,20 +692,22 @@ do local bu, vsel = at.unicode, at.variant if vsel then if vsel>=0xE0100 then vsel = vsel - 0xE0100 end - dest = dest or {}; dest[bu] = dest[bu] or {} local uniq_flag = true - for i,_ in pairs(dest[bu]) do - if i==vs then uniq_flag = false; break end - end + if dest and dest[bu] then + for i,_ in pairs(dest[bu]) do + if i==vsel then uniq_flag = false; break end + end + end if uniq_flag then - dest[bu][vsel] = unitable[gv.name] + dest = dest or {}; dest[bu] = dest[bu] or {} + dest[bu][vsel] = unitable[i] end end end end -- vertical metric local vw, tsb, vk = glyph_vmetric(gv) - local gi = unitable[gv.name] + local gi = unitable[i] 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. @@ -750,19 +743,34 @@ do end prepare_fl_data = function (dest, id) local fl = fontloader.open(id.filename) - local unicodes = id.resources.unicodes + local ind_to_uni, unicodes = {}, {} + for i,v in pairs(id.characters) do + ind_to_uni[v.index] = i + end + if fl.glyphs then + local tg, glyphmin, glyphmax = fl.glyphs, fl.glyphmin, fl.glyphmax + for i = glyphmin, glyphmax do + if tg[i] and tg[i].name then unicodes[tg[i].name] = ind_to_uni[i] end + end 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 + local tg, glyphmin, glyphmax = v.glyphs, v.glyphmin, v.glyphmax + for i = glyphmin, glyphmax do + if tg[i] and tg[i].name then unicodes[tg[i].name] = ind_to_uni[i] end + end + end + for _,v in pairs(fl.subfonts) do dest = add_fl_table(dest, v, unicodes, fl.ascent + fl.descent, fl.units_per_em) end - end - fontloader.close(fl); collectgarbage("collect") - return dest + end + if dest then dest.unicodes = unicodes end + fontloader.close(fl); collectgarbage("collect") + return dest end -- supply vkern table supply_vkern_table = function(id, bname) @@ -783,12 +791,12 @@ end -- do - local cache_ver = 6 + local cache_ver = 9 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 id) or (not id.filename) then return end + local bname = file.nameonly(id.filename) if not font_extra_basename[bname] then -- if the cache is present, read it local newsum = checksum(id.filename) -- MD5 checksum of the fontfile @@ -815,7 +823,7 @@ do end end local function prepare_extra_data_font(id, res) - if type(res)=='table' and res.shared then + if type(res)=='table' and res.shared and res.filename then font_extra_info[id] = font_extra_basename[file.nameonly(res.filename)] end end @@ -935,12 +943,12 @@ end -- MISC ------------------------------------------------------------------------ do - 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 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 ensure_tex_attr = ltjb.ensure_tex_attr - local node_write = Dnode.write + local node_write = node.direct.write local font = font local new_ic_kern if status.luatex_version>=89 then