summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons
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/addons
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/addons')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty14
1 files changed, 9 insertions, 5 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 3a819078555..b37b08f6c0b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -43,13 +43,17 @@
\cs_new:Nn \ltj_fontspec_select:nn {
\group_begin:
+ \ltj_fontspec_define_option:nn {CID} {
+ \fontspec_update_fontid:n {+cid=##1}
+ \fontspec_update_featstr:n {cid=##1}
+ }
\ltj_fontspec_define_option:nn {JFM} {
\fontspec_update_fontid:n {+jfm=##1}
- \fontspec_update_featstr:n {jfm=##1}
+ \fontspec_update_featstr:n {jfm=##1}
}
\ltj_fontspec_define_option:nn {JFM-var} {
\fontspec_update_fontid:n {+jfmvar=##1}
- \fontspec_update_featstr:n {jfmvar=##1}
+ \fontspec_update_featstr:n {jfmvar=##1}
}
\ltj_fontspec_define_preparse_external:nn {NoEmbed} {
\cs_set:Nn \fontspec_namewrap:n {psft:####1}
@@ -58,14 +62,14 @@
%% "OpenType feature 'Kerning=Off' (-kern) not available ..."
\ltj_fontspec_define_option:nn {Kerning/Off} {
\fontspec_update_fontid:n {-kern}
- \fontspec_update_featstr:n {-kern}
- }
+ \fontspec_update_featstr:n {-kern}
+ }
\ltj_fontspec_if_liiikeys:TF {
\tl_set:Nn \g_fontspec_encoding_tl {JY3}
} {
\tl_set:Nn \zf@enc {JY3}
}
- \tl_set:Nx \g_fontspec_default_fontopts_tl
+ \tl_set:Nx \g_fontspec_default_fontopts_tl
{JFM=ujis,Scale=0.962216,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl}
\cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
\fontspec_select:nn{#1}{#2}