summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-03-08 22:34:05 +0000
committerKarl Berry <karl@freefriends.org>2015-03-08 22:34:05 +0000
commit8d291def7999406c0274694b7235c94c1c1182ed (patch)
tree76f4c5728dadaa046e5c452bd10738df77c948b2 /Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty
parent24ef94ac17615157dda1e8ab34500b982dfd4a6c (diff)
luatexja (8mar15)
git-svn-id: svn://tug.org/texlive/trunk@36466 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty10
1 files changed, 4 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty
index 4bd81c62cc9..f4438544b0c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty
@@ -3,13 +3,12 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-24}[2014/06/19 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-24}[2014/12/03 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
%%%%%%%% Change Japanese font family by \rmfamily or not
-\bool_if:NTF \ltj_fontspec_match
-{
+\cs_new:Npn \ltj_fontspec_match_cmd {
\renewcommand\jttdefault{\gtdefault}
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
@@ -21,12 +20,11 @@
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\jttdefault\selectfont}
\DeclareDocumentCommand \setmonojfont { O{} m } {
- \ltj_fontspec_set_family:Nnn \jttdefault {#1}{#2}
+ \ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
\normalfont
}
-}{
}
-
+\bool_if:NT \ltj_fontspec_match_bool \ltj_fontspec_match_cmd
%%%%%%%% Messages
\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}