1 files changed, 5 insertions, 24 deletions
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 a5cac59aec8..e1ee6b8ea6f 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
@@ -77,11 +77,9 @@
 \edef\mathbotaccentwide{\string\mathbotaccentwide}
 \cs_new:Nn \__um_set_big_operator:nnn
  {
-  \group_begin:
-    \char_set_catcode_active:n {#3}
-    \__um_char_gmake_mathactive:n {#3}
-    \__um_active_char_set:wc #3 \q_nil { \cs_to_str:N #2 _sym }
-  \group_end:
+  \__um_char_gmake_mathactive:n {#3}
+  \cs_set_protected_nopar:Npx \__um_tmpa: { \exp_not:c { \cs_to_str:N #2 _sym } }
+  \char_gset_active_eq:nN {#3} \__um_tmpa:
 
   \__um_set_mathchar:cNnn {\cs_to_str:N #2 op} \mathop {#1} {#3}
 
@@ -1186,38 +1184,21 @@
     \exp_not:n { \__um_sym:nnn {##1} {##2} {##3} }
    }
  }
-\CatchFileEdef \g__um_mathtable_tl {unicode-math-table.tex} {\__um_symbol_setup:}
+\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}
-\cs_set:Npn \__um_cs_set_eq_active_char:Nw #1 = "#2 \q_nil
-  {
-    \exp_last_unbraced:NNx \cs_gset_eq:NN #1 { \Ucharcat "#2 ~ 12 ~ }
-  }
-\group_begin:
-  \char_set_catcode_other:N \^
-  \cs_new:Npn \__um_active_char_set:wc "#1 \q_nil #2
-   {
-    \tex_lowercase:D
-     {
-      \tl_rescan:nn { \ExplSyntaxOn }
-        { \cs_gset_protected_nopar:Npx ^^^^^#1 { \exp_not:c {#2} } }
-     }
-   }
-\group_end:
 \AtBeginDocument{\__um_define_math_chars:}
 \cs_new:Nn \__um_define_math_chars:
  {
   \group_begin:
-    \char_set_catcode_math_superscript:N \^
     \cs_set:Npn \__um_sym:nnn ##1##2##3
      {
       \tl_if_in:nnT
        { \mathord \mathalpha \mathbin \mathrel \mathpunct \mathop \mathfence }
        {##3}
       {
-        \__um_cs_set_eq_active_char:Nw ##2 = ##1 \q_nil \ignorespaces
+        \exp_last_unbraced:NNx \cs_gset_eq:NN ##2 { \Ucharcat ##1 ~ 12 ~ }
       }
      }
-    \char_set_catcode_other:N \#
     \__um_input_math_symbol_table:
   \group_end:
  }