summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx')
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx16
1 files changed, 5 insertions, 11 deletions
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 03289ea5788..2a2f2703e3e 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-opentype.dtx
@@ -113,10 +113,8 @@
%<debug> \typeout{:: @@_make_OT_feature:nnn \exp_not:n { {#1}{#2}{#3} } }
\bool_set_true:N \l_@@_proceed_bool
- \bool_set_true:N \l_@@_check_feat_bool
- \tl_if_empty:nT {#1} { \bool_set_false:N \l_@@_check_feat_bool }
- \bool_if:NT \l_@@_check_feat_bool
+ \tl_if_empty:nF {#1}
{
\exp_args:No \@@_check_ot_feat:NnF \l_@@_fontface_cs_tl {#1}
{
@@ -125,13 +123,9 @@
}
}
- \bool_if:NT \l_@@_proceed_bool
- {
- \exp_args:Nx \@@_remove_clashing_featstr:n
- { #2 , \@@_swap_plus_minus:n {#2} , #3 }
+ \@@_remove_clashing_featstr:x { #2 , \@@_swap_plus_minus:n {#2} , #3 }
- \@@_update_featstr:n {#2}
- }
+ \bool_if:NT \l_@@_proceed_bool { \@@_update_featstr:n {#2} }
}
\cs_generate_variant:Nn \@@_make_OT_feature:nnn {xxx}
% \end{macrocode}
@@ -208,7 +202,7 @@
% \begin{macrocode}
\prg_new_conditional:Nnn \@@_check_lang:Nn {TF}
{
- \@@_check_lang:NnnTF #1 {#2} {\l_fontspec_script_tl} {\prg_return_true:} {\prg_return_false:}
+ \@@_check_lang:NnnTF #1 {#2} {\l_@@_script_tl} {\prg_return_true:} {\prg_return_false:}
}
% \end{macrocode}
%
@@ -272,7 +266,7 @@
% \begin{macrocode}
\prg_new_conditional:Nnn \@@_check_ot_feat:Nn {TF,F}
{
- \@@_check_ot_feat:NnnnTF #1 {#2} {\l_fontspec_lang_tl} {\l_fontspec_script_tl}
+ \@@_check_ot_feat:NnnnTF #1 {#2} {\l_@@_lang_tl} {\l_@@_script_tl}
{\prg_return_true:} {\prg_return_false:}
}
% \end{macrocode}