texlive[53547] Master/texmf-dist: fontspec (25jan20)
commits+karl at tug.org
commits+karl at tug.org
Sat Jan 25 23:24:10 CET 2020
Revision: 53547
http://tug.org/svn/texlive?view=revision&revision=53547
Author: karl
Date: 2020-01-25 23:24:10 +0100 (Sat, 25 Jan 2020)
Log Message:
-----------
fontspec (25jan20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/fontspec/CHANGES.md
trunk/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf
trunk/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx
trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx
trunk/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
trunk/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
trunk/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
trunk/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
trunk/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
Modified: trunk/Master/texmf-dist/doc/latex/fontspec/CHANGES.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/fontspec/CHANGES.md 2020-01-25 22:23:53 UTC (rev 53546)
+++ trunk/Master/texmf-dist/doc/latex/fontspec/CHANGES.md 2020-01-25 22:24:10 UTC (rev 53547)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/fontspec/fontspec-code.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/fontspec/fontspec.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx 2020-01-25 22:23:53 UTC (rev 53546)
+++ trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx 2020-01-25 22:24:10 UTC (rev 53547)
@@ -925,11 +925,8 @@
{
\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>
@@ -936,15 +933,9 @@
%<*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}
Modified: trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx 2020-01-25 22:23:53 UTC (rev 53546)
+++ trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx 2020-01-25 22:24:10 UTC (rev 53547)
@@ -486,7 +486,7 @@
\group_begin:
\fontencoding { \encodingdefault }
- \fontfamily { \rmdefault }
+ \fontfamily { \familydefault }
\selectfont
\@@_set_font_dimen:NnN \l_@@_tmpa_dim {#1} \font
Modified: trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx 2020-01-25 22:23:53 UTC (rev 53546)
+++ trunk/Master/texmf-dist/source/latex/fontspec/fontspec-code-user.dtx 2020-01-25 22:24:10 UTC (rev 53547)
@@ -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}
Modified: trunk/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/fontspec/fontspec.dtx 2020-01-25 22:23:53 UTC (rev 53546)
+++ trunk/Master/texmf-dist/source/latex/fontspec/fontspec.dtx 2020-01-25 22:24:10 UTC (rev 53547)
@@ -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",
Modified: trunk/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty 2020-01-25 22:23:53 UTC (rev 53546)
+++ trunk/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty 2020-01-25 22:24:10 UTC (rev 53547)
@@ -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 <wspr.io/fontspec>
%%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <wspr.io/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
Modified: trunk/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty 2020-01-25 22:23:53 UTC (rev 53546)
+++ trunk/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty 2020-01-25 22:24:10 UTC (rev 53547)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fontspec/fontspec.lua 2020-01-25 22:23:53 UTC (rev 53546)
+++ trunk/Master/texmf-dist/tex/latex/fontspec/fontspec.lua 2020-01-25 22:24:10 UTC (rev 53547)
@@ -23,8 +23,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",
Modified: trunk/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/fontspec/fontspec.sty 2020-01-25 22:23:53 UTC (rev 53546)
+++ trunk/Master/texmf-dist/tex/latex/fontspec/fontspec.sty 2020-01-25 22:24:10 UTC (rev 53547)
@@ -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 <wspr.io/fontspec>
\sys_if_engine_luatex:T
More information about the tex-live-commits
mailing list