summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx')
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx18
1 files changed, 12 insertions, 6 deletions
diff --git a/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx b/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx
index c57f0890a92..2de5752f0df 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-internal.dtx
@@ -247,7 +247,9 @@
% \begin{macrocode}
\cs_set:Nn \@@_construct_font_call:nnnnnn
{
- " \@@_fontname_wrap:n { #1 #2 #3 } #4 #5
+%<xetexx> " \@@_fontname_wrap:n { #1 #2 #3 }
+%<luatex> " \@@_fontname_wrap:n { #1 #2 } #3
+ #4 #5
\str_if_eq_x:nnF {#6}{} {:#6} "
}
% \end{macrocode}
@@ -276,8 +278,7 @@
}
\cs_new:Nn \@@_font_is_file:
{
-%<xetexx> \cs_set:Npn \@@_fontname_wrap:n ##1 { [ \l_@@_font_path_tl ##1 ] }
-%<luatex> \cs_set:Npn \@@_fontname_wrap:n ##1 { file:\l_@@_font_path_tl ##1 }
+ \cs_set:Npn \@@_fontname_wrap:n ##1 { [ \l_@@_font_path_tl ##1 ] }
}
% \end{macrocode}
% \end{macro}
@@ -341,19 +342,24 @@
\bool_if:NTF \l_@@_ot_bool
{
%<debug> \typeout{::: Setting~ keys~ for~ OpenType~ font~ features:~"\l_@@_keys_leftover_clist"}
- \keys_set:nx {fontspec-opentype} {\l_@@_keys_leftover_clist}
+ % \tracingall
+ \keys_set:nV {fontspec-opentype} \l_@@_keys_leftover_clist
+ % \EROROR
}
{
%<debug> \typeout{::: Setting~ keys~ for~ AAT~ font~ features:~"\l_@@_keys_leftover_clist"}
\bool_if:NT \l_@@_atsui_bool
- { \keys_set:nx {fontspec-aat} {\l_@@_keys_leftover_clist} }
+ { \keys_set:nV {fontspec-aat} \l_@@_keys_leftover_clist }
}
%</xetexx>
%<*luatex>
%<debug> \typeout{::: Setting~ keys~ for~ OpenType~ font~ features:~"\l_@@_keys_leftover_clist"}
- \keys_set:nx {fontspec-opentype} {\l_@@_keys_leftover_clist}
+ \keys_set:nV {fontspec-opentype} \l_@@_keys_leftover_clist
%</luatex>
+ \tl_if_empty:NF \l_@@_mapping_tl
+ { \@@_update_featstr:n { mapping = \l_@@_mapping_tl } }
+
\str_if_eq_x:nnF { \l_@@_hexcol_tl \l_@@_opacity_tl }
{ \g_@@_hexcol_tl \g_@@_opacity_tl }
{ \@@_update_featstr:n { color = \l_@@_hexcol_tl\l_@@_opacity_tl } }