summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-03-24 20:42:07 +0000
committerKarl Berry <karl@freefriends.org>2014-03-24 20:42:07 +0000
commitf70b06da25c665c72900ba23f10ca1bc8dbadd79 (patch)
tree8274724e010ada8625e8abfef3454c5105e729b9 /Master/texmf-dist/tex/luatex/luatexja/addons
parent382a7e4800835b989130b7973529b1156ce82892 (diff)
luatexja (24mar14)
git-svn-id: svn://tug.org/texlive/trunk@33277 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty7
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty2
2 files changed, 5 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
index 597e53303ff..9fa1ec4867e 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -187,9 +187,10 @@
\ifin@\edef\k@family{#1}\else%
\directlua{luatexja.jfont.is_Nffam(\tmp@enc, \tmp@item)}%
\ifin@\@notffamtrue\else%
- \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\f@encoding+%
- \message{(I search kanjifont definition file: \@@temp)}%
- \IfFileExists{\@@temp#1.fd}{\@tempswztrue}{\@tempswzfalse}%
+ % filename of font definition file is always lowercase
+ \edef\@temp{\lowercase{\noexpand\IfFileExists{\f@encoding#1.fd}}}%
+ \message{(I search font definition file)}%
+ \@temp{\@tempswztrue}{\@tempswzfalse}%
\if@tempswz
\directlua{luatexja.jfont.add_ffam_list(\tmp@enc, \tmp@item)}%
\edef\f@family{#1}%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index 7bf54a2081e..6f8ad23509a 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -140,7 +140,7 @@
A-OTF-RyuminPr6N-Light.otf , A-OTF-FutoMinA101Pr6N-Bold.otf , % mc/m, mc/bx
A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-FutoGoB101Pr6N-Bold.otf , % gt/m, gt/bx (multiweight))
A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-MidashiGoPr6N-MB31.otf , % gt/m (uni), gt/eb
- A-OTF-Jun101Pr6N-Light.otf % mg/m
+ A-OTF-ShinMGoPr6N-Light.otf % mg/m
}
}