unicode-math (27jan17)

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

4 files changed, 146 insertions, 157 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 f127f0a17db..e0913a4d904 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
@@ -6,7 +6,7 @@
 %%
 %% unicode-math.dtx  (with options: `package,LU')
 %% unicode-math-compat.dtx  (with options: `compat,LU')
-%% Copyright 2006-2015   Will Robertson <will.robertson@latex-project.org>
+%% 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>
 %% 
@@ -745,25 +745,16 @@
   \clist_map_inline:nn
    {
     Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,
-    alpha,beta,gamma,delta,        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,    chi,psi,omega,
-    varTheta,
-    varsigma,vartheta,varkappa,varrho,varpi
+    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 } }
    }
-  \tl_set:Nn \epsilon
-   { \bool_if:NTF \g__um_texgreek_bool \mitvarepsilon \mitepsilon }
-  \tl_set:Nn \phi
-   { \bool_if:NTF \g__um_texgreek_bool \mitvarphi \mitphi }
-  \tl_set:Nn \varepsilon
-   { \bool_if:NTF \g__um_texgreek_bool \mitepsilon \mitvarepsilon }
-  \tl_set:Nn \varphi
-   { \bool_if:NTF \g__um_texgreek_bool \mitphi \mitvarphi }
  }
 \cs_set:Npn \use@mathgroup #1 #2
  {
@@ -1044,16 +1035,16 @@
    {
     \__um_set_mathalphabet_greek:nnn {normal} {##1} {#2}
     \__um_map_chars_range:nnnn {25} {##1} {#2} {greek}
-    \__um_map_char_single:nnn {##1} {#2} {varepsilon}
+    \__um_map_char_single:nnn {##1} {#2} {epsilon}
     \__um_map_char_single:nnn {##1} {#2} {vartheta}
     \__um_map_char_single:nnn {##1} {#2} {varkappa}
-    \__um_map_char_single:nnn {##1} {#2} {varphi}
+    \__um_map_char_single:nnn {##1} {#2} {phi}
     \__um_map_char_single:nnn {##1} {#2} {varrho}
     \__um_map_char_single:nnn {##1} {#2} {varpi}
-    \__um_set_mathalphabet_pos:nnnn {normal} {varepsilon} {##1} {#2}
+    \__um_set_mathalphabet_pos:nnnn {normal} {epsilon} {##1} {#2}
     \__um_set_mathalphabet_pos:nnnn {normal} {vartheta} {##1} {#2}
     \__um_set_mathalphabet_pos:nnnn {normal} {varkappa} {##1} {#2}
-    \__um_set_mathalphabet_pos:nnnn {normal} {varphi} {##1} {#2}
+    \__um_set_mathalphabet_pos:nnnn {normal} {phi} {##1} {#2}
     \__um_set_mathalphabet_pos:nnnn {normal} {varrho} {##1} {#2}
     \__um_set_mathalphabet_pos:nnnn {normal} {varpi} {##1} {#2}
    }
@@ -1144,10 +1135,10 @@
   \clist_map_inline:nn {#2}
    {
     \__um_set_mathalph_range:nnnnn {25} {#1} {##1} {#3} {greek}
-    \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varepsilon}
+    \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {epsilon}
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {vartheta}
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varkappa}
-    \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varphi}
+    \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {phi}
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varrho}
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varpi}
    }
@@ -1573,9 +1564,18 @@
 \__um_setup_active_subscript:nn {^^^^208e} {)}
 \__um_setup_active_subscript:nn {^^^^2090} {a}
 \__um_setup_active_subscript:nn {^^^^2091} {e}
+\__um_setup_active_subscript:nn {^^^^2095} {h}
 \__um_setup_active_subscript:nn {^^^^1d62} {i}
+\__um_setup_active_subscript:nn {^^^^2c7c} {j}
+\__um_setup_active_subscript:nn {^^^^2096} {k}
+\__um_setup_active_subscript:nn {^^^^2097} {l}
+\__um_setup_active_subscript:nn {^^^^2098} {m}
+\__um_setup_active_subscript:nn {^^^^2099} {n}
 \__um_setup_active_subscript:nn {^^^^2092} {o}
+\__um_setup_active_subscript:nn {^^^^209a} {p}
 \__um_setup_active_subscript:nn {^^^^1d63} {r}
+\__um_setup_active_subscript:nn {^^^^209b} {s}
+\__um_setup_active_subscript:nn {^^^^209c} {t}
 \__um_setup_active_subscript:nn {^^^^1d64} {u}
 \__um_setup_active_subscript:nn {^^^^1d65} {v}
 \__um_setup_active_subscript:nn {^^^^2093} {x}
@@ -1668,33 +1668,33 @@
   \group_end:
  }
 \__um_setup_active_frac:
-\def\to{\rightarrow}
-\def\le{\leq}
-\def\ge{\geq}
-\def\neq{\ne}
-\def\triangle{\mathord{\bigtriangleup}}
-\def\bigcirc{\mdlgwhtcircle}
-\def\circ{\vysmwhtcircle}
-\def\bullet{\smblkcircle}
-\def\mathyen{\yen}
-\def\mathsterling{\sterling}
-\def\diamond{\smwhtdiamond}
-\def\emptyset{\varnothing}
-\def\hbar{\hslash}
-\def\land{\wedge}
-\def\lor{\vee}
-\def\owns{\ni}
-\def\gets{\leftarrow}
-\def\mathring{\ocirc}
-\def\lnot{\neg}
-\def\longdivision{\longdivisionsign}
-\def\backepsilon{\upbackepsilon}
-\def\eth{\matheth}
-\def\dbkarow {\dbkarrow}
-\def\drbkarow{\drbkarrow}
-\def\hksearow{\hksearrow}
-\def\hkswarow{\hkswarrow}
-\def\smallint{\mathop{\textstyle\int}\limits}
+\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
  {
@@ -1710,11 +1710,11 @@
     \bool_if:NTF \g__um_literal_colon_bool {:} { \mathpunct{:} }
    }
  }
-\def\digamma{\updigamma}
-\def\Digamma{\upDigamma}
-\cs_set:Npn \| {\Vert}
-\cs_set:Npn \mathellipsis {\mathinner{\unicodeellipsis}}
-\cs_set:Npn \cdots {\mathinner{\unicodecdots}}
+\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
  {
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex
index 9d2ef42932f..23e9cfa199f 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex
@@ -1,4 +1,4 @@
-\UnicodeMathSymbol{"00021}{\mathexclam               }{\mathpunct}{exclamation mark}%
+\UnicodeMathSymbol{"00021}{\mathexclam               }{\mathclose}{exclamation mark}%
 \UnicodeMathSymbol{"00023}{\mathoctothorpe           }{\mathord}{number sign}%
 \UnicodeMathSymbol{"00024}{\mathdollar               }{\mathord}{dollar sign}%
 \UnicodeMathSymbol{"00025}{\mathpercent              }{\mathord}{percent sign}%
@@ -24,8 +24,10 @@
 \UnicodeMathSymbol{"0007D}{\rbrace                   }{\mathclose}{right curly bracket}%
 \UnicodeMathSymbol{"000A3}{\mathsterling             }{\mathord}{pound sign}%
 \UnicodeMathSymbol{"000A5}{\mathyen                  }{\mathord}{yen sign}%
+\UnicodeMathSymbol{"000A7}{\mathsection              }{\mathord}{section symbol}%
 \UnicodeMathSymbol{"000AC}{\neg                      }{\mathord}{/neg /lnot not sign}%
 \UnicodeMathSymbol{"000B1}{\pm                       }{\mathbin}{plus-or-minus sign}%
+\UnicodeMathSymbol{"000B6}{\mathparagraph            }{\mathord}{paragraph symbol}%
 \UnicodeMathSymbol{"000B7}{\cdotp                    }{\mathbin}{/centerdot b: middle dot}%
 \UnicodeMathSymbol{"000D7}{\times                    }{\mathbin}{multiply sign}%
 \UnicodeMathSymbol{"000F0}{\matheth                  }{\mathalpha}{eth}%
@@ -39,12 +41,15 @@
 \UnicodeMathSymbol{"00303}{\widetilde                }{\mathaccentwide}{tilde}%
 \UnicodeMathSymbol{"00304}{\bar                      }{\mathaccent}{macron}%
 \UnicodeMathSymbol{"00305}{\overbar                  }{\mathaccent}{overbar embellishment}%
+\UnicodeMathSymbol{"00305}{\wideoverbar              }{\mathaccentwide}{stretchy overbar embellishment}%
 \UnicodeMathSymbol{"00306}{\breve                    }{\mathaccent}{breve}%
+\UnicodeMathSymbol{"00306}{\widebreve                }{\mathaccentwide}{stretchy breve}%
 \UnicodeMathSymbol{"00307}{\dot                      }{\mathaccent}{dot above}%
 \UnicodeMathSymbol{"00308}{\ddot                     }{\mathaccent}{dieresis}%
 \UnicodeMathSymbol{"00309}{\ovhook                   }{\mathaccent}{combining hook above}%
 \UnicodeMathSymbol{"0030A}{\ocirc                    }{\mathaccent}{ring}%
 \UnicodeMathSymbol{"0030C}{\check                    }{\mathaccent}{caron}%
+\UnicodeMathSymbol{"0030C}{\widecheck                }{\mathaccentwide}{stretchy caron}%
 \UnicodeMathSymbol{"00310}{\candra                   }{\mathaccent}{candrabindu (non-spacing)}%
 \UnicodeMathSymbol{"00312}{\oturnedcomma             }{\mathaccent}{combining turned comma above}%
 \UnicodeMathSymbol{"00315}{\ocommatopright           }{\mathaccent}{combining comma above right}%
@@ -81,7 +86,7 @@
 \UnicodeMathSymbol{"003B2}{\mupbeta                  }{\mathalpha}{small beta, greek}%
 \UnicodeMathSymbol{"003B3}{\mupgamma                 }{\mathalpha}{small gamma, greek}%
 \UnicodeMathSymbol{"003B4}{\mupdelta                 }{\mathalpha}{small delta, greek}%
-\UnicodeMathSymbol{"003B5}{\mupepsilon               }{\mathalpha}{rounded small epsilon, greek}%
+\UnicodeMathSymbol{"003B5}{\mupvarepsilon            }{\mathalpha}{rounded small varepsilon    , greek}%
 \UnicodeMathSymbol{"003B6}{\mupzeta                  }{\mathalpha}{small zeta, greek}%
 \UnicodeMathSymbol{"003B7}{\mupeta                   }{\mathalpha}{small eta, greek}%
 \UnicodeMathSymbol{"003B8}{\muptheta                 }{\mathalpha}{straight theta, small theta, greek}%
@@ -102,24 +107,15 @@
 \UnicodeMathSymbol{"003C7}{\mupchi                   }{\mathalpha}{small chi, greek}%
 \UnicodeMathSymbol{"003C8}{\muppsi                   }{\mathalpha}{small psi, greek}%
 \UnicodeMathSymbol{"003C9}{\mupomega                 }{\mathalpha}{small omega, greek}%
-\UnicodeMathSymbol{"003D0}{\mupvarbeta               }{\mathalpha}{rounded small beta, greek}%
 \UnicodeMathSymbol{"003D1}{\mupvartheta              }{\mathalpha}{/vartheta - curly or open theta}%
 \UnicodeMathSymbol{"003D5}{\mupphi                   }{\mathalpha}{/straightphi - small phi, greek}%
 \UnicodeMathSymbol{"003D6}{\mupvarpi                 }{\mathalpha}{rounded small pi (pomega), greek}%
-\UnicodeMathSymbol{"003D8}{\upoldKoppa               }{\mathord}{greek letter archaic koppa}%
-\UnicodeMathSymbol{"003D9}{\upoldkoppa               }{\mathord}{greek small letter archaic koppa}%
-\UnicodeMathSymbol{"003DA}{\upStigma                 }{\mathalpha}{capital stigma}%
-\UnicodeMathSymbol{"003DB}{\upstigma                 }{\mathalpha}{greek small letter stigma}%
 \UnicodeMathSymbol{"003DC}{\upDigamma                }{\mathalpha}{capital digamma}%
 \UnicodeMathSymbol{"003DD}{\updigamma                }{\mathalpha}{old greek small letter digamma}%
-\UnicodeMathSymbol{"003DE}{\upKoppa                  }{\mathalpha}{capital koppa}%
-\UnicodeMathSymbol{"003DF}{\upkoppa                  }{\mathalpha}{greek small letter koppa}%
-\UnicodeMathSymbol{"003E0}{\upSampi                  }{\mathalpha}{capital sampi}%
-\UnicodeMathSymbol{"003E1}{\upsampi                  }{\mathalpha}{greek small letter sampi}%
 \UnicodeMathSymbol{"003F0}{\mupvarkappa              }{\mathalpha}{rounded small kappa, greek}%
 \UnicodeMathSymbol{"003F1}{\mupvarrho                }{\mathalpha}{rounded small rho, greek}%
 \UnicodeMathSymbol{"003F4}{\mupvarTheta              }{\mathalpha}{greek capital theta symbol}%
-\UnicodeMathSymbol{"003F5}{\mupvarepsilon            }{\mathalpha}{greek lunate epsilon symbol}%
+\UnicodeMathSymbol{"003F5}{\mupepsilon               }{\mathalpha}{greek lunate varepsilon symbol}%
 \UnicodeMathSymbol{"003F6}{\upbackepsilon            }{\mathord}{greek reversed lunate epsilon symbol}%
 \UnicodeMathSymbol{"02015}{\horizbar                 }{\mathord}{horizontal bar}%
 \UnicodeMathSymbol{"02016}{\Vert                     }{\mathfence}{double vertical bar}%
@@ -2130,7 +2126,7 @@
 \UnicodeMathSymbol{"1D6C3}{\mbfbeta                  }{\mathalpha}{mathematical bold small beta}%
 \UnicodeMathSymbol{"1D6C4}{\mbfgamma                 }{\mathalpha}{mathematical bold small gamma}%
 \UnicodeMathSymbol{"1D6C5}{\mbfdelta                 }{\mathalpha}{mathematical bold small delta}%
-\UnicodeMathSymbol{"1D6C6}{\mbfepsilon               }{\mathalpha}{mathematical bold small epsilon}%
+\UnicodeMathSymbol{"1D6C6}{\mbfvarepsilon            }{\mathalpha}{mathematical bold small varepsilon    }%
 \UnicodeMathSymbol{"1D6C7}{\mbfzeta                  }{\mathalpha}{mathematical bold small zeta}%
 \UnicodeMathSymbol{"1D6C8}{\mbfeta                   }{\mathalpha}{mathematical bold small eta}%
 \UnicodeMathSymbol{"1D6C9}{\mbftheta                 }{\mathalpha}{mathematical bold small theta}%
@@ -2152,7 +2148,7 @@
 \UnicodeMathSymbol{"1D6D9}{\mbfpsi                   }{\mathalpha}{mathematical bold small psi}%
 \UnicodeMathSymbol{"1D6DA}{\mbfomega                 }{\mathalpha}{mathematical bold small omega}%
 \UnicodeMathSymbol{"1D6DB}{\mbfpartial               }{\mathalpha}{mathematical bold partial differential}%
-\UnicodeMathSymbol{"1D6DC}{\mbfvarepsilon            }{\mathalpha}{mathematical bold epsilon symbol}%
+\UnicodeMathSymbol{"1D6DC}{\mbfepsilon               }{\mathalpha}{mathematical bold varepsilon     symbol}%
 \UnicodeMathSymbol{"1D6DD}{\mbfvartheta              }{\mathalpha}{mathematical bold theta symbol}%
 \UnicodeMathSymbol{"1D6DE}{\mbfvarkappa              }{\mathalpha}{mathematical bold kappa symbol}%
 \UnicodeMathSymbol{"1D6DF}{\mbfphi                   }{\mathalpha}{mathematical bold phi symbol}%
@@ -2188,7 +2184,7 @@
 \UnicodeMathSymbol{"1D6FD}{\mitbeta                  }{\mathalpha}{mathematical italic small beta}%
 \UnicodeMathSymbol{"1D6FE}{\mitgamma                 }{\mathalpha}{mathematical italic small gamma}%
 \UnicodeMathSymbol{"1D6FF}{\mitdelta                 }{\mathalpha}{mathematical italic small delta}%
-\UnicodeMathSymbol{"1D700}{\mitepsilon               }{\mathalpha}{mathematical italic small epsilon}%
+\UnicodeMathSymbol{"1D700}{\mitvarepsilon            }{\mathalpha}{mathematical italic small varepsilon    }%
 \UnicodeMathSymbol{"1D701}{\mitzeta                  }{\mathalpha}{mathematical italic small zeta}%
 \UnicodeMathSymbol{"1D702}{\miteta                   }{\mathalpha}{mathematical italic small eta}%
 \UnicodeMathSymbol{"1D703}{\mittheta                 }{\mathalpha}{mathematical italic small theta}%
@@ -2205,15 +2201,15 @@
 \UnicodeMathSymbol{"1D70E}{\mitsigma                 }{\mathalpha}{mathematical italic small sigma}%
 \UnicodeMathSymbol{"1D70F}{\mittau                   }{\mathalpha}{mathematical italic small tau}%
 \UnicodeMathSymbol{"1D710}{\mitupsilon               }{\mathalpha}{mathematical italic small upsilon}%
-\UnicodeMathSymbol{"1D711}{\mitphi                   }{\mathalpha}{mathematical italic small phi}%
+\UnicodeMathSymbol{"1D711}{\mitvarphi                }{\mathalpha}{mathematical italic small phi}%
 \UnicodeMathSymbol{"1D712}{\mitchi                   }{\mathalpha}{mathematical italic small chi}%
 \UnicodeMathSymbol{"1D713}{\mitpsi                   }{\mathalpha}{mathematical italic small psi}%
 \UnicodeMathSymbol{"1D714}{\mitomega                 }{\mathalpha}{mathematical italic small omega}%
 \UnicodeMathSymbol{"1D715}{\mitpartial               }{\mathalpha}{mathematical italic partial differential}%
-\UnicodeMathSymbol{"1D716}{\mitvarepsilon            }{\mathalpha}{mathematical italic epsilon symbol}%
+\UnicodeMathSymbol{"1D716}{\mitepsilon               }{\mathalpha}{mathematical italic varepsilon     symbol}%
 \UnicodeMathSymbol{"1D717}{\mitvartheta              }{\mathalpha}{mathematical italic theta symbol}%
 \UnicodeMathSymbol{"1D718}{\mitvarkappa              }{\mathalpha}{mathematical italic kappa symbol}%
-\UnicodeMathSymbol{"1D719}{\mitvarphi                }{\mathalpha}{mathematical italic phi symbol}%
+\UnicodeMathSymbol{"1D719}{\mitphi                   }{\mathalpha}{mathematical italic phi symbol}%
 \UnicodeMathSymbol{"1D71A}{\mitvarrho                }{\mathalpha}{mathematical italic rho symbol}%
 \UnicodeMathSymbol{"1D71B}{\mitvarpi                 }{\mathalpha}{mathematical italic pi symbol}%
 \UnicodeMathSymbol{"1D71C}{\mbfitAlpha               }{\mathalpha}{mathematical bold italic capital alpha}%
@@ -2246,7 +2242,7 @@
 \UnicodeMathSymbol{"1D737}{\mbfitbeta                }{\mathalpha}{mathematical bold italic small beta}%
 \UnicodeMathSymbol{"1D738}{\mbfitgamma               }{\mathalpha}{mathematical bold italic small gamma}%
 \UnicodeMathSymbol{"1D739}{\mbfitdelta               }{\mathalpha}{mathematical bold italic small delta}%
-\UnicodeMathSymbol{"1D73A}{\mbfitepsilon             }{\mathalpha}{mathematical bold italic small epsilon}%
+\UnicodeMathSymbol{"1D73A}{\mbfitvarepsilon          }{\mathalpha}{mathematical bold italic small varepsilon    }%
 \UnicodeMathSymbol{"1D73B}{\mbfitzeta                }{\mathalpha}{mathematical bold italic small zeta}%
 \UnicodeMathSymbol{"1D73C}{\mbfiteta                 }{\mathalpha}{mathematical bold italic small eta}%
 \UnicodeMathSymbol{"1D73D}{\mbfittheta               }{\mathalpha}{mathematical bold italic small theta}%
@@ -2263,15 +2259,15 @@
 \UnicodeMathSymbol{"1D748}{\mbfitsigma               }{\mathalpha}{mathematical bold italic small sigma}%
 \UnicodeMathSymbol{"1D749}{\mbfittau                 }{\mathalpha}{mathematical bold italic small tau}%
 \UnicodeMathSymbol{"1D74A}{\mbfitupsilon             }{\mathalpha}{mathematical bold italic small upsilon}%
-\UnicodeMathSymbol{"1D74B}{\mbfitphi                 }{\mathalpha}{mathematical bold italic small phi}%
+\UnicodeMathSymbol{"1D74B}{\mbfitvarphi              }{\mathalpha}{mathematical bold italic small phi}%
 \UnicodeMathSymbol{"1D74C}{\mbfitchi                 }{\mathalpha}{mathematical bold italic small chi}%
 \UnicodeMathSymbol{"1D74D}{\mbfitpsi                 }{\mathalpha}{mathematical bold italic small psi}%
 \UnicodeMathSymbol{"1D74E}{\mbfitomega               }{\mathalpha}{mathematical bold italic small omega}%
 \UnicodeMathSymbol{"1D74F}{\mbfitpartial             }{\mathalpha}{mathematical bold italic partial differential}%
-\UnicodeMathSymbol{"1D750}{\mbfitvarepsilon          }{\mathalpha}{mathematical bold italic epsilon symbol}%
+\UnicodeMathSymbol{"1D750}{\mbfitepsilon             }{\mathalpha}{mathematical bold italic varepsilon     symbol}%
 \UnicodeMathSymbol{"1D751}{\mbfitvartheta            }{\mathalpha}{mathematical bold italic theta symbol}%
 \UnicodeMathSymbol{"1D752}{\mbfitvarkappa            }{\mathalpha}{mathematical bold italic kappa symbol}%
-\UnicodeMathSymbol{"1D753}{\mbfitvarphi              }{\mathalpha}{mathematical bold italic phi symbol}%
+\UnicodeMathSymbol{"1D753}{\mbfitphi                 }{\mathalpha}{mathematical bold italic phi symbol}%
 \UnicodeMathSymbol{"1D754}{\mbfitvarrho              }{\mathalpha}{mathematical bold italic rho symbol}%
 \UnicodeMathSymbol{"1D755}{\mbfitvarpi               }{\mathalpha}{mathematical bold italic pi symbol}%
 \UnicodeMathSymbol{"1D756}{\mbfsansAlpha             }{\mathalpha}{mathematical sans-serif bold capital alpha}%
@@ -2304,7 +2300,7 @@
 \UnicodeMathSymbol{"1D771}{\mbfsansbeta              }{\mathalpha}{mathematical sans-serif bold small beta}%
 \UnicodeMathSymbol{"1D772}{\mbfsansgamma             }{\mathalpha}{mathematical sans-serif bold small gamma}%
 \UnicodeMathSymbol{"1D773}{\mbfsansdelta             }{\mathalpha}{mathematical sans-serif bold small delta}%
-\UnicodeMathSymbol{"1D774}{\mbfsansepsilon           }{\mathalpha}{mathematical sans-serif bold small epsilon}%
+\UnicodeMathSymbol{"1D774}{\mbfsansvarepsilon        }{\mathalpha}{mathematical sans-serif bold small varepsilon    }%
 \UnicodeMathSymbol{"1D775}{\mbfsanszeta              }{\mathalpha}{mathematical sans-serif bold small zeta}%
 \UnicodeMathSymbol{"1D776}{\mbfsanseta               }{\mathalpha}{mathematical sans-serif bold small eta}%
 \UnicodeMathSymbol{"1D777}{\mbfsanstheta             }{\mathalpha}{mathematical sans-serif bold small theta}%
@@ -2321,15 +2317,15 @@
 \UnicodeMathSymbol{"1D782}{\mbfsanssigma             }{\mathalpha}{mathematical sans-serif bold small sigma}%
 \UnicodeMathSymbol{"1D783}{\mbfsanstau               }{\mathalpha}{mathematical sans-serif bold small tau}%
 \UnicodeMathSymbol{"1D784}{\mbfsansupsilon           }{\mathalpha}{mathematical sans-serif bold small upsilon}%
-\UnicodeMathSymbol{"1D785}{\mbfsansphi               }{\mathalpha}{mathematical sans-serif bold small phi}%
+\UnicodeMathSymbol{"1D785}{\mbfsansvarphi            }{\mathalpha}{mathematical sans-serif bold small phi}%
 \UnicodeMathSymbol{"1D786}{\mbfsanschi               }{\mathalpha}{mathematical sans-serif bold small chi}%
 \UnicodeMathSymbol{"1D787}{\mbfsanspsi               }{\mathalpha}{mathematical sans-serif bold small psi}%
 \UnicodeMathSymbol{"1D788}{\mbfsansomega             }{\mathalpha}{mathematical sans-serif bold small omega}%
 \UnicodeMathSymbol{"1D789}{\mbfsanspartial           }{\mathalpha}{mathematical sans-serif bold partial differential}%
-\UnicodeMathSymbol{"1D78A}{\mbfsansvarepsilon        }{\mathalpha}{mathematical sans-serif bold epsilon symbol}%
+\UnicodeMathSymbol{"1D78A}{\mbfsansepsilon           }{\mathalpha}{mathematical sans-serif bold varepsilon     symbol}%
 \UnicodeMathSymbol{"1D78B}{\mbfsansvartheta          }{\mathalpha}{mathematical sans-serif bold theta symbol}%
 \UnicodeMathSymbol{"1D78C}{\mbfsansvarkappa          }{\mathalpha}{mathematical sans-serif bold kappa symbol}%
-\UnicodeMathSymbol{"1D78D}{\mbfsansvarphi            }{\mathalpha}{mathematical sans-serif bold phi symbol}%
+\UnicodeMathSymbol{"1D78D}{\mbfsansphi               }{\mathalpha}{mathematical sans-serif bold phi symbol}%
 \UnicodeMathSymbol{"1D78E}{\mbfsansvarrho            }{\mathalpha}{mathematical sans-serif bold rho symbol}%
 \UnicodeMathSymbol{"1D78F}{\mbfsansvarpi             }{\mathalpha}{mathematical sans-serif bold pi symbol}%
 \UnicodeMathSymbol{"1D790}{\mbfitsansAlpha           }{\mathalpha}{mathematical sans-serif bold italic capital alpha}%
@@ -2362,7 +2358,7 @@
 \UnicodeMathSymbol{"1D7AB}{\mbfitsansbeta            }{\mathalpha}{mathematical sans-serif bold italic small beta}%
 \UnicodeMathSymbol{"1D7AC}{\mbfitsansgamma           }{\mathalpha}{mathematical sans-serif bold italic small gamma}%
 \UnicodeMathSymbol{"1D7AD}{\mbfitsansdelta           }{\mathalpha}{mathematical sans-serif bold italic small delta}%
-\UnicodeMathSymbol{"1D7AE}{\mbfitsansepsilon         }{\mathalpha}{mathematical sans-serif bold italic small epsilon}%
+\UnicodeMathSymbol{"1D7AE}{\mbfitsansvarepsilon      }{\mathalpha}{mathematical sans-serif bold italic small varepsilon    }%
 \UnicodeMathSymbol{"1D7AF}{\mbfitsanszeta            }{\mathalpha}{mathematical sans-serif bold italic small zeta}%
 \UnicodeMathSymbol{"1D7B0}{\mbfitsanseta             }{\mathalpha}{mathematical sans-serif bold italic small eta}%
 \UnicodeMathSymbol{"1D7B1}{\mbfitsanstheta           }{\mathalpha}{mathematical sans-serif bold italic small theta}%
@@ -2379,15 +2375,15 @@
 \UnicodeMathSymbol{"1D7BC}{\mbfitsanssigma           }{\mathalpha}{mathematical sans-serif bold italic small sigma}%
 \UnicodeMathSymbol{"1D7BD}{\mbfitsanstau             }{\mathalpha}{mathematical sans-serif bold italic small tau}%
 \UnicodeMathSymbol{"1D7BE}{\mbfitsansupsilon         }{\mathalpha}{mathematical sans-serif bold italic small upsilon}%
-\UnicodeMathSymbol{"1D7BF}{\mbfitsansphi             }{\mathalpha}{mathematical sans-serif bold italic small phi}%
+\UnicodeMathSymbol{"1D7BF}{\mbfitsansvarphi          }{\mathalpha}{mathematical sans-serif bold italic small phi}%
 \UnicodeMathSymbol{"1D7C0}{\mbfitsanschi             }{\mathalpha}{mathematical sans-serif bold italic small chi}%
 \UnicodeMathSymbol{"1D7C1}{\mbfitsanspsi             }{\mathalpha}{mathematical sans-serif bold italic small psi}%
 \UnicodeMathSymbol{"1D7C2}{\mbfitsansomega           }{\mathalpha}{mathematical sans-serif bold italic small omega}%
 \UnicodeMathSymbol{"1D7C3}{\mbfitsanspartial         }{\mathalpha}{mathematical sans-serif bold italic partial differential}%
-\UnicodeMathSymbol{"1D7C4}{\mbfitsansvarepsilon      }{\mathalpha}{mathematical sans-serif bold italic epsilon symbol}%
+\UnicodeMathSymbol{"1D7C4}{\mbfitsansepsilon         }{\mathalpha}{mathematical sans-serif bold italic varepsilon     symbol}%
 \UnicodeMathSymbol{"1D7C5}{\mbfitsansvartheta        }{\mathalpha}{mathematical sans-serif bold italic theta symbol}%
 \UnicodeMathSymbol{"1D7C6}{\mbfitsansvarkappa        }{\mathalpha}{mathematical sans-serif bold italic kappa symbol}%
-\UnicodeMathSymbol{"1D7C7}{\mbfitsansvarphi          }{\mathalpha}{mathematical sans-serif bold italic phi symbol}%
+\UnicodeMathSymbol{"1D7C7}{\mbfitsansphi             }{\mathalpha}{mathematical sans-serif bold italic phi symbol}%
 \UnicodeMathSymbol{"1D7C8}{\mbfitsansvarrho          }{\mathalpha}{mathematical sans-serif bold italic rho symbol}%
 \UnicodeMathSymbol{"1D7C9}{\mbfitsansvarpi           }{\mathalpha}{mathematical sans-serif bold italic pi symbol}%
 \UnicodeMathSymbol{"1D7CA}{\mbfDigamma               }{\mathalpha}{mathematical bold capital digamma}%
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 e1ee6b8ea6f..6ce8f49063f 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
@@ -6,7 +6,7 @@
 %%
 %% unicode-math.dtx  (with options: `package,XE')
 %% unicode-math-compat.dtx  (with options: `compat,XE')
-%% Copyright 2006-2015   Will Robertson <will.robertson@latex-project.org>
+%% 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>
 %% 
@@ -770,25 +770,16 @@
   \clist_map_inline:nn
    {
     Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,
-    alpha,beta,gamma,delta,        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,    chi,psi,omega,
-    varTheta,
-    varsigma,vartheta,varkappa,varrho,varpi
+    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 } }
    }
-  \tl_set:Nn \epsilon
-   { \bool_if:NTF \g__um_texgreek_bool \mitvarepsilon \mitepsilon }
-  \tl_set:Nn \phi
-   { \bool_if:NTF \g__um_texgreek_bool \mitvarphi \mitphi }
-  \tl_set:Nn \varepsilon
-   { \bool_if:NTF \g__um_texgreek_bool \mitepsilon \mitvarepsilon }
-  \tl_set:Nn \varphi
-   { \bool_if:NTF \g__um_texgreek_bool \mitphi \mitvarphi }
  }
 \cs_set:Npn \use@mathgroup #1 #2
  {
@@ -1069,16 +1060,16 @@
    {
     \__um_set_mathalphabet_greek:nnn {normal} {##1} {#2}
     \__um_map_chars_range:nnnn {25} {##1} {#2} {greek}
-    \__um_map_char_single:nnn {##1} {#2} {varepsilon}
+    \__um_map_char_single:nnn {##1} {#2} {epsilon}
     \__um_map_char_single:nnn {##1} {#2} {vartheta}
     \__um_map_char_single:nnn {##1} {#2} {varkappa}
-    \__um_map_char_single:nnn {##1} {#2} {varphi}
+    \__um_map_char_single:nnn {##1} {#2} {phi}
     \__um_map_char_single:nnn {##1} {#2} {varrho}
     \__um_map_char_single:nnn {##1} {#2} {varpi}
-    \__um_set_mathalphabet_pos:nnnn {normal} {varepsilon} {##1} {#2}
+    \__um_set_mathalphabet_pos:nnnn {normal} {epsilon} {##1} {#2}
     \__um_set_mathalphabet_pos:nnnn {normal} {vartheta} {##1} {#2}
     \__um_set_mathalphabet_pos:nnnn {normal} {varkappa} {##1} {#2}
-    \__um_set_mathalphabet_pos:nnnn {normal} {varphi} {##1} {#2}
+    \__um_set_mathalphabet_pos:nnnn {normal} {phi} {##1} {#2}
     \__um_set_mathalphabet_pos:nnnn {normal} {varrho} {##1} {#2}
     \__um_set_mathalphabet_pos:nnnn {normal} {varpi} {##1} {#2}
    }
@@ -1169,10 +1160,10 @@
   \clist_map_inline:nn {#2}
    {
     \__um_set_mathalph_range:nnnnn {25} {#1} {##1} {#3} {greek}
-    \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varepsilon}
+    \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {epsilon}
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {vartheta}
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varkappa}
-    \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varphi}
+    \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {phi}
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varrho}
     \__um_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varpi}
    }
@@ -1614,9 +1605,18 @@
 \__um_setup_active_subscript:nn {^^^^208e} {)}
 \__um_setup_active_subscript:nn {^^^^2090} {a}
 \__um_setup_active_subscript:nn {^^^^2091} {e}
+\__um_setup_active_subscript:nn {^^^^2095} {h}
 \__um_setup_active_subscript:nn {^^^^1d62} {i}
+\__um_setup_active_subscript:nn {^^^^2c7c} {j}
+\__um_setup_active_subscript:nn {^^^^2096} {k}
+\__um_setup_active_subscript:nn {^^^^2097} {l}
+\__um_setup_active_subscript:nn {^^^^2098} {m}
+\__um_setup_active_subscript:nn {^^^^2099} {n}
 \__um_setup_active_subscript:nn {^^^^2092} {o}
+\__um_setup_active_subscript:nn {^^^^209a} {p}
 \__um_setup_active_subscript:nn {^^^^1d63} {r}
+\__um_setup_active_subscript:nn {^^^^209b} {s}
+\__um_setup_active_subscript:nn {^^^^209c} {t}
 \__um_setup_active_subscript:nn {^^^^1d64} {u}
 \__um_setup_active_subscript:nn {^^^^1d65} {v}
 \__um_setup_active_subscript:nn {^^^^2093} {x}
@@ -1709,33 +1709,33 @@
   \group_end:
  }
 \__um_setup_active_frac:
-\def\to{\rightarrow}
-\def\le{\leq}
-\def\ge{\geq}
-\def\neq{\ne}
-\def\triangle{\mathord{\bigtriangleup}}
-\def\bigcirc{\mdlgwhtcircle}
-\def\circ{\vysmwhtcircle}
-\def\bullet{\smblkcircle}
-\def\mathyen{\yen}
-\def\mathsterling{\sterling}
-\def\diamond{\smwhtdiamond}
-\def\emptyset{\varnothing}
-\def\hbar{\hslash}
-\def\land{\wedge}
-\def\lor{\vee}
-\def\owns{\ni}
-\def\gets{\leftarrow}
-\def\mathring{\ocirc}
-\def\lnot{\neg}
-\def\longdivision{\longdivisionsign}
-\def\backepsilon{\upbackepsilon}
-\def\eth{\matheth}
-\def\dbkarow {\dbkarrow}
-\def\drbkarow{\drbkarrow}
-\def\hksearow{\hksearrow}
-\def\hkswarow{\hkswarrow}
-\def\smallint{\mathop{\textstyle\int}\limits}
+\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
  {
@@ -1751,11 +1751,11 @@
     \bool_if:NTF \g__um_literal_colon_bool {:} { \mathpunct{:} }
    }
  }
-\def\digamma{\updigamma}
-\def\Digamma{\upDigamma}
-\cs_set:Npn \| {\Vert}
-\cs_set:Npn \mathellipsis {\mathinner{\unicodeellipsis}}
-\cs_set:Npn \cdots {\mathinner{\unicodecdots}}
+\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
  {
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 b587a824c65..62ee5eff1af 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
@@ -9,7 +9,7 @@
 %% unicode-math-usv.dtx  (with options: `usv')
 %% unicode-math.dtx  (with options: `load')
 %% unicode-math-alphabets.dtx  (with options: `alphabets')
-%% Copyright 2006-2015   Will Robertson <will.robertson@latex-project.org>
+%% 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>
 %% 
@@ -19,7 +19,7 @@
 %% 
 %% This work is "maintained" by Will Robertson.
 \ProvidesPackage{unicode-math}
-  [2015/09/24 v0.8c Unicode maths in XeLaTeX and LuaLaTeX]
+  [2017/01/27 v0.8d Unicode maths in XeLaTeX and LuaLaTeX]
 \usepackage{ifxetex,ifluatex}
 \ifxetex
   \ifdim\number\XeTeXversion\XeTeXrevision in<0.9998in%
@@ -72,8 +72,6 @@
 \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 \g__um_texgreek_bool
-\bool_set_true:N \g__um_texgreek_bool
 \bool_new:N \l__um_smallfrac_bool
 \bool_new:N \g__um_literal_colon_bool
 \bool_new:N \g__um_mathrm_text_bool
@@ -335,11 +333,6 @@
             }
   {literal} { \bool_set_true:N  \g__um_literal_partial_bool }
  }
-\__um_keys_choices:nn {vargreek-shape}
- {
-  {unicode} { \bool_set_false:N \g__um_texgreek_bool }
-  {TeX}     { \bool_set_true:N  \g__um_texgreek_bool }
- }
 \__um_keys_choices:nn {colon}
  {
   {literal} { \bool_set_true:N  \g__um_literal_colon_bool }
@@ -493,10 +486,10 @@
 \usv_set:nnn {normal}  {Greek}{"1D6E2}
 \usv_set:nnn {normal}  {greek}{"1D6FC}
 \usv_set:nnn {normal}{varTheta}  {"1D6F3}
-\usv_set:nnn {normal}{varepsilon}{"1D716}
+\usv_set:nnn {normal}{epsilon}{"1D716}
 \usv_set:nnn {normal}{vartheta}  {"1D717}
 \usv_set:nnn {normal}{varkappa}  {"1D718}
-\usv_set:nnn {normal}{varphi}    {"1D719}
+\usv_set:nnn {normal}{phi}    {"1D719}
 \usv_set:nnn {normal}{varrho}    {"1D71A}
 \usv_set:nnn {normal}{varpi}     {"1D71B}
 \usv_set:nnn {normal}    {Nabla}{"1D6FB}
@@ -568,48 +561,48 @@
 \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}{varepsilon}{"3F5}
+\usv_set:nnn {up}{epsilon}{"3F5}
 \usv_set:nnn {up}{vartheta}  {"3D1}
 \usv_set:nnn {up}{varkappa}  {"3F0}
-\usv_set:nnn {up}{varphi}    {"3D5}
+\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}{varepsilon}{"1D6DC}
+\usv_set:nnn {bfup}{epsilon}{"1D6DC}
 \usv_set:nnn {bfup}{vartheta}  {"1D6DD}
 \usv_set:nnn {bfup}{varkappa}  {"1D6DE}
-\usv_set:nnn {bfup}{varphi}    {"1D6DF}
+\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}{varepsilon}{"1D716}
+\usv_set:nnn {it}{epsilon}{"1D716}
 \usv_set:nnn {it}{vartheta}  {"1D717}
 \usv_set:nnn {it}{varkappa}  {"1D718}
-\usv_set:nnn {it}{varphi}    {"1D719}
+\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}{varepsilon}{"1D750}
+\usv_set:nnn {bfit}{epsilon}{"1D750}
 \usv_set:nnn {bfit}{vartheta}  {"1D751}
 \usv_set:nnn {bfit}{varkappa}  {"1D752}
-\usv_set:nnn {bfit}{varphi}    {"1D753}
+\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}{varepsilon}{"1D78A}
+\usv_set:nnn {bfsfup}{epsilon}{"1D78A}
 \usv_set:nnn {bfsfup}{vartheta}  {"1D78B}
 \usv_set:nnn {bfsfup}{varkappa}  {"1D78C}
-\usv_set:nnn {bfsfup}{varphi}    {"1D78D}
+\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}{varepsilon}{"1D7C4}
+\usv_set:nnn {bfsfit}{epsilon}{"1D7C4}
 \usv_set:nnn {bfsfit}{vartheta}  {"1D7C5}
 \usv_set:nnn {bfsfit}{varkappa}  {"1D7C6}
-\usv_set:nnn {bfsfit}{varphi}    {"1D7C7}
+\usv_set:nnn {bfsfit}{phi}    {"1D7C7}
 \usv_set:nnn {bfsfit}{varrho}    {"1D7C8}
 \usv_set:nnn {bfsfit}{varpi}     {"1D7C9}
 \usv_set:nnn {up}    {Nabla}{"02207}
@@ -732,8 +725,8 @@
 \usv_set:nnn {frak}{I}{"2111}
 \usv_set:nnn {frak}{R}{"211C}
 \usv_set:nnn {frak}{Z}{"2128}
-\luatex_if_engine:T { \RequirePackage{unicode-math-luatex} }
-\xetex_if_engine:T  { \RequirePackage{unicode-math-xetex}  }
+\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}