From 060abea21b37d957e4915ef17fa193b84e9764bc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 25 Jan 2020 22:24:10 +0000 Subject: fontspec (25jan20) git-svn-id: svn://tug.org/texlive/trunk@53547 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/fontspec/fontspec-code-internal.dtx | 19 +++++-------------- .../source/latex/fontspec/fontspec-code-keyval.dtx | 2 +- .../source/latex/fontspec/fontspec-code-user.dtx | 6 +++--- Master/texmf-dist/source/latex/fontspec/fontspec.dtx | 6 +++--- 4 files changed, 12 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx index d86f675dfa1..432ae803f60 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx @@ -925,26 +925,17 @@ { \bool_if:NT \l_@@_ot_bool { - \tl_if_empty:NF \l_@@_script_tl - { - script = \l_@@_script_tl ; - language = \l_@@_lang_tl ; - } + \tl_if_empty:NF \l_@@_script_tl { script = \l_@@_script_tl ; } + \tl_if_empty:NF \l_@@_lang_tl { language = \l_@@_lang_tl ; } } } % %<*LU> { mode = \l_@@_mode_tl ; - \tl_if_empty:NF \l_@@_shaper_tl - { - shaper = \l_@@_shaper_tl ; - } - \tl_if_empty:NF \l_@@_script_tl - { - script = \l_@@_script_tl ; - language = \l_@@_lang_tl ; - } + \tl_if_empty:NF \l_@@_shaper_tl { shaper = \l_@@_shaper_tl ; } + \tl_if_empty:NF \l_@@_script_tl { script = \l_@@_script_tl ; } + \tl_if_empty:NF \l_@@_lang_tl { language = \l_@@_lang_tl ; } } % % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx index 25c71c34008..b7e660da0c5 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx @@ -486,7 +486,7 @@ \group_begin: \fontencoding { \encodingdefault } - \fontfamily { \rmdefault } + \fontfamily { \familydefault } \selectfont \@@_set_font_dimen:NnN \l_@@_tmpa_dim {#1} \font diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx index e4ba3539d0b..d235d0dbe91 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx @@ -46,9 +46,9 @@ \tl_replace_all:cnn { ttfamily~ } { \fontfamily } { \fontencoding \l_@@_ttfamily_encoding_tl \fontfamily } } -\tl_set_eq:NN \l_@@_rmfamily_encoding_tl \g_fontspec_encoding_tl -\tl_set_eq:NN \l_@@_sffamily_encoding_tl \g_fontspec_encoding_tl -\tl_set_eq:NN \l_@@_ttfamily_encoding_tl \g_fontspec_encoding_tl +\tl_set:Nn \l_@@_rmfamily_encoding_tl { \encodingdefault } +\tl_set:Nn \l_@@_sffamily_encoding_tl { \encodingdefault } +\tl_set:Nn \l_@@_ttfamily_encoding_tl { \encodingdefault } % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx index 7e0232e989e..826ad41ccee 100644 --- a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx +++ b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx @@ -70,7 +70,7 @@ \ProvidesExplFile{fontspec.dtx} % %<*fontspec> - {2020/01/24}{2.7f}{Font selection for XeLaTeX and LuaLaTeX} + {2020/01/26}{2.7g}{Font selection for XeLaTeX and LuaLaTeX} % % \end{macrocode} % @@ -89,8 +89,8 @@ %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", -- cgit v1.2.3