summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-08 19:33:43 +0000
committerKarl Berry <karl@freefriends.org>2024-05-08 19:33:43 +0000
commita2b1e144f8c72c4e95ca6576f4e8e73e5b51085b (patch)
treedeac848028d3986031f4e6bb396b05b9fb90d678 /Master/texmf-dist/tex/latex
parent42a2e6123235230d846115088015ce249c8aa3c5 (diff)
fontspec (8may24)
git-svn-id: svn://tug.org/texlive/trunk@71210 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty48
-rw-r--r--Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty52
-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, 31 insertions, 75 deletions
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-luatex.sty
index 17efa49db69..4fe9f75c91f 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}%
- {2024/05/03}{2.9c}{Font selection for XeLaTeX and LuaLaTeX}
+ {2024/05/07}{2.9d}{Font selection for XeLaTeX and LuaLaTeX}
%%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <latex3.github.io/fontspec>
%%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <latex3.github.io/fontspec>
@@ -68,7 +68,6 @@
\bool_new:N \l__fontspec_scriptlang_exist_bool
\bool_new:N \g__fontspec_em_normalise_slant_bool
\bool_new:N \l__fontspec_external_kpse_bool
-\bool_new:N \l__fontspec_proceed_bool
\bool_new:N \l__fontspec_never_check_bool
\int_new:N \l__fontspec_script_int
\int_new:N \l__fontspec_language_int
@@ -335,17 +334,6 @@
AAT feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
in font '\l_fontspec_fontname_tl'.
}
-\__fontspec_msg_new:nn {icu-feature-not-exist}
- {
- '\l_keys_key_tl=\l_keys_value_tl' feature not supported
- for OpenType font '\l_fontspec_fontname_tl'
- }
-\__fontspec_msg_new:nn {icu-feature-not-exist-in-font}
- {
- OpenType feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
- for font '\l_fontspec_fontname_tl'
- with script '\l__fontspec_script_name_tl' and language '\l__fontspec_lang_name_tl'.
- }
\__fontspec_msg_new:nn {no-opticals}
{
'#1' doesn't appear to have an Optical Size axis.
@@ -1186,9 +1174,9 @@
\__fontspec_font_suppress_not_found_error:
\__fontspec_init:
- \__fontspec_sanitise_fontname:Nn \l_fontspec_fontname_tl {#2}
- \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_up_tl {#2}
- \__fontspec_sanitise_fontname:Nn \l__fontspec_basename_tl {#2}
+ \__fontspec_sanitise_fontname:Nn \l_fontspec_fontname_tl {#2}
+ \tl_set_eq:NN \l__fontspec_fontname_up_tl \l_fontspec_fontname_tl
+ \tl_set_eq:NN \l__fontspec_basename_tl \l_fontspec_fontname_tl
\__fontspec_if_detect_external:nT {#2}
@@ -1257,9 +1245,9 @@
{
\str_if_eq:eeT { \str_lowercase:f {\l__fontspec_extension_tl} } {.ttc}
{
- \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_it_tl {#1}
- \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_bf_tl {#1}
- \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_bfit_tl {#1}
+ \tl_set_eq:NN \l__fontspec_fontname_it_tl \l_fontspec_fontname_tl
+ \tl_set_eq:NN \l__fontspec_fontname_bf_tl \l_fontspec_fontname_tl
+ \tl_set_eq:NN \l__fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
}
}
\cs_new:Nn \__fontspec_load_external_fontoptions:N
@@ -1321,6 +1309,7 @@
\cs_new:Nn \__fontspec_load_font:
{
+ \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_up_tl { \l__fontspec_fontname_up_tl }
\__fontspec_primitive_font_set:NnnF \l__fontspec_test_font
{ \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } { \l__fontspec_pre_feat_sclist } }
{ \f@size pt - 2sp }
@@ -1492,8 +1481,10 @@
\cs_new:Nn \fontspec_complete_fontname:Nn
{
\tl_set:Nx #1 {#2}
- \tl_replace_all:Nne #1 {*} {\l__fontspec_basename_tl}
- \__fontspec_process_ext:N #1
+ \tl_if_in:NnF \l_fontspec_fontname_tl {*}
+ {
+ \tl_replace_all:Nne #1 {*} {\l__fontspec_basename_tl}
+ }
}
\cs_new:Nn \__fontspec_add_nfssfont:nnnn
{
@@ -1903,21 +1894,8 @@
}
\cs_new:Nn \__fontspec_make_OT_feature:nnn
{
-
- \bool_set_true:N \l__fontspec_proceed_bool
-
- \tl_if_empty:nF {#1}
- {
- \exp_args:No \__fontspec_check_ot_feat:NnF \l__fontspec_fontface_cs_tl {#1}
- {
- \__fontspec_warning:nx {icu-feature-not-exist-in-font} {#1}
- \bool_set_false:N \l__fontspec_proceed_bool
- }
- }
-
\__fontspec_remove_clashing_featstr:x { #2 , \__fontspec_swap_plus_minus:n {#2} , #3 }
-
- \bool_if:NT \l__fontspec_proceed_bool { \__fontspec_update_featstr:n {#2} }
+ \__fontspec_update_featstr:n {#2}
}
\cs_generate_variant:Nn \__fontspec_make_OT_feature:nnn {xxx}
\cs_new:Nn \__fontspec_swap_plus_minus:n { \__fontspec_swap_plus_minus_aux:Nq #1 \q_nil }
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty b/Master/texmf-dist/tex/latex/fontspec/fontspec-xetex.sty
index d0068bb3b76..242e8141c0e 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}%
- {2024/05/03}{2.9c}{Font selection for XeLaTeX and LuaLaTeX}
+ {2024/05/07}{2.9d}{Font selection for XeLaTeX and LuaLaTeX}
%%^^A%% fontspec-code-load.dtx -- part of FONTSPEC <latex3.github.io/fontspec>
%%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <latex3.github.io/fontspec>
@@ -68,7 +68,6 @@
\bool_new:N \l__fontspec_scriptlang_exist_bool
\bool_new:N \g__fontspec_em_normalise_slant_bool
\bool_new:N \l__fontspec_external_kpse_bool
-\bool_new:N \l__fontspec_proceed_bool
\bool_new:N \l__fontspec_never_check_bool
\int_new:N \l__fontspec_script_int
\int_new:N \l__fontspec_language_int
@@ -335,17 +334,6 @@
AAT feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
in font '\l_fontspec_fontname_tl'.
}
-\__fontspec_msg_new:nn {icu-feature-not-exist}
- {
- '\l_keys_key_tl=\l_keys_value_tl' feature not supported
- for OpenType font '\l_fontspec_fontname_tl'
- }
-\__fontspec_msg_new:nn {icu-feature-not-exist-in-font}
- {
- OpenType feature '\l_keys_key_tl=\l_keys_value_tl' (#1) not available
- for font '\l_fontspec_fontname_tl'
- with script '\l__fontspec_script_name_tl' and language '\l__fontspec_lang_name_tl'.
- }
\__fontspec_msg_new:nn {no-opticals}
{
'#1' doesn't appear to have an Optical Size axis.
@@ -1182,9 +1170,9 @@
\__fontspec_font_suppress_not_found_error:
\__fontspec_init:
- \__fontspec_sanitise_fontname:Nn \l_fontspec_fontname_tl {#2}
- \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_up_tl {#2}
- \__fontspec_sanitise_fontname:Nn \l__fontspec_basename_tl {#2}
+ \__fontspec_sanitise_fontname:Nn \l_fontspec_fontname_tl {#2}
+ \tl_set_eq:NN \l__fontspec_fontname_up_tl \l_fontspec_fontname_tl
+ \tl_set_eq:NN \l__fontspec_basename_tl \l_fontspec_fontname_tl
\__fontspec_if_detect_external:nT {#2}
@@ -1253,9 +1241,9 @@
{
\str_if_eq:eeT { \str_lowercase:f {\l__fontspec_extension_tl} } {.ttc}
{
- \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_it_tl {#1}
- \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_bf_tl {#1}
- \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_bfit_tl {#1}
+ \tl_set_eq:NN \l__fontspec_fontname_it_tl \l_fontspec_fontname_tl
+ \tl_set_eq:NN \l__fontspec_fontname_bf_tl \l_fontspec_fontname_tl
+ \tl_set_eq:NN \l__fontspec_fontname_bfit_tl \l_fontspec_fontname_tl
}
}
\cs_new:Nn \__fontspec_load_external_fontoptions:N
@@ -1317,6 +1305,7 @@
\cs_new:Nn \__fontspec_load_font:
{
+ \__fontspec_sanitise_fontname:Nn \l__fontspec_fontname_up_tl { \l__fontspec_fontname_up_tl }
\__fontspec_primitive_font_set:NnnF \l__fontspec_test_font
{ \__fontspec_construct_font_call:nn { \l__fontspec_fontname_up_tl } { \l__fontspec_pre_feat_sclist } }
{ \f@size pt - 2sp }
@@ -1495,8 +1484,10 @@
\cs_new:Nn \fontspec_complete_fontname:Nn
{
\tl_set:Nx #1 {#2}
- \tl_replace_all:Nne #1 {*} {\l__fontspec_basename_tl}
- \__fontspec_process_ext:N #1
+ \tl_if_in:NnF \l_fontspec_fontname_tl {*}
+ {
+ \tl_replace_all:Nne #1 {*} {\l__fontspec_basename_tl}
+ }
}
\cs_new:Nn \__fontspec_add_nfssfont:nnnn
{
@@ -1945,21 +1936,8 @@
}
\cs_new:Nn \__fontspec_make_OT_feature:nnn
{
-
- \bool_set_true:N \l__fontspec_proceed_bool
-
- \tl_if_empty:nF {#1}
- {
- \exp_args:No \__fontspec_check_ot_feat:NnF \l__fontspec_fontface_cs_tl {#1}
- {
- \__fontspec_warning:nx {icu-feature-not-exist-in-font} {#1}
- \bool_set_false:N \l__fontspec_proceed_bool
- }
- }
-
\__fontspec_remove_clashing_featstr:x { #2 , \__fontspec_swap_plus_minus:n {#2} , #3 }
-
- \bool_if:NT \l__fontspec_proceed_bool { \__fontspec_update_featstr:n {#2} }
+ \__fontspec_update_featstr:n {#2}
}
\cs_generate_variant:Nn \__fontspec_make_OT_feature:nnn {xxx}
\cs_new:Nn \__fontspec_swap_plus_minus:n { \__fontspec_swap_plus_minus_aux:Nq #1 \q_nil }
@@ -2321,12 +2299,12 @@
}
\__fontspec_keys_define_code:nnn {fontspec-preparse} {Script}
{
- \keys_set:nn {fontspec-renderer} {Renderer=OpenType}
+ \tl_if_empty:NT \l__fontspec_renderer_tl { \keys_set:nn {fontspec-renderer} {Renderer=OpenType} }
\tl_set:Nn \l__fontspec_script_name_tl {#1}
}
\__fontspec_keys_define_code:nnn {fontspec-preparse} {Language}
{
- \keys_set:nn {fontspec-renderer} {Renderer=OpenType}
+ \tl_if_empty:NT \l__fontspec_renderer_tl { \keys_set:nn {fontspec-renderer} {Renderer=OpenType} }
\tl_set:Nn \l__fontspec_lang_name_tl {#1}
}
\__fontspec_keys_define_code:nnn {fontspec-preparse} {FontIndex}
diff --git a/Master/texmf-dist/tex/latex/fontspec/fontspec.lua b/Master/texmf-dist/tex/latex/fontspec/fontspec.lua
index f5507973c77..c889bc65b2c 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.9c",
- date = "2024/05/03",
+ version = "2.9d",
+ date = "2024/05/07",
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 ca1d17e2165..b0c70f2b249 100644
--- a/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
+++ b/Master/texmf-dist/tex/latex/fontspec/fontspec.sty
@@ -24,7 +24,7 @@
\RequirePackage{xparse}
\ProvidesExplPackage{fontspec}%
- {2024/05/03}{2.9c}{Font selection for XeLaTeX and LuaLaTeX}
+ {2024/05/07}{2.9d}{Font selection for XeLaTeX and LuaLaTeX}
%%^^A%% fontspec-code-vars.dtx -- part of FONTSPEC <latex3.github.io/fontspec>
\bool_new:N \g__fontspec_cfg_bool