diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
4 files changed, 18 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty index 4d671b2946f..619ec56d998 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty @@ -40,7 +40,7 @@ \RequirePackage{xparse} \ProvidesExplPackage{fontspec-luatex}% - {2020/01/24}{2.7f}{Font selection for XeLaTeX and LuaLaTeX} + {2020/01/26}{2.7g}{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> @@ -749,9 +749,9 @@ \tl_replace_all:cnn { ttfamily~ } { \fontfamily } { \fontencoding \l__fontspec_ttfamily_encoding_tl \fontfamily } } -\tl_set_eq:NN \l__fontspec_rmfamily_encoding_tl \g_fontspec_encoding_tl -\tl_set_eq:NN \l__fontspec_sffamily_encoding_tl \g_fontspec_encoding_tl -\tl_set_eq:NN \l__fontspec_ttfamily_encoding_tl \g_fontspec_encoding_tl +\tl_set:Nn \l__fontspec_rmfamily_encoding_tl { \encodingdefault } +\tl_set:Nn \l__fontspec_sffamily_encoding_tl { \encodingdefault } +\tl_set:Nn \l__fontspec_ttfamily_encoding_tl { \encodingdefault } \cs_new:Nn \__fontspec_main_setmainfont:nn { \fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2} @@ -1722,15 +1722,9 @@ \tl_set:Nn \l__fontspec_pre_feat_sclist { mode = \l__fontspec_mode_tl ; - \tl_if_empty:NF \l__fontspec_shaper_tl - { - shaper = \l__fontspec_shaper_tl ; - } - \tl_if_empty:NF \l__fontspec_script_tl - { - script = \l__fontspec_script_tl ; - language = \l__fontspec_lang_tl ; - } + \tl_if_empty:NF \l__fontspec_shaper_tl { shaper = \l__fontspec_shaper_tl ; } + \tl_if_empty:NF \l__fontspec_script_tl { script = \l__fontspec_script_tl ; } + \tl_if_empty:NF \l__fontspec_lang_tl { language = \l__fontspec_lang_tl ; } } \cs_new:Nn \__fontspec_make_smallcaps:TF { @@ -2339,7 +2333,7 @@ \group_begin: \fontencoding { \encodingdefault } - \fontfamily { \rmdefault } + \fontfamily { \familydefault } \selectfont \__fontspec_set_font_dimen:NnN \l__fontspec_tmpa_dim {#1} \font diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty index c9ef53a09ac..1f99dfcf5a2 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/01/24}{2.7f}{Font selection for XeLaTeX and LuaLaTeX} + {2020/01/26}{2.7g}{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> @@ -742,9 +742,9 @@ \tl_replace_all:cnn { ttfamily~ } { \fontfamily } { \fontencoding \l__fontspec_ttfamily_encoding_tl \fontfamily } } -\tl_set_eq:NN \l__fontspec_rmfamily_encoding_tl \g_fontspec_encoding_tl -\tl_set_eq:NN \l__fontspec_sffamily_encoding_tl \g_fontspec_encoding_tl -\tl_set_eq:NN \l__fontspec_ttfamily_encoding_tl \g_fontspec_encoding_tl +\tl_set:Nn \l__fontspec_rmfamily_encoding_tl { \encodingdefault } +\tl_set:Nn \l__fontspec_sffamily_encoding_tl { \encodingdefault } +\tl_set:Nn \l__fontspec_ttfamily_encoding_tl { \encodingdefault } \cs_new:Nn \__fontspec_main_setmainfont:nn { \fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2} @@ -1740,11 +1740,8 @@ { \bool_if:NT \l__fontspec_ot_bool { - \tl_if_empty:NF \l__fontspec_script_tl - { - script = \l__fontspec_script_tl ; - language = \l__fontspec_lang_tl ; - } + \tl_if_empty:NF \l__fontspec_script_tl { script = \l__fontspec_script_tl ; } + \tl_if_empty:NF \l__fontspec_lang_tl { language = \l__fontspec_lang_tl ; } } } \cs_new:Nn \__fontspec_make_ot_smallcaps:TF @@ -2454,7 +2451,7 @@ \group_begin: \fontencoding { \encodingdefault } - \fontfamily { \rmdefault } + \fontfamily { \familydefault } \selectfont \__fontspec_set_font_dimen:NnN \l__fontspec_tmpa_dim {#1} \font diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua index 62f646d421b..85797603ca2 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua @@ -23,8 +23,8 @@ fontspec = fontspec or {} local fontspec = fontspec fontspec.module = { name = "fontspec", - version = "2.7f", - date = "2020/01/24", + version = "2.7g", + date = "2020/01/26", description = "Font selection for XeLaTeX and LuaLaTeX", author = "Khaled Hosny, Philipp Gesang, Will Robertson", copyright = "Khaled Hosny, Philipp Gesang, Will Robertson", diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty index b9a37e66e36..325fdf2456c 100644 --- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty +++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty @@ -21,7 +21,7 @@ \RequirePackage{xparse} \ProvidesExplPackage{fontspec}% - {2020/01/24}{2.7f}{Font selection for XeLaTeX and LuaLaTeX} + {2020/01/26}{2.7g}{Font selection for XeLaTeX and LuaLaTeX} %%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec> \sys_if_engine_luatex:T |