summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons
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
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')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-24.sty10
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty16
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty10
3 files changed, 21 insertions, 15 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}
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 51346d56d14..6287324f5e0 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2014/06/19 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2014/12/03 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
@@ -11,16 +11,16 @@
\cs_set:Nn \ltj_fontspec_pass_opts: {}
\keys_define:nn { luatexja-fontspec }
{
- match .bool_set:N = \ltj_fontspec_match,
+ match .bool_set:N = \ltj_fontspec_match_bool,
match .default:n = true,
- pass .code:n = \cs_set:Nn \ltj_fontspec_pass_opts: {#1},
+ pass .code:n = \cs_set:Nn \ltj_fontspec_pass_opts: {#1},% 互換性
}
\ProcessKeysOptions { luatexja-fontspec }
-\RequirePackage[\ltj_fontspec_pass_opts:]{fontspec}[2011/09/13]
-\cs_if_exist:NTF \fontspec_update_featstr:n {
- \RequirePackage{luatexja-fontspec-23}
-} {
+\RequirePackage[\ltj_fontspec_pass_opts:]{fontspec}[2014/06/01]
+%\cs_if_exist:NTF \fontspec_update_featstr:n {
+% \RequirePackage{luatexja-fontspec-23}
+%} {
\RequirePackage{luatexja-fontspec-24}
-}
+%}
\endinput
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 3f6b4efc9f5..680f689919c 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
% luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2013/10/28 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2014/12/03 Japanese font presets]
\RequirePackage{expl3}
\RequirePackage{luatexja-fontspec}
@@ -195,6 +195,14 @@
}
\ExecuteOptions{ipaex}
+
+% match
+\DeclareOption{match} {
+ \bool_if:NF \ltj_fontspec_match_bool {
+ \ltj_fontspec_match_cmd
+ \bool_set_true:N \ltj_fontspec_match_bool
+ }
+}
\ProcessOptions*
%% KozMinPr6N の場合はjp04 feature がないので,nlck にする