diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty index 8fba89c97e5..4758f213f0c 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty @@ -14,7 +14,7 @@ %% %% \ProvidesPackage{fontspec-luatex} - [2013/05/12 v2.3b Font selection for XeLaTeX and LuaLaTeX] + [2013/05/20 v2.3c Font selection for XeLaTeX and LuaLaTeX] \ExplSyntaxOn @@ -903,8 +903,7 @@ { \bool_set_false:N \l_fontspec_icu_bool \bool_set_true:N \l_fontspec_firsttime_bool - \cs_set:Npn \fontspec_namewrap:n ##1 - { name:##1 } + \cs_set:Npn \fontspec_namewrap:n ##1 { ##1 } \tl_clear:N \l_fontspec_optical_size_tl \tl_clear:N \l_fontspec_renderer_tl \tl_clear:N \l_fontspec_defined_shapes_tl @@ -964,7 +963,7 @@ \fontspec_check_ot_feat:nTF {#1} { \fontspec_update_fontid:n {#1=#2} - \fontspec_update_featstr:n { #1 = \int_eval:n {#2+1} } + \fontspec_update_featstr:n { #1 = #2 } } { \fontspec_warning:nx {icu-feature-not-exist-in-font} {#1} } } @@ -1078,8 +1077,7 @@ \bool_set_true:N \l_fontspec_nobf_bool \bool_set_true:N \l_fontspec_noit_bool \bool_set_true:N \l_fontspec_external_bool - \cs_gset:Npn \fontspec_namewrap:n ##1 - { file: #1 ##1 } + \cs_gset:Npn \fontspec_namewrap:n ##1 { [ #1 ##1 ] } } \aliasfontfeature{ExternalLocation}{Path} \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {Extension} @@ -1603,8 +1601,7 @@ { \fontspec_make_feature:nnx {17}{##1} { \fontspec_salt:n {##1} } } } } -\cs_set:Nn \fontspec_salt:n - { +salt = \int_eval:n {#1+1} } +\cs_set:Nn \fontspec_salt:n { +salt = #1 } \fontspec_define_font_feature:n {Variant} \keys_define:nn {fontspec} { @@ -1641,12 +1638,12 @@ { ScriptStyle .code:n = { - \fontspec_update_fontid:n {+ssty=1} + \fontspec_update_fontid:n {+ssty=0} \fontspec_update_featstr:n{+sstyle} }, ScriptScriptStyle .code:n = { - \fontspec_update_fontid:n {+ssty=2} + \fontspec_update_fontid:n {+ssty=1} \fontspec_update_featstr:n{+ssstyle} } } @@ -1699,8 +1696,7 @@ Annotation .default:n = {0} , Annotation / unknown .code:n = { - \fontspec_make_feature:nnx {}{} - { +nalt= \int_eval:n {#1+1} } + \fontspec_make_feature:nnx {}{}{ +nalt=#1 } } } \keys_define:nn {fontspec} |