diff options
Diffstat (limited to 'macros/latex/contrib/fontspec/fontspec-code-internal.dtx')
-rw-r--r-- | macros/latex/contrib/fontspec/fontspec-code-internal.dtx | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx b/macros/latex/contrib/fontspec/fontspec-code-internal.dtx index 50ae7498cd..7e159a1e10 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx +++ b/macros/latex/contrib/fontspec/fontspec-code-internal.dtx @@ -233,14 +233,14 @@ %<debug>\typeout{Set~ base~ font~ for~ preliminary~ analysis: \@@_construct_font_call:nn { \l_@@_fontname_up_tl } {} } \@@_primitive_font_set:NnnF \l_@@_test_font - { \@@_construct_font_call:nn { \l_@@_fontname_up_tl } {} } + { \@@_construct_font_call:nn { \l_@@_fontname_up_tl } { \l_@@_pre_feat_sclist } } { \f@size pt - 2sp } { \@@_error:nx {font-not-found} {\l_@@_fontname_up_tl} } %<debug>\typeout{Set~ base~ font~ properly: \@@_construct_font_call:nn { \l_@@_fontname_up_tl } {} } \@@_set_font_type:N \l_@@_test_font \@@_primitive_font_gset:Onn \l_@@_fontface_cs_tl - { \@@_construct_font_call:nn { \l_@@_fontname_up_tl } {} } + { \@@_construct_font_call:nn { \l_@@_fontname_up_tl } { \l_@@_pre_feat_sclist } } { \f@size pt } \l_@@_fontface_cs_tl % this is necessary for LuaLaTeX to check the scripts properly @@ -496,13 +496,12 @@ % \begin{macrocode} \cs_new:Nn \@@_set_faces: { - \@@_add_nfssfont:nnnn \mddefault \updefault \l_fontspec_fontname_tl \l_@@_fontfeat_up_clist - \@@_add_nfssfont:nnnn \bfdefault \updefault \l_@@_fontname_bf_tl \l_@@_fontfeat_bf_clist - \@@_add_nfssfont:nnnn \mddefault \itdefault \l_@@_fontname_it_tl \l_@@_fontfeat_it_clist - \@@_add_nfssfont:nnnn \mddefault \sldefault \l_@@_fontname_sl_tl \l_@@_fontfeat_sl_clist - \@@_add_nfssfont:nnnn \bfdefault \itdefault \l_@@_fontname_bfit_tl \l_@@_fontfeat_bfit_clist - \@@_add_nfssfont:nnnn \bfdefault \sldefault \l_@@_fontname_bfsl_tl \l_@@_fontfeat_bfsl_clist - + \@@_add_nfssfont:nnnn \mddefault \shapedefault \l_fontspec_fontname_tl \l_@@_fontfeat_up_clist + \@@_add_nfssfont:nnnn \bfdefault \shapedefault \l_@@_fontname_bf_tl \l_@@_fontfeat_bf_clist + \@@_add_nfssfont:nnnn \mddefault \itdefault \l_@@_fontname_it_tl \l_@@_fontfeat_it_clist + \@@_add_nfssfont:nnnn \mddefault \sldefault \l_@@_fontname_sl_tl \l_@@_fontfeat_sl_clist + \@@_add_nfssfont:nnnn \bfdefault \itdefault \l_@@_fontname_bfit_tl \l_@@_fontfeat_bfit_clist + \@@_add_nfssfont:nnnn \bfdefault \sldefault \l_@@_fontname_bfsl_tl \l_@@_fontfeat_bfsl_clist \prop_map_inline:Nn \l_@@_nfssfont_prop { \@@_set_faces_aux:nnnnn ##2 } } % \end{macrocode} @@ -646,8 +645,8 @@ \prg_new_conditional:Nnn \@@_if_autofont:nn {T,TF} { \group_begin: - \@@_primitive_font_set:Nnn \l_@@_tmpa_font { \@@_construct_font_call:nn {#1} {} } { \f@size pt + 1sp } - \@@_primitive_font_set:Nnn \l_@@_tmpb_font { \@@_construct_font_call:nn {#1#2} {} } { \f@size pt + 1sp } + \@@_primitive_font_set:Nnn \l_@@_tmpa_font { \@@_construct_font_call:nn {#1} { \l_@@_pre_feat_sclist } } { \f@size pt + 1sp } + \@@_primitive_font_set:Nnn \l_@@_tmpb_font { \@@_construct_font_call:nn {#1#2} { \l_@@_pre_feat_sclist } } { \f@size pt + 1sp } \str_if_eq:eeTF { \@@_primitive_font_get_name:N \l_@@_tmpa_font } { \@@_primitive_font_get_name:N \l_@@_tmpb_font } { \group_end: \prg_return_false: } { \group_end: \prg_return_true: } @@ -683,7 +682,7 @@ { \clist_clear:N \l_@@_fontopts_clist } \keys_set_groups:nnV {fontspec/fontname} {getfontname} \l_@@_fontopts_clist \@@_primitive_font_set:OnnF \l_@@_fontface_cs_tl - { \@@_construct_font_call:nn {#1} {} } { \f@size pt } + { \@@_construct_font_call:nn {#1} { \l_@@_pre_feat_sclist } } { \f@size pt } { \@@_error:nx {font-not-found} {#2} } } % \end{macrocode} @@ -882,8 +881,8 @@ \exp_not:n { \\ } -~ \exp_not:N \str_case:nn {#1/#2} { - {\mddefault/\updefault} {'normal'~} - {\bfdefault/\updefault} {'bold'~} + {\mddefault/\shapedefault} {'normal'~} + {\bfdefault/\shapedefault} {'bold'~} {\mddefault/\itdefault} {'italic'~} {\mddefault/\sldefault} {'slanted'~} {\bfdefault/\itdefault} {'bold~ italic'~} @@ -896,10 +895,10 @@ { {\mddefault/\scdefault} {'small~ caps'~} {\bfdefault/\scdefault} {'bold~ small~ caps'~} - {\mddefault/\itscdefault} {'italic~ small~ caps'~} - {\bfdefault/\itscdefault} {'bold~ italic~ small~ caps'~} - {\mddefault/\slscdefault} {'slanted~ small~ caps'~} - {\bfdefault/\slscdefault} {'bold~ slanted~ small~ caps'~} + {\mddefault/\scitdefault} {'italic~ small~ caps'~} + {\bfdefault/\scitdefault} {'bold~ italic~ small~ caps'~} + {\mddefault/\scsldefault} {'slanted~ small~ caps'~} + {\bfdefault/\scsldefault} {'bold~ slanted~ small~ caps'~} }~( #1 / \@@_combo_sc_shape:n {#2} )~ with~ NFSS~ spec.:~ \l_@@_nfss_sc_tl @@ -1184,7 +1183,7 @@ % ------------------------------------------------ % The FONTSPEC package <wspr.io/fontspec> % ------------------------------------------------ -% Copyright 2004-2019 Will Robertson, LPPL "maintainer" +% Copyright 2004-2020 Will Robertson, LPPL "maintainer" % Copyright 2009-2015 Khaled Hosny % Copyright 2013 Philipp Gesang % Copyright 2013-2016 Joseph Wright |