unicode-math (27jan17)

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

10 files changed, 247 insertions, 280 deletions

diff --git a/Master/texmf-dist/doc/latex/unicode-math/README.md b/Master/texmf-dist/doc/latex/unicode-math/README.md
index baea74011da..bbfcfa1c80e 100644
--- a/Master/texmf-dist/doc/latex/unicode-math/README.md
+++ b/Master/texmf-dist/doc/latex/unicode-math/README.md
@@ -14,10 +14,8 @@ interface and functionality should not be considered completely stable. But
 the more the package is used the more stable it will become. (Things are
 generally working now; it is only minutiae that may change in the future.)
 
-Unicode maths is currently supported by the following fonts:
+Unicode maths is currently supported by the following freely available fonts:
 
- - [Cambria Math][CM] (Microsoft),
- - [Minion Math][MM] (Johannes Küster, typoma GmbH)
  - [Latin Modern Math][LM] (Bogusław Jackowski, Janusz M. Nowacki)
  - [TeX Gyre Pagella Math][PM] (Bogusław Jackowski, Janusz M. Nowacki)
  - [Asana Math][AM] (Apostolos Syropolous),
@@ -25,10 +23,14 @@ Unicode maths is currently supported by the following fonts:
  - [STIX][SM] (STI Pub), and
  - [XITS Math][XM] (Khaled Hosny).
 
-With the exception of Cambria Math, which is proprietry, the fonts above
-are all freely available and released under open source licences
+These fonts are available under open source licences
 (the [GUST Font License][GFL] and [Open Font Licence][OFL]).
 
+The following fonts are proprietary with OpenType maths support:
+
+ - [Cambria Math][CM] (Microsoft),
+ - [Minion Math][MM] (Johannes Küster, typoma GmbH)
+
 I'm always looking for new fonts to test with, so please let me know of any
 new releases.
 
@@ -79,6 +81,15 @@ Please file bug reports with minimal examples:
 CHANGE HISTORY
 --------------
 
+- v0.8d (2017/01/25)
+
+  * `vargreek-shape=TeX` and `vargreek-shape=unicode` package options dropped; for consistency and compatibility, `\phi` and `\epsilon` should and will now behave the same as in `TeX`.
+  * On that note, when using control sequences such as `\mbfitsansvarphi` (and so on), there were a few faulty definitions. The new behaviour is to consistenyl define the `varphi` and `varepsilon` ones as those with the "curly" designs.
+  * Add `\wideoverbar`, `\widebreve`, `\widecheck`.
+  * Add `\mathsection`, `\mathparagraph`.
+  * Remove `\mupvarbeta`, `upold(Kk)oppa`, `\up(Ss)tigma`, `\up(Kk)oppa`, `\up(Ss)ampi` — none of these are maths symbols.
+  * `!` (`\mathexclam`) changed from `\mathpunct` to `\mathclose` for backwards compatibility with TeX.
+
 - v0.8c (2015/09/24)
 
   * Add `\over(left/right)harpoon` as "wide" accents.
@@ -271,7 +282,7 @@ greater.
 
 This work is author-maintained and consists of the files
 
-- unicode-math.dtx,
+- unicode-math*.dtx,
 - unicode-math-table.tex,
 - unimath-example.ltx,
 - unimath-symbols.ltx,
@@ -285,17 +296,15 @@ the derived files
 the compiled documentation files
 
 - unicode-math.pdf,
-- unicode-math-testsuite.pdf,
 - unimath-example.pdf,
 - unimath-symbols.pdf;
 
 and the test suite for this package
 
 - testfiles/umtest-preamble.tex,
-- testfiles/umtest-suite-(F|L|X).tex,
-- testfiles/*.ltx.
+- testfiles/*.(lvt|tlg).
 
 ____________________________________
-Copyright 2006-2012   Will Robertson  <will.robertson@latex-project.org>
-Copyright 2010-2011 Philipp Stephani  <st_philipp@yahoo.de>
-Copyright 2012          Khaled Hosny  <khaledhosny@eglug.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>
diff --git a/Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex b/Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex
index 29835b9a5b1..263b10bd698 100644
--- a/Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex
+++ b/Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex
@@ -389,8 +389,8 @@ Therefore, to use an \ascii-encoded fractur font, for example, write
 and because the math plane fractur glyphs will be missing, \pkg{unicode-math} will know to use the \ascii\ ones instead.
 If necessary this behaviour can be forced with |[range=frak->up]|, since the `|up|' range corresponds to \ascii\ letters.
 
-If you wanted to swap the maths symbols with sans serif forms, it would be possible to write |[range={up->sfup,it->sfit}]|.
-Note, however, that at present Unicode does not encode glyphs for sans serif Greek (\tabref{mathalphabets}).
+%If you wanted to swap the maths symbols with sans serif forms, it would be possible to write |[range={up->sfup,it->sfit}]|.
+%Note, however, that at present Unicode does not encode glyphs for sans serif Greek (\tabref{mathalphabets}).
 
 Users of the impressive Minion Math fonts (commercial) may use remapping to access the bold glyphs using:
 \begin{Verbatim}
@@ -462,7 +462,7 @@ While these commands can still be used, \pkg{unicode-math} defines a wrapper com
 This command is known as \cs{setmathface} in symmetry with \pkg{fontspec}'s \cs{newfontface} command; it takes syntax:
 \begin{quote}
   \cmd\setmathfontface\meta{command}\marg{font name}|[|\meta{font features}|]|
-  
+
   \makebox[0pt][l]{\cmd\setmathfontface\meta{command}\marg{font name}|[||version=|\meta{version name}|,|\meta{font features}|]|}
 \end{quote}
 For example, if you want to define a new legacy maths alphabet font \cs{mathittt}:
@@ -850,26 +850,6 @@ is activated following |math-style=literal|.
 
 See \tabref{partial} for the variations on the partial differential symbol.
 
-\subsubsection{Epsilon and phi: $\epsilon$ vs.\ $\varepsilon$ and $\phi$ vs.\ $\varphi$}
-\seclabel{vargreek-shape}
-
-\TeX\ defines \cs{epsilon} to look like $\epsilon$ and \cs{varepsilon} to
-look like $\varepsilon$. By constrast, the Unicode glyph directly after delta and before zeta
-is `epsilon' and looks like $\varepsilon$; there is a subsequent variant of
-epsilon that looks like $\epsilon$. This creates a problem. People who
-use Unicode input won't want their glyphs transforming; \TeX\ users will be
-confused that what they think as `normal epsilon' is actual the `variant
-epsilon'. And the same problem exists for `phi'.
-
-We have an option to control this behaviour.
-With |vargreek-shape=TeX|,
-\cs{phi} and \cs{epsilon} produce $\phi$ and $\epsilon$ and
-\cs{varphi} and \cs{varepsilon} produce $\varphi$ and $\varepsilon$.
-With |vargreek-shape=unicode|, these symbols are swapped.
-Note, however, that Unicode characters are not affected by this option.
-That is, no remapping occurs of the characters/glyphs, only the control sequences.
-
-The package default is to use |vargreek-shape=TeX|.
 
 \subsubsection{Primes}
 
diff --git a/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf b/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf
index 7c97b8dc05f..e794dd8ec75 100644
--- a/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf
+++ b/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf
diff --git a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf
index 56c31e52d3a..6f56b857de5 100644
--- a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf
+++ b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf
diff --git a/Master/texmf-dist/source/latex/unicode-math/unicode-math-usv.dtx b/Master/texmf-dist/source/latex/unicode-math/unicode-math-usv.dtx
index 35e7f17a563..96793f77c74 100644
--- a/Master/texmf-dist/source/latex/unicode-math/unicode-math-usv.dtx
+++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math-usv.dtx
@@ -18,10 +18,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}
@@ -102,10 +102,10 @@
 %    \begin{macrocode}
 \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}
@@ -114,10 +114,10 @@
 %    \begin{macrocode}
 \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}
@@ -125,40 +125,40 @@
 % Italic Greek variants:
 %    \begin{macrocode}
 \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}
 %    \end{macrocode}
 % Bold italic:
 %    \begin{macrocode}
 \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}
 %    \end{macrocode}
 % Bold sans:
 %    \begin{macrocode}
 \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}
 %    \end{macrocode}
 % Bold sans italic:
 %    \begin{macrocode}
 \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}
 %    \end{macrocode}
@@ -347,10 +347,10 @@
 \usv_set:nnn {stixsfup}{Greek}{"E17D}
 \usv_set:nnn {stixsfup}{greek}{"E196}
 \usv_set:nnn {stixsfup}{varTheta}{"E18E}
-\usv_set:nnn {stixsfup}{varepsilon}{"E1AF}
+\usv_set:nnn {stixsfup}{epsilon}{"E1AF}
 \usv_set:nnn {stixsfup}{vartheta}{"E1B0}
 \usv_set:nnn {stixsfup}{varkappa}{0000} % ???
-\usv_set:nnn {stixsfup}{varphi}{"E1B1}
+\usv_set:nnn {stixsfup}{phi}{"E1B1}
 \usv_set:nnn {stixsfup}{varrho}{"E1B2}
 \usv_set:nnn {stixsfup}{varpi}{"E1B3}
 \usv_set:nnn {stixupslash}{Greek}{"E2FC}
@@ -409,10 +409,10 @@
 \usv_set:nnn {stixsfit}{Greek}{"E1BF}
 \usv_set:nnn {stixsfit}{greek}{"E1D8}
 \usv_set:nnn {stixsfit}{varTheta}{"E1D0}
-\usv_set:nnn {stixsfit}{varepsilon}{"E1F1}
+\usv_set:nnn {stixsfit}{epsilon}{"E1F1}
 \usv_set:nnn {stixsfit}{vartheta}{"E1F2}
 \usv_set:nnn {stixsfit}{varkappa}{0000} % ???
-\usv_set:nnn {stixsfit}{varphi}{"E1F3}
+\usv_set:nnn {stixsfit}{phi}{"E1F3}
 \usv_set:nnn {stixsfit}{varrho}{"E1F4}
 \usv_set:nnn {stixsfit}{varpi}{"E1F5}
 %    \end{macrocode}
@@ -428,10 +428,10 @@
 \usv_set:nnn {stixsfitslash}{Latin}{"E294}
 \usv_set:nnn {stixsfitslash}{latin}{"E2C8}
 \usv_set:nnn {stixsfitslash}{greek}{"E32C}
-\usv_set:nnn {stixsfitslash}{varepsilon}{"E37A}
+\usv_set:nnn {stixsfitslash}{epsilon}{"E37A}
 \usv_set:nnn {stixsfitslash}{vartheta}{"E35E}
 \usv_set:nnn {stixsfitslash}{varkappa}{"E374}
-\usv_set:nnn {stixsfitslash}{varphi}{"E360}
+\usv_set:nnn {stixsfitslash}{phi}{"E360}
 \usv_set:nnn {stixsfitslash}{varrho}{"E376}
 \usv_set:nnn {stixsfitslash}{varpi}{"E362}
 \usv_set:nnn {stixsfitslash}{digamma}{"E36A}
@@ -554,10 +554,10 @@
 \usv_set:nnn {stixbfitslash}{Latin}{"E295}
 \usv_set:nnn {stixbfitslash}{latin}{"E2C9}
 \usv_set:nnn {stixbfitslash}{greek}{"E32D}
-\usv_set:nnn {stixsfitslash}{varepsilon}{"E37B}
+\usv_set:nnn {stixsfitslash}{epsilon}{"E37B}
 \usv_set:nnn {stixsfitslash}{vartheta}{"E35F}
 \usv_set:nnn {stixsfitslash}{varkappa}{"E375}
-\usv_set:nnn {stixsfitslash}{varphi}{"E361}
+\usv_set:nnn {stixsfitslash}{phi}{"E361}
 \usv_set:nnn {stixsfitslash}{varrho}{"E377}
 \usv_set:nnn {stixsfitslash}{varpi}{"E363}
 \usv_set:nnn {stixsfitslash}{digamma}{"E36B}
@@ -565,4 +565,4 @@
 %
 %    \begin{macrocode}
 %</stix>
-%    \end{macrocode}
\ No newline at end of file
+%    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
index f1fb5a36d84..69eeeaccc20 100644
--- a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
+++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
@@ -25,7 +25,7 @@
 \keepsilent
 \let\MetaPrefix\DoubleperCent
 \declarepreamble\texpreamble
-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>
 
@@ -69,7 +69,7 @@ This work is "maintained" by Will Robertson.
 %<preamble&XE>\ProvidesPackage{unicode-math-xetex}
 %<preamble&LU>\ProvidesPackage{unicode-math-luatex}
 %<*preamble>
-  [2015/09/24 v0.8c Unicode maths in XeLaTeX and LuaLaTeX]
+  [2017/01/27 v0.8d Unicode maths in XeLaTeX and LuaLaTeX]
 %</preamble>
 %<*internal>
 \def\DOCUMENTEND{F}
@@ -99,8 +99,8 @@ This work is "maintained" by Will Robertson.
 % Shared code executed before loading the engine-specific code is indicated with the flag \textsf{preamble}.
 %    \begin{macrocode}
 %<*load>
-\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}  }
 %</load>
 %    \end{macrocode}
 % The shared part of the code starts here before the split above.
@@ -194,8 +194,6 @@ This work is "maintained" by Will Robertson.
 \bool_new:N \g_@@_uppartial_bool
 \bool_new:N \g_@@_literal_Nabla_bool
 \bool_new:N \g_@@_literal_partial_bool
-\bool_new:N \g_@@_texgreek_bool
-\bool_set_true:N \g_@@_texgreek_bool
 \bool_new:N \l_@@_smallfrac_bool
 \bool_new:N \g_@@_literal_colon_bool
 \bool_new:N \g_@@_mathrm_text_bool
@@ -599,15 +597,6 @@ This work is "maintained" by Will Robertson.
  }
 %    \end{macrocode}
 %
-% \paragraph{Epsilon and phi shapes}
-%    \begin{macrocode}
-\@@_keys_choices:nn {vargreek-shape}
- {
-  {unicode} { \bool_set_false:N \g_@@_texgreek_bool }
-  {TeX}     { \bool_set_true:N  \g_@@_texgreek_bool }
- }
-%    \end{macrocode}
-%
 % \paragraph{Colon style}
 %    \begin{macrocode}
 \@@_keys_choices:nn {colon}
@@ -2165,25 +2154,16 @@ This work is "maintained" by Will Robertson.
   \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_@@_texgreek_bool \mitvarepsilon \mitepsilon }
-  \tl_set:Nn \phi
-   { \bool_if:NTF \g_@@_texgreek_bool \mitvarphi \mitphi }
-  \tl_set:Nn \varepsilon
-   { \bool_if:NTF \g_@@_texgreek_bool \mitepsilon \mitvarepsilon }
-  \tl_set:Nn \varphi
-   { \bool_if:NTF \g_@@_texgreek_bool \mitphi \mitvarphi }
  }
 %    \end{macrocode}
 % \end{macro}
@@ -2761,16 +2741,16 @@ This work is "maintained" by Will Robertson.
    {
     \@@_set_mathalphabet_greek:nnn {normal} {##1} {#2}
     \@@_map_chars_range:nnnn {25} {##1} {#2} {greek}
-    \@@_map_char_single:nnn {##1} {#2} {varepsilon}
+    \@@_map_char_single:nnn {##1} {#2} {epsilon}
     \@@_map_char_single:nnn {##1} {#2} {vartheta}
     \@@_map_char_single:nnn {##1} {#2} {varkappa}
-    \@@_map_char_single:nnn {##1} {#2} {varphi}
+    \@@_map_char_single:nnn {##1} {#2} {phi}
     \@@_map_char_single:nnn {##1} {#2} {varrho}
     \@@_map_char_single:nnn {##1} {#2} {varpi}
-    \@@_set_mathalphabet_pos:nnnn {normal} {varepsilon} {##1} {#2}
+    \@@_set_mathalphabet_pos:nnnn {normal} {epsilon} {##1} {#2}
     \@@_set_mathalphabet_pos:nnnn {normal} {vartheta} {##1} {#2}
     \@@_set_mathalphabet_pos:nnnn {normal} {varkappa} {##1} {#2}
-    \@@_set_mathalphabet_pos:nnnn {normal} {varphi} {##1} {#2}
+    \@@_set_mathalphabet_pos:nnnn {normal} {phi} {##1} {#2}
     \@@_set_mathalphabet_pos:nnnn {normal} {varrho} {##1} {#2}
     \@@_set_mathalphabet_pos:nnnn {normal} {varpi} {##1} {#2}
    }
@@ -2940,10 +2920,10 @@ This work is "maintained" by Will Robertson.
   \clist_map_inline:nn {#2}
    {
     \@@_set_mathalph_range:nnnnn {25} {#1} {##1} {#3} {greek}
-    \@@_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varepsilon}
+    \@@_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {epsilon}
     \@@_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {vartheta}
     \@@_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varkappa}
-    \@@_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varphi}
+    \@@_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {phi}
     \@@_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varrho}
     \@@_set_mathalphabet_char:nnnn    {#1} {##1} {#3} {varpi}
    }
@@ -3597,9 +3577,18 @@ This work is "maintained" by Will Robertson.
 \@@_setup_active_subscript:nn {^^^^208e} {)}
 \@@_setup_active_subscript:nn {^^^^2090} {a}
 \@@_setup_active_subscript:nn {^^^^2091} {e}
+\@@_setup_active_subscript:nn {^^^^2095} {h}
 \@@_setup_active_subscript:nn {^^^^1d62} {i}
+\@@_setup_active_subscript:nn {^^^^2c7c} {j}
+\@@_setup_active_subscript:nn {^^^^2096} {k}
+\@@_setup_active_subscript:nn {^^^^2097} {l}
+\@@_setup_active_subscript:nn {^^^^2098} {m}
+\@@_setup_active_subscript:nn {^^^^2099} {n}
 \@@_setup_active_subscript:nn {^^^^2092} {o}
+\@@_setup_active_subscript:nn {^^^^209a} {p}
 \@@_setup_active_subscript:nn {^^^^1d63} {r}
+\@@_setup_active_subscript:nn {^^^^209b} {s}
+\@@_setup_active_subscript:nn {^^^^209c} {t}
 \@@_setup_active_subscript:nn {^^^^1d64} {u}
 \@@_setup_active_subscript:nn {^^^^1d65} {v}
 \@@_setup_active_subscript:nn {^^^^2093} {x}
@@ -3738,45 +3727,45 @@ This work is "maintained" by Will Robertson.
 % These are symbols with multiple names. Eventually to be taken care of
 % automatically by the maths characters database.
 %    \begin{macrocode}
-\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}
+\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}
 %    \end{macrocode}
 % These are somewhat odd: (and their usual Unicode uprightness does not match their amssymb glyphs)
 %    \begin{macrocode}
-\def\backepsilon{\upbackepsilon}
-\def\eth{\matheth}
+\protected\def\backepsilon{\upbackepsilon}
+\protected\def\eth{\matheth}
 %    \end{macrocode}
 % These are names that are `frozen' in HTML but have dumb names:
 %    \begin{macrocode}
-\def\dbkarow {\dbkarrow}
-\def\drbkarow{\drbkarrow}
-\def\hksearow{\hksearrow}
-\def\hkswarow{\hkswarrow}
+\protected\def\dbkarow {\dbkarrow}
+\protected\def\drbkarow{\drbkarrow}
+\protected\def\hksearow{\hksearrow}
+\protected\def\hkswarow{\hkswarrow}
 %    \end{macrocode}
 %
 % Due to the magic of OpenType math, big operators are automatically
 % enlarged when necessary. Since there isn't a separate unicode glyph for
 % `small integral', I'm not sure if there is a better way to do this:
 %    \begin{macrocode}
-\def\smallint{\mathop{\textstyle\int}\limits}
+\protected\def\smallint{\mathop{\textstyle\int}\limits}
 %    \end{macrocode}
 %
 % \begin{macro}{\underbar}
@@ -3811,20 +3800,20 @@ This work is "maintained" by Will Robertson.
 % \begin{macro}{\Digamma}
 % I might end up just changing these in the table.
 %    \begin{macrocode}
-\def\digamma{\updigamma}
-\def\Digamma{\upDigamma}
+\protected\def\digamma{\updigamma}
+\protected\def\Digamma{\upDigamma}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
 %
 % \paragraph{Symbols}
 %    \begin{macrocode}
-\cs_set:Npn \| {\Vert}
+\cs_set_protected:Npn \| {\Vert}
 %    \end{macrocode}
 % \cs{mathinner} items:
 %    \begin{macrocode}
-\cs_set:Npn \mathellipsis {\mathinner{\unicodeellipsis}}
-\cs_set:Npn \cdots {\mathinner{\unicodecdots}}
+\cs_set_protected:Npn \mathellipsis {\mathinner{\unicodeellipsis}}
+\cs_set_protected:Npn \cdots {\mathinner{\unicodecdots}}
 %    \end{macrocode}
 %
 %    \begin{macrocode}
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}