diff options
author | Karl Berry <karl@freefriends.org> | 2020-01-25 22:24:10 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-01-25 22:24:10 +0000 |
commit | 060abea21b37d957e4915ef17fa193b84e9764bc (patch) | |
tree | da4439b9322edac9c187720e86c960829684cbfa /Master/texmf-dist/source/latex/fontspec | |
parent | bfea31280bebe65648d90b3ad63dcfb6c0e2e8a2 (diff) |
fontspec (25jan20)
git-svn-id: svn://tug.org/texlive/trunk@53547 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/fontspec')
4 files changed, 12 insertions, 21 deletions
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 ; } } } %</XE> %<*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 ; } } %</LU> % \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} %</dtx> %<*fontspec> - {2020/01/24}{2.7f}{Font selection for XeLaTeX and LuaLaTeX} + {2020/01/26}{2.7g}{Font selection for XeLaTeX and LuaLaTeX} %</fontspec> % \end{macrocode} % @@ -89,8 +89,8 @@ %<lua>local fontspec = fontspec %<lua>fontspec.module = { %<lua> name = "fontspec", -%<lua> version = "2.7f", -%<lua> date = "2020/01/24", +%<lua> version = "2.7g", +%<lua> date = "2020/01/26", %<lua> description = "Font selection for XeLaTeX and LuaLaTeX", %<lua> author = "Khaled Hosny, Philipp Gesang, Will Robertson", %<lua> copyright = "Khaled Hosny, Philipp Gesang, Will Robertson", |