summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx')
-rw-r--r--Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx12
1 files changed, 5 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx
index 2ae228df24e..0cd47069e3c 100644
--- a/Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx
+++ b/Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx
@@ -91,15 +91,13 @@
{
\cs_if_exist:NF \l_@@_fontname_tl
{
+%<debug>\typeout{SETTING~ DEFAULT~ FONT~(latinmodern-math)}
\setmathfont{latinmodern-math.otf}
[BoldFont={latinmodern-math.otf}]
+%<debug>\typeout{END~ DEFAULT~ FONT)}
}
}
% \end{macrocode}
-% Note that here we reset the `font already loaded' boolean so that a new font being set
-% will do the right thing in terms of setting up defaults.
-%
-% TODO: need a better way to do this for the general case. (Maybe a `reset' command option?)
%
% \begin{macro}{\@@_init:n}
% Reset local variables.
@@ -167,7 +165,7 @@
\group_begin:
\fontfamily { \l_@@_trial_family_tl } \selectfont
- \@@_fontface_gset_eq:NV \g_@@_trial_font \font@name
+ \exp_last_unbraced:NNo \@@_fontface_gset_eq:NN \g_@@_trial_font \font@name
\fontspec_if_script:nF {math}
{
\bool_gset_false:N \l_@@_ot_math_bool
@@ -216,11 +214,11 @@
\int_gincr:N \g_@@_fonts_used_int
\group_begin:
\fontfamily { \l_@@_family_tl } \selectfont
- \@@_fontface_gset_eq:cV {g_@@_mathfont_ \int_use:N \g_@@_fonts_used_int _font} \font@name
+ \exp_last_unbraced:Nno \@@_fontface_gset_eq:cN {g_@@_mathfont_ \int_use:N \g_@@_fonts_used_int _font} \font@name
\tl_gset:Nx \g_@@_curr_font_cmd_tl { \exp_not:c {g_@@_mathfont_ \int_use:N \g_@@_fonts_used_int _font} }
\bool_if:NT \l_@@_init_bool
{
- \@@_fontface_gset_eq:NV \l_@@_font \font@name
+ \exp_last_unbraced:NNo \@@_fontface_gset_eq:NN \l_@@_font \font@name
}
\fontspec_if_script:nF {math}
{