summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty17
1 files changed, 7 insertions, 10 deletions
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