X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fltj-rmlgbm.lua;h=f12e1a361d74e40b7a58cef64354cf6f52a08c9e;hb=5bb253ab78fb107b8f34b3b7d31c8cb9b9e57261;hp=c7f7bc7791407721ad4883d31b7acfe1f9f2b9dd;hpb=afcfedc2c802d40a24c9dc4dd3592518e0b5cc65;p=luatex-ja%2Fluatexja.git diff --git a/src/ltj-rmlgbm.lua b/src/ltj-rmlgbm.lua index c7f7bc7..f12e1a3 100644 --- a/src/ltj-rmlgbm.lua +++ b/src/ltj-rmlgbm.lua @@ -5,7 +5,8 @@ luatexja.load_module('base'); local ltjb = luatexja.base local cidfont_data = {} local cache_chars = {} -local cache_ver = '3' +local cache_ver = 7 +local identifiers = fonts.hashes.identifiers local cid_reg, cid_order, cid_supp, cid_name local cid_replace = { @@ -117,6 +118,7 @@ do }, embedding = "no", cache = "yes", factor = 0, hfactor = 0, vfactor = 0, tounicode = 1, + properties = { language = "dflt", script = "dflt" }, } cidfont_data[cid_name] = k @@ -138,29 +140,31 @@ do ttu[cid_order .. '.' .. i] = cidmo[i] end - -- 縦書用字形 - tt, cidm = {}, {} - for i = 0,kx[2] do cidm[i] = -1 end - open_cmap_file(kx[1] .. "-V", increment, tonumber, entry) - local ttv = {} - for i,v in pairs(tt) do ttv[i] = cidmo[v.index] end - -- shared k.shared = { otfdata = { cidinfo= k.cidinfo, verbose = false, shared = { featuredata = {}, }, - luatex = { features = {}, - defaultwidth=1000, - }, }, dynamics = {}, features = {}, processes = {}, - ltj_vert_table = ttv + --rawdata = { descriptions = {} }, + } + k.resources = { + unicodes = ttu, + features = { dummy={dummy={dflt=true}} } } - k.resources = { unicodes = ttu, } k.descriptions = {} cache_chars[cid_name] = { [655360] = k.characters } + -- 縦書用字形 + tt, cidm = {}, {} + local ttv = {}; k.shared.ltj_vert_table = ttv + for i = 0,kx[2] do cidm[i] = -1 end + open_cmap_file(kx[1] .. "-V", increment, tonumber, entry) + for i,v in pairs(tt) do + ttv[i] = cidmo[v.index] + end + -- tounicode エントリ local cidp = {nil, nil}; tt, ttu, cidm = {}, {}, {} open_cmap_file(cid_name .. "-UCS2", @@ -193,6 +197,26 @@ do end -- +local cidf_vert_processor +do + local traverse_id = node.traverse_id + local id_glyph = node.id('glyph') + cidf_vert_processor = { + function (head, fnum) + local fontdata = identifiers[fnum] + if luatexja.jfont.font_metric_table[fnum].vert_activated then + local vt = fontdata.shared.ltj_vert_table + for n in traverse_id(id_glyph, head) do + if n.font==fnum then + n.char = vt[n.char] or n.char + end + end + return head, false + end + end + } +end + local function cid_cache_outdated(t) return t.version~=cache_ver end local function read_cid_font() local dat = ltjb.load_cache("ltj-cid-auto-" .. string.lower(cid_name), @@ -205,14 +229,23 @@ local function read_cid_font() make_cid_font() end if cidfont_data[cid_name] then + cidfont_data[cid_name].shared.processes = cidf_vert_processor for i,v in pairs(cidfont_data[cid_name].characters) do if not v.width then v.width = 655360 end v.height, v.depth = 576716.8, 78643.2 -- optimized for jfm-ujis.lua end + return cidfont_data[cid_name] + else + return nil end end -- High-level +local function prepare_cid_font(reg, ord) + cid_reg, cid_order, cid_name, cid_supp = reg, ord, reg .. '-' .. ord + return cidfont_data[cid_name] or read_cid_font() +end + local definers = fonts.definers local function mk_rml(name, size, id) @@ -223,7 +256,7 @@ local function mk_rml(name, size, id) local fontdata = {} local cachedata = {} local s = cidfont_data[cid_name] - luatexja.rmlgbm.vert_addfunc(id, s.shared.ltj_vert_table) + luatexja.rmlgbm.vert_addfunc(id) for k, v in pairs(s) do fontdata[k] = v cachedata[k] = v @@ -290,13 +323,14 @@ local function mk_rml(name, size, id) fontdata.name = specification.name .. size .. var; cachedata.name = fontdata.name fontdata.fullname = specification.name .. var; cachedata.fullname = fontdata.fullname fontdata.psname = specification.name; cachedata.psname = fontdata.psname - fonts.hashes.identifiers[id] = cachedata + identifiers[id] = cachedata return fontdata end local function font_callback(name, size, id, fallback) - local p = name:find(":") or name:len()+1 + if name:sub(1,1)=="{" and name:sub(-1)=="}" then name = name:sub(2,-2) end + local p = name:find(":") or 0 if name:sub(1, p-1) == 'psft' then local s = "Adobe-Japan1-6" local basename = name:sub(p+1) @@ -317,35 +351,36 @@ local function font_callback(name, size, id, fallback) if xname:len()+1==q then p = nil else p = q + 1 end end end + p = basename:find(":") + if p then basename=basename:sub(1,p-1) end + if basename:sub(1,1)=="{" and basename:sub(-1)=="}" then basename = basename:sub(2,-2) end cid_reg, cid_order = string.match(s, "^(.-)%-(.-)%-(%d-)$") if not cid_reg then cid_reg, cid_order = string.match(s, "^(.-)%-(.-)$") end - cid_name = cid_reg .. '-' .. cid_order - if not cidfont_data[cid_name] then - read_cid_font() - if not cidfont_data[cid_name] then - ltjb.package_error('luatexja', - "bad cid key `" .. s .. "'", - "I couldn't find any non-embedded font information for the CID\n" .. - '`' .. s .. "'. For now, I'll use `Adobe-Japan1-6'.\n".. - 'Please contact the LuaTeX-ja project team.') - cid_name = "Adobe-Japan1" - end + if not prepare_cid_font(cid_reg, cid_order) then + ltjb.package_error('luatexja', + "bad cid key `" .. s .. "'", + "I couldn't find any non-embedded font information for the CID\n" .. + '`' .. s .. "'. For now, I'll use `Adobe-Japan1-6'.\n".. + 'Please contact the LuaTeX-ja project team.') + cid_name = "Adobe-Japan1" end return mk_rml(basename, size, id) else - return fallback(name, size, id) + local tfmdata=fallback(name, size, id) + if type (tfmdata) == "table" and tfmdata.shared then + luatexbase.call_callback("luaotfload.patch_font", tfmdata, name) + end + return tfmdata end end luatexja.rmlgbm = { + prepare_cid_font = prepare_cid_font, cidfont_data = cidfont_data, font_callback = font_callback, vert_addfunc = function () end, -- dummy, set in ltj-direction.lua } -cid_reg, cid_order, cid_name, cid_supp = 'Adobe', 'Japan1', 'Adobe-Japan1' -read_cid_font() - - +prepare_cid_font('Adobe', 'Japan1')