summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-09-04 23:02:12 +0000
committerKarl Berry <karl@freefriends.org>2012-09-04 23:02:12 +0000
commita0fb1a4d69667793af3cff54f71b5c01ad5434c1 (patch)
tree636b1fb2eb001114988f35e3f2c676b39db6d4f7 /Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
parenta3298cd2a9d5a805dea61e95b0077e73470ab270 (diff)
luatexja (4sep12)
git-svn-id: svn://tug.org/texlive/trunk@27593 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua9
1 files changed, 4 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
index 792c46a2701..71f974979e9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
@@ -66,15 +66,14 @@ function cid(key)
end
function extract(head)
- local p = head, v
+ local p = head
+ local v
while p do
if p.id==id_whatsit then
if p.subtype==sid_user and p.user_id==30113 then
local g = node_new(id_glyph)
g.subtype = 0; g.char = p.value
v = has_attr(p, attr_curjfnt); g.font = v
- set_attr(g, attr_jchar_class,
- ltjf_find_char_class(g.char, ltjf_font_metric_table[v]))
set_attr(g, attr_curjfnt, v)
v = has_attr(p, attr_yablshift)
if v then
@@ -113,7 +112,7 @@ local function cid_to_char(fmtable, fn)
local fi = fonts.ids[fn]
if fi.cidinfo and fi.cidinfo.ordering == "Japan1" then
fmtable.cid_char_type = {}
- for i, v in pairs(ltjf.metrics[fmtable.jfm].chars) do
+ for i, v in pairs(fmtable.size_cache.chars) do
local j = string.match(i, "^AJ1%-([0-9]*)")
if j then
j = tonumber(fi.unicodes['Japan1.'..tostring(j)])
@@ -135,7 +134,7 @@ end
local function cid_set_char_class(arg, fmtable, char)
if arg~=0 then return arg
- elseif fmtable.cid_char_type then
+ elseif fmtable.cid_char_type then
return fmtable.cid_char_type[char] or 0
else return 0
end