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 | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty index 62ec78a76a5..e0c14fd0357 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} - [2014/06/01 v2.4 Font selection for XeLaTeX and LuaLaTeX] + [2014/06/21 v2.4a Font selection for XeLaTeX and LuaLaTeX] \ExplSyntaxOn @@ -646,14 +646,17 @@ } \cs_if_exist:cF {g__fontspec_UID_\l__fontspec_fontid_tl} { - \cs_if_exist:cTF {g__fontspec_family_#1_int} - { \int_gincr:c {g__fontspec_family_#1_int} } - { \int_new:c {g__fontspec_family_#1_int} } + % The font name is fully expanded, in case it's defined in terms of macros, before having its spaces zapped: \tl_set:Nx \l__fontspec_tmp_tl {#1} \tl_remove_all:Nn \l__fontspec_tmp_tl {~} + + \cs_if_exist:cTF {g__fontspec_family_ \l__fontspec_tmp_tl _int} + { \int_gincr:c {g__fontspec_family_ \l__fontspec_tmp_tl _int} } + { \int_new:c {g__fontspec_family_ \l__fontspec_tmp_tl _int} } + \tl_gset:cx {g__fontspec_UID_\l__fontspec_fontid_tl} { - \l__fontspec_tmp_tl ( \int_use:c {g__fontspec_family_#1_int} ) + \l__fontspec_tmp_tl ( \int_use:c {g__fontspec_family_ \l__fontspec_tmp_tl _int} ) } } \tl_gset:Nv \l_fontspec_family_tl {g__fontspec_UID_\l__fontspec_fontid_tl} @@ -1265,11 +1268,8 @@ } \__fontspec_keys_define_code:nnn {fontspec-preparse} {BoldFeatures} { - \ \clist_set:Nn \l__fontspec_fontfeat_bf_clist {#1} - \prop_put:NxV \l__fontspec_nfss_prop - {BoldFont-\g__fontspec_curr_series_tl} \l__fontspec_curr_bfname_tl } \__fontspec_keys_define_code:nnn {fontspec-preparse} {ItalicFeatures} { @@ -1384,10 +1384,11 @@ \rmfamily \__fontspec_set_font_dimen:NnN \l__fontspec_tmpa_dim {#1} \font \__fontspec_set_font_dimen:NnN \l__fontspec_tmpb_dim {#1} \l_fontspec_font - \fp_set_from_dim:Nn \l__fontspec_tmpa_fp { \l__fontspec_tmpa_dim } - \fp_set_from_dim:Nn \l__fontspec_tmpb_fp { \l__fontspec_tmpb_dim } - \fp_div:Nn \l__fontspec_tmpa_fp { \l__fontspec_tmpb_fp } - \tl_gset:Nx \l__fontspec_scale_tl { \fp_use:N \l__fontspec_tmpa_fp } + \tl_gset:Nx \l__fontspec_scale_tl + { + \fp_eval:n { \dim_to_fp:n {\l__fontspec_tmpa_dim} / + \dim_to_fp:n {\l__fontspec_tmpb_dim} } + } \__fontspec_info:n {set-scale} \group_end: } @@ -2211,7 +2212,7 @@ } \DeclareSymbolFont{operators}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault \SetSymbolFont{operators}{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault - \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault + \DeclareSymbolFontAlphabet\mathrm{operators} \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\itdefault \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl\mddefault\updefault @@ -2219,7 +2220,6 @@ \SetSymbolFont{operators}{bold}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault \tl_if_empty:NTF \g__fontspec_bfmathrm_tl { - \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault \SetMathAlphabet\mathit{bold}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\itdefault } { @@ -2291,14 +2291,16 @@ %% version 1.3c or higher (your choice). The latest version of %% this license is at: http://www.latex-project.org/lppl.txt %% -%% This work is "author-maintained" by Will Robertson. +%% This work is "maintained" by Will Robertson. %% %% This work consists of this file fontspec.dtx %% and the derived files fontspec.sty, %% fontspec.lua, %% fontspec.cfg, -%% fontspec-xetex.tex, -%% fontspec-luatex.tex, +%% fontspec-xetex.sty, +%% fontspec-luatex.sty, +%% fontspec-patches.sty, +%% fontspec-example.tex, %% and fontspec.pdf. %% %% |