summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty43
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty43
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.lua4
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec.sty2
4 files changed, 53 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
index 987a42e5d85..da486464f58 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
@@ -41,7 +41,7 @@
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec-luatex}%
- {2019/02/12}{2.7b}{Font selection for XeLaTeX and LuaLaTeX}
+ {2019/03/15}{2.7c}{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>
@@ -1585,12 +1585,15 @@
}
\cs_new:Nn \__fontspec_declare_shape:nnnn
{
- \tl_clear:N \l__fontspec_nfss_tl
- \tl_clear:N \l__fontspec_nfss_sc_tl
+ \tl_build_begin:N \l__fontspec_nfss_tl
+ \tl_build_begin:N \l__fontspec_nfss_sc_tl
\tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl
\exp_args:Nx \clist_map_inline:nn {#4} { \__fontspec_setup_single_size:nn {#3} {##1} }
+ \tl_build_end:N \l__fontspec_nfss_tl
+ \tl_build_end:N \l__fontspec_nfss_sc_tl
+
\__fontspec_declare_shapes_normal:nn {#1} {#2}
\__fontspec_declare_shapes_smcaps:nn {#1} {#2}
\__fontspec_declare_shape_slanted:nn {#1} {#2}
@@ -1644,7 +1647,7 @@
\tl_set:Nx \l__fontspec_scale_tl { s*[\l__fontspec_scale_tl] }
}
- \tl_put_right:Nx #1
+ \tl_build_put_right:Nx #1
{
<\l__fontspec_size_tl> \l__fontspec_scale_tl
\__fontspec_construct_font_call:nn { \l_fontspec_fontname_tl }
@@ -2304,7 +2307,7 @@
{
\tl_set:Nx \l__fontspec_nfss_fam_tl { #1 }
}
-\__fontspec_keys_define_code:nnn {fontspec} {FontFace}
+\__fontspec_keys_define_code:nnn {fontspec-preparse} {FontFace}
{
\tl_clear:N \l__fontspec_this_font_tl
\clist_set:No \l__fontspec_arg_clist { \use_iii:nnn #1 }
@@ -3746,15 +3749,19 @@
}
\DeclareTextFontCommand{\textsi}{\sishape}
\cs_new:Nn \__fontspec_shape_merge:nn { c__fontspec_shape_#1_#2_tl }
-\tl_const:cn { \__fontspec_shape_merge:nn \itdefault \scdefault } {\itscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \sldefault \scdefault } {\slscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \scdefault \itdefault } {\itscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \scdefault \sldefault } {\slscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \slscdefault \itdefault } {\itscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \itscdefault \sldefault } {\slscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \itscdefault \updefault } {\scdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \slscdefault \updefault } {\scdefault}
-\cs_new:Nn \fontspec_merge_shape:n
+\cs_new:Nn \__fontspec_merge_default_shapes:
+ {
+ \tl_const:cn { \__fontspec_shape_merge:nn \itdefault \scdefault } {\itscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \sldefault \scdefault } {\slscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \scdefault \itdefault } {\itscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \scdefault \sldefault } {\slscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \slscdefault \itdefault } {\itscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \itscdefault \sldefault } {\slscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \itscdefault \updefault } {\scdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \slscdefault \updefault } {\scdefault}
+ }
+\__fontspec_merge_default_shapes:
+\cs_new:Nn \__fontspec_merge_shape:n
{
\__fontspec_if_merge_shape:nTF {#1}
{ \fontshape { \tl_use:c { \__fontspec_shape_merge:nn {\f@shape} {#1} } } \selectfont }
@@ -3776,22 +3783,22 @@
\DeclareRobustCommand \itshape
{
\not@math@alphabet\itshape\mathit
- \fontspec_merge_shape:n\itdefault
+ \__fontspec_merge_shape:n\itdefault
}
\DeclareRobustCommand \slshape
{
\not@math@alphabet\slshape\relax
- \fontspec_merge_shape:n\sldefault
+ \__fontspec_merge_shape:n\sldefault
}
\DeclareRobustCommand \scshape
{
\not@math@alphabet\scshape\relax
- \fontspec_merge_shape:n\scdefault
+ \__fontspec_merge_shape:n\scdefault
}
\DeclareRobustCommand \upshape
{
\not@math@alphabet\upshape\relax
- \fontspec_merge_shape:n\updefault
+ \__fontspec_merge_shape:n\updefault
}
\cs_new_protected:Npn \emfontdeclare #1
{
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
index ba9bcca405c..84672a8a2f3 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
@@ -41,7 +41,7 @@
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec-xetex}%
- {2019/02/12}{2.7b}{Font selection for XeLaTeX and LuaLaTeX}
+ {2019/03/15}{2.7c}{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>
@@ -1602,12 +1602,15 @@
}
\cs_new:Nn \__fontspec_declare_shape:nnnn
{
- \tl_clear:N \l__fontspec_nfss_tl
- \tl_clear:N \l__fontspec_nfss_sc_tl
+ \tl_build_begin:N \l__fontspec_nfss_tl
+ \tl_build_begin:N \l__fontspec_nfss_sc_tl
\tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl
\exp_args:Nx \clist_map_inline:nn {#4} { \__fontspec_setup_single_size:nn {#3} {##1} }
+ \tl_build_end:N \l__fontspec_nfss_tl
+ \tl_build_end:N \l__fontspec_nfss_sc_tl
+
\__fontspec_declare_shapes_normal:nn {#1} {#2}
\__fontspec_declare_shapes_smcaps:nn {#1} {#2}
\__fontspec_declare_shape_slanted:nn {#1} {#2}
@@ -1661,7 +1664,7 @@
\tl_set:Nx \l__fontspec_scale_tl { s*[\l__fontspec_scale_tl] }
}
- \tl_put_right:Nx #1
+ \tl_build_put_right:Nx #1
{
<\l__fontspec_size_tl> \l__fontspec_scale_tl
\__fontspec_construct_font_call:nn { \l_fontspec_fontname_tl }
@@ -2419,7 +2422,7 @@
{
\tl_set:Nx \l__fontspec_nfss_fam_tl { #1 }
}
-\__fontspec_keys_define_code:nnn {fontspec} {FontFace}
+\__fontspec_keys_define_code:nnn {fontspec-preparse} {FontFace}
{
\tl_clear:N \l__fontspec_this_font_tl
\clist_set:No \l__fontspec_arg_clist { \use_iii:nnn #1 }
@@ -4014,15 +4017,19 @@
}
\DeclareTextFontCommand{\textsi}{\sishape}
\cs_new:Nn \__fontspec_shape_merge:nn { c__fontspec_shape_#1_#2_tl }
-\tl_const:cn { \__fontspec_shape_merge:nn \itdefault \scdefault } {\itscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \sldefault \scdefault } {\slscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \scdefault \itdefault } {\itscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \scdefault \sldefault } {\slscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \slscdefault \itdefault } {\itscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \itscdefault \sldefault } {\slscdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \itscdefault \updefault } {\scdefault}
-\tl_const:cn { \__fontspec_shape_merge:nn \slscdefault \updefault } {\scdefault}
-\cs_new:Nn \fontspec_merge_shape:n
+\cs_new:Nn \__fontspec_merge_default_shapes:
+ {
+ \tl_const:cn { \__fontspec_shape_merge:nn \itdefault \scdefault } {\itscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \sldefault \scdefault } {\slscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \scdefault \itdefault } {\itscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \scdefault \sldefault } {\slscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \slscdefault \itdefault } {\itscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \itscdefault \sldefault } {\slscdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \itscdefault \updefault } {\scdefault}
+ \tl_const:cn { \__fontspec_shape_merge:nn \slscdefault \updefault } {\scdefault}
+ }
+\__fontspec_merge_default_shapes:
+\cs_new:Nn \__fontspec_merge_shape:n
{
\__fontspec_if_merge_shape:nTF {#1}
{ \fontshape { \tl_use:c { \__fontspec_shape_merge:nn {\f@shape} {#1} } } \selectfont }
@@ -4044,22 +4051,22 @@
\DeclareRobustCommand \itshape
{
\not@math@alphabet\itshape\mathit
- \fontspec_merge_shape:n\itdefault
+ \__fontspec_merge_shape:n\itdefault
}
\DeclareRobustCommand \slshape
{
\not@math@alphabet\slshape\relax
- \fontspec_merge_shape:n\sldefault
+ \__fontspec_merge_shape:n\sldefault
}
\DeclareRobustCommand \scshape
{
\not@math@alphabet\scshape\relax
- \fontspec_merge_shape:n\scdefault
+ \__fontspec_merge_shape:n\scdefault
}
\DeclareRobustCommand \upshape
{
\not@math@alphabet\upshape\relax
- \fontspec_merge_shape:n\updefault
+ \__fontspec_merge_shape:n\updefault
}
\cs_new_protected:Npn \emfontdeclare #1
{
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index 81ba4d6cc29..2b8f73a8436 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.7b",
- date = "2019/02/12",
+ version = "2.7c",
+ date = "2019/03/15",
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 0d60008ae5f..6a0eace2473 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}%
- {2019/02/12}{2.7b}{Font selection for XeLaTeX and LuaLaTeX}
+ {2019/03/15}{2.7c}{Font selection for XeLaTeX and LuaLaTeX}
%%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <wspr.io/fontspec>
\sys_if_engine_luatex:T