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 --- Master/texmf-dist/doc/latex/fontspec/CHANGES.md | 9 +++++++++ .../doc/latex/fontspec/fontspec-code.pdf | Bin 627146 -> 627145 bytes Master/texmf-dist/doc/latex/fontspec/fontspec.pdf | Bin 610894 -> 610857 bytes .../latex/fontspec/fontspec-code-internal.dtx | 19 +++++------------- .../source/latex/fontspec/fontspec-code-keyval.dtx | 2 +- .../source/latex/fontspec/fontspec-code-user.dtx | 6 +++--- .../texmf-dist/source/latex/fontspec/fontspec.dtx | 6 +++--- .../tex/latex/fontspec/fontspec-luatex.sty | 22 ++++++++------------- .../tex/latex/fontspec/fontspec-xetex.sty | 17 +++++++--------- Master/texmf-dist/tex/latex/fontspec/fontspec.lua | 4 ++-- Master/texmf-dist/tex/latex/fontspec/fontspec.sty | 2 +- 11 files changed, 39 insertions(+), 48 deletions(-) diff --git a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md index 1f6b1d96c12..d65a8b1c01f 100644 --- a/Master/texmf-dist/doc/latex/fontspec/CHANGES.md +++ b/Master/texmf-dist/doc/latex/fontspec/CHANGES.md @@ -1,6 +1,15 @@ Change history ============== +## v2.7g (2020/01/26) + + * Fix regression that broke changing the default encoding after `fontspec` was loaded + (e.g., to use legacy fonts by default but use a `fontspec` font occassionally). + * Fix bug exhibited in `polyglossia` and perhaps elsewhere when `Script` is set without + a corresponding `Language`. + * Use `\familydefault` instead of `\rmdefault` when calculating scaling parameters in + `Scale=MatchLowercase` and `Scale=MatchUppercase`. + ## v2.7f (2020/01/24) * Rename font feature `Letters=Uppercase` to `Style=Uppercase`, as this feature does diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf index fca2c0af987..8982d35be2f 100644 Binary files a/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf and b/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf index 193b3234f8b..b64f4417713 100644 Binary files a/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf and b/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf differ 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", 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 %%^^A%% fontspec-code-vars.dtx -- part of 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 %%^^A%% fontspec-code-vars.dtx -- part of 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 \sys_if_engine_luatex:T -- cgit v1.2.3