summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-12 22:04:13 +0000
committerKarl Berry <karl@freefriends.org>2019-02-12 22:04:13 +0000
commita737da09d5024f98cc47c98db5805e1132a55f37 (patch)
treeab5404964bc7bd53e65237b3254d419a593c8036 /Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
parent73c46da967e396166213cc768463e9414bb69694 (diff)
fontspec (12feb19)
git-svn-id: svn://tug.org/texlive/trunk@50011 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx')
-rw-r--r--Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx37
1 files changed, 21 insertions, 16 deletions
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 9dcea4f8e0e..a195afa3b16 100644
--- a/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
+++ b/Master/texmf-dist/source/latex/fontspec/fontspec-code-internal.dtx
@@ -275,7 +275,7 @@
{#1}
\l_@@_extension_tl
\l_@@_ttc_index_tl
- \l_fontspec_renderer_tl
+ \l_@@_renderer_tl
\l_@@_optical_size_tl
{#2}
}
@@ -449,8 +449,8 @@
}
\prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {script-num} \l_@@_script_int
\prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {lang-num} \l_@@_language_int
- \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {script-tag} \l_fontspec_script_tl
- \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {lang-tag} \l_fontspec_lang_tl
+ \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {script-tag} \l_@@_script_tl
+ \prop_gput:cnV {g_@@_fontinfo_ \g_@@_nfss_family_tl _prop} {lang-tag} \l_@@_lang_tl
}
% \end{macrocode}
% \end{macro}
@@ -580,7 +580,7 @@
\or
%<debug> \typeout{:::: AAT}
\bool_set_true:N \l_@@_atsui_bool
- \tl_if_empty:NT \l_fontspec_renderer_tl { \tl_set:Nn \l_fontspec_renderer_tl {/AAT} }
+ \tl_if_empty:NT \l_@@_renderer_tl { \tl_set:Nn \l_@@_renderer_tl {/AAT} }
\ifnum\XeTeXcountvariations #1 > 0\relax
%<debug> \typeout{:::: MM}
\bool_set_true:N \l_@@_mm_bool
@@ -588,15 +588,15 @@
\or
%<debug> \typeout{:::: OpenType}
\bool_set_true:N \l_@@_ot_bool
- \tl_if_empty:NT \l_fontspec_renderer_tl { \tl_set:Nn \l_fontspec_renderer_tl {/OT} }
+ \tl_if_empty:NT \l_@@_renderer_tl { \tl_set:Nn \l_@@_renderer_tl {/OT} }
\or
%<debug> \typeout{:::: Graphite}
\bool_set_true:N \l_@@_graphite_bool
- \tl_if_empty:NT \l_fontspec_renderer_tl { \tl_set:Nn \l_fontspec_renderer_tl {/GR} }
+ \tl_if_empty:NT \l_@@_renderer_tl { \tl_set:Nn \l_@@_renderer_tl {/GR} }
\fi
%</XE>
% \end{macrocode}
-% If automatic, the \cmd{\l_fontspec_renderer_tl} token list will still be
+% If automatic, the \cmd{\l_@@_renderer_tl} token list will still be
% empty (other suffices that could be added will be later in the feature
% processing), and if it is indeed still empty, assign it a value so that the
% other weights of the font are specifically loaded with the same renderer.
@@ -923,21 +923,25 @@
{
\bool_if:NT \l_@@_ot_bool
{
- \tl_if_empty:NF \l_fontspec_script_tl
+ \tl_if_empty:NF \l_@@_script_tl
{
- script = \l_fontspec_script_tl ;
- language = \l_fontspec_lang_tl ;
+ script = \l_@@_script_tl ;
+ language = \l_@@_lang_tl ;
}
}
}
%</XE>
%<*LU>
{
- mode = \l_fontspec_mode_tl ;
- \tl_if_empty:NF \l_fontspec_script_tl
+ mode = \l_@@_mode_tl ;
+ \tl_if_empty:NF \l_@@_shaper_tl
{
- script = \l_fontspec_script_tl ;
- language = \l_fontspec_lang_tl ;
+ shaper = \l_@@_shaper_tl ;
+ }
+ \tl_if_empty:NF \l_@@_script_tl
+ {
+ script = \l_@@_script_tl ;
+ language = \l_@@_lang_tl ;
}
}
%</LU>
@@ -1001,6 +1005,7 @@
\tl_gremove_all:Nn \g_@@_rawfeatures_sclist {##1;}
}
}
+\cs_generate_variant:Nn \@@_remove_clashing_featstr:n {x}
% \end{macrocode}
% \end{macro}
%
@@ -1020,12 +1025,12 @@
\tl_clear:N \l_@@_font_path_tl
\tl_clear:N \l_@@_optical_size_tl
\tl_clear:N \l_@@_ttc_index_tl
- \tl_clear:N \l_fontspec_renderer_tl
+ \tl_clear:N \l_@@_renderer_tl
\tl_gclear:N \g_@@_defined_shapes_tl
\tl_gclear:N \g_@@_curr_series_tl
\tl_gset_eq:NN \g_@@_nfss_enc_tl \g_fontspec_encoding_tl
%<*LU>
- \tl_set:Nn \l_fontspec_mode_tl {node}
+ \tl_set:Nn \l_@@_mode_tl {node}
\int_set:Nn \prehyphenchar { `\- } % fixme
\int_zero:N \posthyphenchar % fixme
\int_zero:N \preexhyphenchar % fixme