unicode-math (9oct17)

git-svn-id: svn://tug.org/texlive/trunk@45510 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 3948 insertions, 2217 deletions

diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
index 477db3d8108..b0e2343ad09 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
@@ -5,8 +5,23 @@
 %% The original source files were:
 %%
 %% unicode-math.dtx  (with options: `package,LU')
-%% unicode-math-epilogue.dtx  (with options: `package,XE')
-%% unicode-math-compat.dtx  (with options: `compat,LU')
+%% unicode-math-preamble.dtx  (with options: `package,LU')
+%% unicode-math-pkgopt.dtx  (with options: `package,LU')
+%% unicode-math-msg.dtx  (with options: `package,LU')
+%% unicode-math-usv.dtx  (with options: `package,LU')
+%% unicode-math-setchar.dtx  (with options: `package,LU')
+%% unicode-math-mathtext.dtx  (with options: `package,LU')
+%% unicode-math-main.dtx  (with options: `package,LU')
+%% unicode-math-fontopt.dtx  (with options: `package,LU')
+%% unicode-math-fontparam.dtx  (with options: `package,LU')
+%% unicode-math-mathmap.dtx  (with options: `package,LU')
+%% unicode-math-mathtext.dtx  (with options: `package,LU')
+%% unicode-math-epilogue.dtx  (with options: `package,LU')
+%% unicode-math-primes.dtx  (with options: `package,LU')
+%% unicode-math-sscript.dtx  (with options: `package,LU')
+%% unicode-math-compat.dtx  (with options: `package,LU')
+%% unicode-math-alphabets.dtx  (with options: `package,LU')
+%% 
 %% Copyright 2006-2017   Will Robertson <will.robertson@latex-project.org>
 %% Copyright 2010-2013 Philipp Stephani <st_philipp@yahoo.de>
 %% Copyright 2012-2015     Khaled Hosny <khaledhosny@eglug.org>
@@ -16,9 +31,746 @@
 %% (your choice): <http://www.latex-project.org/lppl/>.
 %% 
 %% This work is "maintained" by Will Robertson.
+\ProvidesPackage{unicode-math-luatex}
+  [2017/10/09 v0.8h Unicode maths in XeLaTeX and LuaLaTeX]
+
+\RequirePackage{lualatex-math}
 \ExplSyntaxOn
-\RequirePackage{luaotfload}   [2014/05/18]
-\RequirePackage{lualatex-math}[2011/08/07]
+\cs_set_protected_nopar:Npn \exp_last_unbraced:NNx { \::N \::x_unbraced \::: }
+\cs_generate_variant:Nn \fontspec_set_family:Nnn {Nx}
+\cs_generate_variant:Nn \fontspec_set_fontface:NNnn {NNx}
+\bool_new:N \l__um_ot_math_bool
+\bool_new:N \l__um_init_bool
+\bool_new:N \l__um_implicit_alph_bool
+\bool_new:N \g__um_mainfont_already_set_bool
+\bool_new:N \g__um_literal_bool
+\bool_new:N \g__um_upLatin_bool
+\bool_new:N \g__um_uplatin_bool
+\bool_new:N \g__um_upGreek_bool
+\bool_new:N \g__um_upgreek_bool
+\bool_new:N \g__um_bfliteral_bool
+\bool_new:N \g__um_bfupLatin_bool
+\bool_new:N \g__um_bfuplatin_bool
+\bool_new:N \g__um_bfupGreek_bool
+\bool_new:N \g__um_bfupgreek_bool
+\bool_new:N \g__um_upsans_bool
+\bool_new:N \g__um_sfliteral_bool
+\bool_new:N \g__um_upNabla_bool
+\bool_new:N \g__um_uppartial_bool
+\bool_new:N \g__um_literal_Nabla_bool
+\bool_new:N \g__um_literal_partial_bool
+\bool_new:N \l__um_smallfrac_bool
+\bool_new:N \g__um_literal_colon_bool
+\bool_new:N \g__um_mathrm_text_bool
+\bool_new:N \g__um_mathit_text_bool
+\bool_new:N \g__um_mathbf_text_bool
+\bool_new:N \g__um_mathsf_text_bool
+\bool_new:N \g__um_mathtt_text_bool
+\int_new:N \g__um_fam_int
+\tl_const:Nn \c__um_math_alphabet_name_latin_tl {Latin,~lowercase}
+\tl_const:Nn \c__um_math_alphabet_name_Latin_tl {Latin,~uppercase}
+\tl_const:Nn \c__um_math_alphabet_name_greek_tl {Greek,~lowercase}
+\tl_const:Nn \c__um_math_alphabet_name_Greek_tl {Greek,~uppercase}
+\tl_const:Nn \c__um_math_alphabet_name_num_tl   {Numerals}
+\tl_const:Nn \c__um_math_alphabet_name_misc_tl  {Misc.}
+\tl_new:N \l__um_mathstyle_tl
+\tl_new:N \l__um_radicals_tl
+\tl_new:N \l__um_nolimits_tl
+\tl_new:N \g__um_operator_mathfont_tl
+\seq_new:N \l__um_missing_alph_seq
+\seq_new:N \l__um_mathalph_seq
+\seq_new:N \l__um_char_range_seq
+\seq_new:N \l__um_mclass_range_seq
+\seq_new:N \l__um_cmd_range_seq
+\clist_new:N  \g__um_alphabets_seq
+\clist_set:Nn \g__um_alphabets_seq { latin, Latin, greek, Greek, num }
+\clist_new:N \g__um_named_ranges_clist
+\clist_new:N \g__um_char_nrange_clist
+\clist_new:N \g__um_unknown_keys_clist
+\clist_new:N \g__um_alphabet_clist
+\seq_new:N \g__um_mathclasses_seq
+\seq_set_from_clist:Nn \g__um_mathclasses_seq
+  {
+    \mathord,\mathalpha,\mathbin,\mathrel,\mathpunct,
+     \mathop,
+    \mathopen,\mathclose,
+    \mathfence,\mathover,\mathunder,
+     \mathaccent,\mathbotaccent,\mathaccentwide,\mathbotaccentwide
+  }
+
+\seq_new:N \g__um_default_mathalph_seq
+\seq_new:N \g__um_named_ranges_seq
+\seq_new:N \g__um_mathstyles_seq
+\muskip_new:N \g__um_primekern_muskip
+\muskip_gset:Nn \g__um_primekern_muskip { -\thinmuskip/2 }% arbitrary
+\int_new:N \l__um_primecount_int
+\prop_new:N \g__um_supers_prop
+\prop_new:N \g__um_subs_prop
+\tl_new:N \l_not_token_name_tl
+\tl_new:N \g__um_slash_delimiter_usv
+\tl_new:N \g__um_mathtable_tl
+\tl_new:N \g__um_fontname_tl
+\tl_new:N \g__um_mversion_tl
+\tl_new:N \g__um_symfont_tl
+\tl_new:N \g__um_font_keyval_tl
+\tl_new:N \g__um_family_tl
+\tl_new:N \g__um_style_tl
+\tl_new:N \g__um_remap_style_tl
+\prg_new_conditional:Nnn \__um_glyph_if_exist:n {p,TF,T,F}
+ {
+  \etex_iffontchar:D \l__um_font #1 \scan_stop:
+    \prg_return_true:
+  \else:
+    \prg_return_false:
+  \fi:
+ }
+\cs_set:Npn \__um_set_mathcode:nnnn #1#2#3#4 {
+  \Umathcode \int_eval:n {#1} =
+    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
+}
+\cs_set:Npn \__um_set_mathcode:nnn #1#2#3 {
+  \Umathcode \int_eval:n {#1} =
+    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#1} \scan_stop:
+}
+\cs_set:Npn \__um_set_mathchar:NNnn #1#2#3#4 {
+  \Umathchardef #1 =
+    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
+}
+\cs_new:Nn \__um_set_delcode:nnn {
+  \Udelcode#2 = \csname sym#1\endcsname #3 \scan_stop:
+}
+\cs_new:Nn \__um_radical:nn {
+  \Uradical \csname sym#1\endcsname #2 \scan_stop:
+}
+\cs_new:Nn \__um_delimiter:Nnn {
+  \Udelimiter \mathchar@type#1 \csname sym#2\endcsname #3 \scan_stop:
+}
+\cs_new:Nn \__um_accent:nnn {
+  \Umathaccent #1~ \mathchar@type\mathaccent \use:c { sym #2 } #3 \scan_stop:
+}
+\cs_generate_variant:Nn \__um_set_mathchar:NNnn {c}
+\cs_new:Nn \__um_char_gmake_mathactive:N
+ {
+  \global\mathcode `#1 = "8000 \scan_stop:
+ }
+\cs_new:Nn \__um_char_gmake_mathactive:n
+ {
+  \global\mathcode #1 = "8000 \scan_stop:
+ }
+\cs_new:Nn \usv_set:nnn  { \tl_const:cn { c__um_#1_#2_usv } {#3} }
+\cs_new:Nn \__um_to_usv:nn {       \use:c { c__um_#1_#2_usv } }
+\prg_new_conditional:Nnn \__um_usv_if_exist:nn {T,F,TF}
+  {
+    \cs_if_exist:cTF { c__um_#1_#2_usv }
+      \prg_return_true: \prg_return_false:
+  }
+\cs_new:Nn \unimath_get_mathstyle:
+ {
+  \tl_use:N \l__um_mathstyle_tl
+ }
+\tl_map_inline:nn
+ {
+  \new@mathgroup\cdp@list\cdp@elt\DeclareMathSizes
+  \@DeclareMathSizes\newmathalphabet\newmathalphabet__um\newmathalphabet__um@
+  \DeclareMathVersion\define@mathalphabet\define@mathgroup\addtoversion
+  \version@list\version@elt\alpha@list\alpha@elt
+  \restore@mathversion\init@restore@version\dorestore@version\process@table
+  \new@mathversion\DeclareSymbolFont\group@list\group@elt
+  \new@symbolfont\SetSymbolFont\SetSymbolFont@\get@cdp
+  \DeclareMathAlphabet\new@mathalphabet\SetMathAlphabet\SetMathAlphabet@
+  \DeclareMathAccent\set@mathaccent\DeclareMathSymbol\set@mathchar
+  \set@mathsymbol\DeclareMathDelimiter\@xxDeclareMathDelimiter
+  \@DeclareMathDelimiter\@xDeclareMathDelimiter\set@mathdelimiter
+  \set__ummathdelimiter\DeclareMathRadical\mathchar@type
+  \DeclareSymbolFontAlphabet\DeclareSymbolFontAlphabet@
+ }
+ {
+  \tl_remove_once:Nn \@preamblecmds {\do#1}
+ }
+
+\DeclareDocumentCommand \unimathsetup {m} { \keys_set:nn {unicode-math} {#1} }
+\cs_new:Nn \__um_keys_choices:nn
+ {
+  \cs_set:Npn \__um_keys_choices_fn:nn { \__um_keys_choices_aux:nnn {#1} }
+  \use:x
+   {
+    \exp_not:N \keys_define:nn {unicode-math}
+     {
+      #1 .choice: ,
+      \__um_tl_map_dbl:nN {#2} \__um_keys_choices_fn:nn
+     }
+   }
+ }
+\cs_new:Nn \__um_keys_choices_aux:nnn { #1 / #2 .code:n = { \exp_not:n {#3} } , }
+\cs_new:Nn \__um_tl_map_dbl:nN
+  {
+    \__um_tl_map_dbl:Nnn #2 #1 \q_recursion_tail {}{} \q_recursion_stop
+  }
+\cs_new:Nn \__um_tl_map_dbl:Nnn
+  {
+    \quark_if_recursion_tail_stop:n {#2}
+    \quark_if_recursion_tail_stop:n {#3}
+    #1 {#2} {#3}
+    \__um_tl_map_dbl:Nnn #1
+ }
+\__um_keys_choices:nn {mathup}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathrm_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathrm_text_bool }
+ }
+\__um_keys_choices:nn {mathrm}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathrm_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathrm_text_bool }
+ }
+\__um_keys_choices:nn {mathit}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathit_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathit_text_bool }
+ }
+\__um_keys_choices:nn {mathbf}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathbf_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathbf_text_bool }
+ }
+\__um_keys_choices:nn {mathsf}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathsf_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathsf_text_bool }
+ }
+\__um_keys_choices:nn {mathtt}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathtt_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathtt_text_bool }
+ }
+\__um_keys_choices:nn {normal-style}
+ {
+       {ISO} {
+              \bool_set_false:N \g__um_literal_bool
+              \bool_set_false:N \g__um_upGreek_bool
+              \bool_set_false:N \g__um_upgreek_bool
+              \bool_set_false:N \g__um_upLatin_bool
+              \bool_set_false:N \g__um_uplatin_bool
+             }
+       {TeX} {
+              \bool_set_false:N \g__um_literal_bool
+              \bool_set_true:N  \g__um_upGreek_bool
+              \bool_set_false:N \g__um_upgreek_bool
+              \bool_set_false:N \g__um_upLatin_bool
+              \bool_set_false:N \g__um_uplatin_bool
+             }
+    {french} {
+              \bool_set_false:N \g__um_literal_bool
+              \bool_set_true:N  \g__um_upGreek_bool
+              \bool_set_true:N  \g__um_upgreek_bool
+              \bool_set_true:N  \g__um_upLatin_bool
+              \bool_set_false:N \g__um_uplatin_bool
+             }
+   {upright} {
+              \bool_set_false:N \g__um_literal_bool
+              \bool_set_true:N  \g__um_upGreek_bool
+              \bool_set_true:N  \g__um_upgreek_bool
+              \bool_set_true:N  \g__um_upLatin_bool
+              \bool_set_true:N  \g__um_uplatin_bool
+             }
+   {literal} {
+              \bool_set_true:N  \g__um_literal_bool
+             }
+ }
+\__um_keys_choices:nn {math-style}
+ {
+      {ISO} {
+             \unimathsetup { nabla=upright, partial=italic,
+              normal-style=ISO, bold-style=ISO, sans-style=italic }
+            }
+      {TeX} {
+             \unimathsetup { nabla=upright, partial=italic,
+               normal-style=TeX, bold-style=TeX, sans-style=upright }
+            }
+   {french} {
+             \unimathsetup { nabla=upright, partial=upright,
+               normal-style=french, bold-style=upright, sans-style=upright }
+            }
+  {upright} {
+             \unimathsetup { nabla=upright, partial=upright,
+               normal-style=upright, bold-style=upright, sans-style=upright }
+            }
+  {literal} {
+             \unimathsetup { colon=literal, nabla=literal, partial=literal,
+               normal-style=literal, bold-style=literal, sans-style=literal }
+            }
+ }
+\__um_keys_choices:nn {bold-style}
+ {
+      {ISO} {
+             \bool_set_false:N \g__um_bfliteral_bool
+             \bool_set_false:N \g__um_bfupGreek_bool
+             \bool_set_false:N \g__um_bfupgreek_bool
+             \bool_set_false:N \g__um_bfupLatin_bool
+             \bool_set_false:N \g__um_bfuplatin_bool
+            }
+      {TeX} {
+             \bool_set_false:N \g__um_bfliteral_bool
+             \bool_set_true:N  \g__um_bfupGreek_bool
+             \bool_set_false:N \g__um_bfupgreek_bool
+             \bool_set_true:N  \g__um_bfupLatin_bool
+             \bool_set_true:N  \g__um_bfuplatin_bool
+            }
+  {upright} {
+             \bool_set_false:N \g__um_bfliteral_bool
+             \bool_set_true:N  \g__um_bfupGreek_bool
+             \bool_set_true:N  \g__um_bfupgreek_bool
+             \bool_set_true:N  \g__um_bfupLatin_bool
+             \bool_set_true:N  \g__um_bfuplatin_bool
+            }
+  {literal} {
+             \bool_set_true:N  \g__um_bfliteral_bool
+            }
+ }
+\__um_keys_choices:nn {sans-style}
+ {
+  {italic}  { \bool_set_false:N \g__um_upsans_bool    }
+  {upright} { \bool_set_true:N  \g__um_upsans_bool    }
+  {literal} { \bool_set_true:N  \g__um_sfliteral_bool }
+ }
+\__um_keys_choices:nn {nabla}
+ {
+  {upright} {
+              \bool_set_false:N \g__um_literal_Nabla_bool
+              \bool_set_true:N  \g__um_upNabla_bool
+            }
+  {italic}  {
+              \bool_set_false:N \g__um_literal_Nabla_bool
+              \bool_set_false:N \g__um_upNabla_bool
+            }
+  {literal} { \bool_set_true:N  \g__um_literal_Nabla_bool }
+ }
+\__um_keys_choices:nn {partial}
+ {
+  {upright} {
+              \bool_set_false:N \g__um_literal_partial_bool
+              \bool_set_true:N  \g__um_uppartial_bool
+            }
+  {italic}  {
+              \bool_set_false:N \g__um_literal_partial_bool
+              \bool_set_false:N \g__um_uppartial_bool
+            }
+  {literal} { \bool_set_true:N  \g__um_literal_partial_bool }
+ }
+\__um_keys_choices:nn {colon}
+ {
+  {literal} { \bool_set_true:N  \g__um_literal_colon_bool }
+  {TeX}     { \bool_set_false:N \g__um_literal_colon_bool }
+ }
+\__um_keys_choices:nn {slash-delimiter}
+ {
+  {ascii} { \tl_set:Nn \g__um_slash_delimiter_usv {"002F} }
+  {frac}  { \tl_set:Nn \g__um_slash_delimiter_usv {"2044} }
+  {div}   { \tl_set:Nn \g__um_slash_delimiter_usv {"2215} }
+ }
+\__um_keys_choices:nn {active-frac}
+ {
+   {small}
+   {
+    \cs_if_exist:NTF \tfrac
+     { \bool_set_true:N \l__um_smallfrac_bool }
+     {
+      \__um_warning:n {no-tfrac}
+      \bool_set_false:N \l__um_smallfrac_bool
+     }
+    \use:c {__um_setup_active_frac:}
+   }
+
+   {normalsize}
+   {
+    \bool_set_false:N \l__um_smallfrac_bool
+    \use:c {__um_setup_active_frac:}
+   }
+ }
+\keys_define:nn {unicode-math}
+  {
+    warnings-off .code:n =
+      {
+        \clist_map_inline:nn {#1}
+          { \msg_redirect_name:nnn { unicode-math } { ##1 } { none } }
+      }
+  }
+\__um_keys_choices:nn {trace}
+ {
+  {on}    {} % default
+  {debug} { \msg_redirect_module:nnn { unicode-math } { log } { warning } }
+  {off}   { \msg_redirect_module:nnn { unicode-math } { log } { none } }
+ }
+\unimathsetup {math-style=TeX}
+\unimathsetup {slash-delimiter=ascii}
+\unimathsetup {trace=off}
+\unimathsetup {mathrm=text,mathit=text,mathbf=text,mathsf=text,mathtt=text}
+\cs_if_exist:NT \tfrac { \unimathsetup {active-frac=small} }
+\ProcessKeysOptions {unicode-math}
+
+\cs_new:Npn \__um_error:n   { \msg_error:nn   {unicode-math} }
+\cs_new:Npn \__um_warning:n { \msg_warning:nn {unicode-math} }
+\cs_new:Npn \__um_warning:nnn { \msg_warning:nnxx {unicode-math} }
+\cs_new:Npn \__um_log:n     { \msg_log:nn     {unicode-math} }
+\cs_new:Npn \__um_log:nx    { \msg_log:nnx    {unicode-math} }
+\msg_new:nnn {unicode-math} {no-tfrac}
+{
+  Small~ fraction~ command~ \protect\tfrac\ not~ defined.\\
+  Load~ amsmath~ or~ define~ it~ manually~ before~ loading~ unicode-math.
+}
+\msg_new:nnn {unicode-math} {default-math-font}
+{
+  Defining~ the~ default~ maths~ font~ as~ '\l__um_fontname_tl'.
+}
+\msg_new:nnn {unicode-math} {setup-implicit}
+{
+  Setup~ alphabets:~ implicit~ mode.
+}
+\msg_new:nnn {unicode-math} {setup-explicit}
+{
+  Setup~ alphabets:~ explicit~ mode.
+}
+\msg_new:nnn {unicode-math} {alph-initialise}
+{
+  Initialising~ \@backslashchar math#1.
+}
+\msg_new:nnn {unicode-math} {setup-alph}
+{
+  Setup~ alphabet:~ #1.
+}
+\msg_new:nnn {unicode-math} {no-alphabet}
+{
+  I~ am~ trying~ to~ set~ up~ alphabet~"#1"~ but~ there~ are~ no~ configuration~ settings~ for~ it.~
+  (See~ source~ file~ "unicode-math-alphabets.dtx"~ to~ debug.)
+}
+\msg_new:nnn { unicode-math } { no-named-range }
+ {
+  I~ am~ trying~ to~ define~ new~ alphabet~ "#2"~ in~ range~ "#1",~ but~ range~ "#1"~ hasn't~ been~ defined~ yet.
+ }
+\msg_new:nnn { unicode-math } { missing-alphabets }
+ {
+  Missing~math~alphabets~in~font~ "\fontname\l__um_font" \\ \\
+  \seq_map_function:NN \l__um_missing_alph_seq \__um_print_indent:n
+ }
+\cs_new:Nn \__um_print_indent:n { \space\space\space\space #1 \\ }
+\msg_new:nnn {unicode-math} {macro-expected}
+{
+  I've~ expected~ that~ #1~ is~ a~ macro,~ but~ it~ isn't.
+}
+\msg_new:nnn {unicode-math} {wrong-meaning}
+{
+  I've~ expected~ #1~ to~ have~ the~ meaning~ #3,~ but~ it~ has~ the~ meaning~ #2.
+}
+\msg_new:nnn {unicode-math} {patch-macro}
+{
+  I'm~ going~ to~ patch~ macro~ #1.
+}
+\msg_new:nnn { unicode-math } { mathtools-overbracket } {
+  Using~ \token_to_str:N \overbracket\ and~
+         \token_to_str:N \underbracket\ from~
+ `mathtools'~ package.\\
+  \\
+  Use~ \token_to_str:N \Uoverbracket\ and~
+       \token_to_str:N \Uunderbracket\ for~
+       original~ `unicode-math'~ definition.
+}
+\msg_new:nnn { unicode-math } { mathtools-colon } {
+  I'm~ going~ to~ overwrite~ the~ following~ commands~ from~
+  the~ `mathtools'~ package: \\ \\
+  \ \ \ \ \token_to_str:N \dblcolon,~
+  \token_to_str:N \coloneqq,~
+  \token_to_str:N \Coloneqq,~
+  \token_to_str:N \eqqcolon. \\ \\
+  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like~
+  commands,~ using~ them~ will~ lead~ to~ inconsistencies.
+}
+\msg_new:nnn { unicode-math } { colonequals } {
+  I'm~ going~ to~ overwrite~ the~ following~ commands~ from~
+  the~ `colonequals'~ package: \\ \\
+  \ \ \ \ \token_to_str:N \ratio,~
+          \token_to_str:N \coloncolon,~
+          \token_to_str:N \minuscolon, \\
+  \ \ \ \ \token_to_str:N \colonequals,~
+          \token_to_str:N \equalscolon,~
+          \token_to_str:N \coloncolonequals. \\ \\
+  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like~
+  commands,~ using~ them~ will~ lead~ to~ inconsistencies.~
+  Furthermore,~ changing~ \token_to_str:N \colonsep \c_space_tl
+  or~ \token_to_str:N \doublecolonsep \c_space_tl won't~ have~
+  any~ effect~ on~ the~ re-defined~ commands.
+}
+
+\usv_set:nnn {normal}  {num}  {48}
+\usv_set:nnn {normal}  {Latin}{"1D434}
+\usv_set:nnn {normal}  {latin}{"1D44E}
+\usv_set:nnn {normal}  {Greek}{"1D6E2}
+\usv_set:nnn {normal}  {greek}{"1D6FC}
+\usv_set:nnn {normal}{varTheta}  {"1D6F3}
+\usv_set:nnn {normal}{epsilon}{"1D716}
+\usv_set:nnn {normal}{vartheta}  {"1D717}
+\usv_set:nnn {normal}{varkappa}  {"1D718}
+\usv_set:nnn {normal}{phi}    {"1D719}
+\usv_set:nnn {normal}{varrho}    {"1D71A}
+\usv_set:nnn {normal}{varpi}     {"1D71B}
+\usv_set:nnn {normal}    {Nabla}{"1D6FB}
+\usv_set:nnn {normal}    {partial}{"1D715}
+
+\usv_set:nnn {up}  {num}  {48}
+\usv_set:nnn {up}  {Latin}{65}
+\usv_set:nnn {up}  {latin}{97}
+\usv_set:nnn {up}  {Greek}{"391}
+\usv_set:nnn {up}  {greek}{"3B1}
+\usv_set:nnn {it}  {Latin}{"1D434}
+\usv_set:nnn {it}  {latin}{"1D44E}
+\usv_set:nnn {it}  {Greek}{"1D6E2}
+\usv_set:nnn {it}  {greek}{"1D6FC}
+\usv_set:nnn {bb}  {num}  {"1D7D8}
+\usv_set:nnn {bb}  {Latin}{"1D538}
+\usv_set:nnn {bb}  {latin}{"1D552}
+\usv_set:nnn {scr} {Latin}{"1D49C}
+\usv_set:nnn {cal} {Latin}{"1D49C}
+\usv_set:nnn {scr} {latin}{"1D4B6}
+\usv_set:nnn {frak}{Latin}{"1D504}
+\usv_set:nnn {frak}{latin}{"1D51E}
+\usv_set:nnn {sf}  {num}  {"1D7E2}
+\usv_set:nnn {sfup}{num}  {"1D7E2}
+\usv_set:nnn {sfit}{num}  {"1D7E2}
+\usv_set:nnn {sfup}{Latin}{"1D5A0}
+\usv_set:nnn {sf}  {Latin}{"1D5A0}
+\usv_set:nnn {sfup}{latin}{"1D5BA}
+\usv_set:nnn {sf}  {latin}{"1D5BA}
+\usv_set:nnn {sfit}{Latin}{"1D608}
+\usv_set:nnn {sfit}{latin}{"1D622}
+\usv_set:nnn {tt}  {num}  {"1D7F6}
+\usv_set:nnn {tt}  {Latin}{"1D670}
+\usv_set:nnn {tt}  {latin}{"1D68A}
+\usv_set:nnn {bf}    {num}  {"1D7CE}
+\usv_set:nnn {bfup}  {num}  {"1D7CE}
+\usv_set:nnn {bfit}  {num}  {"1D7CE}
+\usv_set:nnn {bfup}  {Latin}{"1D400}
+\usv_set:nnn {bfup}  {latin}{"1D41A}
+\usv_set:nnn {bfup}  {Greek}{"1D6A8}
+\usv_set:nnn {bfup}  {greek}{"1D6C2}
+\usv_set:nnn {bfit}  {Latin}{"1D468}
+\usv_set:nnn {bfit}  {latin}{"1D482}
+\usv_set:nnn {bfit}  {Greek}{"1D71C}
+\usv_set:nnn {bfit}  {greek}{"1D736}
+\usv_set:nnn {bffrak}{Latin}{"1D56C}
+\usv_set:nnn {bffrak}{latin}{"1D586}
+\usv_set:nnn {bfscr} {Latin}{"1D4D0}
+\usv_set:nnn {bfcal} {Latin}{"1D4D0}
+\usv_set:nnn {bfscr} {latin}{"1D4EA}
+\usv_set:nnn {bfsf}  {num}  {"1D7EC}
+\usv_set:nnn {bfsfup}{num}  {"1D7EC}
+\usv_set:nnn {bfsfit}{num}  {"1D7EC}
+\usv_set:nnn {bfsfup}{Latin}{"1D5D4}
+\usv_set:nnn {bfsfup}{latin}{"1D5EE}
+\usv_set:nnn {bfsfup}{Greek}{"1D756}
+\usv_set:nnn {bfsfup}{greek}{"1D770}
+\usv_set:nnn {bfsfit}{Latin}{"1D63C}
+\usv_set:nnn {bfsfit}{latin}{"1D656}
+\usv_set:nnn {bfsfit}{Greek}{"1D790}
+\usv_set:nnn {bfsfit}{greek}{"1D7AA}
+\usv_set:nnn {bfsf}{Latin}{ \bool_if:NTF \g__um_upLatin_bool   \g__um_bfsfup_Latin_usv \g__um_bfsfit_Latin_usv }
+\usv_set:nnn {bfsf}{latin}{ \bool_if:NTF \g__um_uplatin_bool   \g__um_bfsfup_latin_usv \g__um_bfsfit_latin_usv }
+\usv_set:nnn {bfsf}{Greek}{ \bool_if:NTF \g__um_upGreek_bool   \g__um_bfsfup_Greek_usv \g__um_bfsfit_Greek_usv }
+\usv_set:nnn {bfsf}{greek}{ \bool_if:NTF \g__um_upgreek_bool   \g__um_bfsfup_greek_usv \g__um_bfsfit_greek_usv }
+\usv_set:nnn {bf}  {Latin}{ \bool_if:NTF \g__um_bfupLatin_bool \g__um_bfup_Latin_usv   \g__um_bfit_Latin_usv   }
+\usv_set:nnn {bf}  {latin}{ \bool_if:NTF \g__um_bfuplatin_bool \g__um_bfup_latin_usv   \g__um_bfit_latin_usv   }
+\usv_set:nnn {bf}  {Greek}{ \bool_if:NTF \g__um_bfupGreek_bool \g__um_bfup_Greek_usv   \g__um_bfit_Greek_usv   }
+\usv_set:nnn {bf}  {greek}{ \bool_if:NTF \g__um_bfupgreek_bool \g__um_bfup_greek_usv   \g__um_bfit_greek_usv   }
+\usv_set:nnn {up}{varTheta}  {"3F4}
+\usv_set:nnn {up}{Digamma}   {"3DC}
+\usv_set:nnn {up}{epsilon}{"3F5}
+\usv_set:nnn {up}{vartheta}  {"3D1}
+\usv_set:nnn {up}{varkappa}  {"3F0}
+\usv_set:nnn {up}{phi}    {"3D5}
+\usv_set:nnn {up}{varrho}    {"3F1}
+\usv_set:nnn {up}{varpi}     {"3D6}
+\usv_set:nnn {up}{digamma}   {"3DD}
+\usv_set:nnn {bfup}{varTheta}  {"1D6B9}
+\usv_set:nnn {bfup}{Digamma}   {"1D7CA}
+\usv_set:nnn {bfup}{epsilon}{"1D6DC}
+\usv_set:nnn {bfup}{vartheta}  {"1D6DD}
+\usv_set:nnn {bfup}{varkappa}  {"1D6DE}
+\usv_set:nnn {bfup}{phi}    {"1D6DF}
+\usv_set:nnn {bfup}{varrho}    {"1D6E0}
+\usv_set:nnn {bfup}{varpi}     {"1D6E1}
+\usv_set:nnn {bfup}{digamma}   {"1D7CB}
+\usv_set:nnn {it}{varTheta}  {"1D6F3}
+\usv_set:nnn {it}{epsilon}{"1D716}
+\usv_set:nnn {it}{vartheta}  {"1D717}
+\usv_set:nnn {it}{varkappa}  {"1D718}
+\usv_set:nnn {it}{phi}    {"1D719}
+\usv_set:nnn {it}{varrho}    {"1D71A}
+\usv_set:nnn {it}{varpi}     {"1D71B}
+\usv_set:nnn {bfit}{varTheta}  {"1D72D}
+\usv_set:nnn {bfit}{epsilon}{"1D750}
+\usv_set:nnn {bfit}{vartheta}  {"1D751}
+\usv_set:nnn {bfit}{varkappa}  {"1D752}
+\usv_set:nnn {bfit}{phi}    {"1D753}
+\usv_set:nnn {bfit}{varrho}    {"1D754}
+\usv_set:nnn {bfit}{varpi}     {"1D755}
+\usv_set:nnn {bfsfup}{varTheta}  {"1D767}
+\usv_set:nnn {bfsfup}{epsilon}{"1D78A}
+\usv_set:nnn {bfsfup}{vartheta}  {"1D78B}
+\usv_set:nnn {bfsfup}{varkappa}  {"1D78C}
+\usv_set:nnn {bfsfup}{phi}    {"1D78D}
+\usv_set:nnn {bfsfup}{varrho}    {"1D78E}
+\usv_set:nnn {bfsfup}{varpi}     {"1D78F}
+\usv_set:nnn {bfsfit}{varTheta}  {"1D7A1}
+\usv_set:nnn {bfsfit}{epsilon}{"1D7C4}
+\usv_set:nnn {bfsfit}{vartheta}  {"1D7C5}
+\usv_set:nnn {bfsfit}{varkappa}  {"1D7C6}
+\usv_set:nnn {bfsfit}{phi}    {"1D7C7}
+\usv_set:nnn {bfsfit}{varrho}    {"1D7C8}
+\usv_set:nnn {bfsfit}{varpi}     {"1D7C9}
+\usv_set:nnn {up}    {Nabla}{"02207}
+\usv_set:nnn {it}    {Nabla}{"1D6FB}
+\usv_set:nnn {bfup}  {Nabla}{"1D6C1}
+\usv_set:nnn {bfit}  {Nabla}{"1D735}
+\usv_set:nnn {bfsfup}{Nabla}{"1D76F}
+\usv_set:nnn {bfsfit}{Nabla}{"1D7A9}
+\usv_set:nnn {up}    {partial}{"02202}
+\usv_set:nnn {it}    {partial}{"1D715}
+\usv_set:nnn {bfup}  {partial}{"1D6DB}
+\usv_set:nnn {bfit}  {partial}{"1D74F}
+\usv_set:nnn {bfsfup}{partial}{"1D789}
+\usv_set:nnn {bfsfit}{partial}{"1D7C3}
+\usv_set:nnn {up}{B}{`\B}
+\usv_set:nnn {up}{C}{`\C}
+\usv_set:nnn {up}{D}{`\D}
+\usv_set:nnn {up}{E}{`\E}
+\usv_set:nnn {up}{F}{`\F}
+\usv_set:nnn {up}{H}{`\H}
+\usv_set:nnn {up}{I}{`\I}
+\usv_set:nnn {up}{L}{`\L}
+\usv_set:nnn {up}{M}{`\M}
+\usv_set:nnn {up}{N}{`\N}
+\usv_set:nnn {up}{P}{`\P}
+\usv_set:nnn {up}{Q}{`\Q}
+\usv_set:nnn {up}{R}{`\R}
+\usv_set:nnn {up}{Z}{`\Z}
+\usv_set:nnn {it}{B}{"1D435}
+\usv_set:nnn {it}{C}{"1D436}
+\usv_set:nnn {it}{D}{"1D437}
+\usv_set:nnn {it}{E}{"1D438}
+\usv_set:nnn {it}{F}{"1D439}
+\usv_set:nnn {it}{H}{"1D43B}
+\usv_set:nnn {it}{I}{"1D43C}
+\usv_set:nnn {it}{L}{"1D43F}
+\usv_set:nnn {it}{M}{"1D440}
+\usv_set:nnn {it}{N}{"1D441}
+\usv_set:nnn {it}{P}{"1D443}
+\usv_set:nnn {it}{Q}{"1D444}
+\usv_set:nnn {it}{R}{"1D445}
+\usv_set:nnn {it}{Z}{"1D44D}
+\usv_set:nnn {up}{d}{`\d}
+\usv_set:nnn {up}{e}{`\e}
+\usv_set:nnn {up}{g}{`\g}
+\usv_set:nnn {up}{h}{`\h}
+\usv_set:nnn {up}{i}{`\i}
+\usv_set:nnn {up}{j}{`\j}
+\usv_set:nnn {up}{o}{`\o}
+\usv_set:nnn {it}{d}{"1D451}
+\usv_set:nnn {it}{e}{"1D452}
+\usv_set:nnn {it}{g}{"1D454}
+\usv_set:nnn {it}{h}{"0210E}
+\usv_set:nnn {it}{i}{"1D456}
+\usv_set:nnn {it}{j}{"1D457}
+\usv_set:nnn {it}{o}{"1D45C}
+\usv_set:nnn {bb}    {h}{"1D559}
+\usv_set:nnn {tt}    {h}{"1D691}
+\usv_set:nnn {scr}   {h}{"1D4BD}
+\usv_set:nnn {frak}  {h}{"1D525}
+\usv_set:nnn {bfup}  {h}{"1D421}
+\usv_set:nnn {bfit}  {h}{"1D489}
+\usv_set:nnn {sfup}  {h}{"1D5C1}
+\usv_set:nnn {sfit}  {h}{"1D629}
+\usv_set:nnn {bffrak}{h}{"1D58D}
+\usv_set:nnn {bfscr} {h}{"1D4F1}
+\usv_set:nnn {bfsfup}{h}{"1D5F5}
+\usv_set:nnn {bfsfit}{h}{"1D65D}
+\usv_set:nnn {up}{dotlessi}{"00131}
+\usv_set:nnn {up}{dotlessj}{"00237}
+\usv_set:nnn {it}{dotlessi}{"1D6A4}
+\usv_set:nnn {it}{dotlessj}{"1D6A5}
+\usv_set:nnn {bb}{C}{"2102}
+\usv_set:nnn {bb}{H}{"210D}
+\usv_set:nnn {bb}{N}{"2115}
+\usv_set:nnn {bb}{P}{"2119}
+\usv_set:nnn {bb}{Q}{"211A}
+\usv_set:nnn {bb}{R}{"211D}
+\usv_set:nnn {bb}{Z}{"2124}
+\usv_set:nnn {up}{Pi}       {"003A0}
+\usv_set:nnn {up}{pi}       {"003C0}
+\usv_set:nnn {up}{Gamma}    {"00393}
+\usv_set:nnn {up}{gamma}    {"003B3}
+\usv_set:nnn {up}{summation}{"02211}
+\usv_set:nnn {it}{Pi}       {"1D6F1}
+\usv_set:nnn {it}{pi}       {"1D70B}
+\usv_set:nnn {it}{Gamma}    {"1D6E4}
+\usv_set:nnn {it}{gamma}    {"1D6FE}
+\usv_set:nnn {bb}{Pi}       {"0213F}
+\usv_set:nnn {bb}{pi}       {"0213C}
+\usv_set:nnn {bb}{Gamma}    {"0213E}
+\usv_set:nnn {bb}{gamma}    {"0213D}
+\usv_set:nnn {bb}{summation}{"02140}
+\usv_set:nnn {bbit}{D}{"2145}
+\usv_set:nnn {bbit}{d}{"2146}
+\usv_set:nnn {bbit}{e}{"2147}
+\usv_set:nnn {bbit}{i}{"2148}
+\usv_set:nnn {bbit}{j}{"2149}
+\usv_set:nnn {scr}{B}{"212C}
+\usv_set:nnn {scr}{E}{"2130}
+\usv_set:nnn {scr}{F}{"2131}
+\usv_set:nnn {scr}{H}{"210B}
+\usv_set:nnn {scr}{I}{"2110}
+\usv_set:nnn {scr}{L}{"2112}
+\usv_set:nnn {scr}{M}{"2133}
+\usv_set:nnn {scr}{R}{"211B}
+\usv_set:nnn {scr}{e}{"212F}
+\usv_set:nnn {scr}{g}{"210A}
+\usv_set:nnn {scr}{o}{"2134}
+\usv_set:nnn {cal}{B}{"212C}
+\usv_set:nnn {cal}{E}{"2130}
+\usv_set:nnn {cal}{F}{"2131}
+\usv_set:nnn {cal}{H}{"210B}
+\usv_set:nnn {cal}{I}{"2110}
+\usv_set:nnn {cal}{L}{"2112}
+\usv_set:nnn {cal}{M}{"2133}
+\usv_set:nnn {cal}{R}{"211B}
+\usv_set:nnn {frak}{C}{"212D}
+\usv_set:nnn {frak}{H}{"210C}
+\usv_set:nnn {frak}{I}{"2111}
+\usv_set:nnn {frak}{R}{"211C}
+\usv_set:nnn {frak}{Z}{"2128}
+
+\cs_new:Npn \__um_symbol_setup:
+ {
+  \cs_set:Npn \UnicodeMathSymbol ##1##2##3##4
+   {
+    \exp_not:n { \__um_sym:nnn {##1} {##2} {##3} }
+   }
+ }
+\tl_set_from_file_x:Nnn \g__um_mathtable_tl {\__um_symbol_setup:} {unicode-math-table.tex}
+\cs_new:Nn \__um_input_math_symbol_table: {\g__um_mathtable_tl}
+\AtBeginDocument{\__um_define_math_chars:}
+\cs_new:Nn \__um_define_math_chars:
+ {
+  \group_begin:
+    \cs_set:Npn \__um_sym:nnn ##1##2##3
+     {
+      \tl_if_in:nnT
+       { \mathord \mathalpha \mathbin \mathrel \mathpunct \mathop \mathfence }
+       {##3}
+      {
+        \exp_last_unbraced:NNx \cs_gset_eq:NN ##2 { \Ucharcat ##1 ~ 12 ~ }
+      }
+     }
+    \__um_input_math_symbol_table:
+  \group_end:
+ }
 \cs_set:Nn \__um_set_mathsymbol:nNNn
  {
   \bool_lazy_and:nnT
@@ -120,12 +872,12 @@
     \limits
    }
  }
+
 \keys_define:nn {__um_mathface}
  {
   version .code:n =
    { \tl_set:Nn \l__um_mversion_tl {#1} }
  }
-
 \DeclareDocumentCommand \setmathfontface { m O{} m O{} }
  {
   \tl_clear:N \l__um_mversion_tl
@@ -149,7 +901,6 @@
     \mathtt { \cs_set_eq:NN \g__fontspec_mathtt_tl \l__um_tmpa_tl }
    }
  }
-
 \@onlypreamble \setmathfontface
 \DeclareDocumentCommand \setoperatorfont {m}
  { \tl_set:Nn \g__um_operator_mathfont_tl {#1} }
@@ -207,6 +958,7 @@
     \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault
     \SetMathAlphabet\mathtt{bold}  \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault
   }
+
 \DeclareDocumentCommand \setmathfont { O{} m O{} }
   {
     \__um_setmathfont:nn {#1,#3} {#2}
@@ -219,7 +971,6 @@
   \csname S@\f@size\endcsname
   \keys_set_known:nnN {unicode-math} {#1} \l__um_unknown_keys_clist
   \bool_if:NT \l__um_init_bool { \__um_log:n {default-math-font} }
-
   \__um_fontspec_select_font:
   \bool_if:nT { \l__um_ot_math_bool && !\g__um_mainfont_already_set_bool }
    {
@@ -233,8 +984,7 @@
     }
   \SetSymbolFont{\__um_symfont_tl}{\l__um_mversion_tl}
     {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
-  \tl_set:Nn \l__um_tmpa_tl {normal}
-  \tl_if_eq:NNT \l__um_mversion_tl \l__um_tmpa_tl
+  \str_if_eq_x:nnT {\l__um_mversion_tl} {normal}
     {
      \SetSymbolFont{\__um_symfont_tl}{bold}
       {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault}
@@ -251,9 +1001,17 @@
   \__um_setup_delcodes:
   \__um_setup_alphabets:
   \__um_setup_negations:
-  \ignorespaces
  }
-\cs_set_eq:NN \resetmathfont \setmathfont
+\AtBeginDocument { \__um_load_lm_if_necessary: }
+\cs_new:Nn \__um_load_lm_if_necessary:
+  {
+    \cs_if_exist:NF \l__um_fontname_tl
+      {
+        % TODO: update this when lmmath-bold.otf is released
+        \setmathfont{latinmodern-math.otf}[BoldFont={latinmodern-math.otf}]
+        \bool_set_false:N \g__um_mainfont_already_set_bool
+      }
+  }
 \cs_new:Nn \__um_init:
  {
   \bool_set_true:N  \l__um_ot_math_bool
@@ -315,11 +1073,11 @@
         \fontdimen22\font=\__um_get_fontparam:nn {15} {AxisHeight}\relax
        }
       } {\l__um_fontname_tl}
+
     \SetSymbolFont{symbols}{\l__um_mversion_tl}
       {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
 
-    \tl_set:Nn \l__um_tmpa_tl {normal}
-    \tl_if_eq:NNT \l__um_mversion_tl \l__um_tmpa_tl
+    \str_if_eq_x:nnT {\l__um_mversion_tl} {normal}
       {
       \SetSymbolFont{symbols}{bold}
         {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault}
@@ -340,18 +1098,20 @@
         \fontdimen13\font=0pt\relax
       }
     } {\l__um_fontname_tl}
+
     \SetSymbolFont{largesymbols}{\l__um_mversion_tl}
       {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
 
-    \tl_set:Nn \l__um_tmpa_tl {normal}
-    \tl_if_eq:NNT \l__um_mversion_tl \l__um_tmpa_tl
+    \str_if_eq_x:nnT {\l__um_mversion_tl} {normal}
       {
       \SetSymbolFont{largesymbols}{bold}
         {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault}
       }
   }
 \cs_new:Nn \__um_get_fontparam:nn
-  { \directlua{fontspec.mathfontdimen("l__um_font","#2")} }
+  {
+    \directlua{fontspec.mathfontdimen("l__um_font","#2")}
+  }
 \cs_new:Nn \__um_fontspec_select_font:
  {
   \tl_set:Nx \l__um_font_keyval_tl {
@@ -487,7 +1247,6 @@
   \__um_assign_delcode:n {"21EA} % up white arrow from bar
   \__um_assign_delcode:n {"21F3} % updown white arrow
  }
-\tl_new:N \l__um_nolimits_tl
 \tl_set:Nn \l__um_nolimits_tl
  {
   \int\iint\iiint\iiiint\oint\oiint\oiiint
@@ -504,91 +1263,8 @@
  {
   \tl_remove_all:Nn \l__um_nolimits_tl {#1}
  }
-\tl_new:N \l__um_radicals_tl
 \tl_set:Nn \l__um_radicals_tl {\sqrt \longdivision}
-\cs_new_protected_nopar:Nn \__um_new_cramped_style:N
-  {
-    \cs_if_exist:NF #1
-      { \cs_new_eq:Nc #1 { luatex \cs_to_str:N #1 } }
-  }
-\__um_new_cramped_style:N \crampeddisplaystyle
-\__um_new_cramped_style:N \crampedtextstyle
-\__um_new_cramped_style:N \crampedscriptstyle
-\__um_new_cramped_style:N \crampedscriptscriptstyle
-\cs_new_protected_nopar:Nn \__um_font_param:nnnnn
-{
-  \tl_set:Nn \l__um_tmpa_tl { #1 }
-  \tl_remove_all:Nn \l__um_tmpa_tl { _ }
-  \__um_font_param_aux:ccc { __um_ #1 :N } { __um_set_ #1 :Nn }
-    { Umath \l__um_tmpa_tl }
-}
-\cs_new_protected_nopar:Nn \__um_font_param:nnn
- {
-  \__um_font_param:nnnnn { #1 } { #2 } { #2 } { #3 } { #3 }
- }
-\cs_new_protected_nopar:Nn \__um_font_param:nn
- {
-  \__um_font_param:nnnnn { #1 } { #2 } { #2 } { #2 } { #2 }
- }
-\cs_new_protected_nopar:Nn \__um_font_param:n
-  { \__um_font_param:nnnnn { #1 } { 0 } { 0 } { 0 } { 0 } }
-\cs_new_protected_nopar:Nn \__um_font_param_aux:NNN
-  {
-    \cs_new_nopar:Npn #1 ##1
-     {
-      #3 ##1
-     }
-    \cs_new_protected_nopar:Npn #2 ##1 ##2
-     {
-      #3 ##1 \dim_eval:n { ##2 }
-     }
-  }
-\cs_generate_variant:Nn \__um_font_param_aux:NNN { ccc }
-\__um_font_param:nn { axis } { 15 }
-\__um_font_param:nn { operator_size } { 13 }
-\__um_font_param:n { fraction_del_size }
-\__um_font_param:nnn { fraction_denom_down } { 45 } { 44 }
-\__um_font_param:nnn { fraction_denom_vgap } { 50 } { 49 }
-\__um_font_param:nnn { fraction_num_up } { 43 } { 42 }
-\__um_font_param:nnn { fraction_num_vgap } { 47 } { 46 }
-\__um_font_param:nn { fraction_rule } { 48 }
-\__um_font_param:nn { limit_above_bgap } { 29 }
-\__um_font_param:n { limit_above_kern }
-\__um_font_param:nn { limit_above_vgap } { 28 }
-\__um_font_param:nn { limit_below_bgap } { 31 }
-\__um_font_param:n { limit_below_kern }
-\__um_font_param:nn { limit_below_vgap } { 30 }
-\__um_font_param:nn { over_delimiter_vgap } { 41 }
-\__um_font_param:nn { over_delimiter_bgap } { 38 }
-\__um_font_param:nn { under_delimiter_vgap } { 40 }
-\__um_font_param:nn { under_delimiter_bgap } { 39 }
-\__um_font_param:nn { overbar_kern } { 55 }
-\__um_font_param:nn { overbar_rule } { 54 }
-\__um_font_param:nn { overbar_vgap } { 53 }
-\__um_font_param:n { quad }
-\__um_font_param:nn { radical_kern } { 62 }
-\__um_font_param:nn { radical_rule } { 61 }
-\__um_font_param:nnn { radical_vgap } { 60 } { 59 }
-\__um_font_param:nn { radical_degree_before } { 63 }
-\__um_font_param:nn { radical_degree_after } { 64 }
-\__um_font_param:nn { radical_degree_raise } { 65 }
-\__um_font_param:nn { space_after_script } { 27 }
-\__um_font_param:nnn { stack_denom_down } { 35 } { 34 }
-\__um_font_param:nnn { stack_num_up } { 33 } { 32 }
-\__um_font_param:nnn { stack_vgap } { 37 } { 36 }
-\__um_font_param:nn { sub_shift_down } { 18 }
-\__um_font_param:nn { sub_shift_drop } { 20 }
-\__um_font_param:n { subsup_shift_down }
-\__um_font_param:nn { sub_top_max } { 19 }
-\__um_font_param:nn { subsup_vgap } { 25 }
-\__um_font_param:nn { sup_bottom_min } { 23 }
-\__um_font_param:nn { sup_shift_drop } { 24 }
-\__um_font_param:nnnnn { sup_shift_up } { 21 } { 22 } { 21 } { 22 }
-\__um_font_param:nn { supsub_bottom_max } { 26 }
-\__um_font_param:nn { underbar_kern } { 58 }
-\__um_font_param:nn { underbar_rule } { 57 }
-\__um_font_param:nn { underbar_vgap } { 56 }
-\__um_font_param:n { connector_overlap_min }
+
 \keys_define:nn {unicode-math}
   {
     version .code:n =
@@ -718,23 +1394,111 @@
     \int_compare:nT {#1>=#2} { \int_compare:nT {#1<=#3} {#5} }
       } } }
   }
-\AtBeginDocument{\__um_resolve_greek:}
-\cs_new:Npn \__um_resolve_greek:
+
+\cs_new_protected_nopar:Nn \__um_new_cramped_style:N
+  {
+    \cs_if_exist:NF #1
+      { \cs_new_eq:Nc #1 { luatex \cs_to_str:N #1 } }
+  }
+\__um_new_cramped_style:N \crampeddisplaystyle
+\__um_new_cramped_style:N \crampedtextstyle
+\__um_new_cramped_style:N \crampedscriptstyle
+\__um_new_cramped_style:N \crampedscriptscriptstyle
+\cs_new_protected_nopar:Nn \__um_font_param:nnnnn
+{
+  \tl_set:Nn \l__um_tmpa_tl { #1 }
+  \tl_remove_all:Nn \l__um_tmpa_tl { _ }
+  \__um_font_param_aux:ccc { __um_ #1 :N } { __um_set_ #1 :Nn }
+    { Umath \l__um_tmpa_tl }
+}
+\cs_new_protected_nopar:Nn \__um_font_param:nnn
  {
-  \clist_map_inline:nn
-   {
-    Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,
-    alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,
-    Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,
-    mu,nu,xi,omicron,pi,rho,sigma,tau,upsilon,phi,chi,psi,omega,
-    varTheta,varsigma,vartheta,varkappa,varrho,varpi,varepsilon,varphi
-   }
-   {
-    \tl_set:cx {##1} { \exp_not:c { mit ##1 } }
-    \tl_set:cx {up ##1} { \exp_not:N \symup \exp_not:c { ##1 } }
-    \tl_set:cx {it ##1} { \exp_not:N \symit \exp_not:c { ##1 } }
-   }
+  \__um_font_param:nnnnn { #1 } { #2 } { #2 } { #3 } { #3 }
+ }
+\cs_new_protected_nopar:Nn \__um_font_param:nn
+ {
+  \__um_font_param:nnnnn { #1 } { #2 } { #2 } { #2 } { #2 }
  }
+\cs_new_protected_nopar:Nn \__um_font_param:n
+  { \__um_font_param:nnnnn { #1 } { 0 } { 0 } { 0 } { 0 } }
+\cs_new_protected_nopar:Nn \__um_font_param_aux:NNN
+  {
+    \cs_new_nopar:Npn #1 ##1
+     {
+      #3 ##1
+     }
+    \cs_new_protected_nopar:Npn #2 ##1 ##2
+     {
+      #3 ##1 \dim_eval:n { ##2 }
+     }
+  }
+\cs_generate_variant:Nn \__um_font_param_aux:NNN { ccc }
+\__um_font_param:nn { axis } { 15 }
+\__um_font_param:nn { operator_size } { 13 }
+\__um_font_param:n { fraction_del_size }
+\__um_font_param:nnn { fraction_denom_down } { 45 } { 44 }
+\__um_font_param:nnn { fraction_denom_vgap } { 50 } { 49 }
+\__um_font_param:nnn { fraction_num_up } { 43 } { 42 }
+\__um_font_param:nnn { fraction_num_vgap } { 47 } { 46 }
+\__um_font_param:nn { fraction_rule } { 48 }
+\__um_font_param:nn { limit_above_bgap } { 29 }
+\__um_font_param:n { limit_above_kern }
+\__um_font_param:nn { limit_above_vgap } { 28 }
+\__um_font_param:nn { limit_below_bgap } { 31 }
+\__um_font_param:n { limit_below_kern }
+\__um_font_param:nn { limit_below_vgap } { 30 }
+\__um_font_param:nn { over_delimiter_vgap } { 41 }
+\__um_font_param:nn { over_delimiter_bgap } { 38 }
+\__um_font_param:nn { under_delimiter_vgap } { 40 }
+\__um_font_param:nn { under_delimiter_bgap } { 39 }
+\__um_font_param:nn { overbar_kern } { 55 }
+\__um_font_param:nn { overbar_rule } { 54 }
+\__um_font_param:nn { overbar_vgap } { 53 }
+\__um_font_param:n { quad }
+\__um_font_param:nn { radical_kern } { 62 }
+\__um_font_param:nn { radical_rule } { 61 }
+\__um_font_param:nnn { radical_vgap } { 60 } { 59 }
+\__um_font_param:nn { radical_degree_before } { 63 }
+\__um_font_param:nn { radical_degree_after } { 64 }
+\__um_font_param:nn { radical_degree_raise } { 65 }
+\__um_font_param:nn { space_after_script } { 27 }
+\__um_font_param:nnn { stack_denom_down } { 35 } { 34 }
+\__um_font_param:nnn { stack_num_up } { 33 } { 32 }
+\__um_font_param:nnn { stack_vgap } { 37 } { 36 }
+\__um_font_param:nn { sub_shift_down } { 18 }
+\__um_font_param:nn { sub_shift_drop } { 20 }
+\__um_font_param:n { subsup_shift_down }
+\__um_font_param:nn { sub_top_max } { 19 }
+\__um_font_param:nn { subsup_vgap } { 25 }
+\__um_font_param:nn { sup_bottom_min } { 23 }
+\__um_font_param:nn { sup_shift_drop } { 24 }
+\__um_font_param:nnnnn { sup_shift_up } { 21 } { 22 } { 21 } { 22 }
+\__um_font_param:nn { supsub_bottom_max } { 26 }
+\__um_font_param:nn { underbar_kern } { 58 }
+\__um_font_param:nn { underbar_rule } { 57 }
+\__um_font_param:nn { underbar_vgap } { 56 }
+\__um_font_param:n { connector_overlap_min }
+\cs_new:Nn \__um_fontdimen_to_percent:nn
+ {
+  \fp_eval:n { \dim_to_decimal:n { \fontdimen #1 #2 } * 65536 / 100 }
+ }
+\cs_new:Nn \__um_fontdimen_to_scale:nn
+ {
+  \fp_eval:n {\__um_fontdimen_to_percent:nn {#1} {#2} * \f@size } pt
+ }
+\cs_new:Nn \__um_mathstyle_scale:Nnn
+ {
+  \ifx#1\scriptstyle
+    #2 \__um_fontdimen_to_percent:nn {10} \l__um_font #3
+  \else
+    \ifx#1\scriptscriptstyle
+      #2 \__um_fontdimen_to_percent:nn {11} \l__um_font #3
+    \else
+      #2 #3
+    \fi
+  \fi
+ }
+
 \cs_set:Npn \use@mathgroup #1 #2
  {
   \mode_if_math:T % <- not sure if this is really necessary since we've just checked for mmode and raised an error if not!
@@ -746,6 +1510,11 @@
     \math@egroup
    }
  }
+\cs_set:Npn \operator@font
+ {
+  \__um_switchto_literal:
+  \@fontswitch {} { \g__um_operator_mathfont_tl }
+ }
 \cs_new:Nn \__um_prepare_mathstyle:n
  {
   \seq_put_right:Nn \g__um_mathstyles_seq {#1}
@@ -783,8 +1552,6 @@
  }
 \clist_map_inline:Nn \g__um_named_ranges_clist
  { \__um_new_named_range:n {#1} }
-\clist_new:N  \g__um_alphabets_seq
-\clist_set:Nn \g__um_alphabets_seq { latin, Latin, greek, Greek, num }
 \cs_new:Nn \__um_new_alphabet_config:nnn
  {
   \prop_if_exist:cF {g__um_named_range_#1_prop}
@@ -862,11 +1629,6 @@
  }}
 \cs_set_protected:Npn \mathup { \mathrm }
 \cs_set_protected:Npn \symrm  { \symup  }
-\cs_set:Npn \operator@font
- {
-  \__um_switchto_literal:
-  \@fontswitch {} { \g__um_operator_mathfont_tl }
- }
 \cs_new:Npn \__um_setup_alphabets:
  {
   \seq_if_empty:NTF \l__um_mathalph_seq
@@ -1122,31 +1884,253 @@
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varpi}
    }
  }
-\cs_new:Npn \__um_symbol_setup:
+
+\keys_define:nn {__um_mathface}
  {
-  \cs_set:Npn \UnicodeMathSymbol ##1##2##3##4
+  version .code:n =
+   { \tl_set:Nn \l__um_mversion_tl {#1} }
+ }
+\DeclareDocumentCommand \setmathfontface { m O{} m O{} }
+ {
+  \tl_clear:N \l__um_mversion_tl
+
+  \keys_set_known:nnN {__um_mathface} {#2,#4} \l__um_keyval_clist
+  \exp_args:Nnx \fontspec_set_family:Nxn \l__um_tmpa_tl
+   { ItalicFont={}, BoldFont={}, \exp_not:V \l__um_keyval_clist } {#3}
+
+  \tl_if_empty:NT \l__um_mversion_tl
    {
-    \exp_not:n { \__um_sym:nnn {##1} {##2} {##3} }
+    \tl_set:Nn \l__um_mversion_tl {normal}
+    \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault}
+   }
+  \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault}
+
+  % integrate with fontspec's \setmathrm etc:
+  \tl_case:Nn #1
+   {
+    \mathrm { \cs_set_eq:NN \g__fontspec_mathrm_tl \l__um_tmpa_tl }
+    \mathsf { \cs_set_eq:NN \g__fontspec_mathsf_tl \l__um_tmpa_tl }
+    \mathtt { \cs_set_eq:NN \g__fontspec_mathtt_tl \l__um_tmpa_tl }
    }
  }
-\tl_set_from_file_x:Nnn \g__um_mathtable_tl {\__um_symbol_setup:} {unicode-math-table.tex}
-\cs_new:Nn \__um_input_math_symbol_table: {\g__um_mathtable_tl}
-\AtBeginDocument{\__um_define_math_chars:}
-\cs_new:Nn \__um_define_math_chars:
- {
-  \group_begin:
-    \cs_set:Npn \__um_sym:nnn ##1##2##3
-     {
-      \tl_if_in:nnT
-       { \mathord \mathalpha \mathbin \mathrel \mathpunct \mathop \mathfence }
-       {##3}
+\@onlypreamble \setmathfontface
+\DeclareDocumentCommand \setoperatorfont {m}
+ { \tl_set:Nn \g__um_operator_mathfont_tl {#1} }
+\setoperatorfont{\mathrm}
+\cs_generate_variant:Nn \tl_if_eq:nnT {o}
+\cs_set:Nn \__fontspec_setmainfont_hook:nn
+  {
+    \tl_if_eq:onT {\g__fontspec_mathrm_tl} {\rmdefault}
       {
-        \exp_last_unbraced:NNx \cs_gset_eq:NN ##2 { \Ucharcat ##1 ~ 12 ~ }
+   \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {Renderer=Basic,#1} {#2}
+        \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault
+        \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\itdefault
+        \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault
       }
+  }
+
+\cs_set:Nn \__fontspec_setsansfont_hook:nn
+  {
+    \tl_if_eq:onT {\g__fontspec_mathsf_tl} {\sfdefault}
+      {
+   \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {Renderer=Basic,#1} {#2}
+        \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl\mddefault\updefault
+        \SetMathAlphabet\mathsf{bold}  \g_fontspec_encoding_tl\g__fontspec_mathsf_tl\bfdefault\updefault
+      }
+  }
+
+\cs_set:Nn \__fontspec_setmonofont_hook:nn
+  {
+    \tl_if_eq:onT {\g__fontspec_mathtt_tl} {\ttdefault}
+      {
+   \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {Renderer=Basic,#1} {#2}
+        \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault
+        \SetMathAlphabet\mathtt{bold}  \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault
+      }
+  }
+\cs_set:Nn \__fontspec_setmathrm_hook:nn
+  {
+    \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault
+    \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\itdefault
+    \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault
+  }
+\cs_set:Nn \__fontspec_setboldmathrm_hook:nn
+  {
+    \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\updefault
+    \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\bfdefault\updefault
+    \SetMathAlphabet\mathit{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\itdefault
+  }
+\cs_set:Nn \__fontspec_setmathsf_hook:nn
+  {
+    \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl\mddefault\updefault
+    \SetMathAlphabet\mathsf{bold}  \g_fontspec_encoding_tl\g__fontspec_mathsf_tl\bfdefault\updefault
+  }
+\cs_set:Nn \__fontspec_setmathtt_hook:nn
+  {
+    \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault
+    \SetMathAlphabet\mathtt{bold}  \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault
+  }
+
+\AtBeginDocument{\__um_resolve_greek:}
+\cs_new:Npn \__um_resolve_greek:
+ {
+  \clist_map_inline:nn
+   {
+    Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,
+    alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,
+    Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,
+    mu,nu,xi,omicron,pi,rho,sigma,tau,upsilon,phi,chi,psi,omega,
+    varTheta,varsigma,vartheta,varkappa,varrho,varpi,varepsilon,varphi
+   }
+   {
+    \tl_set:cx {##1} { \exp_not:c { mit ##1 } }
+    \tl_set:cx {up ##1} { \exp_not:N \symup \exp_not:c { ##1 } }
+    \tl_set:cx {it ##1} { \exp_not:N \symit \exp_not:c { ##1 } }
+   }
+ }
+\cs_if_exist:NF \Uroot
+  { \cs_new_eq:NN \Uroot \luatexUroot }
+\AtBeginDocument{\__um_redefine_radical:}
+\cs_new:Nn \__um_redefine_radical:
+ {
+  \@ifpackageloaded { amsmath } { }
+   {
+    \cs_set:Npn \root ##1 \of ##2
+     {
+       \Uroot \l__um_radical_sqrt_tl { ##1 } { ##2 }
      }
-    \__um_input_math_symbol_table:
+   }
+ }
+\cs_new:Npn \__um_define_active_frac:Nw #1 #2/#3
+ {
+  \char_set_catcode_active:N #1
+  \__um_char_gmake_mathactive:N #1
+  \tl_rescan:nn
+   {
+    \catcode`\_=11\relax
+    \catcode`\:=11\relax
+   }
+   {
+    \cs_gset:Npx #1
+     {
+      \bool_if:NTF \l__um_smallfrac_bool {\exp_not:N\tfrac} {\exp_not:N\frac}
+          {#2} {#3}
+     }
+   }
+ }
+\cs_new:Npn \__um_setup_active_frac:
+ {
+  \group_begin:
+  \__um_define_active_frac:Nw  ^^^^2189  0/3
+  \__um_define_active_frac:Nw  ^^^^2152  1/{10}
+  \__um_define_active_frac:Nw  ^^^^2151  1/9
+  \__um_define_active_frac:Nw  ^^^^215b  1/8
+  \__um_define_active_frac:Nw  ^^^^2150  1/7
+  \__um_define_active_frac:Nw  ^^^^2159  1/6
+  \__um_define_active_frac:Nw  ^^^^2155  1/5
+  \__um_define_active_frac:Nw  ^^^^00bc  1/4
+  \__um_define_active_frac:Nw  ^^^^2153  1/3
+  \__um_define_active_frac:Nw  ^^^^215c  3/8
+  \__um_define_active_frac:Nw  ^^^^2156  2/5
+  \__um_define_active_frac:Nw  ^^^^00bd  1/2
+  \__um_define_active_frac:Nw  ^^^^2157  3/5
+  \__um_define_active_frac:Nw  ^^^^215d  5/8
+  \__um_define_active_frac:Nw  ^^^^2154  2/3
+  \__um_define_active_frac:Nw  ^^^^00be  3/4
+  \__um_define_active_frac:Nw  ^^^^2158  4/5
+  \__um_define_active_frac:Nw  ^^^^215a  5/6
+  \__um_define_active_frac:Nw  ^^^^215e  7/8
   \group_end:
  }
+\__um_setup_active_frac:
+\protected\def\to{\rightarrow}
+\protected\def\le{\leq}
+\protected\def\ge{\geq}
+\protected\def\neq{\ne}
+\protected\def\triangle{\mathord{\bigtriangleup}}
+\protected\def\bigcirc{\mdlgwhtcircle}
+\protected\def\circ{\vysmwhtcircle}
+\protected\def\bullet{\smblkcircle}
+\protected\def\mathyen{\yen}
+\protected\def\mathsterling{\sterling}
+\protected\def\diamond{\smwhtdiamond}
+\protected\def\emptyset{\varnothing}
+\protected\def\hbar{\hslash}
+\protected\def\land{\wedge}
+\protected\def\lor{\vee}
+\protected\def\owns{\ni}
+\protected\def\gets{\leftarrow}
+\protected\def\mathring{\ocirc}
+\protected\def\lnot{\neg}
+\protected\def\longdivision{\longdivisionsign}
+\protected\def\backepsilon{\upbackepsilon}
+\protected\def\eth{\matheth}
+\protected\def\dbkarow {\dbkarrow}
+\protected\def\drbkarow{\drbkarrow}
+\protected\def\hksearow{\hksearrow}
+\protected\def\hkswarow{\hkswarrow}
+\protected\def\smallint{\mathop{\textstyle\int}\limits}
+\cs_set_eq:NN \latexe_underbar:n \underbar
+\renewcommand\underbar
+ {
+  \mode_if_math:TF \mathunderbar \latexe_underbar:n
+ }
+\@ifpackageloaded{amsmath}
+ {
+  % define their own colon, perhaps I should just steal it. (It does look much better.)
+ }
+ {
+  \cs_set_protected:Npn \colon
+   {
+    \bool_if:NTF \g__um_literal_colon_bool {:} { \mathpunct{:} }
+   }
+ }
+\protected\def\digamma{\updigamma}
+\protected\def\Digamma{\upDigamma}
+\cs_set_protected:Npn \| {\Vert}
+\cs_set_protected:Npn \mathellipsis {\mathinner{\unicodeellipsis}}
+\cs_set_protected:Npn \cdots {\mathinner{\unicodecdots}}
+\cs_set_eq:NN \__um_text_slash: \slash
+\cs_set_protected:Npn \slash
+ {
+  \mode_if_math:TF {\mathslash} {\__um_text_slash:}
+ }
+\cs_new:Npn \__um_newnot:N #1
+ {
+   \tl_set:Nx \l_not_token_name_tl { \token_to_str:N #1 }
+   \exp_args:Nx \tl_if_empty:nF { \tl_tail:V \l_not_token_name_tl }
+    {
+     \tl_set:Nx \l_not_token_name_tl { \tl_tail:V \l_not_token_name_tl }
+    }
+   \cs_if_exist:cTF { n \l_not_token_name_tl }
+    {
+     \use:c { n \l_not_token_name_tl }
+    }
+    {
+     \cs_if_exist:cTF { not \l_not_token_name_tl }
+      {
+       \use:c { not \l_not_token_name_tl }
+      }
+      {
+       \__um_oldnot: #1
+      }
+    }
+ }
+\cs_set_eq:NN \__um_oldnot: \not
+\AtBeginDocument{\cs_set_eq:NN \not \__um_newnot:N}
+\cs_new_protected_nopar:Nn \__um_setup_negations:
+ {
+  \cs_gset:cpn { not= }    { \neq }
+  \cs_gset:cpn { not< }    { \nless }
+  \cs_gset:cpn { not> }    { \ngtr }
+  \cs_gset:Npn  \ngets     { \nleftarrow }
+  \cs_gset:Npn  \nsimeq    { \nsime }
+  \cs_gset:Npn  \nequal    { \ne }
+  \cs_gset:Npn  \nle       { \nleq }
+  \cs_gset:Npn  \nge       { \ngeq }
+  \cs_gset:Npn  \ngreater  { \ngtr }
+  \cs_gset:Npn  \nforksnot { \forks }
+ }
 
 \cs_new:Nn \__um_arg_i_before_egroup:n {#1\egroup}
 \cs_new:Nn \__um_superscript:n
@@ -1162,7 +2146,6 @@
     \prg_replicate:nn {#2-1} { \mskip \g__um_primekern_muskip #1 }
    }
  }
-
 \cs_new:Nn \__um_nprimes_select:nn
  {
   \int_case:nnF {#2}
@@ -1395,7 +2378,7 @@
      }
    }
  }
-\AtBeginDocument{\__um_define_prime_commands: \__um_define_prime_chars:}
+\AtBeginDocument { \__um_define_prime_commands: \__um_define_prime_chars: }
 \cs_new:Nn \__um_define_prime_commands:
  {
   \cs_set_eq:NN \prime       \__um_prime_single_mchar
@@ -1429,55 +2412,7 @@
     \cs_set_eq:NN ^^^^2037 \__um_scan_sup_backtrprime:
    }
 \group_end:
-\AtBeginDocument{\__um_redefine_radical:}
-\cs_new:Nn \__um_redefine_radical:
- {
-  \@ifpackageloaded { amsmath } { }
-   {
-    \cs_set_nopar:Npn \r@@t ##1 ##2
-     {
-      \hbox_set:Nn \l_tmpa_box
-       {
-        \c_math_toggle_token
-        \m@th
-        ##1
-        \sqrtsign { ##2 }
-        \c_math_toggle_token
-       }
-      \__um_mathstyle_scale:Nnn ##1 { \kern }
-       { \fontdimen 63 \l__um_font }
-      \box_move_up:nn
-       {
-        (\box_ht:N \l_tmpa_box - \box_dp:N \l_tmpa_box)
-        * \number \fontdimen 65 \l__um_font / 100
-       }
-       { \box_use:N \rootbox }
-      \__um_mathstyle_scale:Nnn ##1 { \kern }
-       { \fontdimen 64 \l__um_font }
-      \box_use_clear:N \l_tmpa_box
-     }
-   }
- }
-\cs_new:Nn \__um_fontdimen_to_percent:nn
- {
-  \fp_eval:n { \dim_to_decimal:n { \fontdimen #1 #2 } * 65536 / 100 }
- }
-\cs_new:Nn \__um_fontdimen_to_scale:nn
- {
-  \fp_eval:n {\__um_fontdimen_to_percent:nn {#1} {#2} * \f@size } pt
- }
-\cs_new:Nn \__um_mathstyle_scale:Nnn
- {
-  \ifx#1\scriptstyle
-    #2 \__um_fontdimen_to_percent:nn {10} \l__um_font #3
-  \else
-    \ifx#1\scriptscriptstyle
-      #2 \__um_fontdimen_to_percent:nn {11} \l__um_font #3
-    \else
-      #2 #3
-    \fi
-  \fi
- }
+
 \group_begin:
 \cs_new:Nn \__um_setup_active_superscript:nn
  {
@@ -1600,146 +2535,6 @@
    }
    { \group_align_safe_end: #2 #3 }
  }
-\cs_new:Npn \__um_define_active_frac:Nw #1 #2/#3
- {
-  \char_set_catcode_active:N #1
-  \__um_char_gmake_mathactive:N #1
-  \tl_rescan:nn
-   {
-    \catcode`\_=11\relax
-    \catcode`\:=11\relax
-   }
-   {
-    \cs_gset:Npx #1
-     {
-      \bool_if:NTF \l__um_smallfrac_bool {\exp_not:N\tfrac} {\exp_not:N\frac}
-          {#2} {#3}
-     }
-   }
- }
-\cs_new:Npn \__um_setup_active_frac:
- {
-  \group_begin:
-  \__um_define_active_frac:Nw  ^^^^2189  0/3
-  \__um_define_active_frac:Nw  ^^^^2152  1/{10}
-  \__um_define_active_frac:Nw  ^^^^2151  1/9
-  \__um_define_active_frac:Nw  ^^^^215b  1/8
-  \__um_define_active_frac:Nw  ^^^^2150  1/7
-  \__um_define_active_frac:Nw  ^^^^2159  1/6
-  \__um_define_active_frac:Nw  ^^^^2155  1/5
-  \__um_define_active_frac:Nw  ^^^^00bc  1/4
-  \__um_define_active_frac:Nw  ^^^^2153  1/3
-  \__um_define_active_frac:Nw  ^^^^215c  3/8
-  \__um_define_active_frac:Nw  ^^^^2156  2/5
-  \__um_define_active_frac:Nw  ^^^^00bd  1/2
-  \__um_define_active_frac:Nw  ^^^^2157  3/5
-  \__um_define_active_frac:Nw  ^^^^215d  5/8
-  \__um_define_active_frac:Nw  ^^^^2154  2/3
-  \__um_define_active_frac:Nw  ^^^^00be  3/4
-  \__um_define_active_frac:Nw  ^^^^2158  4/5
-  \__um_define_active_frac:Nw  ^^^^215a  5/6
-  \__um_define_active_frac:Nw  ^^^^215e  7/8
-  \group_end:
- }
-\__um_setup_active_frac:
-\protected\def\to{\rightarrow}
-\protected\def\le{\leq}
-\protected\def\ge{\geq}
-\protected\def\neq{\ne}
-\protected\def\triangle{\mathord{\bigtriangleup}}
-\protected\def\bigcirc{\mdlgwhtcircle}
-\protected\def\circ{\vysmwhtcircle}
-\protected\def\bullet{\smblkcircle}
-\protected\def\mathyen{\yen}
-\protected\def\mathsterling{\sterling}
-\protected\def\diamond{\smwhtdiamond}
-\protected\def\emptyset{\varnothing}
-\protected\def\hbar{\hslash}
-\protected\def\land{\wedge}
-\protected\def\lor{\vee}
-\protected\def\owns{\ni}
-\protected\def\gets{\leftarrow}
-\protected\def\mathring{\ocirc}
-\protected\def\lnot{\neg}
-\protected\def\longdivision{\longdivisionsign}
-\protected\def\backepsilon{\upbackepsilon}
-\protected\def\eth{\matheth}
-\protected\def\dbkarow {\dbkarrow}
-\protected\def\drbkarow{\drbkarrow}
-\protected\def\hksearow{\hksearrow}
-\protected\def\hkswarow{\hkswarrow}
-\protected\def\smallint{\mathop{\textstyle\int}\limits}
-\cs_set_eq:NN \latexe_underbar:n \underbar
-\renewcommand\underbar
- {
-  \mode_if_math:TF \mathunderbar \latexe_underbar:n
- }
-\@ifpackageloaded{amsmath}
- {
-  % define their own colon, perhaps I should just steal it. (It does look much better.)
- }
- {
-  \cs_set_protected:Npn \colon
-   {
-    \bool_if:NTF \g__um_literal_colon_bool {:} { \mathpunct{:} }
-   }
- }
-\protected\def\digamma{\updigamma}
-\protected\def\Digamma{\upDigamma}
-\cs_set_protected:Npn \| {\Vert}
-\cs_set_protected:Npn \mathellipsis {\mathinner{\unicodeellipsis}}
-\cs_set_protected:Npn \cdots {\mathinner{\unicodecdots}}
-\cs_set_eq:NN \__um_text_slash: \slash
-\cs_set_protected:Npn \slash
- {
-  \mode_if_math:TF {\mathslash} {\__um_text_slash:}
- }
-\cs_new:Npn \__um_newnot:N #1
- {
-   \tl_set:Nx \l_not_token_name_tl { \token_to_str:N #1 }
-   \exp_args:Nx \tl_if_empty:nF { \tl_tail:V \l_not_token_name_tl }
-    {
-     \tl_set:Nx \l_not_token_name_tl { \tl_tail:V \l_not_token_name_tl }
-    }
-   \cs_if_exist:cTF { n \l_not_token_name_tl }
-    {
-     \use:c { n \l_not_token_name_tl }
-    }
-    {
-     \cs_if_exist:cTF { not \l_not_token_name_tl }
-      {
-       \use:c { not \l_not_token_name_tl }
-      }
-      {
-       \__um_oldnot: #1
-      }
-    }
- }
-\cs_set_eq:NN \__um_oldnot: \not
-\AtBeginDocument{\cs_set_eq:NN \not \__um_newnot:N}
-\cs_new_protected_nopar:Nn \__um_setup_negations:
- {
-  \cs_gset:cpn { not= }    { \neq }
-  \cs_gset:cpn { not< }    { \nless }
-  \cs_gset:cpn { not> }    { \ngtr }
-  \cs_gset:Npn  \ngets     { \nleftarrow }
-  \cs_gset:Npn  \nsimeq    { \nsime }
-  \cs_gset:Npn  \nequal    { \ne }
-  \cs_gset:Npn  \nle       { \nleq }
-  \cs_gset:Npn  \nge       { \ngeq }
-  \cs_gset:Npn  \ngreater  { \ngtr }
-  \cs_gset:Npn  \nforksnot { \forks }
- }
-\AtBeginDocument { \__um_load_lm_if_necessary: }
-\cs_new:Nn \__um_load_lm_if_necessary:
-  {
-    \cs_if_exist:NF \l__um_fontname_tl
-      {
-        % TODO: update this when lmmath-bold.otf is released
-        \setmathfont{latinmodern-math.otf}[BoldFont={latinmodern-math.otf}]
-        \bool_set_false:N \g__um_mainfont_already_set_bool
-      }
-  }
 \cs_new_protected_nopar:Nn \__um_check_and_fix:NNnnnn
  {
   \cs_if_exist:NT #1
@@ -1954,3 +2749,827 @@
   \RenewDocumentCommand \equalscolon { } { \eqcolon }
   \RenewDocumentCommand \coloncolonequals { } { \Coloneq }
  }
+\__um_new_alphabet_config:nnn {up} {num}
+ {
+  \__um_set_normal_numbers:nn {up} {#1}
+  \__um_set_mathalphabet_numbers:nnn {up} {up} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {up} {Latin}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_Latin:nn {up} {#1} }
+   {
+    \bool_if:NT \g__um_upLatin_bool { \__um_set_normal_Latin:nn {up,it} {#1} }
+   }
+  \__um_set_mathalphabet_Latin:nnn {up} {up,it} {#1}
+  \__um_set_mathalphabet_Latin:nnn {literal} {up} {up}
+  \__um_set_mathalphabet_Latin:nnn {literal} {it} {it}
+ }
+
+\__um_new_alphabet_config:nnn {up} {latin}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_latin:nn {up} {#1} }
+   {
+    \bool_if:NT \g__um_uplatin_bool
+     {
+      \__um_set_normal_latin:nn        {up,it} {#1}
+      \__um_set_normal_char:nnn        {h} {up,it} {#1}
+      \__um_set_normal_char:nnn {dotlessi} {up,it} {#1}
+      \__um_set_normal_char:nnn {dotlessj} {up,it} {#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {up} {up,it}{#1}
+  \__um_set_mathalphabet_latin:nnn {literal} {up} {up}
+  \__um_set_mathalphabet_latin:nnn {literal} {it} {it}
+ }
+
+\__um_new_alphabet_config:nnn {up} {Greek}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_Greek:nn {up}{#1} }
+   {
+    \bool_if:NT \g__um_upGreek_bool { \__um_set_normal_Greek:nn {up,it}{#1} }
+   }
+  \__um_set_mathalphabet_Greek:nnn {up} {up,it}{#1}
+  \__um_set_mathalphabet_Greek:nnn {literal} {up} {up}
+  \__um_set_mathalphabet_Greek:nnn {literal} {it} {it}
+ }
+
+\__um_new_alphabet_config:nnn {up} {greek}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_greek:nn {up} {#1} }
+   {
+    \bool_if:NT \g__um_upgreek_bool
+     {
+      \__um_set_normal_greek:nn {up,it} {#1}
+     }
+   }
+  \__um_set_mathalphabet_greek:nnn {up} {up,it} {#1}
+  \__um_set_mathalphabet_greek:nnn {literal} {up} {up}
+  \__um_set_mathalphabet_greek:nnn {literal} {it} {it}
+ }
+
+\__um_new_alphabet_config:nnn {up} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{up}{up}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{up,it}{up}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{up}{up}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{up,it}{up}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {up}  {partial} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {up}    {Nabla} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {up} {dotlessi} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {up} {dotlessj} {up,it} {#1}
+ }
+\__um_new_alphabet_config:nnn {it} {Latin}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_Latin:nn {it} {#1} }
+   {
+    \bool_if:NF \g__um_upLatin_bool { \__um_set_normal_Latin:nn {up,it} {#1} }
+   }
+  \__um_set_mathalphabet_Latin:nnn {it}{up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {it} {latin}
+ {
+  \bool_if:NTF \g__um_literal_bool
+   {
+    \__um_set_normal_latin:nn {it} {#1}
+    \__um_set_normal_char:nnn {h}{it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_uplatin_bool
+     {
+      \__um_set_normal_latin:nn {up,it} {#1}
+      \__um_set_normal_char:nnn {h}{up,it}{#1}
+      \__um_set_normal_char:nnn {dotlessi}{up,it}{#1}
+      \__um_set_normal_char:nnn {dotlessj}{up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {it}            {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {it} {dotlessi} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {it} {dotlessj} {up,it} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {it} {Greek}
+ {
+  \bool_if:NTF \g__um_literal_bool
+   {
+    \__um_set_normal_Greek:nn {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upGreek_bool { \__um_set_normal_Greek:nn {up,it}{#1} }
+   }
+  \__um_set_mathalphabet_Greek:nnn {it} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {it} {greek}
+ {
+  \bool_if:NTF \g__um_literal_bool
+   {
+    \__um_set_normal_greek:nn {it} {#1}
+   }
+   {
+    \bool_if:NF \g__um_upgreek_bool { \__um_set_normal_greek:nn {it,up} {#1} }
+   }
+  \__um_set_mathalphabet_greek:nnn {it} {up,it} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {it} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{it}{it}
+   }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{up,it}{it}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{it}{it}
+   }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{up,it}{it}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {it} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {it} {Nabla}   {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bb} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {bb} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bb} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {bb} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {C} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {H} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {N} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {P} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {Q} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {R} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {Z} {up,it} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {bb} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {bb} {up}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bb} {misc}
+ {
+  \__um_set_mathalphabet_pos:nnnn {bb}        {Pi} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb}        {pi} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb}     {Gamma} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb}     {gamma} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {summation} {up} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {bbit} {misc}
+ {
+  \__um_set_mathalphabet_pos:nnnn {bbit} {D} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bbit} {d} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bbit} {e} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bbit} {i} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bbit} {j} {up,it} {#1}
+ }
+\__um_new_alphabet_config:nnn {scr} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {scr}    {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {B}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {E}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {F}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {H}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {I}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {L}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {M}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {R}{up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {scr} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {scr}    {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {e}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {g}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {o}{up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {cal} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {cal}  {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {B}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {E}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {F}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {H}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {I}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {L}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {M}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {R}{up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {frak} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {frak}    {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {C}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {H}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {I}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {R}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {Z}{up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {frak} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {frak} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfup} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {sf}   {up}{#1}
+  \__um_set_mathalphabet_numbers:nnn {sfup} {up}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfup} {Latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {sfup} {#1}
+    \__um_set_mathalphabet_Latin:nnn {sf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_Latin:nn {sfup,sfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {sf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Latin:nnn {sfup} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfup} {latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_latin:nn {sfup} {#1}
+    \__um_set_mathalphabet_latin:nnn {sf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_latin:nn {sfup,sfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {sf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {sfup} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfit} {Latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {sfit} {#1}
+    \__um_set_mathalphabet_Latin:nnn {sf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_Latin:nn {sfup,sfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {sf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Latin:nnn {sfit} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfit} {latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_latin:nn {sfit} {#1}
+    \__um_set_mathalphabet_latin:nnn {sf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_latin:nn {sfup,sfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {sf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {sfit} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {tt} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {tt} {up}{#1}
+ }
+\__um_new_alphabet_config:nnn {tt} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {tt} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {tt} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {tt} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfit} {Latin}
+ {
+  \bool_if:NF \g__um_bfupLatin_bool
+   {
+    \__um_set_normal_Latin:nn {bfup,bfit} {#1}
+   }
+  \__um_set_mathalphabet_Latin:nnn {bfit} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {bfit} {#1}
+    \__um_set_mathalphabet_Latin:nnn {bf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_bfupLatin_bool
+     {
+      \__um_set_normal_Latin:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfit} {latin}
+ {
+  \bool_if:NF \g__um_bfuplatin_bool
+   {
+    \__um_set_normal_latin:nn {bfup,bfit} {#1}
+   }
+  \__um_set_mathalphabet_latin:nnn {bfit} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_latin:nn {bfit} {#1}
+    \__um_set_mathalphabet_latin:nnn {bf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_bfuplatin_bool
+     {
+      \__um_set_normal_latin:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfit} {Greek}
+ {
+  \__um_set_mathalphabet_Greek:nnn {bfit} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_Greek:nn {bfit}{#1}
+    \__um_set_mathalphabet_Greek:nnn {bf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_bfupGreek_bool
+     {
+      \__um_set_normal_Greek:nn {bfup,bfit}{#1}
+      \__um_set_mathalphabet_Greek:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfit} {greek}
+ {
+  \__um_set_mathalphabet_greek:nnn {bfit} {up,it} {#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_greek:nn {bfit} {#1}
+    \__um_set_mathalphabet_greek:nnn {bf} {it} {#1}
+   }
+   {
+    \bool_if:NF \g__um_bfupgreek_bool
+     {
+      \__um_set_normal_greek:nn {bfit,bfup} {#1}
+      \__um_set_mathalphabet_greek:nnn {bf} {up,it} {#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfit} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   { \__um_set_normal_char:nnn {Nabla}{bfit}{#1} }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     { \__um_set_normal_char:nnn {Nabla}{bfup,bfit}{#1} }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   { \__um_set_normal_char:nnn {partial}{bfit}{#1} }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     { \__um_set_normal_char:nnn {partial}{bfup,bfit}{#1} }
+   }
+  \__um_set_mathalphabet_pos:nnnn {bfit} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfit} {Nabla}   {up,it}{#1}
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bf} {partial} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bf} {partial} {up,it}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {up,it}{#1}
+     }
+   }
+ }
+\__um_new_alphabet_config:nnn {bfup} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {bf}   {up}{#1}
+  \__um_set_mathalphabet_numbers:nnn {bfup} {up}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfup} {Latin}
+ {
+  \bool_if:NT \g__um_bfupLatin_bool
+   {
+    \__um_set_normal_Latin:nn {bfup,bfit} {#1}
+   }
+  \__um_set_mathalphabet_Latin:nnn {bfup} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {bfup} {#1}
+    \__um_set_mathalphabet_Latin:nnn {bf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_bfupLatin_bool
+     {
+      \__um_set_normal_Latin:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfup} {latin}
+ {
+  \bool_if:NT \g__um_bfuplatin_bool
+   {
+    \__um_set_normal_latin:nn {bfup,bfit} {#1}
+   }
+  \__um_set_mathalphabet_latin:nnn {bfup} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_latin:nn {bfup} {#1}
+    \__um_set_mathalphabet_latin:nnn {bf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_bfuplatin_bool
+     {
+      \__um_set_normal_latin:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+\__um_new_alphabet_config:nnn {bfup} {Greek}
+ {
+  \__um_set_mathalphabet_Greek:nnn {bfup} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_Greek:nn {bfup}{#1}
+    \__um_set_mathalphabet_Greek:nnn {bf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_bfupGreek_bool
+     {
+      \__um_set_normal_Greek:nn {bfup,bfit}{#1}
+      \__um_set_mathalphabet_Greek:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfup} {greek}
+ {
+  \__um_set_mathalphabet_greek:nnn {bfup} {up,it} {#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_greek:nn {bfup} {#1}
+    \__um_set_mathalphabet_greek:nnn {bf} {up} {#1}
+   }
+   {
+    \bool_if:NT \g__um_bfupgreek_bool
+     {
+      \__um_set_normal_greek:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_greek:nnn {bf} {up,it} {#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfup} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{bfup}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{bfup,bfit}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{bfup}{#1}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{bfup,bfit}{#1}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {bfup} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfup} {Nabla}   {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfup} {digamma} {up}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfup} {Digamma} {up}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bf}   {digamma} {up}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bf}   {Digamma} {up}{#1}
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bf} {partial} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bf} {partial} {up,it}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {up,it}{#1}
+     }
+   }
+ }
+\__um_new_alphabet_config:nnn {bffrak} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {bffrak} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bffrak} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {bffrak} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfscr} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {bfscr} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfscr} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {bfscr} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfcal} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {bfcal}  {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfsfup} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {bfsf}   {up}{#1}
+  \__um_set_mathalphabet_numbers:nnn {bfsfup} {up}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfsfup} {Latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {bfsfup} {#1}
+    \__um_set_mathalphabet_Latin:nnn {bfsf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_Latin:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Latin:nnn {bfsfup} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfup} {latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_latin:nn {bfsfup} {#1}
+    \__um_set_mathalphabet_latin:nnn {bfsf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_latin:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {bfsfup} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfup} {Greek}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Greek:nn {bfsfup}{#1}
+    \__um_set_mathalphabet_Greek:nnn {bfsf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_Greek:nn {bfsfup,bfsfit}{#1}
+      \__um_set_mathalphabet_Greek:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Greek:nnn {bfsfup} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfup} {greek}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_greek:nn {bfsfup} {#1}
+    \__um_set_mathalphabet_greek:nnn {bfsf} {up} {#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_greek:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_greek:nnn {bfsf} {up,it} {#1}
+     }
+   }
+  \__um_set_mathalphabet_greek:nnn {bfsfup} {up,it} {#1}
+ }
+\__um_new_alphabet_config:nnn {bfsfup} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{bfsfup}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{bfsfup,bfsfit}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{bfsfup}{#1}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{bfsfup,bfsfit}{#1}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {bfsfup} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfsfup} {Nabla}   {up,it}{#1}
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {up,it}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {up,it}{#1}
+     }
+   }
+ }
+\__um_new_alphabet_config:nnn {bfsfit} {Latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {bfsfit} {#1}
+    \__um_set_mathalphabet_Latin:nnn {bfsf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_Latin:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Latin:nnn {bfsfit} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfit} {latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_latin:nn {bfsfit} {#1}
+    \__um_set_mathalphabet_latin:nnn {bfsf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_latin:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {bfsfit} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfit} {Greek}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Greek:nn {bfsfit}{#1}
+    \__um_set_mathalphabet_Greek:nnn {bfsf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_Greek:nn {bfsfup,bfsfit}{#1}
+      \__um_set_mathalphabet_Greek:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Greek:nnn {bfsfit} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfit} {greek}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_greek:nn {bfsfit} {#1}
+    \__um_set_mathalphabet_greek:nnn {bfsf} {it} {#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_greek:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_greek:nnn {bfsf} {up,it} {#1}
+     }
+   }
+  \__um_set_mathalphabet_greek:nnn {bfsfit} {up,it} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfit} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{bfsfit}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{bfsfup,bfsfit}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{bfsfit}{#1}
+   }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{bfsfup,bfsfit}{#1}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {bfsfit} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfsfit} {Nabla}   {up,it}{#1}
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {up,it}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {up,it}{#1}
+     }
+   }
+ }
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
index 6895fa6ac37..84c3c217745 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
@@ -5,8 +5,23 @@
 %% The original source files were:
 %%
 %% unicode-math.dtx  (with options: `package,XE')
+%% unicode-math-preamble.dtx  (with options: `package,XE')
+%% unicode-math-pkgopt.dtx  (with options: `package,XE')
+%% unicode-math-msg.dtx  (with options: `package,XE')
+%% unicode-math-usv.dtx  (with options: `package,XE')
+%% unicode-math-setchar.dtx  (with options: `package,XE')
+%% unicode-math-mathtext.dtx  (with options: `package,XE')
+%% unicode-math-main.dtx  (with options: `package,XE')
+%% unicode-math-fontopt.dtx  (with options: `package,XE')
+%% unicode-math-fontparam.dtx  (with options: `package,XE')
+%% unicode-math-mathmap.dtx  (with options: `package,XE')
+%% unicode-math-mathtext.dtx  (with options: `package,XE')
 %% unicode-math-epilogue.dtx  (with options: `package,XE')
-%% unicode-math-compat.dtx  (with options: `compat,XE')
+%% unicode-math-primes.dtx  (with options: `package,XE')
+%% unicode-math-sscript.dtx  (with options: `package,XE')
+%% unicode-math-compat.dtx  (with options: `package,XE')
+%% unicode-math-alphabets.dtx  (with options: `package,XE')
+%% 
 %% Copyright 2006-2017   Will Robertson <will.robertson@latex-project.org>
 %% Copyright 2010-2013 Philipp Stephani <st_philipp@yahoo.de>
 %% Copyright 2012-2015     Khaled Hosny <khaledhosny@eglug.org>
@@ -16,7 +31,745 @@
 %% (your choice): <http://www.latex-project.org/lppl/>.
 %% 
 %% This work is "maintained" by Will Robertson.
+\ProvidesPackage{unicode-math-xetex}
+  [2017/10/09 v0.8h Unicode maths in XeLaTeX and LuaLaTeX]
+
 \ExplSyntaxOn
+\cs_set_protected_nopar:Npn \exp_last_unbraced:NNx { \::N \::x_unbraced \::: }
+\cs_generate_variant:Nn \fontspec_set_family:Nnn {Nx}
+\cs_generate_variant:Nn \fontspec_set_fontface:NNnn {NNx}
+\bool_new:N \l__um_ot_math_bool
+\bool_new:N \l__um_init_bool
+\bool_new:N \l__um_implicit_alph_bool
+\bool_new:N \g__um_mainfont_already_set_bool
+\bool_new:N \g__um_literal_bool
+\bool_new:N \g__um_upLatin_bool
+\bool_new:N \g__um_uplatin_bool
+\bool_new:N \g__um_upGreek_bool
+\bool_new:N \g__um_upgreek_bool
+\bool_new:N \g__um_bfliteral_bool
+\bool_new:N \g__um_bfupLatin_bool
+\bool_new:N \g__um_bfuplatin_bool
+\bool_new:N \g__um_bfupGreek_bool
+\bool_new:N \g__um_bfupgreek_bool
+\bool_new:N \g__um_upsans_bool
+\bool_new:N \g__um_sfliteral_bool
+\bool_new:N \g__um_upNabla_bool
+\bool_new:N \g__um_uppartial_bool
+\bool_new:N \g__um_literal_Nabla_bool
+\bool_new:N \g__um_literal_partial_bool
+\bool_new:N \l__um_smallfrac_bool
+\bool_new:N \g__um_literal_colon_bool
+\bool_new:N \g__um_mathrm_text_bool
+\bool_new:N \g__um_mathit_text_bool
+\bool_new:N \g__um_mathbf_text_bool
+\bool_new:N \g__um_mathsf_text_bool
+\bool_new:N \g__um_mathtt_text_bool
+\int_new:N \g__um_fam_int
+\tl_const:Nn \c__um_math_alphabet_name_latin_tl {Latin,~lowercase}
+\tl_const:Nn \c__um_math_alphabet_name_Latin_tl {Latin,~uppercase}
+\tl_const:Nn \c__um_math_alphabet_name_greek_tl {Greek,~lowercase}
+\tl_const:Nn \c__um_math_alphabet_name_Greek_tl {Greek,~uppercase}
+\tl_const:Nn \c__um_math_alphabet_name_num_tl   {Numerals}
+\tl_const:Nn \c__um_math_alphabet_name_misc_tl  {Misc.}
+\tl_new:N \l__um_mathstyle_tl
+\tl_new:N \l__um_radicals_tl
+\tl_new:N \l__um_nolimits_tl
+\tl_new:N \g__um_operator_mathfont_tl
+\seq_new:N \l__um_missing_alph_seq
+\seq_new:N \l__um_mathalph_seq
+\seq_new:N \l__um_char_range_seq
+\seq_new:N \l__um_mclass_range_seq
+\seq_new:N \l__um_cmd_range_seq
+\clist_new:N  \g__um_alphabets_seq
+\clist_set:Nn \g__um_alphabets_seq { latin, Latin, greek, Greek, num }
+\clist_new:N \g__um_named_ranges_clist
+\clist_new:N \g__um_char_nrange_clist
+\clist_new:N \g__um_unknown_keys_clist
+\clist_new:N \g__um_alphabet_clist
+\seq_new:N \g__um_mathclasses_seq
+\seq_set_from_clist:Nn \g__um_mathclasses_seq
+  {
+    \mathord,\mathalpha,\mathbin,\mathrel,\mathpunct,
+     \mathop,
+    \mathopen,\mathclose,
+    \mathfence,\mathover,\mathunder,
+     \mathaccent,\mathbotaccent,\mathaccentwide,\mathbotaccentwide
+  }
+
+\seq_new:N \g__um_default_mathalph_seq
+\seq_new:N \g__um_named_ranges_seq
+\seq_new:N \g__um_mathstyles_seq
+\muskip_new:N \g__um_primekern_muskip
+\muskip_gset:Nn \g__um_primekern_muskip { -\thinmuskip/2 }% arbitrary
+\int_new:N \l__um_primecount_int
+\prop_new:N \g__um_supers_prop
+\prop_new:N \g__um_subs_prop
+\tl_new:N \l_not_token_name_tl
+\tl_new:N \g__um_slash_delimiter_usv
+\tl_new:N \g__um_mathtable_tl
+\tl_new:N \g__um_fontname_tl
+\tl_new:N \g__um_mversion_tl
+\tl_new:N \g__um_symfont_tl
+\tl_new:N \g__um_font_keyval_tl
+\tl_new:N \g__um_family_tl
+\tl_new:N \g__um_style_tl
+\tl_new:N \g__um_remap_style_tl
+\prg_new_conditional:Nnn \__um_glyph_if_exist:n {p,TF,T,F}
+ {
+  \etex_iffontchar:D \l__um_font #1 \scan_stop:
+    \prg_return_true:
+  \else:
+    \prg_return_false:
+  \fi:
+ }
+\cs_set:Npn \__um_set_mathcode:nnnn #1#2#3#4 {
+  \Umathcode \int_eval:n {#1} =
+    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
+}
+\cs_set:Npn \__um_set_mathcode:nnn #1#2#3 {
+  \Umathcode \int_eval:n {#1} =
+    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#1} \scan_stop:
+}
+\cs_set:Npn \__um_set_mathchar:NNnn #1#2#3#4 {
+  \Umathchardef #1 =
+    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
+}
+\cs_new:Nn \__um_set_delcode:nnn {
+  \Udelcode#2 = \csname sym#1\endcsname #3 \scan_stop:
+}
+\cs_new:Nn \__um_radical:nn {
+  \Uradical \csname sym#1\endcsname #2 \scan_stop:
+}
+\cs_new:Nn \__um_delimiter:Nnn {
+  \Udelimiter \mathchar@type#1 \csname sym#2\endcsname #3 \scan_stop:
+}
+\cs_new:Nn \__um_accent:nnn {
+  \Umathaccent #1~ \mathchar@type\mathaccent \use:c { sym #2 } #3 \scan_stop:
+}
+\cs_generate_variant:Nn \__um_set_mathchar:NNnn {c}
+\cs_new:Nn \__um_char_gmake_mathactive:N
+ {
+  \global\mathcode `#1 = "8000 \scan_stop:
+ }
+\cs_new:Nn \__um_char_gmake_mathactive:n
+ {
+  \global\mathcode #1 = "8000 \scan_stop:
+ }
+\cs_new:Nn \usv_set:nnn  { \tl_const:cn { c__um_#1_#2_usv } {#3} }
+\cs_new:Nn \__um_to_usv:nn {       \use:c { c__um_#1_#2_usv } }
+\prg_new_conditional:Nnn \__um_usv_if_exist:nn {T,F,TF}
+  {
+    \cs_if_exist:cTF { c__um_#1_#2_usv }
+      \prg_return_true: \prg_return_false:
+  }
+\cs_new:Nn \unimath_get_mathstyle:
+ {
+  \tl_use:N \l__um_mathstyle_tl
+ }
+\tl_map_inline:nn
+ {
+  \new@mathgroup\cdp@list\cdp@elt\DeclareMathSizes
+  \@DeclareMathSizes\newmathalphabet\newmathalphabet__um\newmathalphabet__um@
+  \DeclareMathVersion\define@mathalphabet\define@mathgroup\addtoversion
+  \version@list\version@elt\alpha@list\alpha@elt
+  \restore@mathversion\init@restore@version\dorestore@version\process@table
+  \new@mathversion\DeclareSymbolFont\group@list\group@elt
+  \new@symbolfont\SetSymbolFont\SetSymbolFont@\get@cdp
+  \DeclareMathAlphabet\new@mathalphabet\SetMathAlphabet\SetMathAlphabet@
+  \DeclareMathAccent\set@mathaccent\DeclareMathSymbol\set@mathchar
+  \set@mathsymbol\DeclareMathDelimiter\@xxDeclareMathDelimiter
+  \@DeclareMathDelimiter\@xDeclareMathDelimiter\set@mathdelimiter
+  \set__ummathdelimiter\DeclareMathRadical\mathchar@type
+  \DeclareSymbolFontAlphabet\DeclareSymbolFontAlphabet@
+ }
+ {
+  \tl_remove_once:Nn \@preamblecmds {\do#1}
+ }
+
+\DeclareDocumentCommand \unimathsetup {m} { \keys_set:nn {unicode-math} {#1} }
+\cs_new:Nn \__um_keys_choices:nn
+ {
+  \cs_set:Npn \__um_keys_choices_fn:nn { \__um_keys_choices_aux:nnn {#1} }
+  \use:x
+   {
+    \exp_not:N \keys_define:nn {unicode-math}
+     {
+      #1 .choice: ,
+      \__um_tl_map_dbl:nN {#2} \__um_keys_choices_fn:nn
+     }
+   }
+ }
+\cs_new:Nn \__um_keys_choices_aux:nnn { #1 / #2 .code:n = { \exp_not:n {#3} } , }
+\cs_new:Nn \__um_tl_map_dbl:nN
+  {
+    \__um_tl_map_dbl:Nnn #2 #1 \q_recursion_tail {}{} \q_recursion_stop
+  }
+\cs_new:Nn \__um_tl_map_dbl:Nnn
+  {
+    \quark_if_recursion_tail_stop:n {#2}
+    \quark_if_recursion_tail_stop:n {#3}
+    #1 {#2} {#3}
+    \__um_tl_map_dbl:Nnn #1
+ }
+\__um_keys_choices:nn {mathup}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathrm_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathrm_text_bool }
+ }
+\__um_keys_choices:nn {mathrm}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathrm_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathrm_text_bool }
+ }
+\__um_keys_choices:nn {mathit}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathit_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathit_text_bool }
+ }
+\__um_keys_choices:nn {mathbf}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathbf_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathbf_text_bool }
+ }
+\__um_keys_choices:nn {mathsf}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathsf_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathsf_text_bool }
+ }
+\__um_keys_choices:nn {mathtt}
+ {
+  {sym}  { \bool_set_false:N \g__um_mathtt_text_bool }
+  {text} { \bool_set_true:N  \g__um_mathtt_text_bool }
+ }
+\__um_keys_choices:nn {normal-style}
+ {
+       {ISO} {
+              \bool_set_false:N \g__um_literal_bool
+              \bool_set_false:N \g__um_upGreek_bool
+              \bool_set_false:N \g__um_upgreek_bool
+              \bool_set_false:N \g__um_upLatin_bool
+              \bool_set_false:N \g__um_uplatin_bool
+             }
+       {TeX} {
+              \bool_set_false:N \g__um_literal_bool
+              \bool_set_true:N  \g__um_upGreek_bool
+              \bool_set_false:N \g__um_upgreek_bool
+              \bool_set_false:N \g__um_upLatin_bool
+              \bool_set_false:N \g__um_uplatin_bool
+             }
+    {french} {
+              \bool_set_false:N \g__um_literal_bool
+              \bool_set_true:N  \g__um_upGreek_bool
+              \bool_set_true:N  \g__um_upgreek_bool
+              \bool_set_true:N  \g__um_upLatin_bool
+              \bool_set_false:N \g__um_uplatin_bool
+             }
+   {upright} {
+              \bool_set_false:N \g__um_literal_bool
+              \bool_set_true:N  \g__um_upGreek_bool
+              \bool_set_true:N  \g__um_upgreek_bool
+              \bool_set_true:N  \g__um_upLatin_bool
+              \bool_set_true:N  \g__um_uplatin_bool
+             }
+   {literal} {
+              \bool_set_true:N  \g__um_literal_bool
+             }
+ }
+\__um_keys_choices:nn {math-style}
+ {
+      {ISO} {
+             \unimathsetup { nabla=upright, partial=italic,
+              normal-style=ISO, bold-style=ISO, sans-style=italic }
+            }
+      {TeX} {
+             \unimathsetup { nabla=upright, partial=italic,
+               normal-style=TeX, bold-style=TeX, sans-style=upright }
+            }
+   {french} {
+             \unimathsetup { nabla=upright, partial=upright,
+               normal-style=french, bold-style=upright, sans-style=upright }
+            }
+  {upright} {
+             \unimathsetup { nabla=upright, partial=upright,
+               normal-style=upright, bold-style=upright, sans-style=upright }
+            }
+  {literal} {
+             \unimathsetup { colon=literal, nabla=literal, partial=literal,
+               normal-style=literal, bold-style=literal, sans-style=literal }
+            }
+ }
+\__um_keys_choices:nn {bold-style}
+ {
+      {ISO} {
+             \bool_set_false:N \g__um_bfliteral_bool
+             \bool_set_false:N \g__um_bfupGreek_bool
+             \bool_set_false:N \g__um_bfupgreek_bool
+             \bool_set_false:N \g__um_bfupLatin_bool
+             \bool_set_false:N \g__um_bfuplatin_bool
+            }
+      {TeX} {
+             \bool_set_false:N \g__um_bfliteral_bool
+             \bool_set_true:N  \g__um_bfupGreek_bool
+             \bool_set_false:N \g__um_bfupgreek_bool
+             \bool_set_true:N  \g__um_bfupLatin_bool
+             \bool_set_true:N  \g__um_bfuplatin_bool
+            }
+  {upright} {
+             \bool_set_false:N \g__um_bfliteral_bool
+             \bool_set_true:N  \g__um_bfupGreek_bool
+             \bool_set_true:N  \g__um_bfupgreek_bool
+             \bool_set_true:N  \g__um_bfupLatin_bool
+             \bool_set_true:N  \g__um_bfuplatin_bool
+            }
+  {literal} {
+             \bool_set_true:N  \g__um_bfliteral_bool
+            }
+ }
+\__um_keys_choices:nn {sans-style}
+ {
+  {italic}  { \bool_set_false:N \g__um_upsans_bool    }
+  {upright} { \bool_set_true:N  \g__um_upsans_bool    }
+  {literal} { \bool_set_true:N  \g__um_sfliteral_bool }
+ }
+\__um_keys_choices:nn {nabla}
+ {
+  {upright} {
+              \bool_set_false:N \g__um_literal_Nabla_bool
+              \bool_set_true:N  \g__um_upNabla_bool
+            }
+  {italic}  {
+              \bool_set_false:N \g__um_literal_Nabla_bool
+              \bool_set_false:N \g__um_upNabla_bool
+            }
+  {literal} { \bool_set_true:N  \g__um_literal_Nabla_bool }
+ }
+\__um_keys_choices:nn {partial}
+ {
+  {upright} {
+              \bool_set_false:N \g__um_literal_partial_bool
+              \bool_set_true:N  \g__um_uppartial_bool
+            }
+  {italic}  {
+              \bool_set_false:N \g__um_literal_partial_bool
+              \bool_set_false:N \g__um_uppartial_bool
+            }
+  {literal} { \bool_set_true:N  \g__um_literal_partial_bool }
+ }
+\__um_keys_choices:nn {colon}
+ {
+  {literal} { \bool_set_true:N  \g__um_literal_colon_bool }
+  {TeX}     { \bool_set_false:N \g__um_literal_colon_bool }
+ }
+\__um_keys_choices:nn {slash-delimiter}
+ {
+  {ascii} { \tl_set:Nn \g__um_slash_delimiter_usv {"002F} }
+  {frac}  { \tl_set:Nn \g__um_slash_delimiter_usv {"2044} }
+  {div}   { \tl_set:Nn \g__um_slash_delimiter_usv {"2215} }
+ }
+\__um_keys_choices:nn {active-frac}
+ {
+   {small}
+   {
+    \cs_if_exist:NTF \tfrac
+     { \bool_set_true:N \l__um_smallfrac_bool }
+     {
+      \__um_warning:n {no-tfrac}
+      \bool_set_false:N \l__um_smallfrac_bool
+     }
+    \use:c {__um_setup_active_frac:}
+   }
+
+   {normalsize}
+   {
+    \bool_set_false:N \l__um_smallfrac_bool
+    \use:c {__um_setup_active_frac:}
+   }
+ }
+\keys_define:nn {unicode-math}
+  {
+    warnings-off .code:n =
+      {
+        \clist_map_inline:nn {#1}
+          { \msg_redirect_name:nnn { unicode-math } { ##1 } { none } }
+      }
+  }
+\__um_keys_choices:nn {trace}
+ {
+  {on}    {} % default
+  {debug} { \msg_redirect_module:nnn { unicode-math } { log } { warning } }
+  {off}   { \msg_redirect_module:nnn { unicode-math } { log } { none } }
+ }
+\unimathsetup {math-style=TeX}
+\unimathsetup {slash-delimiter=ascii}
+\unimathsetup {trace=off}
+\unimathsetup {mathrm=text,mathit=text,mathbf=text,mathsf=text,mathtt=text}
+\cs_if_exist:NT \tfrac { \unimathsetup {active-frac=small} }
+\ProcessKeysOptions {unicode-math}
+
+\cs_new:Npn \__um_error:n   { \msg_error:nn   {unicode-math} }
+\cs_new:Npn \__um_warning:n { \msg_warning:nn {unicode-math} }
+\cs_new:Npn \__um_warning:nnn { \msg_warning:nnxx {unicode-math} }
+\cs_new:Npn \__um_log:n     { \msg_log:nn     {unicode-math} }
+\cs_new:Npn \__um_log:nx    { \msg_log:nnx    {unicode-math} }
+\msg_new:nnn {unicode-math} {no-tfrac}
+{
+  Small~ fraction~ command~ \protect\tfrac\ not~ defined.\\
+  Load~ amsmath~ or~ define~ it~ manually~ before~ loading~ unicode-math.
+}
+\msg_new:nnn {unicode-math} {default-math-font}
+{
+  Defining~ the~ default~ maths~ font~ as~ '\l__um_fontname_tl'.
+}
+\msg_new:nnn {unicode-math} {setup-implicit}
+{
+  Setup~ alphabets:~ implicit~ mode.
+}
+\msg_new:nnn {unicode-math} {setup-explicit}
+{
+  Setup~ alphabets:~ explicit~ mode.
+}
+\msg_new:nnn {unicode-math} {alph-initialise}
+{
+  Initialising~ \@backslashchar math#1.
+}
+\msg_new:nnn {unicode-math} {setup-alph}
+{
+  Setup~ alphabet:~ #1.
+}
+\msg_new:nnn {unicode-math} {no-alphabet}
+{
+  I~ am~ trying~ to~ set~ up~ alphabet~"#1"~ but~ there~ are~ no~ configuration~ settings~ for~ it.~
+  (See~ source~ file~ "unicode-math-alphabets.dtx"~ to~ debug.)
+}
+\msg_new:nnn { unicode-math } { no-named-range }
+ {
+  I~ am~ trying~ to~ define~ new~ alphabet~ "#2"~ in~ range~ "#1",~ but~ range~ "#1"~ hasn't~ been~ defined~ yet.
+ }
+\msg_new:nnn { unicode-math } { missing-alphabets }
+ {
+  Missing~math~alphabets~in~font~ "\fontname\l__um_font" \\ \\
+  \seq_map_function:NN \l__um_missing_alph_seq \__um_print_indent:n
+ }
+\cs_new:Nn \__um_print_indent:n { \space\space\space\space #1 \\ }
+\msg_new:nnn {unicode-math} {macro-expected}
+{
+  I've~ expected~ that~ #1~ is~ a~ macro,~ but~ it~ isn't.
+}
+\msg_new:nnn {unicode-math} {wrong-meaning}
+{
+  I've~ expected~ #1~ to~ have~ the~ meaning~ #3,~ but~ it~ has~ the~ meaning~ #2.
+}
+\msg_new:nnn {unicode-math} {patch-macro}
+{
+  I'm~ going~ to~ patch~ macro~ #1.
+}
+\msg_new:nnn { unicode-math } { mathtools-overbracket } {
+  Using~ \token_to_str:N \overbracket\ and~
+         \token_to_str:N \underbracket\ from~
+ `mathtools'~ package.\\
+  \\
+  Use~ \token_to_str:N \Uoverbracket\ and~
+       \token_to_str:N \Uunderbracket\ for~
+       original~ `unicode-math'~ definition.
+}
+\msg_new:nnn { unicode-math } { mathtools-colon } {
+  I'm~ going~ to~ overwrite~ the~ following~ commands~ from~
+  the~ `mathtools'~ package: \\ \\
+  \ \ \ \ \token_to_str:N \dblcolon,~
+  \token_to_str:N \coloneqq,~
+  \token_to_str:N \Coloneqq,~
+  \token_to_str:N \eqqcolon. \\ \\
+  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like~
+  commands,~ using~ them~ will~ lead~ to~ inconsistencies.
+}
+\msg_new:nnn { unicode-math } { colonequals } {
+  I'm~ going~ to~ overwrite~ the~ following~ commands~ from~
+  the~ `colonequals'~ package: \\ \\
+  \ \ \ \ \token_to_str:N \ratio,~
+          \token_to_str:N \coloncolon,~
+          \token_to_str:N \minuscolon, \\
+  \ \ \ \ \token_to_str:N \colonequals,~
+          \token_to_str:N \equalscolon,~
+          \token_to_str:N \coloncolonequals. \\ \\
+  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like~
+  commands,~ using~ them~ will~ lead~ to~ inconsistencies.~
+  Furthermore,~ changing~ \token_to_str:N \colonsep \c_space_tl
+  or~ \token_to_str:N \doublecolonsep \c_space_tl won't~ have~
+  any~ effect~ on~ the~ re-defined~ commands.
+}
+
+\usv_set:nnn {normal}  {num}  {48}
+\usv_set:nnn {normal}  {Latin}{"1D434}
+\usv_set:nnn {normal}  {latin}{"1D44E}
+\usv_set:nnn {normal}  {Greek}{"1D6E2}
+\usv_set:nnn {normal}  {greek}{"1D6FC}
+\usv_set:nnn {normal}{varTheta}  {"1D6F3}
+\usv_set:nnn {normal}{epsilon}{"1D716}
+\usv_set:nnn {normal}{vartheta}  {"1D717}
+\usv_set:nnn {normal}{varkappa}  {"1D718}
+\usv_set:nnn {normal}{phi}    {"1D719}
+\usv_set:nnn {normal}{varrho}    {"1D71A}
+\usv_set:nnn {normal}{varpi}     {"1D71B}
+\usv_set:nnn {normal}    {Nabla}{"1D6FB}
+\usv_set:nnn {normal}    {partial}{"1D715}
+
+\usv_set:nnn {up}  {num}  {48}
+\usv_set:nnn {up}  {Latin}{65}
+\usv_set:nnn {up}  {latin}{97}
+\usv_set:nnn {up}  {Greek}{"391}
+\usv_set:nnn {up}  {greek}{"3B1}
+\usv_set:nnn {it}  {Latin}{"1D434}
+\usv_set:nnn {it}  {latin}{"1D44E}
+\usv_set:nnn {it}  {Greek}{"1D6E2}
+\usv_set:nnn {it}  {greek}{"1D6FC}
+\usv_set:nnn {bb}  {num}  {"1D7D8}
+\usv_set:nnn {bb}  {Latin}{"1D538}
+\usv_set:nnn {bb}  {latin}{"1D552}
+\usv_set:nnn {scr} {Latin}{"1D49C}
+\usv_set:nnn {cal} {Latin}{"1D49C}
+\usv_set:nnn {scr} {latin}{"1D4B6}
+\usv_set:nnn {frak}{Latin}{"1D504}
+\usv_set:nnn {frak}{latin}{"1D51E}
+\usv_set:nnn {sf}  {num}  {"1D7E2}
+\usv_set:nnn {sfup}{num}  {"1D7E2}
+\usv_set:nnn {sfit}{num}  {"1D7E2}
+\usv_set:nnn {sfup}{Latin}{"1D5A0}
+\usv_set:nnn {sf}  {Latin}{"1D5A0}
+\usv_set:nnn {sfup}{latin}{"1D5BA}
+\usv_set:nnn {sf}  {latin}{"1D5BA}
+\usv_set:nnn {sfit}{Latin}{"1D608}
+\usv_set:nnn {sfit}{latin}{"1D622}
+\usv_set:nnn {tt}  {num}  {"1D7F6}
+\usv_set:nnn {tt}  {Latin}{"1D670}
+\usv_set:nnn {tt}  {latin}{"1D68A}
+\usv_set:nnn {bf}    {num}  {"1D7CE}
+\usv_set:nnn {bfup}  {num}  {"1D7CE}
+\usv_set:nnn {bfit}  {num}  {"1D7CE}
+\usv_set:nnn {bfup}  {Latin}{"1D400}
+\usv_set:nnn {bfup}  {latin}{"1D41A}
+\usv_set:nnn {bfup}  {Greek}{"1D6A8}
+\usv_set:nnn {bfup}  {greek}{"1D6C2}
+\usv_set:nnn {bfit}  {Latin}{"1D468}
+\usv_set:nnn {bfit}  {latin}{"1D482}
+\usv_set:nnn {bfit}  {Greek}{"1D71C}
+\usv_set:nnn {bfit}  {greek}{"1D736}
+\usv_set:nnn {bffrak}{Latin}{"1D56C}
+\usv_set:nnn {bffrak}{latin}{"1D586}
+\usv_set:nnn {bfscr} {Latin}{"1D4D0}
+\usv_set:nnn {bfcal} {Latin}{"1D4D0}
+\usv_set:nnn {bfscr} {latin}{"1D4EA}
+\usv_set:nnn {bfsf}  {num}  {"1D7EC}
+\usv_set:nnn {bfsfup}{num}  {"1D7EC}
+\usv_set:nnn {bfsfit}{num}  {"1D7EC}
+\usv_set:nnn {bfsfup}{Latin}{"1D5D4}
+\usv_set:nnn {bfsfup}{latin}{"1D5EE}
+\usv_set:nnn {bfsfup}{Greek}{"1D756}
+\usv_set:nnn {bfsfup}{greek}{"1D770}
+\usv_set:nnn {bfsfit}{Latin}{"1D63C}
+\usv_set:nnn {bfsfit}{latin}{"1D656}
+\usv_set:nnn {bfsfit}{Greek}{"1D790}
+\usv_set:nnn {bfsfit}{greek}{"1D7AA}
+\usv_set:nnn {bfsf}{Latin}{ \bool_if:NTF \g__um_upLatin_bool   \g__um_bfsfup_Latin_usv \g__um_bfsfit_Latin_usv }
+\usv_set:nnn {bfsf}{latin}{ \bool_if:NTF \g__um_uplatin_bool   \g__um_bfsfup_latin_usv \g__um_bfsfit_latin_usv }
+\usv_set:nnn {bfsf}{Greek}{ \bool_if:NTF \g__um_upGreek_bool   \g__um_bfsfup_Greek_usv \g__um_bfsfit_Greek_usv }
+\usv_set:nnn {bfsf}{greek}{ \bool_if:NTF \g__um_upgreek_bool   \g__um_bfsfup_greek_usv \g__um_bfsfit_greek_usv }
+\usv_set:nnn {bf}  {Latin}{ \bool_if:NTF \g__um_bfupLatin_bool \g__um_bfup_Latin_usv   \g__um_bfit_Latin_usv   }
+\usv_set:nnn {bf}  {latin}{ \bool_if:NTF \g__um_bfuplatin_bool \g__um_bfup_latin_usv   \g__um_bfit_latin_usv   }
+\usv_set:nnn {bf}  {Greek}{ \bool_if:NTF \g__um_bfupGreek_bool \g__um_bfup_Greek_usv   \g__um_bfit_Greek_usv   }
+\usv_set:nnn {bf}  {greek}{ \bool_if:NTF \g__um_bfupgreek_bool \g__um_bfup_greek_usv   \g__um_bfit_greek_usv   }
+\usv_set:nnn {up}{varTheta}  {"3F4}
+\usv_set:nnn {up}{Digamma}   {"3DC}
+\usv_set:nnn {up}{epsilon}{"3F5}
+\usv_set:nnn {up}{vartheta}  {"3D1}
+\usv_set:nnn {up}{varkappa}  {"3F0}
+\usv_set:nnn {up}{phi}    {"3D5}
+\usv_set:nnn {up}{varrho}    {"3F1}
+\usv_set:nnn {up}{varpi}     {"3D6}
+\usv_set:nnn {up}{digamma}   {"3DD}
+\usv_set:nnn {bfup}{varTheta}  {"1D6B9}
+\usv_set:nnn {bfup}{Digamma}   {"1D7CA}
+\usv_set:nnn {bfup}{epsilon}{"1D6DC}
+\usv_set:nnn {bfup}{vartheta}  {"1D6DD}
+\usv_set:nnn {bfup}{varkappa}  {"1D6DE}
+\usv_set:nnn {bfup}{phi}    {"1D6DF}
+\usv_set:nnn {bfup}{varrho}    {"1D6E0}
+\usv_set:nnn {bfup}{varpi}     {"1D6E1}
+\usv_set:nnn {bfup}{digamma}   {"1D7CB}
+\usv_set:nnn {it}{varTheta}  {"1D6F3}
+\usv_set:nnn {it}{epsilon}{"1D716}
+\usv_set:nnn {it}{vartheta}  {"1D717}
+\usv_set:nnn {it}{varkappa}  {"1D718}
+\usv_set:nnn {it}{phi}    {"1D719}
+\usv_set:nnn {it}{varrho}    {"1D71A}
+\usv_set:nnn {it}{varpi}     {"1D71B}
+\usv_set:nnn {bfit}{varTheta}  {"1D72D}
+\usv_set:nnn {bfit}{epsilon}{"1D750}
+\usv_set:nnn {bfit}{vartheta}  {"1D751}
+\usv_set:nnn {bfit}{varkappa}  {"1D752}
+\usv_set:nnn {bfit}{phi}    {"1D753}
+\usv_set:nnn {bfit}{varrho}    {"1D754}
+\usv_set:nnn {bfit}{varpi}     {"1D755}
+\usv_set:nnn {bfsfup}{varTheta}  {"1D767}
+\usv_set:nnn {bfsfup}{epsilon}{"1D78A}
+\usv_set:nnn {bfsfup}{vartheta}  {"1D78B}
+\usv_set:nnn {bfsfup}{varkappa}  {"1D78C}
+\usv_set:nnn {bfsfup}{phi}    {"1D78D}
+\usv_set:nnn {bfsfup}{varrho}    {"1D78E}
+\usv_set:nnn {bfsfup}{varpi}     {"1D78F}
+\usv_set:nnn {bfsfit}{varTheta}  {"1D7A1}
+\usv_set:nnn {bfsfit}{epsilon}{"1D7C4}
+\usv_set:nnn {bfsfit}{vartheta}  {"1D7C5}
+\usv_set:nnn {bfsfit}{varkappa}  {"1D7C6}
+\usv_set:nnn {bfsfit}{phi}    {"1D7C7}
+\usv_set:nnn {bfsfit}{varrho}    {"1D7C8}
+\usv_set:nnn {bfsfit}{varpi}     {"1D7C9}
+\usv_set:nnn {up}    {Nabla}{"02207}
+\usv_set:nnn {it}    {Nabla}{"1D6FB}
+\usv_set:nnn {bfup}  {Nabla}{"1D6C1}
+\usv_set:nnn {bfit}  {Nabla}{"1D735}
+\usv_set:nnn {bfsfup}{Nabla}{"1D76F}
+\usv_set:nnn {bfsfit}{Nabla}{"1D7A9}
+\usv_set:nnn {up}    {partial}{"02202}
+\usv_set:nnn {it}    {partial}{"1D715}
+\usv_set:nnn {bfup}  {partial}{"1D6DB}
+\usv_set:nnn {bfit}  {partial}{"1D74F}
+\usv_set:nnn {bfsfup}{partial}{"1D789}
+\usv_set:nnn {bfsfit}{partial}{"1D7C3}
+\usv_set:nnn {up}{B}{`\B}
+\usv_set:nnn {up}{C}{`\C}
+\usv_set:nnn {up}{D}{`\D}
+\usv_set:nnn {up}{E}{`\E}
+\usv_set:nnn {up}{F}{`\F}
+\usv_set:nnn {up}{H}{`\H}
+\usv_set:nnn {up}{I}{`\I}
+\usv_set:nnn {up}{L}{`\L}
+\usv_set:nnn {up}{M}{`\M}
+\usv_set:nnn {up}{N}{`\N}
+\usv_set:nnn {up}{P}{`\P}
+\usv_set:nnn {up}{Q}{`\Q}
+\usv_set:nnn {up}{R}{`\R}
+\usv_set:nnn {up}{Z}{`\Z}
+\usv_set:nnn {it}{B}{"1D435}
+\usv_set:nnn {it}{C}{"1D436}
+\usv_set:nnn {it}{D}{"1D437}
+\usv_set:nnn {it}{E}{"1D438}
+\usv_set:nnn {it}{F}{"1D439}
+\usv_set:nnn {it}{H}{"1D43B}
+\usv_set:nnn {it}{I}{"1D43C}
+\usv_set:nnn {it}{L}{"1D43F}
+\usv_set:nnn {it}{M}{"1D440}
+\usv_set:nnn {it}{N}{"1D441}
+\usv_set:nnn {it}{P}{"1D443}
+\usv_set:nnn {it}{Q}{"1D444}
+\usv_set:nnn {it}{R}{"1D445}
+\usv_set:nnn {it}{Z}{"1D44D}
+\usv_set:nnn {up}{d}{`\d}
+\usv_set:nnn {up}{e}{`\e}
+\usv_set:nnn {up}{g}{`\g}
+\usv_set:nnn {up}{h}{`\h}
+\usv_set:nnn {up}{i}{`\i}
+\usv_set:nnn {up}{j}{`\j}
+\usv_set:nnn {up}{o}{`\o}
+\usv_set:nnn {it}{d}{"1D451}
+\usv_set:nnn {it}{e}{"1D452}
+\usv_set:nnn {it}{g}{"1D454}
+\usv_set:nnn {it}{h}{"0210E}
+\usv_set:nnn {it}{i}{"1D456}
+\usv_set:nnn {it}{j}{"1D457}
+\usv_set:nnn {it}{o}{"1D45C}
+\usv_set:nnn {bb}    {h}{"1D559}
+\usv_set:nnn {tt}    {h}{"1D691}
+\usv_set:nnn {scr}   {h}{"1D4BD}
+\usv_set:nnn {frak}  {h}{"1D525}
+\usv_set:nnn {bfup}  {h}{"1D421}
+\usv_set:nnn {bfit}  {h}{"1D489}
+\usv_set:nnn {sfup}  {h}{"1D5C1}
+\usv_set:nnn {sfit}  {h}{"1D629}
+\usv_set:nnn {bffrak}{h}{"1D58D}
+\usv_set:nnn {bfscr} {h}{"1D4F1}
+\usv_set:nnn {bfsfup}{h}{"1D5F5}
+\usv_set:nnn {bfsfit}{h}{"1D65D}
+\usv_set:nnn {up}{dotlessi}{"00131}
+\usv_set:nnn {up}{dotlessj}{"00237}
+\usv_set:nnn {it}{dotlessi}{"1D6A4}
+\usv_set:nnn {it}{dotlessj}{"1D6A5}
+\usv_set:nnn {bb}{C}{"2102}
+\usv_set:nnn {bb}{H}{"210D}
+\usv_set:nnn {bb}{N}{"2115}
+\usv_set:nnn {bb}{P}{"2119}
+\usv_set:nnn {bb}{Q}{"211A}
+\usv_set:nnn {bb}{R}{"211D}
+\usv_set:nnn {bb}{Z}{"2124}
+\usv_set:nnn {up}{Pi}       {"003A0}
+\usv_set:nnn {up}{pi}       {"003C0}
+\usv_set:nnn {up}{Gamma}    {"00393}
+\usv_set:nnn {up}{gamma}    {"003B3}
+\usv_set:nnn {up}{summation}{"02211}
+\usv_set:nnn {it}{Pi}       {"1D6F1}
+\usv_set:nnn {it}{pi}       {"1D70B}
+\usv_set:nnn {it}{Gamma}    {"1D6E4}
+\usv_set:nnn {it}{gamma}    {"1D6FE}
+\usv_set:nnn {bb}{Pi}       {"0213F}
+\usv_set:nnn {bb}{pi}       {"0213C}
+\usv_set:nnn {bb}{Gamma}    {"0213E}
+\usv_set:nnn {bb}{gamma}    {"0213D}
+\usv_set:nnn {bb}{summation}{"02140}
+\usv_set:nnn {bbit}{D}{"2145}
+\usv_set:nnn {bbit}{d}{"2146}
+\usv_set:nnn {bbit}{e}{"2147}
+\usv_set:nnn {bbit}{i}{"2148}
+\usv_set:nnn {bbit}{j}{"2149}
+\usv_set:nnn {scr}{B}{"212C}
+\usv_set:nnn {scr}{E}{"2130}
+\usv_set:nnn {scr}{F}{"2131}
+\usv_set:nnn {scr}{H}{"210B}
+\usv_set:nnn {scr}{I}{"2110}
+\usv_set:nnn {scr}{L}{"2112}
+\usv_set:nnn {scr}{M}{"2133}
+\usv_set:nnn {scr}{R}{"211B}
+\usv_set:nnn {scr}{e}{"212F}
+\usv_set:nnn {scr}{g}{"210A}
+\usv_set:nnn {scr}{o}{"2134}
+\usv_set:nnn {cal}{B}{"212C}
+\usv_set:nnn {cal}{E}{"2130}
+\usv_set:nnn {cal}{F}{"2131}
+\usv_set:nnn {cal}{H}{"210B}
+\usv_set:nnn {cal}{I}{"2110}
+\usv_set:nnn {cal}{L}{"2112}
+\usv_set:nnn {cal}{M}{"2133}
+\usv_set:nnn {cal}{R}{"211B}
+\usv_set:nnn {frak}{C}{"212D}
+\usv_set:nnn {frak}{H}{"210C}
+\usv_set:nnn {frak}{I}{"2111}
+\usv_set:nnn {frak}{R}{"211C}
+\usv_set:nnn {frak}{Z}{"2128}
+
+\cs_new:Npn \__um_symbol_setup:
+ {
+  \cs_set:Npn \UnicodeMathSymbol ##1##2##3##4
+   {
+    \exp_not:n { \__um_sym:nnn {##1} {##2} {##3} }
+   }
+ }
+\tl_set_from_file_x:Nnn \g__um_mathtable_tl {\__um_symbol_setup:} {unicode-math-table.tex}
+\cs_new:Nn \__um_input_math_symbol_table: {\g__um_mathtable_tl}
+\AtBeginDocument{\__um_define_math_chars:}
+\cs_new:Nn \__um_define_math_chars:
+ {
+  \group_begin:
+    \cs_set:Npn \__um_sym:nnn ##1##2##3
+     {
+      \tl_if_in:nnT
+       { \mathord \mathalpha \mathbin \mathrel \mathpunct \mathop \mathfence }
+       {##3}
+      {
+        \exp_last_unbraced:NNx \cs_gset_eq:NN ##2 { \Ucharcat ##1 ~ 12 ~ }
+      }
+     }
+    \__um_input_math_symbol_table:
+  \group_end:
+ }
 \cs_set:Nn \__um_set_mathsymbol:nNNn
  {
   \bool_lazy_and:nnT
@@ -118,12 +871,12 @@
     \limits
    }
  }
+
 \keys_define:nn {__um_mathface}
  {
   version .code:n =
    { \tl_set:Nn \l__um_mversion_tl {#1} }
  }
-
 \DeclareDocumentCommand \setmathfontface { m O{} m O{} }
  {
   \tl_clear:N \l__um_mversion_tl
@@ -147,7 +900,6 @@
     \mathtt { \cs_set_eq:NN \g__fontspec_mathtt_tl \l__um_tmpa_tl }
    }
  }
-
 \@onlypreamble \setmathfontface
 \DeclareDocumentCommand \setoperatorfont {m}
  { \tl_set:Nn \g__um_operator_mathfont_tl {#1} }
@@ -205,6 +957,7 @@
     \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault
     \SetMathAlphabet\mathtt{bold}  \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault
   }
+
 \DeclareDocumentCommand \setmathfont { O{} m O{} }
   {
     \__um_setmathfont:nn {#1,#3} {#2}
@@ -217,7 +970,6 @@
   \csname S@\f@size\endcsname
   \keys_set_known:nnN {unicode-math} {#1} \l__um_unknown_keys_clist
   \bool_if:NT \l__um_init_bool { \__um_log:n {default-math-font} }
-
   \__um_fontspec_select_font:
   \bool_if:nT { \l__um_ot_math_bool && !\g__um_mainfont_already_set_bool }
    {
@@ -231,8 +983,7 @@
     }
   \SetSymbolFont{\__um_symfont_tl}{\l__um_mversion_tl}
     {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
-  \tl_set:Nn \l__um_tmpa_tl {normal}
-  \tl_if_eq:NNT \l__um_mversion_tl \l__um_tmpa_tl
+  \str_if_eq_x:nnT {\l__um_mversion_tl} {normal}
     {
      \SetSymbolFont{\__um_symfont_tl}{bold}
       {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault}
@@ -249,9 +1000,17 @@
   \__um_setup_delcodes:
   \__um_setup_alphabets:
   \__um_setup_negations:
-  \ignorespaces
  }
-\cs_set_eq:NN \resetmathfont \setmathfont
+\AtBeginDocument { \__um_load_lm_if_necessary: }
+\cs_new:Nn \__um_load_lm_if_necessary:
+  {
+    \cs_if_exist:NF \l__um_fontname_tl
+      {
+        % TODO: update this when lmmath-bold.otf is released
+        \setmathfont{latinmodern-math.otf}[BoldFont={latinmodern-math.otf}]
+        \bool_set_false:N \g__um_mainfont_already_set_bool
+      }
+  }
 \cs_new:Nn \__um_init:
  {
   \bool_set_true:N  \l__um_ot_math_bool
@@ -309,11 +1068,11 @@
         \fontdimen22\font=\__um_get_fontparam:nn {15} {AxisHeight}\relax
        }
       } {\l__um_fontname_tl}
+
     \SetSymbolFont{symbols}{\l__um_mversion_tl}
       {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
 
-    \tl_set:Nn \l__um_tmpa_tl {normal}
-    \tl_if_eq:NNT \l__um_mversion_tl \l__um_tmpa_tl
+    \str_if_eq_x:nnT {\l__um_mversion_tl} {normal}
       {
       \SetSymbolFont{symbols}{bold}
         {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault}
@@ -334,18 +1093,20 @@
         \fontdimen13\font=0pt\relax
       }
     } {\l__um_fontname_tl}
+
     \SetSymbolFont{largesymbols}{\l__um_mversion_tl}
       {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
 
-    \tl_set:Nn \l__um_tmpa_tl {normal}
-    \tl_if_eq:NNT \l__um_mversion_tl \l__um_tmpa_tl
+    \str_if_eq_x:nnT {\l__um_mversion_tl} {normal}
       {
       \SetSymbolFont{largesymbols}{bold}
         {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault}
       }
   }
 \cs_new:Nn \__um_get_fontparam:nn
-  { \the\fontdimen#1\l__um_font\relax }
+  {
+    \the\fontdimen#1\l__um_font\relax
+  }
 \cs_new:Nn \__um_fontspec_select_font:
  {
   \tl_set:Nx \l__um_font_keyval_tl {
@@ -480,7 +1241,6 @@
   \__um_assign_delcode:n {"21EA} % up white arrow from bar
   \__um_assign_delcode:n {"21F3} % updown white arrow
  }
-\tl_new:N \l__um_nolimits_tl
 \tl_set:Nn \l__um_nolimits_tl
  {
   \int\iint\iiint\iiiint\oint\oiint\oiiint
@@ -497,119 +1257,8 @@
  {
   \tl_remove_all:Nn \l__um_nolimits_tl {#1}
  }
-\tl_new:N \l__um_radicals_tl
 \tl_set:Nn \l__um_radicals_tl {\sqrt \longdivision}
-\cs_new_protected_nopar:Nn \__um_new_cramped_style:N
-  { \quark_new:N #1 }
-\__um_new_cramped_style:N \crampeddisplaystyle
-\__um_new_cramped_style:N \crampedtextstyle
-\__um_new_cramped_style:N \crampedscriptstyle
-\__um_new_cramped_style:N \crampedscriptscriptstyle
-  \cs_new_nopar:Npn \__um_font_dimen:Nnnnn #1 #2 #3 #4 #5 {
-    \fontdimen
-    \cs_if_eq:NNTF #1 \displaystyle {
-      #2 \textfont
-    } {
-      \cs_if_eq:NNTF #1 \crampeddisplaystyle {
-        #3 \textfont
-      } {
-        \cs_if_eq:NNTF #1 \textstyle {
-          #4 \textfont
-        } {
-          \cs_if_eq:NNTF #1 \crampedtextstyle {
-            #5 \textfont
-          } {
-            \cs_if_eq:NNTF #1 \scriptstyle {
-              #4 \scriptfont
-            } {
-              \cs_if_eq:NNTF #1 \crampedscriptstyle {
-                #5 \scriptfont
-              } {
-                \cs_if_eq:NNTF #1 \scriptscriptstyle {
-                  #4 \scriptscriptfont
-                } {
-                  #5 \scriptscriptfont
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    \c_two
-  }
-\cs_new_protected_nopar:Nn \__um_font_param:nnnnn
-{
-  \__um_font_param_aux:ccnnnn { __um_ #1 :N } { __um_set_ #1 :Nn }
-    { #2 } { #3 } { #4 } { #5 }
-}
-\cs_new_protected_nopar:Nn \__um_font_param:nnn
- {
-  \__um_font_param:nnnnn { #1 } { #2 } { #2 } { #3 } { #3 }
- }
-\cs_new_protected_nopar:Nn \__um_font_param:nn
- {
-  \__um_font_param:nnnnn { #1 } { #2 } { #2 } { #2 } { #2 }
- }
-\cs_new_protected_nopar:Nn \__um_font_param:n
-  { }
-\cs_new_protected_nopar:Nn \__um_font_param_aux:NNnnnn
-  {
-    \cs_new_nopar:Npn #1 ##1
-     {
-      \__um_font_dimen:Nnnnn ##1 { #3 } { #4 } { #5 } { #6 }
-     }
-    \cs_new_protected_nopar:Npn #2 ##1 ##2
-     {
-      #1 ##1 \dim_eval:n { ##2 }
-     }
-  }
-\cs_generate_variant:Nn \__um_font_param_aux:NNnnnn { cc }
-\__um_font_param:nn { axis } { 15 }
-\__um_font_param:nn { operator_size } { 13 }
-\__um_font_param:n { fraction_del_size }
-\__um_font_param:nnn { fraction_denom_down } { 45 } { 44 }
-\__um_font_param:nnn { fraction_denom_vgap } { 50 } { 49 }
-\__um_font_param:nnn { fraction_num_up } { 43 } { 42 }
-\__um_font_param:nnn { fraction_num_vgap } { 47 } { 46 }
-\__um_font_param:nn { fraction_rule } { 48 }
-\__um_font_param:nn { limit_above_bgap } { 29 }
-\__um_font_param:n { limit_above_kern }
-\__um_font_param:nn { limit_above_vgap } { 28 }
-\__um_font_param:nn { limit_below_bgap } { 31 }
-\__um_font_param:n { limit_below_kern }
-\__um_font_param:nn { limit_below_vgap } { 30 }
-\__um_font_param:nn { over_delimiter_vgap } { 41 }
-\__um_font_param:nn { over_delimiter_bgap } { 38 }
-\__um_font_param:nn { under_delimiter_vgap } { 40 }
-\__um_font_param:nn { under_delimiter_bgap } { 39 }
-\__um_font_param:nn { overbar_kern } { 55 }
-\__um_font_param:nn { overbar_rule } { 54 }
-\__um_font_param:nn { overbar_vgap } { 53 }
-\__um_font_param:n { quad }
-\__um_font_param:nn { radical_kern } { 62 }
-\__um_font_param:nn { radical_rule } { 61 }
-\__um_font_param:nnn { radical_vgap } { 60 } { 59 }
-\__um_font_param:nn { radical_degree_before } { 63 }
-\__um_font_param:nn { radical_degree_after } { 64 }
-\__um_font_param:nn { radical_degree_raise } { 65 }
-\__um_font_param:nn { space_after_script } { 27 }
-\__um_font_param:nnn { stack_denom_down } { 35 } { 34 }
-\__um_font_param:nnn { stack_num_up } { 33 } { 32 }
-\__um_font_param:nnn { stack_vgap } { 37 } { 36 }
-\__um_font_param:nn { sub_shift_down } { 18 }
-\__um_font_param:nn { sub_shift_drop } { 20 }
-\__um_font_param:n { subsup_shift_down }
-\__um_font_param:nn { sub_top_max } { 19 }
-\__um_font_param:nn { subsup_vgap } { 25 }
-\__um_font_param:nn { sup_bottom_min } { 23 }
-\__um_font_param:nn { sup_shift_drop } { 24 }
-\__um_font_param:nnnnn { sup_shift_up } { 21 } { 22 } { 21 } { 22 }
-\__um_font_param:nn { supsub_bottom_max } { 26 }
-\__um_font_param:nn { underbar_kern } { 58 }
-\__um_font_param:nn { underbar_rule } { 57 }
-\__um_font_param:nn { underbar_vgap } { 56 }
-\__um_font_param:n { connector_overlap_min }
+
 \keys_define:nn {unicode-math}
   {
     version .code:n =
@@ -739,23 +1388,139 @@
     \int_compare:nT {#1>=#2} { \int_compare:nT {#1<=#3} {#5} }
       } } }
   }
-\AtBeginDocument{\__um_resolve_greek:}
-\cs_new:Npn \__um_resolve_greek:
+
+\cs_new_protected_nopar:Nn \__um_new_cramped_style:N
+  { \quark_new:N #1 }
+\__um_new_cramped_style:N \crampeddisplaystyle
+\__um_new_cramped_style:N \crampedtextstyle
+\__um_new_cramped_style:N \crampedscriptstyle
+\__um_new_cramped_style:N \crampedscriptscriptstyle
+  \cs_new_nopar:Npn \__um_font_dimen:Nnnnn #1 #2 #3 #4 #5 {
+    \fontdimen
+    \cs_if_eq:NNTF #1 \displaystyle {
+      #2 \textfont
+    } {
+      \cs_if_eq:NNTF #1 \crampeddisplaystyle {
+        #3 \textfont
+      } {
+        \cs_if_eq:NNTF #1 \textstyle {
+          #4 \textfont
+        } {
+          \cs_if_eq:NNTF #1 \crampedtextstyle {
+            #5 \textfont
+          } {
+            \cs_if_eq:NNTF #1 \scriptstyle {
+              #4 \scriptfont
+            } {
+              \cs_if_eq:NNTF #1 \crampedscriptstyle {
+                #5 \scriptfont
+              } {
+                \cs_if_eq:NNTF #1 \scriptscriptstyle {
+                  #4 \scriptscriptfont
+                } {
+                  #5 \scriptscriptfont
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    \c_two
+  }
+\cs_new_protected_nopar:Nn \__um_font_param:nnnnn
+{
+  \__um_font_param_aux:ccnnnn { __um_ #1 :N } { __um_set_ #1 :Nn }
+    { #2 } { #3 } { #4 } { #5 }
+}
+\cs_new_protected_nopar:Nn \__um_font_param:nnn
  {
-  \clist_map_inline:nn
-   {
-    Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,
-    alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,
-    Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,
-    mu,nu,xi,omicron,pi,rho,sigma,tau,upsilon,phi,chi,psi,omega,
-    varTheta,varsigma,vartheta,varkappa,varrho,varpi,varepsilon,varphi
-   }
-   {
-    \tl_set:cx {##1} { \exp_not:c { mit ##1 } }
-    \tl_set:cx {up ##1} { \exp_not:N \symup \exp_not:c { ##1 } }
-    \tl_set:cx {it ##1} { \exp_not:N \symit \exp_not:c { ##1 } }
-   }
+  \__um_font_param:nnnnn { #1 } { #2 } { #2 } { #3 } { #3 }
+ }
+\cs_new_protected_nopar:Nn \__um_font_param:nn
+ {
+  \__um_font_param:nnnnn { #1 } { #2 } { #2 } { #2 } { #2 }
+ }
+\cs_new_protected_nopar:Nn \__um_font_param:n
+  { }
+\cs_new_protected_nopar:Nn \__um_font_param_aux:NNnnnn
+  {
+    \cs_new_nopar:Npn #1 ##1
+     {
+      \__um_font_dimen:Nnnnn ##1 { #3 } { #4 } { #5 } { #6 }
+     }
+    \cs_new_protected_nopar:Npn #2 ##1 ##2
+     {
+      #1 ##1 \dim_eval:n { ##2 }
+     }
+  }
+\cs_generate_variant:Nn \__um_font_param_aux:NNnnnn { cc }
+\__um_font_param:nn { axis } { 15 }
+\__um_font_param:nn { operator_size } { 13 }
+\__um_font_param:n { fraction_del_size }
+\__um_font_param:nnn { fraction_denom_down } { 45 } { 44 }
+\__um_font_param:nnn { fraction_denom_vgap } { 50 } { 49 }
+\__um_font_param:nnn { fraction_num_up } { 43 } { 42 }
+\__um_font_param:nnn { fraction_num_vgap } { 47 } { 46 }
+\__um_font_param:nn { fraction_rule } { 48 }
+\__um_font_param:nn { limit_above_bgap } { 29 }
+\__um_font_param:n { limit_above_kern }
+\__um_font_param:nn { limit_above_vgap } { 28 }
+\__um_font_param:nn { limit_below_bgap } { 31 }
+\__um_font_param:n { limit_below_kern }
+\__um_font_param:nn { limit_below_vgap } { 30 }
+\__um_font_param:nn { over_delimiter_vgap } { 41 }
+\__um_font_param:nn { over_delimiter_bgap } { 38 }
+\__um_font_param:nn { under_delimiter_vgap } { 40 }
+\__um_font_param:nn { under_delimiter_bgap } { 39 }
+\__um_font_param:nn { overbar_kern } { 55 }
+\__um_font_param:nn { overbar_rule } { 54 }
+\__um_font_param:nn { overbar_vgap } { 53 }
+\__um_font_param:n { quad }
+\__um_font_param:nn { radical_kern } { 62 }
+\__um_font_param:nn { radical_rule } { 61 }
+\__um_font_param:nnn { radical_vgap } { 60 } { 59 }
+\__um_font_param:nn { radical_degree_before } { 63 }
+\__um_font_param:nn { radical_degree_after } { 64 }
+\__um_font_param:nn { radical_degree_raise } { 65 }
+\__um_font_param:nn { space_after_script } { 27 }
+\__um_font_param:nnn { stack_denom_down } { 35 } { 34 }
+\__um_font_param:nnn { stack_num_up } { 33 } { 32 }
+\__um_font_param:nnn { stack_vgap } { 37 } { 36 }
+\__um_font_param:nn { sub_shift_down } { 18 }
+\__um_font_param:nn { sub_shift_drop } { 20 }
+\__um_font_param:n { subsup_shift_down }
+\__um_font_param:nn { sub_top_max } { 19 }
+\__um_font_param:nn { subsup_vgap } { 25 }
+\__um_font_param:nn { sup_bottom_min } { 23 }
+\__um_font_param:nn { sup_shift_drop } { 24 }
+\__um_font_param:nnnnn { sup_shift_up } { 21 } { 22 } { 21 } { 22 }
+\__um_font_param:nn { supsub_bottom_max } { 26 }
+\__um_font_param:nn { underbar_kern } { 58 }
+\__um_font_param:nn { underbar_rule } { 57 }
+\__um_font_param:nn { underbar_vgap } { 56 }
+\__um_font_param:n { connector_overlap_min }
+\cs_new:Nn \__um_fontdimen_to_percent:nn
+ {
+  \fp_eval:n { \dim_to_decimal:n { \fontdimen #1 #2 } * 65536 / 100 }
  }
+\cs_new:Nn \__um_fontdimen_to_scale:nn
+ {
+  \fp_eval:n {\__um_fontdimen_to_percent:nn {#1} {#2} * \f@size } pt
+ }
+\cs_new:Nn \__um_mathstyle_scale:Nnn
+ {
+  \ifx#1\scriptstyle
+    #2 \__um_fontdimen_to_percent:nn {10} \l__um_font #3
+  \else
+    \ifx#1\scriptscriptstyle
+      #2 \__um_fontdimen_to_percent:nn {11} \l__um_font #3
+    \else
+      #2 #3
+    \fi
+  \fi
+ }
+
 \cs_set:Npn \use@mathgroup #1 #2
  {
   \mode_if_math:T % <- not sure if this is really necessary since we've just checked for mmode and raised an error if not!
@@ -767,6 +1532,11 @@
     \math@egroup
    }
  }
+\cs_set:Npn \operator@font
+ {
+  \__um_switchto_literal:
+  \@fontswitch {} { \g__um_operator_mathfont_tl }
+ }
 \cs_new:Nn \__um_prepare_mathstyle:n
  {
   \seq_put_right:Nn \g__um_mathstyles_seq {#1}
@@ -804,8 +1574,6 @@
  }
 \clist_map_inline:Nn \g__um_named_ranges_clist
  { \__um_new_named_range:n {#1} }
-\clist_new:N  \g__um_alphabets_seq
-\clist_set:Nn \g__um_alphabets_seq { latin, Latin, greek, Greek, num }
 \cs_new:Nn \__um_new_alphabet_config:nnn
  {
   \prop_if_exist:cF {g__um_named_range_#1_prop}
@@ -883,11 +1651,6 @@
  }}
 \cs_set_protected:Npn \mathup { \mathrm }
 \cs_set_protected:Npn \symrm  { \symup  }
-\cs_set:Npn \operator@font
- {
-  \__um_switchto_literal:
-  \@fontswitch {} { \g__um_operator_mathfont_tl }
- }
 \cs_new:Npn \__um_setup_alphabets:
  {
   \seq_if_empty:NTF \l__um_mathalph_seq
@@ -1143,31 +1906,269 @@
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varpi}
    }
  }
-\cs_new:Npn \__um_symbol_setup:
+
+\keys_define:nn {__um_mathface}
  {
-  \cs_set:Npn \UnicodeMathSymbol ##1##2##3##4
+  version .code:n =
+   { \tl_set:Nn \l__um_mversion_tl {#1} }
+ }
+\DeclareDocumentCommand \setmathfontface { m O{} m O{} }
+ {
+  \tl_clear:N \l__um_mversion_tl
+
+  \keys_set_known:nnN {__um_mathface} {#2,#4} \l__um_keyval_clist
+  \exp_args:Nnx \fontspec_set_family:Nxn \l__um_tmpa_tl
+   { ItalicFont={}, BoldFont={}, \exp_not:V \l__um_keyval_clist } {#3}
+
+  \tl_if_empty:NT \l__um_mversion_tl
    {
-    \exp_not:n { \__um_sym:nnn {##1} {##2} {##3} }
+    \tl_set:Nn \l__um_mversion_tl {normal}
+    \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault}
+   }
+  \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault}
+
+  % integrate with fontspec's \setmathrm etc:
+  \tl_case:Nn #1
+   {
+    \mathrm { \cs_set_eq:NN \g__fontspec_mathrm_tl \l__um_tmpa_tl }
+    \mathsf { \cs_set_eq:NN \g__fontspec_mathsf_tl \l__um_tmpa_tl }
+    \mathtt { \cs_set_eq:NN \g__fontspec_mathtt_tl \l__um_tmpa_tl }
    }
  }
-\tl_set_from_file_x:Nnn \g__um_mathtable_tl {\__um_symbol_setup:} {unicode-math-table.tex}
-\cs_new:Nn \__um_input_math_symbol_table: {\g__um_mathtable_tl}
-\AtBeginDocument{\__um_define_math_chars:}
-\cs_new:Nn \__um_define_math_chars:
- {
-  \group_begin:
-    \cs_set:Npn \__um_sym:nnn ##1##2##3
-     {
-      \tl_if_in:nnT
-       { \mathord \mathalpha \mathbin \mathrel \mathpunct \mathop \mathfence }
-       {##3}
+\@onlypreamble \setmathfontface
+\DeclareDocumentCommand \setoperatorfont {m}
+ { \tl_set:Nn \g__um_operator_mathfont_tl {#1} }
+\setoperatorfont{\mathrm}
+\cs_generate_variant:Nn \tl_if_eq:nnT {o}
+\cs_set:Nn \__fontspec_setmainfont_hook:nn
+  {
+    \tl_if_eq:onT {\g__fontspec_mathrm_tl} {\rmdefault}
       {
-        \exp_last_unbraced:NNx \cs_gset_eq:NN ##2 { \Ucharcat ##1 ~ 12 ~ }
+   \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {#1} {#2}
+        \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault
+        \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\itdefault
+        \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault
       }
+  }
+
+\cs_set:Nn \__fontspec_setsansfont_hook:nn
+  {
+    \tl_if_eq:onT {\g__fontspec_mathsf_tl} {\sfdefault}
+      {
+   \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {#1} {#2}
+        \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl\mddefault\updefault
+        \SetMathAlphabet\mathsf{bold}  \g_fontspec_encoding_tl\g__fontspec_mathsf_tl\bfdefault\updefault
+      }
+  }
+
+\cs_set:Nn \__fontspec_setmonofont_hook:nn
+  {
+    \tl_if_eq:onT {\g__fontspec_mathtt_tl} {\ttdefault}
+      {
+   \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {#1} {#2}
+        \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault
+        \SetMathAlphabet\mathtt{bold}  \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault
+      }
+  }
+\cs_set:Nn \__fontspec_setmathrm_hook:nn
+  {
+    \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault
+    \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\itdefault
+    \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault
+  }
+\cs_set:Nn \__fontspec_setboldmathrm_hook:nn
+  {
+    \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\updefault
+    \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\bfdefault\updefault
+    \SetMathAlphabet\mathit{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\itdefault
+  }
+\cs_set:Nn \__fontspec_setmathsf_hook:nn
+  {
+    \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl\mddefault\updefault
+    \SetMathAlphabet\mathsf{bold}  \g_fontspec_encoding_tl\g__fontspec_mathsf_tl\bfdefault\updefault
+  }
+\cs_set:Nn \__fontspec_setmathtt_hook:nn
+  {
+    \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault
+    \SetMathAlphabet\mathtt{bold}  \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault
+  }
+
+\AtBeginDocument{\__um_resolve_greek:}
+\cs_new:Npn \__um_resolve_greek:
+ {
+  \clist_map_inline:nn
+   {
+    Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,
+    alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,
+    Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,
+    mu,nu,xi,omicron,pi,rho,sigma,tau,upsilon,phi,chi,psi,omega,
+    varTheta,varsigma,vartheta,varkappa,varrho,varpi,varepsilon,varphi
+   }
+   {
+    \tl_set:cx {##1} { \exp_not:c { mit ##1 } }
+    \tl_set:cx {up ##1} { \exp_not:N \symup \exp_not:c { ##1 } }
+    \tl_set:cx {it ##1} { \exp_not:N \symit \exp_not:c { ##1 } }
+   }
+ }
+\AtBeginDocument{\__um_redefine_radical:}
+\cs_new:Nn \__um_redefine_radical:
+ {
+  \@ifpackageloaded { amsmath } { }
+   {
+    \cs_set_nopar:Npn \r@@t ##1 ##2
+     {
+      \hbox_set:Nn \l_tmpa_box
+       {
+        \c_math_toggle_token
+        \m@th
+        ##1
+        \sqrtsign { ##2 }
+        \c_math_toggle_token
+       }
+      \__um_mathstyle_scale:Nnn ##1 { \kern }
+       { \fontdimen 63 \l__um_font }
+      \box_move_up:nn
+       {
+        (\box_ht:N \l_tmpa_box - \box_dp:N \l_tmpa_box)
+        * \number \fontdimen 65 \l__um_font / 100
+       }
+       { \box_use:N \rootbox }
+      \__um_mathstyle_scale:Nnn ##1 { \kern }
+       { \fontdimen 64 \l__um_font }
+      \box_use_clear:N \l_tmpa_box
      }
-    \__um_input_math_symbol_table:
+   }
+ }
+\cs_new:Npn \__um_define_active_frac:Nw #1 #2/#3
+ {
+  \char_set_catcode_active:N #1
+  \__um_char_gmake_mathactive:N #1
+  \tl_rescan:nn
+   {
+    \catcode`\_=11\relax
+    \catcode`\:=11\relax
+   }
+   {
+    \cs_gset:Npx #1
+     {
+      \bool_if:NTF \l__um_smallfrac_bool {\exp_not:N\tfrac} {\exp_not:N\frac}
+          {#2} {#3}
+     }
+   }
+ }
+\cs_new:Npn \__um_setup_active_frac:
+ {
+  \group_begin:
+  \__um_define_active_frac:Nw  ^^^^2189  0/3
+  \__um_define_active_frac:Nw  ^^^^2152  1/{10}
+  \__um_define_active_frac:Nw  ^^^^2151  1/9
+  \__um_define_active_frac:Nw  ^^^^215b  1/8
+  \__um_define_active_frac:Nw  ^^^^2150  1/7
+  \__um_define_active_frac:Nw  ^^^^2159  1/6
+  \__um_define_active_frac:Nw  ^^^^2155  1/5
+  \__um_define_active_frac:Nw  ^^^^00bc  1/4
+  \__um_define_active_frac:Nw  ^^^^2153  1/3
+  \__um_define_active_frac:Nw  ^^^^215c  3/8
+  \__um_define_active_frac:Nw  ^^^^2156  2/5
+  \__um_define_active_frac:Nw  ^^^^00bd  1/2
+  \__um_define_active_frac:Nw  ^^^^2157  3/5
+  \__um_define_active_frac:Nw  ^^^^215d  5/8
+  \__um_define_active_frac:Nw  ^^^^2154  2/3
+  \__um_define_active_frac:Nw  ^^^^00be  3/4
+  \__um_define_active_frac:Nw  ^^^^2158  4/5
+  \__um_define_active_frac:Nw  ^^^^215a  5/6
+  \__um_define_active_frac:Nw  ^^^^215e  7/8
   \group_end:
  }
+\__um_setup_active_frac:
+\protected\def\to{\rightarrow}
+\protected\def\le{\leq}
+\protected\def\ge{\geq}
+\protected\def\neq{\ne}
+\protected\def\triangle{\mathord{\bigtriangleup}}
+\protected\def\bigcirc{\mdlgwhtcircle}
+\protected\def\circ{\vysmwhtcircle}
+\protected\def\bullet{\smblkcircle}
+\protected\def\mathyen{\yen}
+\protected\def\mathsterling{\sterling}
+\protected\def\diamond{\smwhtdiamond}
+\protected\def\emptyset{\varnothing}
+\protected\def\hbar{\hslash}
+\protected\def\land{\wedge}
+\protected\def\lor{\vee}
+\protected\def\owns{\ni}
+\protected\def\gets{\leftarrow}
+\protected\def\mathring{\ocirc}
+\protected\def\lnot{\neg}
+\protected\def\longdivision{\longdivisionsign}
+\protected\def\backepsilon{\upbackepsilon}
+\protected\def\eth{\matheth}
+\protected\def\dbkarow {\dbkarrow}
+\protected\def\drbkarow{\drbkarrow}
+\protected\def\hksearow{\hksearrow}
+\protected\def\hkswarow{\hkswarrow}
+\protected\def\smallint{\mathop{\textstyle\int}\limits}
+\cs_set_eq:NN \latexe_underbar:n \underbar
+\renewcommand\underbar
+ {
+  \mode_if_math:TF \mathunderbar \latexe_underbar:n
+ }
+\@ifpackageloaded{amsmath}
+ {
+  % define their own colon, perhaps I should just steal it. (It does look much better.)
+ }
+ {
+  \cs_set_protected:Npn \colon
+   {
+    \bool_if:NTF \g__um_literal_colon_bool {:} { \mathpunct{:} }
+   }
+ }
+\protected\def\digamma{\updigamma}
+\protected\def\Digamma{\upDigamma}
+\cs_set_protected:Npn \| {\Vert}
+\cs_set_protected:Npn \mathellipsis {\mathinner{\unicodeellipsis}}
+\cs_set_protected:Npn \cdots {\mathinner{\unicodecdots}}
+\cs_set_eq:NN \__um_text_slash: \slash
+\cs_set_protected:Npn \slash
+ {
+  \mode_if_math:TF {\mathslash} {\__um_text_slash:}
+ }
+\cs_new:Npn \__um_newnot:N #1
+ {
+   \tl_set:Nx \l_not_token_name_tl { \token_to_str:N #1 }
+   \exp_args:Nx \tl_if_empty:nF { \tl_tail:V \l_not_token_name_tl }
+    {
+     \tl_set:Nx \l_not_token_name_tl { \tl_tail:V \l_not_token_name_tl }
+    }
+   \cs_if_exist:cTF { n \l_not_token_name_tl }
+    {
+     \use:c { n \l_not_token_name_tl }
+    }
+    {
+     \cs_if_exist:cTF { not \l_not_token_name_tl }
+      {
+       \use:c { not \l_not_token_name_tl }
+      }
+      {
+       \__um_oldnot: #1
+      }
+    }
+ }
+\cs_set_eq:NN \__um_oldnot: \not
+\AtBeginDocument{\cs_set_eq:NN \not \__um_newnot:N}
+\cs_new_protected_nopar:Nn \__um_setup_negations:
+ {
+  \cs_gset:cpn { not= }    { \neq }
+  \cs_gset:cpn { not< }    { \nless }
+  \cs_gset:cpn { not> }    { \ngtr }
+  \cs_gset:Npn  \ngets     { \nleftarrow }
+  \cs_gset:Npn  \nsimeq    { \nsime }
+  \cs_gset:Npn  \nequal    { \ne }
+  \cs_gset:Npn  \nle       { \nleq }
+  \cs_gset:Npn  \nge       { \ngeq }
+  \cs_gset:Npn  \ngreater  { \ngtr }
+  \cs_gset:Npn  \nforksnot { \forks }
+ }
 
 \cs_new:Nn \__um_arg_i_before_egroup:n {#1\egroup}
 \cs_new:Nn \__um_superscript:n
@@ -1183,7 +2184,6 @@
     \prg_replicate:nn {#2-1} { \mskip \g__um_primekern_muskip #1 }
    }
  }
-
 \cs_new:Nn \__um_nprimes_select:nn
  {
   \int_case:nnF {#2}
@@ -1416,7 +2416,7 @@
      }
    }
  }
-\AtBeginDocument{\__um_define_prime_commands: \__um_define_prime_chars:}
+\AtBeginDocument { \__um_define_prime_commands: \__um_define_prime_chars: }
 \cs_new:Nn \__um_define_prime_commands:
  {
   \cs_set_eq:NN \prime       \__um_prime_single_mchar
@@ -1450,55 +2450,7 @@
     \cs_set_eq:NN ^^^^2037 \__um_scan_sup_backtrprime:
    }
 \group_end:
-\AtBeginDocument{\__um_redefine_radical:}
-\cs_new:Nn \__um_redefine_radical:
- {
-  \@ifpackageloaded { amsmath } { }
-   {
-    \cs_set_nopar:Npn \r@@t ##1 ##2
-     {
-      \hbox_set:Nn \l_tmpa_box
-       {
-        \c_math_toggle_token
-        \m@th
-        ##1
-        \sqrtsign { ##2 }
-        \c_math_toggle_token
-       }
-      \__um_mathstyle_scale:Nnn ##1 { \kern }
-       { \fontdimen 63 \l__um_font }
-      \box_move_up:nn
-       {
-        (\box_ht:N \l_tmpa_box - \box_dp:N \l_tmpa_box)
-        * \number \fontdimen 65 \l__um_font / 100
-       }
-       { \box_use:N \rootbox }
-      \__um_mathstyle_scale:Nnn ##1 { \kern }
-       { \fontdimen 64 \l__um_font }
-      \box_use_clear:N \l_tmpa_box
-     }
-   }
- }
-\cs_new:Nn \__um_fontdimen_to_percent:nn
- {
-  \fp_eval:n { \dim_to_decimal:n { \fontdimen #1 #2 } * 65536 / 100 }
- }
-\cs_new:Nn \__um_fontdimen_to_scale:nn
- {
-  \fp_eval:n {\__um_fontdimen_to_percent:nn {#1} {#2} * \f@size } pt
- }
-\cs_new:Nn \__um_mathstyle_scale:Nnn
- {
-  \ifx#1\scriptstyle
-    #2 \__um_fontdimen_to_percent:nn {10} \l__um_font #3
-  \else
-    \ifx#1\scriptscriptstyle
-      #2 \__um_fontdimen_to_percent:nn {11} \l__um_font #3
-    \else
-      #2 #3
-    \fi
-  \fi
- }
+
 \group_begin:
 \cs_new:Nn \__um_setup_active_superscript:nn
  {
@@ -1621,146 +2573,6 @@
    }
    { \group_align_safe_end: #2 #3 }
  }
-\cs_new:Npn \__um_define_active_frac:Nw #1 #2/#3
- {
-  \char_set_catcode_active:N #1
-  \__um_char_gmake_mathactive:N #1
-  \tl_rescan:nn
-   {
-    \catcode`\_=11\relax
-    \catcode`\:=11\relax
-   }
-   {
-    \cs_gset:Npx #1
-     {
-      \bool_if:NTF \l__um_smallfrac_bool {\exp_not:N\tfrac} {\exp_not:N\frac}
-          {#2} {#3}
-     }
-   }
- }
-\cs_new:Npn \__um_setup_active_frac:
- {
-  \group_begin:
-  \__um_define_active_frac:Nw  ^^^^2189  0/3
-  \__um_define_active_frac:Nw  ^^^^2152  1/{10}
-  \__um_define_active_frac:Nw  ^^^^2151  1/9
-  \__um_define_active_frac:Nw  ^^^^215b  1/8
-  \__um_define_active_frac:Nw  ^^^^2150  1/7
-  \__um_define_active_frac:Nw  ^^^^2159  1/6
-  \__um_define_active_frac:Nw  ^^^^2155  1/5
-  \__um_define_active_frac:Nw  ^^^^00bc  1/4
-  \__um_define_active_frac:Nw  ^^^^2153  1/3
-  \__um_define_active_frac:Nw  ^^^^215c  3/8
-  \__um_define_active_frac:Nw  ^^^^2156  2/5
-  \__um_define_active_frac:Nw  ^^^^00bd  1/2
-  \__um_define_active_frac:Nw  ^^^^2157  3/5
-  \__um_define_active_frac:Nw  ^^^^215d  5/8
-  \__um_define_active_frac:Nw  ^^^^2154  2/3
-  \__um_define_active_frac:Nw  ^^^^00be  3/4
-  \__um_define_active_frac:Nw  ^^^^2158  4/5
-  \__um_define_active_frac:Nw  ^^^^215a  5/6
-  \__um_define_active_frac:Nw  ^^^^215e  7/8
-  \group_end:
- }
-\__um_setup_active_frac:
-\protected\def\to{\rightarrow}
-\protected\def\le{\leq}
-\protected\def\ge{\geq}
-\protected\def\neq{\ne}
-\protected\def\triangle{\mathord{\bigtriangleup}}
-\protected\def\bigcirc{\mdlgwhtcircle}
-\protected\def\circ{\vysmwhtcircle}
-\protected\def\bullet{\smblkcircle}
-\protected\def\mathyen{\yen}
-\protected\def\mathsterling{\sterling}
-\protected\def\diamond{\smwhtdiamond}
-\protected\def\emptyset{\varnothing}
-\protected\def\hbar{\hslash}
-\protected\def\land{\wedge}
-\protected\def\lor{\vee}
-\protected\def\owns{\ni}
-\protected\def\gets{\leftarrow}
-\protected\def\mathring{\ocirc}
-\protected\def\lnot{\neg}
-\protected\def\longdivision{\longdivisionsign}
-\protected\def\backepsilon{\upbackepsilon}
-\protected\def\eth{\matheth}
-\protected\def\dbkarow {\dbkarrow}
-\protected\def\drbkarow{\drbkarrow}
-\protected\def\hksearow{\hksearrow}
-\protected\def\hkswarow{\hkswarrow}
-\protected\def\smallint{\mathop{\textstyle\int}\limits}
-\cs_set_eq:NN \latexe_underbar:n \underbar
-\renewcommand\underbar
- {
-  \mode_if_math:TF \mathunderbar \latexe_underbar:n
- }
-\@ifpackageloaded{amsmath}
- {
-  % define their own colon, perhaps I should just steal it. (It does look much better.)
- }
- {
-  \cs_set_protected:Npn \colon
-   {
-    \bool_if:NTF \g__um_literal_colon_bool {:} { \mathpunct{:} }
-   }
- }
-\protected\def\digamma{\updigamma}
-\protected\def\Digamma{\upDigamma}
-\cs_set_protected:Npn \| {\Vert}
-\cs_set_protected:Npn \mathellipsis {\mathinner{\unicodeellipsis}}
-\cs_set_protected:Npn \cdots {\mathinner{\unicodecdots}}
-\cs_set_eq:NN \__um_text_slash: \slash
-\cs_set_protected:Npn \slash
- {
-  \mode_if_math:TF {\mathslash} {\__um_text_slash:}
- }
-\cs_new:Npn \__um_newnot:N #1
- {
-   \tl_set:Nx \l_not_token_name_tl { \token_to_str:N #1 }
-   \exp_args:Nx \tl_if_empty:nF { \tl_tail:V \l_not_token_name_tl }
-    {
-     \tl_set:Nx \l_not_token_name_tl { \tl_tail:V \l_not_token_name_tl }
-    }
-   \cs_if_exist:cTF { n \l_not_token_name_tl }
-    {
-     \use:c { n \l_not_token_name_tl }
-    }
-    {
-     \cs_if_exist:cTF { not \l_not_token_name_tl }
-      {
-       \use:c { not \l_not_token_name_tl }
-      }
-      {
-       \__um_oldnot: #1
-      }
-    }
- }
-\cs_set_eq:NN \__um_oldnot: \not
-\AtBeginDocument{\cs_set_eq:NN \not \__um_newnot:N}
-\cs_new_protected_nopar:Nn \__um_setup_negations:
- {
-  \cs_gset:cpn { not= }    { \neq }
-  \cs_gset:cpn { not< }    { \nless }
-  \cs_gset:cpn { not> }    { \ngtr }
-  \cs_gset:Npn  \ngets     { \nleftarrow }
-  \cs_gset:Npn  \nsimeq    { \nsime }
-  \cs_gset:Npn  \nequal    { \ne }
-  \cs_gset:Npn  \nle       { \nleq }
-  \cs_gset:Npn  \nge       { \ngeq }
-  \cs_gset:Npn  \ngreater  { \ngtr }
-  \cs_gset:Npn  \nforksnot { \forks }
- }
-\AtBeginDocument { \__um_load_lm_if_necessary: }
-\cs_new:Nn \__um_load_lm_if_necessary:
-  {
-    \cs_if_exist:NF \l__um_fontname_tl
-      {
-        % TODO: update this when lmmath-bold.otf is released
-        \setmathfont{latinmodern-math.otf}[BoldFont={latinmodern-math.otf}]
-        \bool_set_false:N \g__um_mainfont_already_set_bool
-      }
-  }
 \cs_new_protected_nopar:Nn \__um_check_and_fix:NNnnnn
  {
   \cs_if_exist:NT #1
@@ -2097,3 +2909,827 @@
   \RenewDocumentCommand \equalscolon { } { \eqcolon }
   \RenewDocumentCommand \coloncolonequals { } { \Coloneq }
  }
+\__um_new_alphabet_config:nnn {up} {num}
+ {
+  \__um_set_normal_numbers:nn {up} {#1}
+  \__um_set_mathalphabet_numbers:nnn {up} {up} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {up} {Latin}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_Latin:nn {up} {#1} }
+   {
+    \bool_if:NT \g__um_upLatin_bool { \__um_set_normal_Latin:nn {up,it} {#1} }
+   }
+  \__um_set_mathalphabet_Latin:nnn {up} {up,it} {#1}
+  \__um_set_mathalphabet_Latin:nnn {literal} {up} {up}
+  \__um_set_mathalphabet_Latin:nnn {literal} {it} {it}
+ }
+
+\__um_new_alphabet_config:nnn {up} {latin}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_latin:nn {up} {#1} }
+   {
+    \bool_if:NT \g__um_uplatin_bool
+     {
+      \__um_set_normal_latin:nn        {up,it} {#1}
+      \__um_set_normal_char:nnn        {h} {up,it} {#1}
+      \__um_set_normal_char:nnn {dotlessi} {up,it} {#1}
+      \__um_set_normal_char:nnn {dotlessj} {up,it} {#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {up} {up,it}{#1}
+  \__um_set_mathalphabet_latin:nnn {literal} {up} {up}
+  \__um_set_mathalphabet_latin:nnn {literal} {it} {it}
+ }
+
+\__um_new_alphabet_config:nnn {up} {Greek}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_Greek:nn {up}{#1} }
+   {
+    \bool_if:NT \g__um_upGreek_bool { \__um_set_normal_Greek:nn {up,it}{#1} }
+   }
+  \__um_set_mathalphabet_Greek:nnn {up} {up,it}{#1}
+  \__um_set_mathalphabet_Greek:nnn {literal} {up} {up}
+  \__um_set_mathalphabet_Greek:nnn {literal} {it} {it}
+ }
+
+\__um_new_alphabet_config:nnn {up} {greek}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_greek:nn {up} {#1} }
+   {
+    \bool_if:NT \g__um_upgreek_bool
+     {
+      \__um_set_normal_greek:nn {up,it} {#1}
+     }
+   }
+  \__um_set_mathalphabet_greek:nnn {up} {up,it} {#1}
+  \__um_set_mathalphabet_greek:nnn {literal} {up} {up}
+  \__um_set_mathalphabet_greek:nnn {literal} {it} {it}
+ }
+
+\__um_new_alphabet_config:nnn {up} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{up}{up}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{up,it}{up}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{up}{up}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{up,it}{up}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {up}  {partial} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {up}    {Nabla} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {up} {dotlessi} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {up} {dotlessj} {up,it} {#1}
+ }
+\__um_new_alphabet_config:nnn {it} {Latin}
+ {
+  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_Latin:nn {it} {#1} }
+   {
+    \bool_if:NF \g__um_upLatin_bool { \__um_set_normal_Latin:nn {up,it} {#1} }
+   }
+  \__um_set_mathalphabet_Latin:nnn {it}{up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {it} {latin}
+ {
+  \bool_if:NTF \g__um_literal_bool
+   {
+    \__um_set_normal_latin:nn {it} {#1}
+    \__um_set_normal_char:nnn {h}{it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_uplatin_bool
+     {
+      \__um_set_normal_latin:nn {up,it} {#1}
+      \__um_set_normal_char:nnn {h}{up,it}{#1}
+      \__um_set_normal_char:nnn {dotlessi}{up,it}{#1}
+      \__um_set_normal_char:nnn {dotlessj}{up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {it}            {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {it} {dotlessi} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {it} {dotlessj} {up,it} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {it} {Greek}
+ {
+  \bool_if:NTF \g__um_literal_bool
+   {
+    \__um_set_normal_Greek:nn {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upGreek_bool { \__um_set_normal_Greek:nn {up,it}{#1} }
+   }
+  \__um_set_mathalphabet_Greek:nnn {it} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {it} {greek}
+ {
+  \bool_if:NTF \g__um_literal_bool
+   {
+    \__um_set_normal_greek:nn {it} {#1}
+   }
+   {
+    \bool_if:NF \g__um_upgreek_bool { \__um_set_normal_greek:nn {it,up} {#1} }
+   }
+  \__um_set_mathalphabet_greek:nnn {it} {up,it} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {it} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{it}{it}
+   }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{up,it}{it}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{it}{it}
+   }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{up,it}{it}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {it} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {it} {Nabla}   {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bb} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {bb} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bb} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {bb} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {C} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {H} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {N} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {P} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {Q} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {R} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {Z} {up,it} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {bb} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {bb} {up}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bb} {misc}
+ {
+  \__um_set_mathalphabet_pos:nnnn {bb}        {Pi} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb}        {pi} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb}     {Gamma} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb}     {gamma} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bb} {summation} {up} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {bbit} {misc}
+ {
+  \__um_set_mathalphabet_pos:nnnn {bbit} {D} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bbit} {d} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bbit} {e} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bbit} {i} {up,it} {#1}
+  \__um_set_mathalphabet_pos:nnnn {bbit} {j} {up,it} {#1}
+ }
+\__um_new_alphabet_config:nnn {scr} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {scr}    {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {B}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {E}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {F}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {H}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {I}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {L}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {M}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {R}{up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {scr} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {scr}    {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {e}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {g}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {scr} {o}{up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {cal} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {cal}  {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {B}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {E}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {F}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {H}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {I}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {L}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {M}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {cal} {R}{up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {frak} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {frak}    {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {C}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {H}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {I}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {R}{up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {frak} {Z}{up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {frak} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {frak} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfup} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {sf}   {up}{#1}
+  \__um_set_mathalphabet_numbers:nnn {sfup} {up}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfup} {Latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {sfup} {#1}
+    \__um_set_mathalphabet_Latin:nnn {sf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_Latin:nn {sfup,sfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {sf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Latin:nnn {sfup} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfup} {latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_latin:nn {sfup} {#1}
+    \__um_set_mathalphabet_latin:nnn {sf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_latin:nn {sfup,sfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {sf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {sfup} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfit} {Latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {sfit} {#1}
+    \__um_set_mathalphabet_Latin:nnn {sf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_Latin:nn {sfup,sfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {sf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Latin:nnn {sfit} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {sfit} {latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_latin:nn {sfit} {#1}
+    \__um_set_mathalphabet_latin:nnn {sf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_latin:nn {sfup,sfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {sf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {sfit} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {tt} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {tt} {up}{#1}
+ }
+\__um_new_alphabet_config:nnn {tt} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {tt} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {tt} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {tt} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfit} {Latin}
+ {
+  \bool_if:NF \g__um_bfupLatin_bool
+   {
+    \__um_set_normal_Latin:nn {bfup,bfit} {#1}
+   }
+  \__um_set_mathalphabet_Latin:nnn {bfit} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {bfit} {#1}
+    \__um_set_mathalphabet_Latin:nnn {bf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_bfupLatin_bool
+     {
+      \__um_set_normal_Latin:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfit} {latin}
+ {
+  \bool_if:NF \g__um_bfuplatin_bool
+   {
+    \__um_set_normal_latin:nn {bfup,bfit} {#1}
+   }
+  \__um_set_mathalphabet_latin:nnn {bfit} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_latin:nn {bfit} {#1}
+    \__um_set_mathalphabet_latin:nnn {bf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_bfuplatin_bool
+     {
+      \__um_set_normal_latin:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfit} {Greek}
+ {
+  \__um_set_mathalphabet_Greek:nnn {bfit} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_Greek:nn {bfit}{#1}
+    \__um_set_mathalphabet_Greek:nnn {bf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_bfupGreek_bool
+     {
+      \__um_set_normal_Greek:nn {bfup,bfit}{#1}
+      \__um_set_mathalphabet_Greek:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfit} {greek}
+ {
+  \__um_set_mathalphabet_greek:nnn {bfit} {up,it} {#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_greek:nn {bfit} {#1}
+    \__um_set_mathalphabet_greek:nnn {bf} {it} {#1}
+   }
+   {
+    \bool_if:NF \g__um_bfupgreek_bool
+     {
+      \__um_set_normal_greek:nn {bfit,bfup} {#1}
+      \__um_set_mathalphabet_greek:nnn {bf} {up,it} {#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfit} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   { \__um_set_normal_char:nnn {Nabla}{bfit}{#1} }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     { \__um_set_normal_char:nnn {Nabla}{bfup,bfit}{#1} }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   { \__um_set_normal_char:nnn {partial}{bfit}{#1} }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     { \__um_set_normal_char:nnn {partial}{bfup,bfit}{#1} }
+   }
+  \__um_set_mathalphabet_pos:nnnn {bfit} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfit} {Nabla}   {up,it}{#1}
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bf} {partial} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bf} {partial} {up,it}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {up,it}{#1}
+     }
+   }
+ }
+\__um_new_alphabet_config:nnn {bfup} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {bf}   {up}{#1}
+  \__um_set_mathalphabet_numbers:nnn {bfup} {up}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfup} {Latin}
+ {
+  \bool_if:NT \g__um_bfupLatin_bool
+   {
+    \__um_set_normal_Latin:nn {bfup,bfit} {#1}
+   }
+  \__um_set_mathalphabet_Latin:nnn {bfup} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {bfup} {#1}
+    \__um_set_mathalphabet_Latin:nnn {bf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_bfupLatin_bool
+     {
+      \__um_set_normal_Latin:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfup} {latin}
+ {
+  \bool_if:NT \g__um_bfuplatin_bool
+   {
+    \__um_set_normal_latin:nn {bfup,bfit} {#1}
+   }
+  \__um_set_mathalphabet_latin:nnn {bfup} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_latin:nn {bfup} {#1}
+    \__um_set_mathalphabet_latin:nnn {bf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_bfuplatin_bool
+     {
+      \__um_set_normal_latin:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+\__um_new_alphabet_config:nnn {bfup} {Greek}
+ {
+  \__um_set_mathalphabet_Greek:nnn {bfup} {up,it}{#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_Greek:nn {bfup}{#1}
+    \__um_set_mathalphabet_Greek:nnn {bf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_bfupGreek_bool
+     {
+      \__um_set_normal_Greek:nn {bfup,bfit}{#1}
+      \__um_set_mathalphabet_Greek:nnn {bf} {up,it}{#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfup} {greek}
+ {
+  \__um_set_mathalphabet_greek:nnn {bfup} {up,it} {#1}
+  \bool_if:NTF \g__um_bfliteral_bool
+   {
+    \__um_set_normal_greek:nn {bfup} {#1}
+    \__um_set_mathalphabet_greek:nnn {bf} {up} {#1}
+   }
+   {
+    \bool_if:NT \g__um_bfupgreek_bool
+     {
+      \__um_set_normal_greek:nn {bfup,bfit} {#1}
+      \__um_set_mathalphabet_greek:nnn {bf} {up,it} {#1}
+     }
+   }
+ }
+
+\__um_new_alphabet_config:nnn {bfup} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{bfup}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{bfup,bfit}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{bfup}{#1}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{bfup,bfit}{#1}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {bfup} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfup} {Nabla}   {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfup} {digamma} {up}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfup} {Digamma} {up}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bf}   {digamma} {up}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bf}   {Digamma} {up}{#1}
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bf} {partial} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bf} {partial} {up,it}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {up,it}{#1}
+     }
+   }
+ }
+\__um_new_alphabet_config:nnn {bffrak} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {bffrak} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bffrak} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {bffrak} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfscr} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {bfscr} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfscr} {latin}
+ {
+  \__um_set_mathalphabet_latin:nnn {bfscr} {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfcal} {Latin}
+ {
+  \__um_set_mathalphabet_Latin:nnn {bfcal}  {up,it}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfsfup} {num}
+ {
+  \__um_set_mathalphabet_numbers:nnn {bfsf}   {up}{#1}
+  \__um_set_mathalphabet_numbers:nnn {bfsfup} {up}{#1}
+ }
+\__um_new_alphabet_config:nnn {bfsfup} {Latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {bfsfup} {#1}
+    \__um_set_mathalphabet_Latin:nnn {bfsf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_Latin:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Latin:nnn {bfsfup} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfup} {latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_latin:nn {bfsfup} {#1}
+    \__um_set_mathalphabet_latin:nnn {bfsf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_latin:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {bfsfup} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfup} {Greek}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Greek:nn {bfsfup}{#1}
+    \__um_set_mathalphabet_Greek:nnn {bfsf} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_Greek:nn {bfsfup,bfsfit}{#1}
+      \__um_set_mathalphabet_Greek:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Greek:nnn {bfsfup} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfup} {greek}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_greek:nn {bfsfup} {#1}
+    \__um_set_mathalphabet_greek:nnn {bfsf} {up} {#1}
+   }
+   {
+    \bool_if:NT \g__um_upsans_bool
+     {
+      \__um_set_normal_greek:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_greek:nnn {bfsf} {up,it} {#1}
+     }
+   }
+  \__um_set_mathalphabet_greek:nnn {bfsfup} {up,it} {#1}
+ }
+\__um_new_alphabet_config:nnn {bfsfup} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{bfsfup}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{bfsfup,bfsfit}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{bfsfup}{#1}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{bfsfup,bfsfit}{#1}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {bfsfup} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfsfup} {Nabla}   {up,it}{#1}
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_uppartial_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {up,it}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {up}{#1}
+   }
+   {
+    \bool_if:NT \g__um_upNabla_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {up,it}{#1}
+     }
+   }
+ }
+\__um_new_alphabet_config:nnn {bfsfit} {Latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Latin:nn {bfsfit} {#1}
+    \__um_set_mathalphabet_Latin:nnn {bfsf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_Latin:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_Latin:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Latin:nnn {bfsfit} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfit} {latin}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_latin:nn {bfsfit} {#1}
+    \__um_set_mathalphabet_latin:nnn {bfsf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_latin:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_latin:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_latin:nnn {bfsfit} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfit} {Greek}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_Greek:nn {bfsfit}{#1}
+    \__um_set_mathalphabet_Greek:nnn {bfsf} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_Greek:nn {bfsfup,bfsfit}{#1}
+      \__um_set_mathalphabet_Greek:nnn {bfsf} {up,it}{#1}
+     }
+   }
+  \__um_set_mathalphabet_Greek:nnn {bfsfit} {up,it}{#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfit} {greek}
+ {
+  \bool_if:NTF \g__um_sfliteral_bool
+   {
+    \__um_set_normal_greek:nn {bfsfit} {#1}
+    \__um_set_mathalphabet_greek:nnn {bfsf} {it} {#1}
+   }
+   {
+    \bool_if:NF \g__um_upsans_bool
+     {
+      \__um_set_normal_greek:nn {bfsfup,bfsfit} {#1}
+      \__um_set_mathalphabet_greek:nnn {bfsf} {up,it} {#1}
+     }
+   }
+  \__um_set_mathalphabet_greek:nnn {bfsfit} {up,it} {#1}
+ }
+
+\__um_new_alphabet_config:nnn {bfsfit} {misc}
+ {
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_normal_char:nnn {Nabla}{bfsfit}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     {
+      \__um_set_normal_char:nnn {Nabla}{bfsfup,bfsfit}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_normal_char:nnn {partial}{bfsfit}{#1}
+   }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     {
+      \__um_set_normal_char:nnn {partial}{bfsfup,bfsfit}{#1}
+     }
+   }
+  \__um_set_mathalphabet_pos:nnnn {bfsfit} {partial} {up,it}{#1}
+  \__um_set_mathalphabet_pos:nnnn {bfsfit} {Nabla}   {up,it}{#1}
+  \bool_if:NTF \g__um_literal_partial_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_uppartial_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {up,it}{#1}
+     }
+   }
+  \bool_if:NTF \g__um_literal_Nabla_bool
+   {
+    \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {it}{#1}
+   }
+   {
+    \bool_if:NF \g__um_upNabla_bool
+     {
+      \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {up,it}{#1}
+     }
+   }
+ }
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
index ca388f1d98b..16d02e7423c 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
@@ -4,11 +4,8 @@
 %%
 %% The original source files were:
 %%
-%% unicode-math-preamble.dtx  (with options: `preamble')
-%% unicode-math-msg.dtx  (with options: `msg')
-%% unicode-math-usv.dtx  (with options: `usv')
-%% unicode-math.dtx  (with options: `load')
-%% unicode-math-alphabets.dtx  (with options: `alphabets')
+%% unicode-math.dtx  (with options: `preamble,load')
+%% 
 %% Copyright 2006-2017   Will Robertson <will.robertson@latex-project.org>
 %% Copyright 2010-2013 Philipp Stephani <st_philipp@yahoo.de>
 %% Copyright 2012-2015     Khaled Hosny <khaledhosny@eglug.org>
@@ -18,7 +15,6 @@
 %% (your choice): <http://www.latex-project.org/lppl/>.
 %% 
 %% This work is "maintained" by Will Robertson.
-
 \ifdefined\XeTeXversion
   \ifdim\number\XeTeXversion\XeTeXrevision in<0.9998in%
     \PackageError{unicode-math}{%
@@ -39,1532 +35,12 @@
     Use XeLaTeX or LuaLaTeX instead.%
   }\@ehd
 \fi\fi
-\RequirePackage{expl3}[2015/03/01]
+\RequirePackage{expl3,xparse,l3keys2e}
+\RequirePackage{fontspec}
 \RequirePackage{ucharcat}
-\RequirePackage{xparse}
-\RequirePackage{l3keys2e}
-\RequirePackage{fontspec}[2015/03/14]
-\RequirePackage{fix-cm} % avoid some warnings
+\RequirePackage{fix-cm} % avoid some warnings (still necessary? check...)
 \RequirePackage{filehook}
 \ExplSyntaxOn
-\cs_set_protected_nopar:Npn \exp_last_unbraced:NNx { \::N \::x_unbraced \::: }
-\cs_generate_variant:Nn \fontspec_set_family:Nnn {Nx}
-\cs_generate_variant:Nn \fontspec_set_fontface:NNnn {NNx}
-\bool_new:N \l__um_ot_math_bool
-\bool_new:N \l__um_init_bool
-\bool_new:N \l__um_implicit_alph_bool
-\bool_new:N \g__um_mainfont_already_set_bool
-\bool_new:N \g__um_literal_bool
-\bool_new:N \g__um_upLatin_bool
-\bool_new:N \g__um_uplatin_bool
-\bool_new:N \g__um_upGreek_bool
-\bool_new:N \g__um_upgreek_bool
-\bool_new:N \g__um_bfliteral_bool
-\bool_new:N \g__um_bfupLatin_bool
-\bool_new:N \g__um_bfuplatin_bool
-\bool_new:N \g__um_bfupGreek_bool
-\bool_new:N \g__um_bfupgreek_bool
-\bool_new:N \g__um_upsans_bool
-\bool_new:N \g__um_sfliteral_bool
-\bool_new:N \g__um_upNabla_bool
-\bool_new:N \g__um_uppartial_bool
-\bool_new:N \g__um_literal_Nabla_bool
-\bool_new:N \g__um_literal_partial_bool
-\bool_new:N \l__um_smallfrac_bool
-\bool_new:N \g__um_literal_colon_bool
-\bool_new:N \g__um_mathrm_text_bool
-\bool_new:N \g__um_mathit_text_bool
-\bool_new:N \g__um_mathbf_text_bool
-\bool_new:N \g__um_mathsf_text_bool
-\bool_new:N \g__um_mathtt_text_bool
-\int_new:N \g__um_fam_int
-\tl_const:Nn \c__um_math_alphabet_name_latin_tl {Latin,~lowercase}
-\tl_const:Nn \c__um_math_alphabet_name_Latin_tl {Latin,~uppercase}
-\tl_const:Nn \c__um_math_alphabet_name_greek_tl {Greek,~lowercase}
-\tl_const:Nn \c__um_math_alphabet_name_Greek_tl {Greek,~uppercase}
-\tl_const:Nn \c__um_math_alphabet_name_num_tl   {Numerals}
-\tl_const:Nn \c__um_math_alphabet_name_misc_tl  {Misc.}
-\tl_new:N \l__um_mathstyle_tl
-\tl_new:N \g__um_operator_mathfont_tl
-\seq_new:N \l__um_missing_alph_seq
-\seq_new:N \l__um_mathalph_seq
-\seq_new:N \l__um_char_range_seq
-\seq_new:N \l__um_mclass_range_seq
-\seq_new:N \l__um_cmd_range_seq
-\seq_new:N \g__um_mathclasses_seq
-\seq_set_from_clist:Nn \g__um_mathclasses_seq
-  {
-    \mathord,\mathalpha,\mathbin,\mathrel,\mathpunct,
-     \mathop,
-    \mathopen,\mathclose,
-    \mathfence,\mathover,\mathunder,
-     \mathaccent,\mathbotaccent,\mathaccentwide,\mathbotaccentwide
-  }
-
-\seq_new:N \g__um_default_mathalph_seq
-\seq_new:N \g__um_named_ranges_seq
-\seq_new:N \g__um_mathstyles_seq
-\muskip_new:N \g__um_primekern_muskip
-\muskip_gset:Nn \g__um_primekern_muskip { -\thinmuskip/2 }% arbitrary
-\int_new:N \l__um_primecount_int
-\prop_new:N \g__um_supers_prop
-\prop_new:N \g__um_subs_prop
-\tl_new:N \l_not_token_name_tl
-\prg_new_conditional:Nnn \__um_glyph_if_exist:n {p,TF,T,F}
- {
-  \etex_iffontchar:D \l__um_font #1 \scan_stop:
-    \prg_return_true:
-  \else:
-    \prg_return_false:
-  \fi:
- }
-\cs_set:Npn \__um_set_mathcode:nnnn #1#2#3#4 {
-  \Umathcode \int_eval:n {#1} =
-    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
-}
-\cs_set:Npn \__um_set_mathcode:nnn #1#2#3 {
-  \Umathcode \int_eval:n {#1} =
-    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#1} \scan_stop:
-}
-\cs_set:Npn \__um_set_mathchar:NNnn #1#2#3#4 {
-  \Umathchardef #1 =
-    \mathchar@type#2 \csname sym#3\endcsname \int_eval:n {#4} \scan_stop:
-}
-\cs_new:Nn \__um_set_delcode:nnn {
-  \Udelcode#2 = \csname sym#1\endcsname #3 \scan_stop:
-}
-\cs_new:Nn \__um_radical:nn {
-  \Uradical \csname sym#1\endcsname #2 \scan_stop:
-}
-\cs_new:Nn \__um_delimiter:Nnn {
-  \Udelimiter \mathchar@type#1 \csname sym#2\endcsname #3 \scan_stop:
-}
-\cs_new:Nn \__um_accent:nnn {
-  \Umathaccent #1~ \mathchar@type\mathaccent \use:c { sym #2 } #3 \scan_stop:
-}
-\cs_generate_variant:Nn \__um_set_mathchar:NNnn {c}
-\cs_new:Nn \__um_char_gmake_mathactive:N
- {
-  \global\mathcode `#1 = "8000 \scan_stop:
- }
-\cs_new:Nn \__um_char_gmake_mathactive:n
- {
-  \global\mathcode #1 = "8000 \scan_stop:
- }
-\cs_new:Nn \usv_set:nnn
- { \tl_set:cn { g__um_#1_#2_usv } {#3} }
-\cs_new:Nn \__um_to_usv:nn
- { \use:c { g__um_#1_#2_usv } }
-\prg_new_conditional:Nnn \__um_usv_if_exist:nn {T,F,TF}
- {
-  \cs_if_exist:cTF { g__um_#1_#2_usv }
-   \prg_return_true: \prg_return_false:
- }
-\DeclareDocumentCommand \unimathsetup {m}
- { \keys_set:nn {unicode-math} {#1} }
-\cs_new:Nn \__um_keys_choices:nn
- {
-  \cs_set:Npn \__um_keys_choices_fn:nn { \__um_keys_choices_aux:nnn {#1} }
-  \use:x
-   {
-    \exp_not:N \keys_define:nn {unicode-math}
-     {
-      #1 .choice: ,
-      \__um_tl_map_dbl:nN {#2} \__um_keys_choices_fn:nn
-     }
-   }
- }
-\cs_new:Nn \__um_keys_choices_aux:nnn { #1 / #2 .code:n = { \exp_not:n {#3} } , }
-
-\cs_new:Nn \__um_tl_map_dbl:nN
-  {
-    \__um_tl_map_dbl:Nnn #2 #1 \q_recursion_tail {}{} \q_recursion_stop
-  }
-\cs_new:Nn \__um_tl_map_dbl:Nnn
-  {
-    \quark_if_recursion_tail_stop:n {#2}
-    \quark_if_recursion_tail_stop:n {#3}
-    #1 {#2} {#3}
-    \__um_tl_map_dbl:Nnn #1
- }
-\__um_keys_choices:nn {mathup}
- {
-  {sym}  { \bool_set_false:N \g__um_mathrm_text_bool }
-  {text} { \bool_set_true:N  \g__um_mathrm_text_bool }
- }
-\__um_keys_choices:nn {mathrm}
- {
-  {sym}  { \bool_set_false:N \g__um_mathrm_text_bool }
-  {text} { \bool_set_true:N  \g__um_mathrm_text_bool }
- }
-\__um_keys_choices:nn {mathit}
- {
-  {sym}  { \bool_set_false:N \g__um_mathit_text_bool }
-  {text} { \bool_set_true:N  \g__um_mathit_text_bool }
- }
-\__um_keys_choices:nn {mathbf}
- {
-  {sym}  { \bool_set_false:N \g__um_mathbf_text_bool }
-  {text} { \bool_set_true:N  \g__um_mathbf_text_bool }
- }
-\__um_keys_choices:nn {mathsf}
- {
-  {sym}  { \bool_set_false:N \g__um_mathsf_text_bool }
-  {text} { \bool_set_true:N  \g__um_mathsf_text_bool }
- }
-\__um_keys_choices:nn {mathtt}
- {
-  {sym}  { \bool_set_false:N \g__um_mathtt_text_bool }
-  {text} { \bool_set_true:N  \g__um_mathtt_text_bool }
- }
-\__um_keys_choices:nn {normal-style}
- {
-       {ISO} {
-              \bool_set_false:N \g__um_literal_bool
-              \bool_set_false:N \g__um_upGreek_bool
-              \bool_set_false:N \g__um_upgreek_bool
-              \bool_set_false:N \g__um_upLatin_bool
-              \bool_set_false:N \g__um_uplatin_bool
-             }
-       {TeX} {
-              \bool_set_false:N \g__um_literal_bool
-              \bool_set_true:N  \g__um_upGreek_bool
-              \bool_set_false:N \g__um_upgreek_bool
-              \bool_set_false:N \g__um_upLatin_bool
-              \bool_set_false:N \g__um_uplatin_bool
-             }
-    {french} {
-              \bool_set_false:N \g__um_literal_bool
-              \bool_set_true:N  \g__um_upGreek_bool
-              \bool_set_true:N  \g__um_upgreek_bool
-              \bool_set_true:N  \g__um_upLatin_bool
-              \bool_set_false:N \g__um_uplatin_bool
-             }
-   {upright} {
-              \bool_set_false:N \g__um_literal_bool
-              \bool_set_true:N  \g__um_upGreek_bool
-              \bool_set_true:N  \g__um_upgreek_bool
-              \bool_set_true:N  \g__um_upLatin_bool
-              \bool_set_true:N  \g__um_uplatin_bool
-             }
-   {literal} {
-              \bool_set_true:N  \g__um_literal_bool
-             }
- }
-\__um_keys_choices:nn {math-style}
- {
-      {ISO} {
-             \unimathsetup { nabla=upright, partial=italic,
-              normal-style=ISO, bold-style=ISO, sans-style=italic }
-            }
-      {TeX} {
-             \unimathsetup { nabla=upright, partial=italic,
-               normal-style=TeX, bold-style=TeX, sans-style=upright }
-            }
-   {french} {
-             \unimathsetup { nabla=upright, partial=upright,
-               normal-style=french, bold-style=upright, sans-style=upright }
-            }
-  {upright} {
-             \unimathsetup { nabla=upright, partial=upright,
-               normal-style=upright, bold-style=upright, sans-style=upright }
-            }
-  {literal} {
-             \unimathsetup { colon=literal, nabla=literal, partial=literal,
-               normal-style=literal, bold-style=literal, sans-style=literal }
-            }
- }
-\__um_keys_choices:nn {bold-style}
- {
-      {ISO} {
-             \bool_set_false:N \g__um_bfliteral_bool
-             \bool_set_false:N \g__um_bfupGreek_bool
-             \bool_set_false:N \g__um_bfupgreek_bool
-             \bool_set_false:N \g__um_bfupLatin_bool
-             \bool_set_false:N \g__um_bfuplatin_bool
-            }
-      {TeX} {
-             \bool_set_false:N \g__um_bfliteral_bool
-             \bool_set_true:N  \g__um_bfupGreek_bool
-             \bool_set_false:N \g__um_bfupgreek_bool
-             \bool_set_true:N  \g__um_bfupLatin_bool
-             \bool_set_true:N  \g__um_bfuplatin_bool
-            }
-  {upright} {
-             \bool_set_false:N \g__um_bfliteral_bool
-             \bool_set_true:N  \g__um_bfupGreek_bool
-             \bool_set_true:N  \g__um_bfupgreek_bool
-             \bool_set_true:N  \g__um_bfupLatin_bool
-             \bool_set_true:N  \g__um_bfuplatin_bool
-            }
-  {literal} {
-             \bool_set_true:N  \g__um_bfliteral_bool
-            }
- }
-\__um_keys_choices:nn {sans-style}
- {
-  {italic}  { \bool_set_false:N \g__um_upsans_bool    }
-  {upright} { \bool_set_true:N  \g__um_upsans_bool    }
-  {literal} { \bool_set_true:N  \g__um_sfliteral_bool }
- }
-\__um_keys_choices:nn {nabla}
- {
-  {upright} {
-              \bool_set_false:N \g__um_literal_Nabla_bool
-              \bool_set_true:N  \g__um_upNabla_bool
-            }
-  {italic}  {
-              \bool_set_false:N \g__um_literal_Nabla_bool
-              \bool_set_false:N \g__um_upNabla_bool
-            }
-  {literal} { \bool_set_true:N  \g__um_literal_Nabla_bool }
- }
-\__um_keys_choices:nn {partial}
- {
-  {upright} {
-              \bool_set_false:N \g__um_literal_partial_bool
-              \bool_set_true:N  \g__um_uppartial_bool
-            }
-  {italic}  {
-              \bool_set_false:N \g__um_literal_partial_bool
-              \bool_set_false:N \g__um_uppartial_bool
-            }
-  {literal} { \bool_set_true:N  \g__um_literal_partial_bool }
- }
-\__um_keys_choices:nn {colon}
- {
-  {literal} { \bool_set_true:N  \g__um_literal_colon_bool }
-  {TeX}     { \bool_set_false:N \g__um_literal_colon_bool }
- }
-\__um_keys_choices:nn {slash-delimiter}
- {
-  {ascii} { \tl_set:Nn \g__um_slash_delimiter_usv {"002F} }
-  {frac}  { \tl_set:Nn \g__um_slash_delimiter_usv {"2044} }
-  {div}   { \tl_set:Nn \g__um_slash_delimiter_usv {"2215} }
- }
-\__um_keys_choices:nn {active-frac}
- {
-   {small}
-   {
-    \cs_if_exist:NTF \tfrac
-     { \bool_set_true:N \l__um_smallfrac_bool }
-     {
-      \__um_warning:n {no-tfrac}
-      \bool_set_false:N \l__um_smallfrac_bool
-     }
-    \use:c {__um_setup_active_frac:}
-   }
-
-   {normalsize}
-   {
-    \bool_set_false:N \l__um_smallfrac_bool
-    \use:c {__um_setup_active_frac:}
-   }
- }
-\keys_define:nn {unicode-math}
-  {
-    warnings-off .code:n =
-      {
-        \clist_map_inline:nn {#1}
-          { \msg_redirect_name:nnn { unicode-math } { ##1 } { none } }
-      }
-  }
-\__um_keys_choices:nn {trace}
- {
-  {on}    {} % default
-  {debug} { \msg_redirect_module:nnn { unicode-math } { log } { warning } }
-  {off}   { \msg_redirect_module:nnn { unicode-math } { log } { none } }
- }
-\unimathsetup {math-style=TeX}
-\unimathsetup {slash-delimiter=ascii}
-\unimathsetup {trace=off}
-\unimathsetup {mathrm=text,mathit=text,mathbf=text,mathsf=text,mathtt=text}
-\cs_if_exist:NT \tfrac { \unimathsetup {active-frac=small} }
-\ProcessKeysOptions {unicode-math}
-\cs_new:Nn \unimath_get_mathstyle:
- {
-  \tl_use:N \l__um_mathstyle_tl
- }
-\tl_map_inline:nn
- {
-  \new@mathgroup\cdp@list\cdp@elt\DeclareMathSizes
-  \@DeclareMathSizes\newmathalphabet\newmathalphabet__um\newmathalphabet__um@
-  \DeclareMathVersion\define@mathalphabet\define@mathgroup\addtoversion
-  \version@list\version@elt\alpha@list\alpha@elt
-  \restore@mathversion\init@restore@version\dorestore@version\process@table
-  \new@mathversion\DeclareSymbolFont\group@list\group@elt
-  \new@symbolfont\SetSymbolFont\SetSymbolFont@\get@cdp
-  \DeclareMathAlphabet\new@mathalphabet\SetMathAlphabet\SetMathAlphabet@
-  \DeclareMathAccent\set@mathaccent\DeclareMathSymbol\set@mathchar
-  \set@mathsymbol\DeclareMathDelimiter\@xxDeclareMathDelimiter
-  \@DeclareMathDelimiter\@xDeclareMathDelimiter\set@mathdelimiter
-  \set__ummathdelimiter\DeclareMathRadical\mathchar@type
-  \DeclareSymbolFontAlphabet\DeclareSymbolFontAlphabet@
- }
- {
-  \tl_remove_once:Nn \@preamblecmds {\do#1}
- }
-
-\cs_new:Npn \__um_error:n   { \msg_error:nn   {unicode-math} }
-\cs_new:Npn \__um_warning:n { \msg_warning:nn {unicode-math} }
-\cs_new:Npn \__um_warning:nnn { \msg_warning:nnxx {unicode-math} }
-\cs_new:Npn \__um_log:n     { \msg_log:nn     {unicode-math} }
-\cs_new:Npn \__um_log:nx    { \msg_log:nnx    {unicode-math} }
-\msg_new:nnn {unicode-math} {no-tfrac}
-{
-  Small~ fraction~ command~ \protect\tfrac\ not~ defined.\\
-  Load~ amsmath~ or~ define~ it~ manually~ before~ loading~ unicode-math.
-}
-\msg_new:nnn {unicode-math} {default-math-font}
-{
-  Defining~ the~ default~ maths~ font~ as~ '\l__um_fontname_tl'.
-}
-\msg_new:nnn {unicode-math} {setup-implicit}
-{
-  Setup~ alphabets:~ implicit~ mode.
-}
-\msg_new:nnn {unicode-math} {setup-explicit}
-{
-  Setup~ alphabets:~ explicit~ mode.
-}
-\msg_new:nnn {unicode-math} {alph-initialise}
-{
-  Initialising~ \@backslashchar math#1.
-}
-\msg_new:nnn {unicode-math} {setup-alph}
-{
-  Setup~ alphabet:~ #1.
-}
-\msg_new:nnn {unicode-math} {no-alphabet}
-{
-  I~ am~ trying~ to~ set~ up~ alphabet~"#1"~ but~ there~ are~ no~ configuration~ settings~ for~ it.~
-  (See~ source~ file~ "unicode-math-alphabets.dtx"~ to~ debug.)
-}
-\msg_new:nnn { unicode-math } { no-named-range }
- {
-  I~ am~ trying~ to~ define~ new~ alphabet~ "#2"~ in~ range~ "#1",~ but~ range~ "#1"~ hasn't~ been~ defined~ yet.
- }
-\msg_new:nnn { unicode-math } { missing-alphabets }
- {
-  Missing~math~alphabets~in~font~ "\fontname\l__um_font" \\ \\
-  \seq_map_function:NN \l__um_missing_alph_seq \__um_print_indent:n
- }
-\cs_new:Nn \__um_print_indent:n { \space\space\space\space #1 \\ }
-\msg_new:nnn {unicode-math} {macro-expected}
-{
-  I've~ expected~ that~ #1~ is~ a~ macro,~ but~ it~ isn't.
-}
-\msg_new:nnn {unicode-math} {wrong-meaning}
-{
-  I've~ expected~ #1~ to~ have~ the~ meaning~ #3,~ but~ it~ has~ the~ meaning~ #2.
-}
-\msg_new:nnn {unicode-math} {patch-macro}
-{
-  I'm~ going~ to~ patch~ macro~ #1.
-}
-\msg_new:nnn { unicode-math } { mathtools-overbracket } {
-  Using~ \token_to_str:N \overbracket\ and~
-         \token_to_str:N \underbracket\ from~
- `mathtools'~ package.\\
-  \\
-  Use~ \token_to_str:N \Uoverbracket\ and~
-       \token_to_str:N \Uunderbracket\ for~
-       original~ `unicode-math'~ definition.
-}
-\msg_new:nnn { unicode-math } { mathtools-colon } {
-  I'm~ going~ to~ overwrite~ the~ following~ commands~ from~
-  the~ `mathtools'~ package: \\ \\
-  \ \ \ \ \token_to_str:N \dblcolon,~
-  \token_to_str:N \coloneqq,~
-  \token_to_str:N \Coloneqq,~
-  \token_to_str:N \eqqcolon. \\ \\
-  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like~
-  commands,~ using~ them~ will~ lead~ to~ inconsistencies.
-}
-\msg_new:nnn { unicode-math } { colonequals } {
-  I'm~ going~ to~ overwrite~ the~ following~ commands~ from~
-  the~ `colonequals'~ package: \\ \\
-  \ \ \ \ \token_to_str:N \ratio,~
-          \token_to_str:N \coloncolon,~
-          \token_to_str:N \minuscolon, \\
-  \ \ \ \ \token_to_str:N \colonequals,~
-          \token_to_str:N \equalscolon,~
-          \token_to_str:N \coloncolonequals. \\ \\
-  Note~ that~ since~ I~ won't~ overwrite~ the~ other~ colon-like~
-  commands,~ using~ them~ will~ lead~ to~ inconsistencies.~
-  Furthermore,~ changing~ \token_to_str:N \colonsep \c_space_tl
-  or~ \token_to_str:N \doublecolonsep \c_space_tl won't~ have~
-  any~ effect~ on~ the~ re-defined~ commands.
-}
-
-\usv_set:nnn {normal}  {num}  {48}
-\usv_set:nnn {normal}  {Latin}{"1D434}
-\usv_set:nnn {normal}  {latin}{"1D44E}
-\usv_set:nnn {normal}  {Greek}{"1D6E2}
-\usv_set:nnn {normal}  {greek}{"1D6FC}
-\usv_set:nnn {normal}{varTheta}  {"1D6F3}
-\usv_set:nnn {normal}{epsilon}{"1D716}
-\usv_set:nnn {normal}{vartheta}  {"1D717}
-\usv_set:nnn {normal}{varkappa}  {"1D718}
-\usv_set:nnn {normal}{phi}    {"1D719}
-\usv_set:nnn {normal}{varrho}    {"1D71A}
-\usv_set:nnn {normal}{varpi}     {"1D71B}
-\usv_set:nnn {normal}    {Nabla}{"1D6FB}
-\usv_set:nnn {normal}    {partial}{"1D715}
-
-\usv_set:nnn {up}  {num}  {48}
-\usv_set:nnn {up}  {Latin}{65}
-\usv_set:nnn {up}  {latin}{97}
-\usv_set:nnn {up}  {Greek}{"391}
-\usv_set:nnn {up}  {greek}{"3B1}
-\usv_set:nnn {it}  {Latin}{"1D434}
-\usv_set:nnn {it}  {latin}{"1D44E}
-\usv_set:nnn {it}  {Greek}{"1D6E2}
-\usv_set:nnn {it}  {greek}{"1D6FC}
-\usv_set:nnn {bb}  {num}  {"1D7D8}
-\usv_set:nnn {bb}  {Latin}{"1D538}
-\usv_set:nnn {bb}  {latin}{"1D552}
-\usv_set:nnn {scr} {Latin}{"1D49C}
-\usv_set:nnn {cal} {Latin}{"1D49C}
-\usv_set:nnn {scr} {latin}{"1D4B6}
-\usv_set:nnn {frak}{Latin}{"1D504}
-\usv_set:nnn {frak}{latin}{"1D51E}
-\usv_set:nnn {sf}  {num}  {"1D7E2}
-\usv_set:nnn {sfup}{num}  {"1D7E2}
-\usv_set:nnn {sfit}{num}  {"1D7E2}
-\usv_set:nnn {sfup}{Latin}{"1D5A0}
-\usv_set:nnn {sf}  {Latin}{"1D5A0}
-\usv_set:nnn {sfup}{latin}{"1D5BA}
-\usv_set:nnn {sf}  {latin}{"1D5BA}
-\usv_set:nnn {sfit}{Latin}{"1D608}
-\usv_set:nnn {sfit}{latin}{"1D622}
-\usv_set:nnn {tt}  {num}  {"1D7F6}
-\usv_set:nnn {tt}  {Latin}{"1D670}
-\usv_set:nnn {tt}  {latin}{"1D68A}
-\usv_set:nnn {bf}    {num}  {"1D7CE}
-\usv_set:nnn {bfup}  {num}  {"1D7CE}
-\usv_set:nnn {bfit}  {num}  {"1D7CE}
-\usv_set:nnn {bfup}  {Latin}{"1D400}
-\usv_set:nnn {bfup}  {latin}{"1D41A}
-\usv_set:nnn {bfup}  {Greek}{"1D6A8}
-\usv_set:nnn {bfup}  {greek}{"1D6C2}
-\usv_set:nnn {bfit}  {Latin}{"1D468}
-\usv_set:nnn {bfit}  {latin}{"1D482}
-\usv_set:nnn {bfit}  {Greek}{"1D71C}
-\usv_set:nnn {bfit}  {greek}{"1D736}
-\usv_set:nnn {bffrak}{Latin}{"1D56C}
-\usv_set:nnn {bffrak}{latin}{"1D586}
-\usv_set:nnn {bfscr} {Latin}{"1D4D0}
-\usv_set:nnn {bfcal} {Latin}{"1D4D0}
-\usv_set:nnn {bfscr} {latin}{"1D4EA}
-\usv_set:nnn {bfsf}  {num}  {"1D7EC}
-\usv_set:nnn {bfsfup}{num}  {"1D7EC}
-\usv_set:nnn {bfsfit}{num}  {"1D7EC}
-\usv_set:nnn {bfsfup}{Latin}{"1D5D4}
-\usv_set:nnn {bfsfup}{latin}{"1D5EE}
-\usv_set:nnn {bfsfup}{Greek}{"1D756}
-\usv_set:nnn {bfsfup}{greek}{"1D770}
-\usv_set:nnn {bfsfit}{Latin}{"1D63C}
-\usv_set:nnn {bfsfit}{latin}{"1D656}
-\usv_set:nnn {bfsfit}{Greek}{"1D790}
-\usv_set:nnn {bfsfit}{greek}{"1D7AA}
-\usv_set:nnn {bfsf}{Latin}{ \bool_if:NTF \g__um_upLatin_bool   \g__um_bfsfup_Latin_usv \g__um_bfsfit_Latin_usv }
-\usv_set:nnn {bfsf}{latin}{ \bool_if:NTF \g__um_uplatin_bool   \g__um_bfsfup_latin_usv \g__um_bfsfit_latin_usv }
-\usv_set:nnn {bfsf}{Greek}{ \bool_if:NTF \g__um_upGreek_bool   \g__um_bfsfup_Greek_usv \g__um_bfsfit_Greek_usv }
-\usv_set:nnn {bfsf}{greek}{ \bool_if:NTF \g__um_upgreek_bool   \g__um_bfsfup_greek_usv \g__um_bfsfit_greek_usv }
-\usv_set:nnn {bf}  {Latin}{ \bool_if:NTF \g__um_bfupLatin_bool \g__um_bfup_Latin_usv   \g__um_bfit_Latin_usv   }
-\usv_set:nnn {bf}  {latin}{ \bool_if:NTF \g__um_bfuplatin_bool \g__um_bfup_latin_usv   \g__um_bfit_latin_usv   }
-\usv_set:nnn {bf}  {Greek}{ \bool_if:NTF \g__um_bfupGreek_bool \g__um_bfup_Greek_usv   \g__um_bfit_Greek_usv   }
-\usv_set:nnn {bf}  {greek}{ \bool_if:NTF \g__um_bfupgreek_bool \g__um_bfup_greek_usv   \g__um_bfit_greek_usv   }
-\usv_set:nnn {up}{varTheta}  {"3F4}
-\usv_set:nnn {up}{Digamma}   {"3DC}
-\usv_set:nnn {up}{epsilon}{"3F5}
-\usv_set:nnn {up}{vartheta}  {"3D1}
-\usv_set:nnn {up}{varkappa}  {"3F0}
-\usv_set:nnn {up}{phi}    {"3D5}
-\usv_set:nnn {up}{varrho}    {"3F1}
-\usv_set:nnn {up}{varpi}     {"3D6}
-\usv_set:nnn {up}{digamma}   {"3DD}
-\usv_set:nnn {bfup}{varTheta}  {"1D6B9}
-\usv_set:nnn {bfup}{Digamma}   {"1D7CA}
-\usv_set:nnn {bfup}{epsilon}{"1D6DC}
-\usv_set:nnn {bfup}{vartheta}  {"1D6DD}
-\usv_set:nnn {bfup}{varkappa}  {"1D6DE}
-\usv_set:nnn {bfup}{phi}    {"1D6DF}
-\usv_set:nnn {bfup}{varrho}    {"1D6E0}
-\usv_set:nnn {bfup}{varpi}     {"1D6E1}
-\usv_set:nnn {bfup}{digamma}   {"1D7CB}
-\usv_set:nnn {it}{varTheta}  {"1D6F3}
-\usv_set:nnn {it}{epsilon}{"1D716}
-\usv_set:nnn {it}{vartheta}  {"1D717}
-\usv_set:nnn {it}{varkappa}  {"1D718}
-\usv_set:nnn {it}{phi}    {"1D719}
-\usv_set:nnn {it}{varrho}    {"1D71A}
-\usv_set:nnn {it}{varpi}     {"1D71B}
-\usv_set:nnn {bfit}{varTheta}  {"1D72D}
-\usv_set:nnn {bfit}{epsilon}{"1D750}
-\usv_set:nnn {bfit}{vartheta}  {"1D751}
-\usv_set:nnn {bfit}{varkappa}  {"1D752}
-\usv_set:nnn {bfit}{phi}    {"1D753}
-\usv_set:nnn {bfit}{varrho}    {"1D754}
-\usv_set:nnn {bfit}{varpi}     {"1D755}
-\usv_set:nnn {bfsfup}{varTheta}  {"1D767}
-\usv_set:nnn {bfsfup}{epsilon}{"1D78A}
-\usv_set:nnn {bfsfup}{vartheta}  {"1D78B}
-\usv_set:nnn {bfsfup}{varkappa}  {"1D78C}
-\usv_set:nnn {bfsfup}{phi}    {"1D78D}
-\usv_set:nnn {bfsfup}{varrho}    {"1D78E}
-\usv_set:nnn {bfsfup}{varpi}     {"1D78F}
-\usv_set:nnn {bfsfit}{varTheta}  {"1D7A1}
-\usv_set:nnn {bfsfit}{epsilon}{"1D7C4}
-\usv_set:nnn {bfsfit}{vartheta}  {"1D7C5}
-\usv_set:nnn {bfsfit}{varkappa}  {"1D7C6}
-\usv_set:nnn {bfsfit}{phi}    {"1D7C7}
-\usv_set:nnn {bfsfit}{varrho}    {"1D7C8}
-\usv_set:nnn {bfsfit}{varpi}     {"1D7C9}
-\usv_set:nnn {up}    {Nabla}{"02207}
-\usv_set:nnn {it}    {Nabla}{"1D6FB}
-\usv_set:nnn {bfup}  {Nabla}{"1D6C1}
-\usv_set:nnn {bfit}  {Nabla}{"1D735}
-\usv_set:nnn {bfsfup}{Nabla}{"1D76F}
-\usv_set:nnn {bfsfit}{Nabla}{"1D7A9}
-\usv_set:nnn {up}    {partial}{"02202}
-\usv_set:nnn {it}    {partial}{"1D715}
-\usv_set:nnn {bfup}  {partial}{"1D6DB}
-\usv_set:nnn {bfit}  {partial}{"1D74F}
-\usv_set:nnn {bfsfup}{partial}{"1D789}
-\usv_set:nnn {bfsfit}{partial}{"1D7C3}
-\usv_set:nnn {up}{B}{`\B}
-\usv_set:nnn {up}{C}{`\C}
-\usv_set:nnn {up}{D}{`\D}
-\usv_set:nnn {up}{E}{`\E}
-\usv_set:nnn {up}{F}{`\F}
-\usv_set:nnn {up}{H}{`\H}
-\usv_set:nnn {up}{I}{`\I}
-\usv_set:nnn {up}{L}{`\L}
-\usv_set:nnn {up}{M}{`\M}
-\usv_set:nnn {up}{N}{`\N}
-\usv_set:nnn {up}{P}{`\P}
-\usv_set:nnn {up}{Q}{`\Q}
-\usv_set:nnn {up}{R}{`\R}
-\usv_set:nnn {up}{Z}{`\Z}
-\usv_set:nnn {it}{B}{"1D435}
-\usv_set:nnn {it}{C}{"1D436}
-\usv_set:nnn {it}{D}{"1D437}
-\usv_set:nnn {it}{E}{"1D438}
-\usv_set:nnn {it}{F}{"1D439}
-\usv_set:nnn {it}{H}{"1D43B}
-\usv_set:nnn {it}{I}{"1D43C}
-\usv_set:nnn {it}{L}{"1D43F}
-\usv_set:nnn {it}{M}{"1D440}
-\usv_set:nnn {it}{N}{"1D441}
-\usv_set:nnn {it}{P}{"1D443}
-\usv_set:nnn {it}{Q}{"1D444}
-\usv_set:nnn {it}{R}{"1D445}
-\usv_set:nnn {it}{Z}{"1D44D}
-\usv_set:nnn {up}{d}{`\d}
-\usv_set:nnn {up}{e}{`\e}
-\usv_set:nnn {up}{g}{`\g}
-\usv_set:nnn {up}{h}{`\h}
-\usv_set:nnn {up}{i}{`\i}
-\usv_set:nnn {up}{j}{`\j}
-\usv_set:nnn {up}{o}{`\o}
-\usv_set:nnn {it}{d}{"1D451}
-\usv_set:nnn {it}{e}{"1D452}
-\usv_set:nnn {it}{g}{"1D454}
-\usv_set:nnn {it}{h}{"0210E}
-\usv_set:nnn {it}{i}{"1D456}
-\usv_set:nnn {it}{j}{"1D457}
-\usv_set:nnn {it}{o}{"1D45C}
-\usv_set:nnn {bb}    {h}{"1D559}
-\usv_set:nnn {tt}    {h}{"1D691}
-\usv_set:nnn {scr}   {h}{"1D4BD}
-\usv_set:nnn {frak}  {h}{"1D525}
-\usv_set:nnn {bfup}  {h}{"1D421}
-\usv_set:nnn {bfit}  {h}{"1D489}
-\usv_set:nnn {sfup}  {h}{"1D5C1}
-\usv_set:nnn {sfit}  {h}{"1D629}
-\usv_set:nnn {bffrak}{h}{"1D58D}
-\usv_set:nnn {bfscr} {h}{"1D4F1}
-\usv_set:nnn {bfsfup}{h}{"1D5F5}
-\usv_set:nnn {bfsfit}{h}{"1D65D}
-\usv_set:nnn {up}{dotlessi}{"00131}
-\usv_set:nnn {up}{dotlessj}{"00237}
-\usv_set:nnn {it}{dotlessi}{"1D6A4}
-\usv_set:nnn {it}{dotlessj}{"1D6A5}
-\usv_set:nnn {bb}{C}{"2102}
-\usv_set:nnn {bb}{H}{"210D}
-\usv_set:nnn {bb}{N}{"2115}
-\usv_set:nnn {bb}{P}{"2119}
-\usv_set:nnn {bb}{Q}{"211A}
-\usv_set:nnn {bb}{R}{"211D}
-\usv_set:nnn {bb}{Z}{"2124}
-\usv_set:nnn {up}{Pi}       {"003A0}
-\usv_set:nnn {up}{pi}       {"003C0}
-\usv_set:nnn {up}{Gamma}    {"00393}
-\usv_set:nnn {up}{gamma}    {"003B3}
-\usv_set:nnn {up}{summation}{"02211}
-\usv_set:nnn {it}{Pi}       {"1D6F1}
-\usv_set:nnn {it}{pi}       {"1D70B}
-\usv_set:nnn {it}{Gamma}    {"1D6E4}
-\usv_set:nnn {it}{gamma}    {"1D6FE}
-\usv_set:nnn {bb}{Pi}       {"0213F}
-\usv_set:nnn {bb}{pi}       {"0213C}
-\usv_set:nnn {bb}{Gamma}    {"0213E}
-\usv_set:nnn {bb}{gamma}    {"0213D}
-\usv_set:nnn {bb}{summation}{"02140}
-\usv_set:nnn {bbit}{D}{"2145}
-\usv_set:nnn {bbit}{d}{"2146}
-\usv_set:nnn {bbit}{e}{"2147}
-\usv_set:nnn {bbit}{i}{"2148}
-\usv_set:nnn {bbit}{j}{"2149}
-\usv_set:nnn {scr}{B}{"212C}
-\usv_set:nnn {scr}{E}{"2130}
-\usv_set:nnn {scr}{F}{"2131}
-\usv_set:nnn {scr}{H}{"210B}
-\usv_set:nnn {scr}{I}{"2110}
-\usv_set:nnn {scr}{L}{"2112}
-\usv_set:nnn {scr}{M}{"2133}
-\usv_set:nnn {scr}{R}{"211B}
-\usv_set:nnn {scr}{e}{"212F}
-\usv_set:nnn {scr}{g}{"210A}
-\usv_set:nnn {scr}{o}{"2134}
-\usv_set:nnn {cal}{B}{"212C}
-\usv_set:nnn {cal}{E}{"2130}
-\usv_set:nnn {cal}{F}{"2131}
-\usv_set:nnn {cal}{H}{"210B}
-\usv_set:nnn {cal}{I}{"2110}
-\usv_set:nnn {cal}{L}{"2112}
-\usv_set:nnn {cal}{M}{"2133}
-\usv_set:nnn {cal}{R}{"211B}
-\usv_set:nnn {frak}{C}{"212D}
-\usv_set:nnn {frak}{H}{"210C}
-\usv_set:nnn {frak}{I}{"2111}
-\usv_set:nnn {frak}{R}{"211C}
-\usv_set:nnn {frak}{Z}{"2128}
-\sys_if_engine_luatex:T { \RequirePackage{unicode-math-luatex} }
-\sys_if_engine_xetex:T  { \RequirePackage{unicode-math-xetex}  }
-\__um_new_alphabet_config:nnn {up} {num}
- {
-  \__um_set_normal_numbers:nn {up} {#1}
-  \__um_set_mathalphabet_numbers:nnn {up} {up} {#1}
- }
-
-\__um_new_alphabet_config:nnn {up} {Latin}
- {
-  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_Latin:nn {up} {#1} }
-   {
-    \bool_if:NT \g__um_upLatin_bool { \__um_set_normal_Latin:nn {up,it} {#1} }
-   }
-  \__um_set_mathalphabet_Latin:nnn {up} {up,it} {#1}
-  \__um_set_mathalphabet_Latin:nnn {literal} {up} {up}
-  \__um_set_mathalphabet_Latin:nnn {literal} {it} {it}
- }
-
-\__um_new_alphabet_config:nnn {up} {latin}
- {
-  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_latin:nn {up} {#1} }
-   {
-    \bool_if:NT \g__um_uplatin_bool
-     {
-      \__um_set_normal_latin:nn        {up,it} {#1}
-      \__um_set_normal_char:nnn        {h} {up,it} {#1}
-      \__um_set_normal_char:nnn {dotlessi} {up,it} {#1}
-      \__um_set_normal_char:nnn {dotlessj} {up,it} {#1}
-     }
-   }
-  \__um_set_mathalphabet_latin:nnn {up} {up,it}{#1}
-  \__um_set_mathalphabet_latin:nnn {literal} {up} {up}
-  \__um_set_mathalphabet_latin:nnn {literal} {it} {it}
- }
-
-\__um_new_alphabet_config:nnn {up} {Greek}
- {
-  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_Greek:nn {up}{#1} }
-   {
-    \bool_if:NT \g__um_upGreek_bool { \__um_set_normal_Greek:nn {up,it}{#1} }
-   }
-  \__um_set_mathalphabet_Greek:nnn {up} {up,it}{#1}
-  \__um_set_mathalphabet_Greek:nnn {literal} {up} {up}
-  \__um_set_mathalphabet_Greek:nnn {literal} {it} {it}
- }
-
-\__um_new_alphabet_config:nnn {up} {greek}
- {
-  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_greek:nn {up} {#1} }
-   {
-    \bool_if:NT \g__um_upgreek_bool
-     {
-      \__um_set_normal_greek:nn {up,it} {#1}
-     }
-   }
-  \__um_set_mathalphabet_greek:nnn {up} {up,it} {#1}
-  \__um_set_mathalphabet_greek:nnn {literal} {up} {up}
-  \__um_set_mathalphabet_greek:nnn {literal} {it} {it}
- }
-
-\__um_new_alphabet_config:nnn {up} {misc}
- {
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   {
-    \__um_set_normal_char:nnn {Nabla}{up}{up}
-   }
-   {
-    \bool_if:NT \g__um_upNabla_bool
-     {
-      \__um_set_normal_char:nnn {Nabla}{up,it}{up}
-     }
-   }
-  \bool_if:NTF \g__um_literal_partial_bool
-   {
-    \__um_set_normal_char:nnn {partial}{up}{up}
-   }
-   {
-    \bool_if:NT \g__um_uppartial_bool
-     {
-      \__um_set_normal_char:nnn {partial}{up,it}{up}
-     }
-   }
-  \__um_set_mathalphabet_pos:nnnn {up}  {partial} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {up}    {Nabla} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {up} {dotlessi} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {up} {dotlessj} {up,it} {#1}
- }
-\__um_new_alphabet_config:nnn {it} {Latin}
- {
-  \bool_if:NTF \g__um_literal_bool { \__um_set_normal_Latin:nn {it} {#1} }
-   {
-    \bool_if:NF \g__um_upLatin_bool { \__um_set_normal_Latin:nn {up,it} {#1} }
-   }
-  \__um_set_mathalphabet_Latin:nnn {it}{up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {it} {latin}
- {
-  \bool_if:NTF \g__um_literal_bool
-   {
-    \__um_set_normal_latin:nn {it} {#1}
-    \__um_set_normal_char:nnn {h}{it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_uplatin_bool
-     {
-      \__um_set_normal_latin:nn {up,it} {#1}
-      \__um_set_normal_char:nnn {h}{up,it}{#1}
-      \__um_set_normal_char:nnn {dotlessi}{up,it}{#1}
-      \__um_set_normal_char:nnn {dotlessj}{up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_latin:nnn {it}            {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {it} {dotlessi} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {it} {dotlessj} {up,it} {#1}
- }
-
-\__um_new_alphabet_config:nnn {it} {Greek}
- {
-  \bool_if:NTF \g__um_literal_bool
-   {
-    \__um_set_normal_Greek:nn {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_upGreek_bool { \__um_set_normal_Greek:nn {up,it}{#1} }
-   }
-  \__um_set_mathalphabet_Greek:nnn {it} {up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {it} {greek}
- {
-  \bool_if:NTF \g__um_literal_bool
-   {
-    \__um_set_normal_greek:nn {it} {#1}
-   }
-   {
-    \bool_if:NF \g__um_upgreek_bool { \__um_set_normal_greek:nn {it,up} {#1} }
-   }
-  \__um_set_mathalphabet_greek:nnn {it} {up,it} {#1}
- }
-
-\__um_new_alphabet_config:nnn {it} {misc}
- {
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   {
-    \__um_set_normal_char:nnn {Nabla}{it}{it}
-   }
-   {
-    \bool_if:NF \g__um_upNabla_bool
-     {
-      \__um_set_normal_char:nnn {Nabla}{up,it}{it}
-     }
-   }
-  \bool_if:NTF \g__um_literal_partial_bool
-   {
-    \__um_set_normal_char:nnn {partial}{it}{it}
-   }
-   {
-    \bool_if:NF \g__um_uppartial_bool
-     {
-      \__um_set_normal_char:nnn {partial}{up,it}{it}
-     }
-   }
-  \__um_set_mathalphabet_pos:nnnn {it} {partial} {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {it} {Nabla}   {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {bb} {latin}
- {
-  \__um_set_mathalphabet_latin:nnn {bb} {up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bb} {Latin}
- {
-  \__um_set_mathalphabet_Latin:nnn {bb} {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {bb} {C} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb} {H} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb} {N} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb} {P} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb} {Q} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb} {R} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb} {Z} {up,it} {#1}
- }
-
-\__um_new_alphabet_config:nnn {bb} {num}
- {
-  \__um_set_mathalphabet_numbers:nnn {bb} {up}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bb} {misc}
- {
-  \__um_set_mathalphabet_pos:nnnn {bb}        {Pi} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb}        {pi} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb}     {Gamma} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb}     {gamma} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bb} {summation} {up} {#1}
- }
-
-\__um_new_alphabet_config:nnn {bbit} {misc}
- {
-  \__um_set_mathalphabet_pos:nnnn {bbit} {D} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bbit} {d} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bbit} {e} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bbit} {i} {up,it} {#1}
-  \__um_set_mathalphabet_pos:nnnn {bbit} {j} {up,it} {#1}
- }
-\__um_new_alphabet_config:nnn {scr} {Latin}
- {
-  \__um_set_mathalphabet_Latin:nnn {scr}    {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {B}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {E}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {F}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {H}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {I}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {L}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {M}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {R}{up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {scr} {latin}
- {
-  \__um_set_mathalphabet_latin:nnn {scr}    {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {e}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {g}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {scr} {o}{up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {cal} {Latin}
- {
-  \__um_set_mathalphabet_Latin:nnn {cal}  {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {cal} {B}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {cal} {E}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {cal} {F}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {cal} {H}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {cal} {I}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {cal} {L}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {cal} {M}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {cal} {R}{up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {frak} {Latin}
- {
-  \__um_set_mathalphabet_Latin:nnn {frak}    {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {frak} {C}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {frak} {H}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {frak} {I}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {frak} {R}{up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {frak} {Z}{up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {frak} {latin}
- {
-  \__um_set_mathalphabet_latin:nnn {frak} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {sfup} {num}
- {
-  \__um_set_mathalphabet_numbers:nnn {sf}   {up}{#1}
-  \__um_set_mathalphabet_numbers:nnn {sfup} {up}{#1}
- }
-\__um_new_alphabet_config:nnn {sfup} {Latin}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_Latin:nn {sfup} {#1}
-    \__um_set_mathalphabet_Latin:nnn {sf} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_upsans_bool
-     {
-      \__um_set_normal_Latin:nn {sfup,sfit} {#1}
-      \__um_set_mathalphabet_Latin:nnn {sf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_Latin:nnn {sfup} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {sfup} {latin}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_latin:nn {sfup} {#1}
-    \__um_set_mathalphabet_latin:nnn {sf} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_upsans_bool
-     {
-      \__um_set_normal_latin:nn {sfup,sfit} {#1}
-      \__um_set_mathalphabet_latin:nnn {sf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_latin:nnn {sfup} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {sfit} {Latin}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_Latin:nn {sfit} {#1}
-    \__um_set_mathalphabet_Latin:nnn {sf} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_upsans_bool
-     {
-      \__um_set_normal_Latin:nn {sfup,sfit} {#1}
-      \__um_set_mathalphabet_Latin:nnn {sf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_Latin:nnn {sfit} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {sfit} {latin}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_latin:nn {sfit} {#1}
-    \__um_set_mathalphabet_latin:nnn {sf} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_upsans_bool
-     {
-      \__um_set_normal_latin:nn {sfup,sfit} {#1}
-      \__um_set_mathalphabet_latin:nnn {sf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_latin:nnn {sfit} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {tt} {num}
- {
-  \__um_set_mathalphabet_numbers:nnn {tt} {up}{#1}
- }
-\__um_new_alphabet_config:nnn {tt} {Latin}
- {
-  \__um_set_mathalphabet_Latin:nnn {tt} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {tt} {latin}
- {
-  \__um_set_mathalphabet_latin:nnn {tt} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {bfit} {Latin}
- {
-  \bool_if:NF \g__um_bfupLatin_bool
-   {
-    \__um_set_normal_Latin:nn {bfup,bfit} {#1}
-   }
-  \__um_set_mathalphabet_Latin:nnn {bfit} {up,it}{#1}
-  \bool_if:NTF \g__um_bfliteral_bool
-   {
-    \__um_set_normal_Latin:nn {bfit} {#1}
-    \__um_set_mathalphabet_Latin:nnn {bf} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_bfupLatin_bool
-     {
-      \__um_set_normal_Latin:nn {bfup,bfit} {#1}
-      \__um_set_mathalphabet_Latin:nnn {bf} {up,it}{#1}
-     }
-   }
- }
-
-\__um_new_alphabet_config:nnn {bfit} {latin}
- {
-  \bool_if:NF \g__um_bfuplatin_bool
-   {
-    \__um_set_normal_latin:nn {bfup,bfit} {#1}
-   }
-  \__um_set_mathalphabet_latin:nnn {bfit} {up,it}{#1}
-  \bool_if:NTF \g__um_bfliteral_bool
-   {
-    \__um_set_normal_latin:nn {bfit} {#1}
-    \__um_set_mathalphabet_latin:nnn {bf} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_bfuplatin_bool
-     {
-      \__um_set_normal_latin:nn {bfup,bfit} {#1}
-      \__um_set_mathalphabet_latin:nnn {bf} {up,it}{#1}
-     }
-   }
- }
-
-\__um_new_alphabet_config:nnn {bfit} {Greek}
- {
-  \__um_set_mathalphabet_Greek:nnn {bfit} {up,it}{#1}
-  \bool_if:NTF \g__um_bfliteral_bool
-   {
-    \__um_set_normal_Greek:nn {bfit}{#1}
-    \__um_set_mathalphabet_Greek:nnn {bf} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_bfupGreek_bool
-     {
-      \__um_set_normal_Greek:nn {bfup,bfit}{#1}
-      \__um_set_mathalphabet_Greek:nnn {bf} {up,it}{#1}
-     }
-   }
- }
-
-\__um_new_alphabet_config:nnn {bfit} {greek}
- {
-  \__um_set_mathalphabet_greek:nnn {bfit} {up,it} {#1}
-  \bool_if:NTF \g__um_bfliteral_bool
-   {
-    \__um_set_normal_greek:nn {bfit} {#1}
-    \__um_set_mathalphabet_greek:nnn {bf} {it} {#1}
-   }
-   {
-    \bool_if:NF \g__um_bfupgreek_bool
-     {
-      \__um_set_normal_greek:nn {bfit,bfup} {#1}
-      \__um_set_mathalphabet_greek:nnn {bf} {up,it} {#1}
-     }
-   }
- }
-
-\__um_new_alphabet_config:nnn {bfit} {misc}
- {
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   { \__um_set_normal_char:nnn {Nabla}{bfit}{#1} }
-   {
-    \bool_if:NF \g__um_upNabla_bool
-     { \__um_set_normal_char:nnn {Nabla}{bfup,bfit}{#1} }
-   }
-  \bool_if:NTF \g__um_literal_partial_bool
-   { \__um_set_normal_char:nnn {partial}{bfit}{#1} }
-   {
-    \bool_if:NF \g__um_uppartial_bool
-     { \__um_set_normal_char:nnn {partial}{bfup,bfit}{#1} }
-   }
-  \__um_set_mathalphabet_pos:nnnn {bfit} {partial} {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {bfit} {Nabla}   {up,it}{#1}
-  \bool_if:NTF \g__um_literal_partial_bool
-   {
-    \__um_set_mathalphabet_pos:nnnn {bf} {partial} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_uppartial_bool
-     {
-      \__um_set_mathalphabet_pos:nnnn {bf} {partial} {up,it}{#1}
-     }
-   }
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   {
-    \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_upNabla_bool
-     {
-      \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {up,it}{#1}
-     }
-   }
- }
-\__um_new_alphabet_config:nnn {bfup} {num}
- {
-  \__um_set_mathalphabet_numbers:nnn {bf}   {up}{#1}
-  \__um_set_mathalphabet_numbers:nnn {bfup} {up}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bfup} {Latin}
- {
-  \bool_if:NT \g__um_bfupLatin_bool
-   {
-    \__um_set_normal_Latin:nn {bfup,bfit} {#1}
-   }
-  \__um_set_mathalphabet_Latin:nnn {bfup} {up,it}{#1}
-  \bool_if:NTF \g__um_bfliteral_bool
-   {
-    \__um_set_normal_Latin:nn {bfup} {#1}
-    \__um_set_mathalphabet_Latin:nnn {bf} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_bfupLatin_bool
-     {
-      \__um_set_normal_Latin:nn {bfup,bfit} {#1}
-      \__um_set_mathalphabet_Latin:nnn {bf} {up,it}{#1}
-     }
-   }
- }
-
-\__um_new_alphabet_config:nnn {bfup} {latin}
- {
-  \bool_if:NT \g__um_bfuplatin_bool
-   {
-    \__um_set_normal_latin:nn {bfup,bfit} {#1}
-   }
-  \__um_set_mathalphabet_latin:nnn {bfup} {up,it}{#1}
-  \bool_if:NTF \g__um_bfliteral_bool
-   {
-    \__um_set_normal_latin:nn {bfup} {#1}
-    \__um_set_mathalphabet_latin:nnn {bf} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_bfuplatin_bool
-     {
-      \__um_set_normal_latin:nn {bfup,bfit} {#1}
-      \__um_set_mathalphabet_latin:nnn {bf} {up,it}{#1}
-     }
-   }
- }
-\__um_new_alphabet_config:nnn {bfup} {Greek}
- {
-  \__um_set_mathalphabet_Greek:nnn {bfup} {up,it}{#1}
-  \bool_if:NTF \g__um_bfliteral_bool
-   {
-    \__um_set_normal_Greek:nn {bfup}{#1}
-    \__um_set_mathalphabet_Greek:nnn {bf} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_bfupGreek_bool
-     {
-      \__um_set_normal_Greek:nn {bfup,bfit}{#1}
-      \__um_set_mathalphabet_Greek:nnn {bf} {up,it}{#1}
-     }
-   }
- }
-
-\__um_new_alphabet_config:nnn {bfup} {greek}
- {
-  \__um_set_mathalphabet_greek:nnn {bfup} {up,it} {#1}
-  \bool_if:NTF \g__um_bfliteral_bool
-   {
-    \__um_set_normal_greek:nn {bfup} {#1}
-    \__um_set_mathalphabet_greek:nnn {bf} {up} {#1}
-   }
-   {
-    \bool_if:NT \g__um_bfupgreek_bool
-     {
-      \__um_set_normal_greek:nn {bfup,bfit} {#1}
-      \__um_set_mathalphabet_greek:nnn {bf} {up,it} {#1}
-     }
-   }
- }
-
-\__um_new_alphabet_config:nnn {bfup} {misc}
- {
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   {
-    \__um_set_normal_char:nnn {Nabla}{bfup}{#1}
-   }
-   {
-    \bool_if:NT \g__um_upNabla_bool
-     {
-      \__um_set_normal_char:nnn {Nabla}{bfup,bfit}{#1}
-     }
-   }
-  \bool_if:NTF \g__um_literal_partial_bool
-   {
-    \__um_set_normal_char:nnn {partial}{bfup}{#1}
-   }
-   {
-    \bool_if:NT \g__um_uppartial_bool
-     {
-      \__um_set_normal_char:nnn {partial}{bfup,bfit}{#1}
-     }
-   }
-  \__um_set_mathalphabet_pos:nnnn {bfup} {partial} {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {bfup} {Nabla}   {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {bfup} {digamma} {up}{#1}
-  \__um_set_mathalphabet_pos:nnnn {bfup} {Digamma} {up}{#1}
-  \__um_set_mathalphabet_pos:nnnn {bf}   {digamma} {up}{#1}
-  \__um_set_mathalphabet_pos:nnnn {bf}   {Digamma} {up}{#1}
-  \bool_if:NTF \g__um_literal_partial_bool
-   {
-    \__um_set_mathalphabet_pos:nnnn {bf} {partial} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_uppartial_bool
-     {
-      \__um_set_mathalphabet_pos:nnnn {bf} {partial} {up,it}{#1}
-     }
-   }
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   {
-    \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_upNabla_bool
-     {
-      \__um_set_mathalphabet_pos:nnnn {bf} {Nabla}   {up,it}{#1}
-     }
-   }
- }
-\__um_new_alphabet_config:nnn {bffrak} {Latin}
- {
-  \__um_set_mathalphabet_Latin:nnn {bffrak} {up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bffrak} {latin}
- {
-  \__um_set_mathalphabet_latin:nnn {bffrak} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {bfscr} {Latin}
- {
-  \__um_set_mathalphabet_Latin:nnn {bfscr} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {bfscr} {latin}
- {
-  \__um_set_mathalphabet_latin:nnn {bfscr} {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {bfcal} {Latin}
- {
-  \__um_set_mathalphabet_Latin:nnn {bfcal}  {up,it}{#1}
- }
-\__um_new_alphabet_config:nnn {bfsfup} {num}
- {
-  \__um_set_mathalphabet_numbers:nnn {bfsf}   {up}{#1}
-  \__um_set_mathalphabet_numbers:nnn {bfsfup} {up}{#1}
- }
-\__um_new_alphabet_config:nnn {bfsfup} {Latin}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_Latin:nn {bfsfup} {#1}
-    \__um_set_mathalphabet_Latin:nnn {bfsf} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_upsans_bool
-     {
-      \__um_set_normal_Latin:nn {bfsfup,bfsfit} {#1}
-      \__um_set_mathalphabet_Latin:nnn {bfsf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_Latin:nnn {bfsfup} {up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bfsfup} {latin}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_latin:nn {bfsfup} {#1}
-    \__um_set_mathalphabet_latin:nnn {bfsf} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_upsans_bool
-     {
-      \__um_set_normal_latin:nn {bfsfup,bfsfit} {#1}
-      \__um_set_mathalphabet_latin:nnn {bfsf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_latin:nnn {bfsfup} {up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bfsfup} {Greek}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_Greek:nn {bfsfup}{#1}
-    \__um_set_mathalphabet_Greek:nnn {bfsf} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_upsans_bool
-     {
-      \__um_set_normal_Greek:nn {bfsfup,bfsfit}{#1}
-      \__um_set_mathalphabet_Greek:nnn {bfsf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_Greek:nnn {bfsfup} {up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bfsfup} {greek}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_greek:nn {bfsfup} {#1}
-    \__um_set_mathalphabet_greek:nnn {bfsf} {up} {#1}
-   }
-   {
-    \bool_if:NT \g__um_upsans_bool
-     {
-      \__um_set_normal_greek:nn {bfsfup,bfsfit} {#1}
-      \__um_set_mathalphabet_greek:nnn {bfsf} {up,it} {#1}
-     }
-   }
-  \__um_set_mathalphabet_greek:nnn {bfsfup} {up,it} {#1}
- }
-\__um_new_alphabet_config:nnn {bfsfup} {misc}
- {
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   {
-    \__um_set_normal_char:nnn {Nabla}{bfsfup}{#1}
-   }
-   {
-    \bool_if:NT \g__um_upNabla_bool
-     {
-      \__um_set_normal_char:nnn {Nabla}{bfsfup,bfsfit}{#1}
-     }
-   }
-  \bool_if:NTF \g__um_literal_partial_bool
-   {
-    \__um_set_normal_char:nnn {partial}{bfsfup}{#1}
-   }
-   {
-    \bool_if:NT \g__um_uppartial_bool
-     {
-      \__um_set_normal_char:nnn {partial}{bfsfup,bfsfit}{#1}
-     }
-   }
-  \__um_set_mathalphabet_pos:nnnn {bfsfup} {partial} {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {bfsfup} {Nabla}   {up,it}{#1}
-  \bool_if:NTF \g__um_literal_partial_bool
-   {
-    \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_uppartial_bool
-     {
-      \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {up,it}{#1}
-     }
-   }
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   {
-    \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {up}{#1}
-   }
-   {
-    \bool_if:NT \g__um_upNabla_bool
-     {
-      \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {up,it}{#1}
-     }
-   }
- }
-\__um_new_alphabet_config:nnn {bfsfit} {Latin}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_Latin:nn {bfsfit} {#1}
-    \__um_set_mathalphabet_Latin:nnn {bfsf} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_upsans_bool
-     {
-      \__um_set_normal_Latin:nn {bfsfup,bfsfit} {#1}
-      \__um_set_mathalphabet_Latin:nnn {bfsf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_Latin:nnn {bfsfit} {up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bfsfit} {latin}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_latin:nn {bfsfit} {#1}
-    \__um_set_mathalphabet_latin:nnn {bfsf} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_upsans_bool
-     {
-      \__um_set_normal_latin:nn {bfsfup,bfsfit} {#1}
-      \__um_set_mathalphabet_latin:nnn {bfsf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_latin:nnn {bfsfit} {up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bfsfit} {Greek}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_Greek:nn {bfsfit}{#1}
-    \__um_set_mathalphabet_Greek:nnn {bfsf} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_upsans_bool
-     {
-      \__um_set_normal_Greek:nn {bfsfup,bfsfit}{#1}
-      \__um_set_mathalphabet_Greek:nnn {bfsf} {up,it}{#1}
-     }
-   }
-  \__um_set_mathalphabet_Greek:nnn {bfsfit} {up,it}{#1}
- }
-
-\__um_new_alphabet_config:nnn {bfsfit} {greek}
- {
-  \bool_if:NTF \g__um_sfliteral_bool
-   {
-    \__um_set_normal_greek:nn {bfsfit} {#1}
-    \__um_set_mathalphabet_greek:nnn {bfsf} {it} {#1}
-   }
-   {
-    \bool_if:NF \g__um_upsans_bool
-     {
-      \__um_set_normal_greek:nn {bfsfup,bfsfit} {#1}
-      \__um_set_mathalphabet_greek:nnn {bfsf} {up,it} {#1}
-     }
-   }
-  \__um_set_mathalphabet_greek:nnn {bfsfit} {up,it} {#1}
- }
-
-\__um_new_alphabet_config:nnn {bfsfit} {misc}
- {
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   {
-    \__um_set_normal_char:nnn {Nabla}{bfsfit}{#1}
-   }
-   {
-    \bool_if:NF \g__um_upNabla_bool
-     {
-      \__um_set_normal_char:nnn {Nabla}{bfsfup,bfsfit}{#1}
-     }
-   }
-  \bool_if:NTF \g__um_literal_partial_bool
-   {
-    \__um_set_normal_char:nnn {partial}{bfsfit}{#1}
-   }
-   {
-    \bool_if:NF \g__um_uppartial_bool
-     {
-      \__um_set_normal_char:nnn {partial}{bfsfup,bfsfit}{#1}
-     }
-   }
-  \__um_set_mathalphabet_pos:nnnn {bfsfit} {partial} {up,it}{#1}
-  \__um_set_mathalphabet_pos:nnnn {bfsfit} {Nabla}   {up,it}{#1}
-  \bool_if:NTF \g__um_literal_partial_bool
-   {
-    \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_uppartial_bool
-     {
-      \__um_set_mathalphabet_pos:nnnn {bfsf} {partial} {up,it}{#1}
-     }
-   }
-  \bool_if:NTF \g__um_literal_Nabla_bool
-   {
-    \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {it}{#1}
-   }
-   {
-    \bool_if:NF \g__um_upNabla_bool
-     {
-      \__um_set_mathalphabet_pos:nnnn {bfsf} {Nabla}   {up,it}{#1}
-     }
-   }
- }
+\sys_if_engine_luatex:T { \RequirePackageWithOptions{unicode-math-luatex} }
+\sys_if_engine_xetex:T  { \RequirePackageWithOptions{unicode-math-xetex}  }
+\ExplSyntaxOff