local cid_replace = {
["Adobe-Japan1"] = {"UniJIS2004-UTF32", 23057, 6,
function (i)
- if (231<=i and i<=632) or (8718<=i and i<=8719)
+ if (231<=i and i<=632) or (8718<=i and i<=8719)
or (12063<=i and i<=12087) then
return 327680 -- 655360/2
elseif 9758<=i and i<=9778 then
end
end},
-- 基本的には JIS X 0213:2004 に沿ったマッピング
- ["Adobe-Korea1"] = {"UniKS-UTF32", 18351, 2,
+ ["Adobe-Korea1"] = {"UniKS-UTF32", 18351, 2,
function (i)
- if 8094<=i and i<=8100 then
+ if 8094<=i and i<=8100 then
return 327680 -- 655360/2
end
end},
- ["Adobe-GB1"] = {"UniGB-UTF32", 30283, 5,
+ ["Adobe-GB1"] = {"UniGB-UTF32", 30283, 5,
function (i)
- if (814<=i and i<=939) or (i==7716)
+ if (814<=i and i<=939) or (i==7716)
or (22355<=i and i<=22357) then
return 327680 -- 655360/2
end
local cid, ucs, ucsa
line = fh:read("*l")
while line do
- if string.find(line, "end...?char") then
+ if string.find(line, "end...?char") then
line = fh:read("*l"); return
else -- WMA l is in the form "<%x+>%s%d+"
ucs, cid = string.match(line, "<(%x+)>%s+<?(%x+)>?")
- cid = cid_dec(cid); ucs = tonumber(ucs, 16);
- if not tt[ucs] then
+ cid = cid_dec(cid); ucs = tonumber(ucs, 16);
+ if not tt[ucs] then
tt[ucs] = mke(cid); cidm[cid]=ucs
end
end
local bucs, eucs, cid
line = fh:read("*l")
while line do
- if string.find(line, "end...?range") then
+ if string.find(line, "end...?range") then
line = fh:read("*l"); return
else -- WMA l is in the form "<%x+>%s+<%x+>"
bucs, eucs, cid = string.match(line, "<(%x+)>%s+<(%x+)>%s+<?(%x+)>?")
- cid = cid_dec(cid);
+ cid = cid_dec(cid);
bucs = tonumber(bucs, 16); eucs = tonumber(eucs, 16)
for ucs = bucs, eucs do
- if not tt[ucs] then
+ if not tt[ucs] then
tt[ucs] = mke(cid); cidm[cid]=ucs
end
cid = inc(cid)
line = fh:read("*l")
end
end
- fh:close();
+ fh:close();
end
-
+
local function increment(a) return a+1 end
- local function entry(a)
- return {index = a}
+ local function entry(a)
+ return {index = a}
end
make_cid_font = function ()
local kx = cid_replace[cid_name]
ascender = 655360*0.88,
descender = 655360*0.12,
},
- embedding = "no", cache = "yes", factor = 0, hfactor = 0, vfactor = 0,
+ embedding = "no", cache = "yes", factor = 0, hfactor = 0, vfactor = 0,
tounicode = 1,
}
cidfont_data[cid_name] = k
-- これらは TrueType フォントを使って表示するときはおかしくなる
local ttu, pricode = {}, 0xF0000
for i,v in ipairs(cidmo) do
- if v==-1 then
- tth[pricode], cidmo[i], pricode
+ if v==-1 then
+ tth[pricode], cidmo[i], pricode
= { index = i }, pricode, pricode+1;
end
ttu[cid_order .. '.' .. i] = cidmo[i]
-- shared
k.shared = {
- otfdata = {
- cidinfo= k.cidinfo, verbose = false,
- shared = { featuredata = {}, },
- luatex = { features = {},
- defaultwidth=1000,
+ otfdata = {
+ cidinfo= k.cidinfo, verbose = false,
+ shared = { featuredata = {}, },
+ luatex = { features = {},
+ defaultwidth=1000,
},
},
- dynamics = {}, features = {}, processes = {},
+ dynamics = {}, features = {}, processes = {},
ltj_vert_table = ttv
}
k.resources = { unicodes = ttu, }
-- tounicode エントリ
local cidp = {nil, nil}; tt, ttu, cidm = {}, {}, {}
open_cmap_file(cid_name .. "-UCS2",
- function(a)
+ function(a)
a[2] = a[2] +1 ; return a
- end,
- function(a)
+ end,
+ function(a)
cidp[1] = string.upper(string.sub(a,1,string.len(a)-4))
cidp[2] = tonumber(string.sub(a,-4),16)
return cidp
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),
cid_cache_outdated )
- if dat then
+ if dat then
cidfont_data[cid_name] = dat[1]
cache_chars[cid_name] = { [655360] = cidfont_data[cid_name].characters }
else
local scale = size / 655360
do
- local def_height = 0.88 * size
+ local def_height = 0.88 * size
-- character's default height (optimized for jfm-ujis.lua)
local def_depth = 0.12 * size -- and depth.
if not cache_chars[cid_name][size] then
cache_chars[cid_name][size] = {}
for k, v in pairs(cache_chars[cid_name][655360]) do
- cache_chars[cid_name][size][k] = {
- index = v.index, width = v.width * scale,
+ cache_chars[cid_name][size][k] = {
+ index = v.index, width = v.width * scale,
height = def_height, depth = def_depth, tounicode = v.tounicode,
}
end
-- no embedding
local var = ''
local s = string.match(specification.detail, 'slant=([+-]*%d*%.?%d)')
- if s and e~=0 then
+ if s and e~=0 then
s = s * 1000
var, fontdata.slant = var .. 's' .. tostring(s), s
end
local e = string.match(specification.detail, 'extend=([+-]*%d*%.?%d)')
- if e and e~=1 then
+ if e and e~=1 then
e = e * 1000
var, fontdata.extend = var .. 'x' .. tostring(e), e
end
basename = utf.gsub(basename, '/[BI][BI]?', '', 1)
p = utf.find(basename, ":")
end
- if p then
+ if p then
local xname = utf.sub(basename, p+1)
p = 1
while p do
end
end
cid_reg, cid_order = string.match(s, "^(.-)%-(.-)%-(%d-)$")
- if not cid_reg then
+ 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
+ if not cidfont_data[cid_name] then
read_cid_font()
- if not cidfont_data[cid_name] then
+ 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" ..
end
end
return mk_rml(basename, size, id)
- else
+ else
return fallback(name, size, id)
end
end
OSDN Git Service
