diff options
author | Norbert Preining <norbert@preining.info> | 2020-01-26 03:01:11 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-01-26 03:01:11 +0000 |
commit | 71295b0ca41c29bc151c94fa61b71d3ec9cb83c6 (patch) | |
tree | f360f94d59f0a5570baf97997f46330a4731bf66 /macros/latex/contrib/fontspec | |
parent | 75672286990bb55c7b46277f845d14eafcf2ba61 (diff) |
CTAN sync 202001260301
Diffstat (limited to 'macros/latex/contrib/fontspec')
-rw-r--r-- | macros/latex/contrib/fontspec/CHANGES.md | 9 | ||||
-rw-r--r-- | macros/latex/contrib/fontspec/fontspec-code-internal.dtx | 19 | ||||
-rw-r--r-- | macros/latex/contrib/fontspec/fontspec-code-keyval.dtx | 2 | ||||
-rw-r--r-- | macros/latex/contrib/fontspec/fontspec-code-user.dtx | 6 | ||||
-rw-r--r-- | macros/latex/contrib/fontspec/fontspec-code.pdf | bin | 627146 -> 627145 bytes | |||
-rw-r--r-- | macros/latex/contrib/fontspec/fontspec.dtx | 6 | ||||
-rw-r--r-- | macros/latex/contrib/fontspec/fontspec.pdf | bin | 610894 -> 610857 bytes |
7 files changed, 21 insertions, 21 deletions
diff --git a/macros/latex/contrib/fontspec/CHANGES.md b/macros/latex/contrib/fontspec/CHANGES.md index 1f6b1d96c1..d65a8b1c01 100644 --- a/macros/latex/contrib/fontspec/CHANGES.md +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code-internal.dtx b/macros/latex/contrib/fontspec/fontspec-code-internal.dtx index d86f675dfa..432ae803f6 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx b/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx index 25c71c3400..b7e660da0c 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-keyval.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code-user.dtx b/macros/latex/contrib/fontspec/fontspec-code-user.dtx index e4ba3539d0..d235d0dbe9 100644 --- a/macros/latex/contrib/fontspec/fontspec-code-user.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/fontspec/fontspec-code.pdf b/macros/latex/contrib/fontspec/fontspec-code.pdf Binary files differindex fca2c0af98..8982d35be2 100644 --- a/macros/latex/contrib/fontspec/fontspec-code.pdf +++ b/macros/latex/contrib/fontspec/fontspec-code.pdf diff --git a/macros/latex/contrib/fontspec/fontspec.dtx b/macros/latex/contrib/fontspec/fontspec.dtx index 7e0232e989..826ad41cce 100644 --- a/macros/latex/contrib/fontspec/fontspec.dtx +++ b/macros/latex/contrib/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", diff --git a/macros/latex/contrib/fontspec/fontspec.pdf b/macros/latex/contrib/fontspec/fontspec.pdf Binary files differindex 193b3234f8..b64f441771 100644 --- a/macros/latex/contrib/fontspec/fontspec.pdf +++ b/macros/latex/contrib/fontspec/fontspec.pdf |