diff options
author | Karl Berry <karl@freefriends.org> | 2020-02-21 22:54:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-02-21 22:54:05 +0000 |
commit | ee6d6cebcf0c8b850920001a6420f42c156050b0 (patch) | |
tree | e6f3c72dd9ebe84c57967acf084fc280fa1cdcfc /Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty | |
parent | 22ea71d84d3cd13a2523c2ad951f22eff56ea91f (diff) |
fontspec (21feb20)
git-svn-id: svn://tug.org/texlive/trunk@53860 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty index 808b8ebbd15..7f435267612 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty @@ -40,7 +40,7 @@ \RequirePackage{xparse} \ProvidesExplPackage{fontspec-xetex}% - {2020/02/03}{2.7h}{Font selection for XeLaTeX and LuaLaTeX} + {2020/02/21}{2.7i}{Font selection for XeLaTeX and LuaLaTeX} %%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec> %%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <wspr.io/fontspec> @@ -747,6 +747,9 @@ \tl_set:Nn \l__fontspec_ttfamily_encoding_tl { \encodingdefault } \cs_new:Nn \__fontspec_main_setmainfont:nn { + \ifdefined\DeclareFontSeriesDefault + \DeclareFontSeriesDefault[rm]{bf}{\bfdefault} + \fi \fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2} \tl_set_eq:NN \rmdefault \l__fontspec_rmfamily_family_tl \tl_set_eq:NN \l__fontspec_rmfamily_encoding_tl \g__fontspec_nfss_enc_tl @@ -757,6 +760,9 @@ } \cs_new:Nn \__fontspec_main_setsansfont:nn { + \ifdefined\DeclareFontSeriesDefault + \DeclareFontSeriesDefault[sf]{bf}{\bfdefault} + \fi \fontspec_set_family:Nnn \l__fontspec_sffamily_family_tl {#1} {#2} \tl_set_eq:NN \sfdefault \l__fontspec_sffamily_family_tl \tl_set_eq:NN \l__fontspec_sffamily_encoding_tl \g__fontspec_nfss_enc_tl @@ -767,6 +773,9 @@ } \cs_new:Nn \__fontspec_main_setmonofont:nn { + \ifdefined\DeclareFontSeriesDefault + \DeclareFontSeriesDefault[tt]{bf}{\bfdefault} + \fi \fontspec_set_family:Nnn \l__fontspec_ttfamily_family_tl {#1} {#2} \tl_set_eq:NN \ttdefault \l__fontspec_ttfamily_family_tl \tl_set_eq:NN \l__fontspec_ttfamily_encoding_tl \g__fontspec_nfss_enc_tl @@ -1604,6 +1613,7 @@ \__fontspec_declare_shapes_normal:nn {#1} {#2} \__fontspec_declare_shapes_smcaps:nn {#1} {#2} \__fontspec_declare_shape_slanted:nn {#1} {#2} + \__fontspec_declare_shapes_bx:nn {#1} {#2} \__fontspec_declare_shape_loginfo:nn {#1} {#2} } \cs_generate_variant:Nn \__fontspec_declare_shape:nnnn {nnxx} @@ -1701,6 +1711,44 @@ {<->ssub*\g__fontspec_nfss_family_tl/#1/\itdefault}{\l__fontspec_postadjust_tl} } } +\cs_new:Nn \__fontspec_declare_shapes_bx:nn + { + \bool_if:nT + { + \str_if_eq_p:ee {#1} {\bfdefault} && + !(\str_if_eq_p:ee {\bfdefault} {bx}) + } + { + % bx/? + \__fontspec_DeclareFontShape:xxxxxx {\g__fontspec_nfss_enc_tl} {\g__fontspec_nfss_family_tl} + {bx} {#2} + { <->ssub*\g__fontspec_nfss_family_tl/\bfdefault/#2 } + { \l__fontspec_postadjust_tl } + + % bx/sc -> b/sc + \tl_if_empty:NF \l__fontspec_nfss_sc_tl + { + \__fontspec_DeclareFontShape:xxxxxx {\g__fontspec_nfss_enc_tl} {\g__fontspec_nfss_family_tl} + {bx} { \__fontspec_combo_sc_shape:n {#2} } + { <->ssub*\g__fontspec_nfss_family_tl/\bfdefault/#2 } + { \l__fontspec_postadjust_tl } + } + + % bx/sl -> bx/it + \bool_if:nT + { + \str_if_eq_p:ee {#2} {\itdefault} && + !(\str_if_eq_p:ee {\itdefault} {\sldefault}) + } + { + \__fontspec_DeclareFontShape:xxxxxx {\g__fontspec_nfss_enc_tl} {\g__fontspec_nfss_family_tl} + {bx} {\sldefault} + { <->ssub*\g__fontspec_nfss_family_tl/bx/\itdefault } + { \l__fontspec_postadjust_tl } + } + + } + } \cs_new:Nn \__fontspec_declare_shape_loginfo:nn { \tl_gput_right:Nx \g__fontspec_defined_shapes_tl |