X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-jfont.lua;h=207d0e0058fc6705a1e9a77dc72de16142a47279;hb=d6927641105d0fa251c3e767b5c9fbce4cc7171c;hp=2bd7258bbfc31984c641b0b5180cc97e803f5a39;hpb=71b8a2487f68f9b77e19b7bbc8d673441ef0a230;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-jfont.lua b/src/ltj-jfont.lua index 2bd7258..207d0e0 100644 --- a/src/ltj-jfont.lua +++ b/src/ltj-jfont.lua @@ -269,6 +269,7 @@ do '\\endcsname=\\relax') return end + if not f then return end update_jfm_cache(j, f.size) local ad = identifiers[fn].parameters local sz = metrics[j].size_cache[f.size] @@ -367,18 +368,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 @@ -659,6 +660,18 @@ do end ------------------------------------------------------------------------ +-- VERT VARIANT TABLE +------------------------------------------------------------------------ +local 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, +} + +------------------------------------------------------------------------ -- 追加のフォント情報 ------------------------------------------------------------------------ font_extra_info = {} @@ -682,12 +695,11 @@ do end 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 function add_fl_table(dest, glyphs, unitable, asc_des, units, id) + local glyphmin, glyphmax = glyphs.glyphmin, glyphs.glyphmax + if glyphmax < 0 then return dest end + local tg = glyphs.glyphs + for i = glyphmin, glyphmax do local gv = tg[i] if gv then if gv.altuni then @@ -695,17 +707,30 @@ 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 = dest or {}; dest[bu] = dest[bu] or {} dest[bu][vsel] = unitable[gv.name] end end end end + -- vertical form + local gi = unitable[gv.name] + if gi then + if unitable[gv.name .. '.vert'] then + dest = dest or {}; dest[gi] = dest[gi] or {}; + dest[gi].vform = unitable[gv.name .. '.vert'] + elseif id.characters[gi] and vert_form_table[gi] then + dest = dest or {}; dest[gi] = dest[gi] or {}; + dest[gi].vform = vert_form_table[gi] + end + end -- vertical metric local vw, tsb, vk = glyph_vmetric(gv) local gi = unitable[gv.name] @@ -744,19 +769,37 @@ 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 + if 0 <= glyphmax then + for i = glyphmin, glyphmax do + if tg[i] and tg[i].name then unicodes[tg[i].name] = ind_to_uni[i] end + end + end dest = add_fl_table(dest, fl, unicodes, - fl.ascent + fl.descent, fl.units_per_em) + fl.ascent + fl.descent, fl.units_per_em, id) end if fl.subfonts then for _,v in pairs(fl.subfonts) do + local tg, glyphmin, glyphmax = v.glyphs, v.glyphmin, v.glyphmax + if 0 <= glyphmax then + for i = glyphmin, glyphmax do + if tg[i] and tg[i].name then unicodes[tg[i].name] = ind_to_uni[i] end + 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) + fl.ascent + fl.descent, fl.units_per_em, id) 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) @@ -777,12 +820,12 @@ end -- do - local cache_ver = 6 + local cache_ver = 11 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 @@ -809,7 +852,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 @@ -975,15 +1018,3 @@ do 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});