summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-05-06 23:12:06 +0000
committerKarl Berry <karl@freefriends.org>2012-05-06 23:12:06 +0000
commitec4155a8b435806195767c2047ab6b3f9f2a1052 (patch)
treec7c5a7ca784c6239ddb222248150a53843427b63 /Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
parent3c6cdccdf8a900337b27e6c4099aeea5dbc86dcb (diff)
luatexja 20120506.0
git-svn-id: svn://tug.org/texlive/trunk@26229 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.lua11
1 files changed, 7 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
index e9e8f1c45ec..792c46a2701 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-otf.lua
@@ -46,16 +46,19 @@ end
function cid(key)
local curjfnt = fonts.ids[tex.attribute[attr_curjfnt]]
- if curjfnt.cidinfo.ordering ~= "Japan1" then
+ if curjfnt.cidinfo.ordering ~= "Japan1" and
+ curjfnt.cidinfo.ordering ~= "GB1" and
+ curjfnt.cidinfo.ordering ~= "CNS1" and
+ curjfnt.cidinfo.ordering ~= "Korea1" then
ltjb.package_error('luatexja-otf',
- 'Current Japanese font "'..curjfnt.psname..'" is not a CID-Keyed font (Adobe-Japan1)',
+ 'Current Japanese font (or other CJK font) "'..curjfnt.psname..'" is not a CID-Keyed font (Adobe-Japan1 etc.)',
'Select a CID-Keyed font using \jfont.')
return
end
- local char = curjfnt.unicodes['Japan1.'..tostring(key)]
+ local char = curjfnt.unicodes[curjfnt.cidinfo.ordering..'.'..tostring(key)]
if not char then
ltjb.package_warning('luatexja-otf',
- 'Current Japanese font "'..curjfnt.psname..'" does not include the specified CID character ('..tostring(key)..')',
+ 'Current Japanese font (or other CJK font) "'..curjfnt.psname..'" does not include the specified CID character ('..tostring(key)..')',
'Use a font including the specified CID character.')
return
end