diff options
author | Karl Berry <karl@freefriends.org> | 2017-09-04 21:45:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-09-04 21:45:53 +0000 |
commit | ab63f41137a210173bf797f28970ca2591a6cf15 (patch) | |
tree | 6666213ffee7637577d6347201f334b992f6896c /Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua | |
parent | 458a507406076f4746ce1440eca59f981949e0ab (diff) |
luatexja (4sep17)
git-svn-id: svn://tug.org/texlive/trunk@45216 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua index a4a06c77750..a0505c52626 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua +++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-rmlgbm.lua @@ -5,7 +5,7 @@ luatexja.load_module('base'); local ltjb = luatexja.base local cidfont_data = {} local cache_chars = {} -local cache_ver = 5 +local cache_ver = 6 local identifiers = fonts.hashes.identifiers local cid_reg, cid_order, cid_supp, cid_name @@ -118,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 @@ -200,7 +201,7 @@ do cidf_vert_processor = { function (head, fnum) local fontdata = identifiers[fnum] - if fontdata.is_ltj_vert then + 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 @@ -316,9 +317,6 @@ local function mk_rml(name, size, id) e = e * 1000 var, fontdata.extend = var .. 'x' .. tostring(e), e end - if string.match(specification.detail, '(%+?vert)') then - cachedata.is_ltj_vert = true - end 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 @@ -328,7 +326,8 @@ local function mk_rml(name, size, id) 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) |