From e284bb6af38561ed99d9ae16f08dfb9c2ca6949b Mon Sep 17 00:00:00 2001 From: Kazuki Maeda Date: Fri, 23 Sep 2011 04:23:11 +0900 Subject: [PATCH] Update luatexja-fontspec.sty with fontspec v2.2a. --- src/luatexja-fontspec.sty | 25 ++++++++++++++----------- test/test09-fontspec.pdf | Bin 400489 -> 400490 bytes 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/luatexja-fontspec.sty b/src/luatexja-fontspec.sty index 886c7f6..0d5f25a 100644 --- a/src/luatexja-fontspec.sty +++ b/src/luatexja-fontspec.sty @@ -3,9 +3,10 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec}[2011/08/17 v0.1] +\ProvidesPackage{luatexja-fontspec}[2011/09/23 v0.2] -\RequirePackage{luatexja,fontspec} +\RequirePackage{fontspec}[2011/09/18] % v2.2a +\RequirePackage{luatexja} \ExplSyntaxOn @@ -19,14 +20,16 @@ \cs_new:Nn \ltj_fontspec_select:nn { \group_begin: - \define@key[zf]{options}{JFM}{ - \fontspec_update_fontid:n {+jfm=##1} - \fontspec_update_featstr:n {jfm=##1} + \keys_define:nn {fontspec} { JFM .code:n = { + \fontspec_update_fontid:n {+jfm=##1} + \fontspec_update_featstr:n {jfm=##1} + } } - \define@key[zf]{preparse-external}{NoEmbed}[]{ - \cs_set:Nn \fontspec_namewrap:n {psft:####1} + \keys_define:nn {fontspec-preparse-external} { NoEmbed .code:n = { + \cs_set:Nn \fontspec_namewrap:n {psft:####1} + } } - \tl_set:Nn \zf@enc {JY3} + \tl_set:Nn \g_fontspec_encoding_tl {JY3} \tl_set:Nx \g_fontspec_default_fontopts_tl {JFM=ujis,Scale=0.960444,\g_ltj_fontspec_default_fontopts_tl} \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily @@ -36,7 +39,7 @@ \cs_new:Nn \ltj_fontspec_set_family:Nnn { \ltj_fontspec_select:nn{#2}{#3} - \tl_set_eq:NN #1 \zf@family + \tl_set_eq:NN #1 \l_fontspec_family_tl } \DeclareDocumentCommand \jfontspec { O{} m } { @@ -59,7 +62,7 @@ \ltj_fontspec_select:nn{#2}{#3} \use:x { \exp_not:N \DeclareRobustCommand \exp_not:N #1 { - \exp_not:N \kanjifamily {\zf@family} \exp_not:N \selectfont + \exp_not:N \kanjifamily {\l_fontspec_family_tl} \exp_not:N \selectfont } } } @@ -84,7 +87,7 @@ {\csname zf@family@fontname\k@family\endcsname} } \group_end: - \fontfamily\zf@family\selectfont + \fontfamily\l_fontspec_family_tl\selectfont \else \ltj_fontspec_warning:n {addjfontfeatures-ignored} \fi diff --git a/test/test09-fontspec.pdf b/test/test09-fontspec.pdf index 39aa78eb81b77c475f97d17a7ba816f59cb7b207..aaaa9c4a5d6405b0fb68e1d953dddf47839ab74f 100644 GIT binary patch delta 3286 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 UJ`N?9KpX}k2sa8PB}Gq03fra&+5i9m delta 3289 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 X`~jC>4ilF_90nl>GzujpMNdWw0<0*i -- 2.11.0