summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/unicode-math
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-27 23:14:20 +0000
committerKarl Berry <karl@freefriends.org>2017-01-27 23:14:20 +0000
commit58fb8e37353bbebe5cc06cfd1014f14c5ab989b9 (patch)
treedc85cbe817c06c421f54f3b9de2dc486514a1d12 /Master/texmf-dist/source/latex/unicode-math
parent953423df3388111af14ec84c79dfa6b10e1e8aac (diff)
unicode-math (27jan17)
git-svn-id: svn://tug.org/texlive/trunk@43068 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/unicode-math')
-rw-r--r--Master/texmf-dist/source/latex/unicode-math/unicode-math-usv.dtx46
-rw-r--r--Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx119
2 files changed, 77 insertions, 88 deletions
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}