local cidfont_data = {}
local cache_chars = {}
-local cache_ver = '3'
+local cache_ver = 6
+local identifiers = fonts.hashes.identifiers
local cid_reg, cid_order, cid_supp, cid_name
local cid_replace = {
},
embedding = "no", cache = "yes", factor = 0, hfactor = 0, vfactor = 0,
tounicode = 1,
+ properties = { language = "dflt", script = "dflt" },
}
cidfont_data[cid_name] = k
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, }
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",
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),
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)
local specification = definers.analyze(name,size)
- specification = definers.resolve(specification)
+ --specification = definers.resolve(specification) (not needed)
specification.detail = specification.detail or ''
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
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 = utf.find(name, ":") or utf.len(name)+1
- if utf.sub(name, 1, p-1) == 'psft' then
+ 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 = utf.sub(name,p+1)
- local p = utf.find(basename, ":")
- local q = utf.find(basename, "/[BI][BI]?")
+ local basename = name:sub(p+1)
+ local p = basename:find(":")
+ local q = basename:find("/[BI][BI]?")
if q and p and q<=p then
- basename = utf.gsub(basename, '/[BI][BI]?', '', 1)
- p = utf.find(basename, ":")
+ basename = basename:gsub('/[BI][BI]?', '', 1)
+ p = basename:find(":")
end
if p then
- local xname = utf.sub(basename, p+1)
+ local xname = basename:sub(p+1)
p = 1
while p do
- local q = utf.find(xname, ";", p+1) or utf.len(xname)+1
- if utf.sub(xname, p, p+3)=='cid=' and q>p+4 then
- s = utf.sub(xname, p+4, q-1)
+ local q = xname:find(";", p+1) or xname:len()+1
+ if xname:sub(p, p+3)=='cid=' and q>p+4 then
+ s = xname:sub(p+4, q-1)
end
- if utf.len(xname)+1==q then p = nil else p = q + 1 end
+ if xname:len()+1==q then p = nil else p = q + 1 end
end
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')
OSDN Git Service
