diff options
author | Karl Berry <karl@freefriends.org> | 2012-12-10 01:31:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-12-10 01:31:19 +0000 |
commit | eb3f5f9a64a4553a16273f9ff5cfe99d10f27dd8 (patch) | |
tree | 5e47c27e88cdb655ee7fefcf919ab531e8a4b757 /Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty | |
parent | 64b7e39503022a8c0ce58857cea7f25d57369757 (diff) |
luatexja (9dec12)
git-svn-id: svn://tug.org/texlive/trunk@28482 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty | 17 |
1 files changed, 14 insertions, 3 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 b37b08f6c0b..4a037d640cd 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty +++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty @@ -3,12 +3,12 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec}[2011/09/23 v0.2] +\ProvidesPackage{luatexja-fontspec}[2012/09/17 v0.2a] \RequirePackage{fontspec,luatexja} - \ExplSyntaxOn +%%%%%%%% Messages \cs_new:Npn \ltj_fontspec_warning:n { \msg_warning:nn {ltj-fontspec} } \msg_new:nnn {ltj-fontspec} {addjfontfeatures-ignored} @@ -19,12 +19,22 @@ \cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx} +%%%%%%%% For compatibility with old fontspec. \prg_new_conditional:Nnx \ltj_fontspec_if_liiikeys: {TF,F} { \@ifpackagelater {fontspec} {2011/09/13} { \exp_not:N \prg_return_true: } % fontspec >= 2.2 (l3keys) { \exp_not:N \prg_return_false: } % fontspec < 2.2 (xkeyval) } +%%%%%%%% \g_ltj_fontspec_scale_fp +%% Default scale value for jfont. +\group_begin: +\fontsize{10}{10}\selectfont +\fp_gset:Nn \g_ltj_fontspec_scale_fp {\zw / 10} +\group_end: + +%%%%%%%% Internal control sequences +%% Each CS is ltj_fontspec version that corresponds to original CS of fontspec. \cs_new:Nn \ltj_fontspec_define_option:nn { \ltj_fontspec_if_liiikeys:TF { \keys_define:nn {fontspec} { #1 .code:n = {#2}} @@ -70,7 +80,7 @@ \tl_set:Nn \zf@enc {JY3} } \tl_set:Nx \g_fontspec_default_fontopts_tl - {JFM=ujis,Scale=0.962216,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl} + {JFM=ujis,Scale=\fp_use:N \g_ltj_fontspec_scale_fp,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl} \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily \fontspec_select:nn{#1}{#2} \group_end: @@ -84,6 +94,7 @@ \tl_set_eq:NN #1 \l_fontspec_family_tl } +%%%%%%%% User commands \DeclareDocumentCommand \jfontspec { O{} m } { \ltj_fontspec_set_family:Nnn \k@family {#1}{#2} \selectfont |