diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx | 55 |
1 files changed, 24 insertions, 31 deletions
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx index 1169f2458f0..2c56c00d2d1 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-keyval.dtx @@ -13,7 +13,7 @@ % % % \begin{macrocode} -\clist_set:Nn \g_@@_all_keyval_modules_clist +\clist_gset:Nn \g_@@_all_keyval_modules_clist { fontspec, fontspec-opentype, fontspec-aat, fontspec-preparse, fontspec-preparse-cfg, fontspec-preparse-external, fontspec-preparse-nested, @@ -24,7 +24,7 @@ % \begin{macrocode} \cs_new:Nn \@@_keys_define_code:nnn { - \keys_define:nn {#1} { #2 .code:n = {#3} } + \keys_define:nn {#1} { #2 .code:n = {#3} } } % \end{macrocode} % @@ -210,7 +210,7 @@ \seq_if_empty:NT \g_@@_bf_series_seq { \tl_gset:Nx \g_@@_curr_series_tl {\bfdefault} - \seq_put_right:Nx \g_@@_bf_series_seq {\bfdefault} + \seq_gput_right:Nx \g_@@_bf_series_seq {\bfdefault} } \tl_if_eq:oxT \g_@@_curr_series_tl {\bfdefault} { \tl_set_eq:NN \l_@@_fontname_bf_tl \l_@@_curr_bfname_tl } @@ -357,7 +357,7 @@ % \begin{macrocode} \@@_keys_define_code:nnn {fontspec-preparse} {NFSSEncoding} { - \tl_gset:Nx \l_@@_nfss_enc_tl { #1 } + \tl_gset:Nx \g_@@_nfss_enc_tl { #1 } } % \end{macrocode} % @@ -368,9 +368,6 @@ \@@_keys_define_code:nnn {fontspec-preparse} {NFSSFamily} { \tl_set:Nx \l_@@_nfss_fam_tl { #1 } - \cs_undefine:c {g_@@_UID_\l_@@_fontid_tl} - \tl_if_exist:NT \l_fontspec_family_tl - { \cs_undefine:c {g_@@_fontinfo_ \l_fontspec_family_tl _prop} } } % \end{macrocode} % @@ -378,28 +375,24 @@ % This option looks similar in name but has a very different function. % \begin{macrocode} \@@_keys_define_code:nnn {fontspec} {FontFace} - { - \tl_set:No \l_@@_arg_tl { \use_iii:nnn #1 } - \tl_set_eq:NN \l_@@_this_feat_tl \l_@@_arg_tl - \tl_clear:N \l_@@_this_font_tl - \int_compare:nT { \clist_count:N \l_@@_arg_tl = 1 } - { -%<*debug> - \typeout{FontFace~ parsing:~ one~ clist~ item} -%</debug> - \tl_if_in:NnF \l_@@_arg_tl {=} - { -%<*debug> - \typeout{FontFace~ parsing:~ no~ equals~ =>~ font~ name~ only} -%</debug> - \tl_set_eq:NN \l_@@_this_font_tl \l_@@_arg_tl - \tl_clear:N \l_@@_this_feat_tl - } - } + { + \tl_clear:N \l_@@_this_font_tl + \clist_set:No \l_@@_arg_clist { \use_iii:nnn #1 } + \clist_set_eq:NN \l_@@_this_feat_clist \l_@@_arg_clist + \int_compare:nT { \clist_count:N \l_@@_arg_clist = 1 } + { +%<debug>\typeout{FontFace~ parsing:~ one~ clist~ item} + \tl_if_in:NnF \l_@@_arg_clist {=} + { +%<debug>\typeout{FontFace~ parsing:~ no~ equals~ =>~ font~ name~ only} + \tl_set_eq:NN \l_@@_this_font_tl \l_@@_arg_clist + \tl_clear:N \l_@@_this_feat_clist + } + } - \@@_add_nfssfont:nnnn - {\use_i:nnn #1}{\use_ii:nnn #1}{\l_@@_this_font_tl}{\l_@@_this_feat_tl} - } + \@@_add_nfssfont:nnnn + {\use_i:nnn #1} {\use_ii:nnn #1} {\l_@@_this_font_tl} {\l_@@_this_feat_clist} + } % \end{macrocode} % % @@ -634,7 +627,7 @@ \cs_set:Npn \fontspec_parse_colour:viii #1#2#3#4#5#6#7#8 { \tl_set:Nn \l_@@_hexcol_tl {#1#2#3#4#5#6} - \tl_if_eq:NNF \l_@@_opacity_tl \g_@@_opacity_tl + \tl_if_eq:NNF \l_@@_opacity_tl \c_@@_opacity_tl { \bool_if:NF \l_@@_firsttime_bool { \@@_warning:nx {opa-twice-col} {#7#8} } @@ -648,7 +641,7 @@ { \int_set:Nn \l_@@_tmp_int {255} \@@_int_mult_truncate:Nn \l_@@_tmp_int { #1 } - \tl_if_eq:NNF \l_@@_opacity_tl \g_@@_opacity_tl + \tl_if_eq:NNF \l_@@_opacity_tl \c_@@_opacity_tl { \bool_if:NF \l_@@_firsttime_bool { \@@_warning:nx {opa-twice} {#1} } @@ -854,7 +847,7 @@ % ------------------------------------------------ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ -% Copyright 2004-2017 Will Robertson, LPPL "maintainer" +% Copyright 2004-2018 Will Robertson, LPPL "maintainer" % Copyright 2009-2015 Khaled Hosny % Copyright 2013 Philipp Gesang % Copyright 2013-2016 Joseph Wright |