summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-03 21:23:54 +0000
committerKarl Berry <karl@freefriends.org>2024-05-03 21:23:54 +0000
commit034f892130ecc23d687b2406a6182f0e7a3188db (patch)
treecf56a33d993b539264b9f2a98bc27bc99cebe125 /Master/texmf-dist/source/latex
parentb76d4079946c3e532e7475cde00b4b3cc2f3cbf4 (diff)
fontspec (3may24)
git-svn-id: svn://tug.org/texlive/trunk@71163 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx6
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx14
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx6
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec-code-opening.dtx17
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx2
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec-code-xfss.dtx8
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec.dtx6
7 files changed, 24 insertions, 35 deletions
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx
index 4ffc5cda4fa..5fbd797f445 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-feat-opentype.dtx
@@ -556,11 +556,11 @@
\@@_warning:nx {language-not-exist} {#1}
\clist_set:Nn \l_tmpa_clist {#2}
\clist_get:NN \l_tmpa_clist \l_@@_lang_tl
- \exp_args:Noo \@@_check_script:NnF \l_@@_fontface_cs_tl \l_@@_script_tl
+ \exp_args:Noo \@@_check_lang:NnF \l_@@_fontface_cs_tl \l_@@_lang_tl
{
- \tl_set:Nn \l_@@_script_name_tl {#1}
+ \tl_set:Nn \l_@@_lang_name_tl {#1}
\int_set:Nn \l_@@_language_int {\l_@@_strnum_int}
- \tl_gset:Nx \g_@@_single_feat_tl { language=####1 }
+ \tl_gset:Nx \g_@@_single_feat_tl { language=\l_@@_lang_tl }
}
}
}
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 49f019c6564..16e2922b396 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
@@ -344,8 +344,8 @@
\tl_if_empty:NF \l_@@_script_name_tl
{
%<debug> \typeout{:::: Script=\l_@@_script_name_tl, Language=\l_@@_lang_name_tl}
- \keys_set:nx {fontspec-opentype} {Script=\l_@@_script_name_tl}
- \keys_set:nx {fontspec-opentype} {Language=\l_@@_lang_name_tl}
+ \keys_set:ne {fontspec-opentype} {Script=\l_@@_script_name_tl}
+ \keys_set:ne {fontspec-opentype} {Language=\l_@@_lang_name_tl}
}
}
}
@@ -557,7 +557,7 @@
\cs_new:Nn \fontspec_complete_fontname:Nn
{
\tl_set:Nx #1 {#2}
- \tl_replace_all:Nnx #1 {*} {\l_@@_basename_tl}
+ \tl_replace_all:Nne #1 {*} {\l_@@_basename_tl}
\@@_process_ext:N #1
}
% \end{macrocode}
@@ -573,13 +573,13 @@
{
\tl_set:Nx \l_@@_this_font_tl {#3}
- \tl_if_empty:xTF {#4}
+ \tl_if_empty:eTF {#4}
{ \clist_set:Nn \l_@@_sizefeat_clist {Size={-}} }
{ \@@_keys_set_known:nxN {fontspec-preparse-nested} {#4} \l_@@_tmp_tl }
\tl_if_empty:NF \l_@@_this_font_tl
{
- \prop_put:Nxx \l_@@_nfssfont_prop {#1/#2}
+ \prop_put:Nee \l_@@_nfssfont_prop {#1/#2}
{ {#1}{#2}{\l_@@_this_font_tl}{#4}{\l_@@_sizefeat_clist} }
}
}
@@ -662,7 +662,7 @@
{
\bool_if:NF \l_@@_external_bool
{
- \tl_if_empty:xF {#2}
+ \tl_if_empty:eF {#2}
{
\tl_if_empty:NT #1
{
@@ -776,7 +776,7 @@
\tl_clear:N \l_@@_size_tl
\tl_set_eq:NN \l_@@_sizedfont_tl \l_@@_saved_fontname_tl % in case not spec'ed
- \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n #2 }
+ \keys_set_known:neN {fontspec-sizing} { \exp_after:wN \use:n #2 }
\l_@@_sizing_leftover_clist
\tl_if_empty:NT \l_@@_size_tl { \@@_error:n {no-size-info} }
%<debug>\typeout{==~ size:~\l_@@_size_tl}
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 c077a1bc1ff..a844b0e0560 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-keyval.dtx
@@ -273,12 +273,12 @@
\seq_put_right:Nx \l_@@_bf_series_seq {\bfdefault}
}
- \tl_if_eq:oxT \g_@@_curr_series_tl {\bfdefault}
+ \tl_if_eq:oeT \g_@@_curr_series_tl {\bfdefault}
{
\tl_set_eq:NN \l_@@_fontname_bf_tl \l_@@_curr_bfname_tl
}
- \prop_put:NxV \l_@@_nfss_prop {BoldFont-\g_@@_curr_series_tl} \l_@@_curr_bfname_tl
+ \prop_put:NeV \l_@@_nfss_prop {BoldFont-\g_@@_curr_series_tl} \l_@@_curr_bfname_tl
%<debug>\typeout{Setting~bold~font~"\l_@@_curr_bfname_tl"~with~series~"\g_@@_curr_series_tl"}
@@ -335,7 +335,7 @@
\@@_keys_define_code:nnn {fontspec-preparse} {BoldFeatures}
{
\clist_put_right:Nn \l_@@_fontfeat_bf_clist {#1}
-% \prop_put:NxV \l_@@_nfss_prop
+% \prop_put:NeV \l_@@_nfss_prop
% {BoldFont-\g_@@_curr_series_tl} \l_@@_curr_bfname_tl
}
\@@_keys_define_code:nnn {fontspec-preparse} {ItalicFeatures}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-opening.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-opening.dtx
index 3da1f25d7a0..7c19c341b33 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-opening.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-opening.dtx
@@ -163,21 +163,10 @@
%
% \begin{macrocode}
\cs_generate_variant:Nn \int_set:Nn {Nv}
-\cs_generate_variant:Nn \keys_set:nn {nx}
-\cs_generate_variant:Nn \keys_set_known:nnN {nx}
-\cs_generate_variant:Nn \prop_put:Nnn {Nxx}
-\cs_generate_variant:Nn \prop_put:Nnn {NxV}
-\cs_generate_variant:Nn \prop_gput_if_new:Nnn {NxV}
-\cs_generate_variant:Nn \prop_gput:Nnn {Nxn}
-\cs_generate_variant:Nn \prop_get:NnNT {NxN}
-\cs_generate_variant:Nn \prop_get:NnNTF {NxN}
-\cs_generate_variant:Nn \str_if_eq:nnTF {nv}
-\cs_generate_variant:Nn \tl_if_empty_p:n {e}
-\cs_generate_variant:Nn \tl_if_empty:nTF {x}
-\cs_generate_variant:Nn \tl_if_empty:nF {x}
+\cs_generate_variant:Nn \prop_gput_if_not_in:Nnn {NeV}
+\cs_generate_variant:Nn \prop_gput:Nnn {Nxn} % needed by unicode-math
\cs_generate_variant:Nn \tl_if_empty:nF {f}
-\cs_generate_variant:Nn \tl_if_eq:nnT {ox}
-\cs_generate_variant:Nn \tl_replace_all:Nnn {Nnx}
+\cs_generate_variant:Nn \tl_if_eq:nnT {oe}
% \end{macrocode}
%
%
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx
index 5a38be87ffd..d78e0a8be9d 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx
@@ -216,7 +216,7 @@
% The script used is whatever's held in \cmd\l_@@_script_int. By default, that's the
% number corresponding to `|latn|'.
% \begin{macrocode}
-\prg_new_conditional:Nnn \@@_check_lang:Nn {TF}
+\prg_new_conditional:Nnn \@@_check_lang:Nn {TF,F}
{
\@@_check_lang:NnnTF #1 {#2} {\l_@@_script_tl} {\prg_return_true:} {\prg_return_false:}
}
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-code-xfss.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-code-xfss.dtx
index d58424a1654..6fdb9f4ad56 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-xfss.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-xfss.dtx
@@ -102,8 +102,8 @@
\clist_map_inline:nn {\strongreset,#1}
{
##1
- \prop_gput_if_new:NxV \g_@@_strong_prop { \f@series } { \l_@@_strongdef_int }
- \prop_gput:Nxn \g_@@_strong_prop { switch-\int_use:N \l_@@_strongdef_int } { ##1 }
+ \prop_gput_if_not_in:NeV \g_@@_strong_prop { \f@series } { \l_@@_strongdef_int }
+ \prop_gput:Nen \g_@@_strong_prop { switch-\int_use:N \l_@@_strongdef_int } { ##1 }
\int_incr:N \l_@@_strongdef_int
}
\group_end:
@@ -118,7 +118,7 @@
\@nomath\strongenv
%<debug> \typeout{Strong~ level:~\int_use:N \l_@@_strong_int}
- \prop_get:NxNT \g_@@_strong_prop { \f@series } \l_@@_strong_tmp_tl
+ \prop_get:NeNT \g_@@_strong_prop { \f@series } \l_@@_strong_tmp_tl
{
\int_set:Nn \l_@@_strong_int { \l_@@_strong_tmp_tl }
%<debug> \typeout{Series~ (\f@series)~ detected;~ new~ level:~\int_use:N \l_@@_strong_int}
@@ -126,7 +126,7 @@
\int_incr:N \l_@@_strong_int
- \prop_get:NxNTF \g_@@_strong_prop { switch-\int_use:N \l_@@_strong_int } \l_@@_strong_switch_tl
+ \prop_get:NeNTF \g_@@_strong_prop { switch-\int_use:N \l_@@_strong_int } \l_@@_strong_switch_tl
{ \l_@@_strong_switch_tl }
{
\int_zero:N \l_@@_strong_int
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec.dtx
index f6a4a73d93e..e3002ff5e54 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}
%</dtx>
%<*fontspec>
- {2024/04/27}{2.9b}{Font selection for XeLaTeX and LuaLaTeX}
+ {2024/05/03}{2.9c}{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.9b",
-%<lua> date = "2024/04/27",
+%<lua> version = "2.9c",
+%<lua> date = "2024/05/03",
%<lua> description = "Font selection for XeLaTeX and LuaLaTeX",
%<lua> author = "Khaled Hosny, Philipp Gesang, Will Robertson",
%<lua> copyright = "Khaled Hosny, Philipp Gesang, Will Robertson",