diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/README.md | 10 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf | bin | 387725 -> 385698 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.ltx | 40 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf | bin | 1398598 -> 1612020 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/unicode-math/unicode-math-compat.dtx | 17 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx | 18 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty | 21 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty | 23 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty | 2 |
11 files changed, 76 insertions, 61 deletions
diff --git a/Master/texmf-dist/doc/latex/unicode-math/README.md b/Master/texmf-dist/doc/latex/unicode-math/README.md index bbfcfa1c80e..9765072572d 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/README.md +++ b/Master/texmf-dist/doc/latex/unicode-math/README.md @@ -38,7 +38,7 @@ new releases. [MM]: http://www.typoma.com/en/fonts.html [LM]: http://www.gust.org.pl/projects/e-foundry/lm-math [PM]: http://www.ctan.org/pkg/tex-gyre-math-pagella -[AM]: http://www.ctan.org/tex-archive/fonts/Asana-Math/ +[AM]: http://www.ctan.org/pkg/asana-math [NE]: http://github.com/khaledhosny/euler-otf [SM]: http://www.aip.org/stixfonts/ [XM]: http://github.com/khaledhosny/xits-math @@ -81,6 +81,14 @@ Please file bug reports with minimal examples: CHANGE HISTORY -------------- +- v0.8e (2017/07/30) + + * Add `\surd` to access the sqrt symbol. + * Fix bug exposed by expl3 update to booleans. + * Add Deja Vu Math TeX Gyre in list of symbols. + * Add `\sime` alias for `\simeq` and `\nsimeq` for `\nsime`. + (For negations it's helpful when they have consistent naming.) + - 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`. 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 263b10bd698..2c232aa8dde 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 @@ -306,7 +306,6 @@ See following sections for more information. |sans-style| & Style of sans serif letters & \secref{sans-style} \\ |nabla| & Style of the nabla symbol & \secref{nabla} \\ |partial| & Style of the partial symbol & \secref{partial} \\ - |vargreek-shape| & Style of phi and epsilon & \secref{vargreek-shape} \\ |colon| & Behaviour of \cs{colon} & \secref{colon} \\ |slash-delimiter| & Glyph to use for `stretchy' slash & \secref{slash-delimiter} \\ \bottomrule @@ -1089,7 +1088,7 @@ Unicode defines a large number of different types of circles for a variety of mathematical purposes. There are thirteen alone just considering the all white and all black ones, shown in \tabref{circles}. -\LaTeX\ defines considerably fewer: \cs{circ} and cs{bigcirc} for white; +\LaTeX\ defines considerably fewer: \cs{circ} and \cs{bigcirc} for white; \cs{bullet} for black. This package maps those commands to \cs{vysmwhtcircle}, \cs{mdlgwhtcircle}, and \cs{smblkcircle}, respectively. diff --git a/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf b/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf Binary files differindex e794dd8ec75..e393cc3b6d3 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.ltx b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.ltx index 16d38e94d44..caa0e8daf93 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.ltx +++ b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.ltx @@ -46,14 +46,15 @@ \defmathfont{cambria}{Cambria Math}{66CCCC} \defmathfont{asana}{Asana-Math.otf}{6666CC} \defmathfont{pagella}{texgyrepagella-math.otf}{AA6666} -\defmathfont{euler}{Neo Euler}{CC66CC} +\defmathfont{euler}{euler.otf}{CC66CC} +\defmathfont{dejavu}{texgyredejavu-math.otf}{AACC66} \def\INPUT{\input{unicode-math-table.tex}} \def\TABLE{% \par\noindent -\begin{longtable}[l]{@{}lcccccccll@{}} +\begin{longtable}[l]{@{}lccccccccll@{}} \toprule - \textsc{usv} & M & X & S & C & A & P & E & Macro & Description \\ + \textsc{usv} & M & X & S & C & A & P & D & E & Macro & Description \\ \midrule \endhead \INPUT\\ \bottomrule @@ -64,7 +65,7 @@ \makeatother \def\CMD#1{\footnotesize\cmd#1} \def\DESC#1{% - \begin{varwidth}[t]{6cm} + \begin{varwidth}[t]{4cm} \raggedright\linespread{0.6}\scriptsize #1% \end{varwidth} } @@ -86,6 +87,7 @@ \SYMB{#2}{cambria}{#1} & \SYMB{#2}{asana}{#1} & \SYMB{#2}{pagella}{#1} & + \SYMB{#2}{dejavu}{#1} & \SYMB{#2}{euler}{#1} & \CMD{#2} \tl_if_in:NnT \PLAIN {#2} @@ -153,7 +155,7 @@ This document uses the file \texttt{unicode-math-table.tex} to print every symbol defined by the \textsf{unicode-math} package. Use this document to find the command name or the Unicode glyph slot for a symbol that you wish to use. -Eight fonts are shown: (with approximate symbol counts) +Nine fonts are shown: (with approximate symbol counts) \begin{itemize} \item[M] \mathversion{lm} $\mathup{Latin\ Modern\ Math}$ (\ref{count:lm}) \item[X] \mathversion{xits} $\mathup{XITS\ Math}$ (\ref{count:xits}) @@ -162,6 +164,7 @@ Eight fonts are shown: (with approximate symbol counts) \item[A] \mathversion{asana} $\mathup{Asana\ Math}$ (\ref{count:asana}) \item[P] \mathversion{pagella} $\mathup{TeX\ Gyre\ Pagella\ Math}$ (\ref{count:pagella}) \item[E] \mathversion{euler} $\mathup{Neo\ Euler}$ (\ref{count:euler}) +\item[D] \mathversion{dejavu} $\mathup{DejaVu Math TeX Gyre}$ (\ref{count:dejavu}) \end{itemize} Symbols defined in Plain \TeX\ are indicated with {\color[gray]{0.6} \textsuperscript{\sffamily (p)}} after their macro name. \LaTeX\ follows Plain \TeX, but defines a handful more, indicated with {\color[gray]{0.6} \textsuperscript{\sffamily (l)}} @@ -288,23 +291,21 @@ The limits behaviour as specified by \textsf{unicode-math} are shown with grey s \def\INPUT{\ALPHA} \cs_new:Npn \SLOTS #1#2 { \cs_set:Npn \UnicodeMathSymbol ##1##2##3##4 { - \bool_if:nT - { - \int_compare_p:n {##1 >= #1} && \int_compare_p:n {##1 <= #2} - } - { - \PRINTLINE{##1}{##2}{##4} - } + \bool_lazy_and:nnT + { \int_compare_p:n {##1 >= #1} } + { \int_compare_p:n {##1 <= #2} } + { + \PRINTLINE{##1}{##2}{##4} + } } \TABLE \cs_set:Npn \UnicodeMathSymbol ##1##2##3##4 { - \bool_if:nT - { - \int_compare_p:n {##1 > #2} || \int_compare_p:n {##1 < #1} - } - { - \exp_not:n { \UnicodeMathSymbol {##1}{##2}{##3}{##4} } - } + \bool_lazy_or:nnT + { \int_compare_p:n {##1 > #2} } + { \int_compare_p:n {##1 < #1} } + { + \exp_not:n { \UnicodeMathSymbol {##1}{##2}{##3}{##4} } + } } \edef\ALPHA{\ALPHA} } @@ -440,5 +441,6 @@ The limits behaviour as specified by \textsf{unicode-math} are shown with grey s \refstepcounter{asana}\label{count:asana} \refstepcounter{pagella}\label{count:pagella} \refstepcounter{euler}\label{count:euler} +\refstepcounter{dejavu}\label{count:dejavu} \end{document} diff --git a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf Binary files differindex 6f56b857de5..18fbed43f19 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-compat.dtx b/Master/texmf-dist/source/latex/unicode-math/unicode-math-compat.dtx index f7768095976..f04177c60f1 100644 --- a/Master/texmf-dist/source/latex/unicode-math/unicode-math-compat.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math-compat.dtx @@ -302,7 +302,7 @@ \box_wd:N \l_tmpb_box + (\box_ht:N \l_tmpa_box - \box_dp:N \l_tmpa_box) * \number \fontdimen 65 \l_@@_font / 100 - } + } { \box_use:N \rootbox } @@ -342,10 +342,9 @@ % \pkg{mathtools}’s |\cramped| command and others that make use of its internal version use an incorrect font dimension. % % \begin{macrocode} +%<*XE> \AtEndOfPackageFile * { mathtools } { -%<*XE> - \newfam \g_@@_empty_fam \@@_check_and_fix:NNnnn \MT_cramped_internal:Nn \cs_set_nopar:Npn { #1 #2 } { @@ -380,7 +379,9 @@ } % \end{macrocode} % The \XeTeX\ version is pretty similar to the legacy version, only using the correct font dimensions. -% Note we used `\verb|\XeTeXradical|' with a newly-allocated empty family to make sure that the radical rule width is not set. +% Note we used `\verb|\XeTeXradical|' with the family 255 to be almost sure +% that the radical rule width is not set. Former use of `\verb|\newfam|' had an +% upsetting effect on legacy math alphabets. % \begin{macrocode} { \hbox_set:Nn \l_tmpa_box @@ -390,7 +391,7 @@ \m@th #1 \dim_zero:N \nulldelimiterspace - \XeTeXradical \g_@@_empty_fam \c_zero { #2 } + \XeTeXradical \c_two_hundred_fifty_five \c_zero { #2 } \c_math_toggle_token \color@endgroup } @@ -404,6 +405,7 @@ } \box_use_clear:N \l_tmpa_box } + } %</XE> % \end{macrocode} % @@ -445,8 +447,7 @@ \let\Uunderbracket=\underbracket \let\overbracket =\MToverbracket \let\underbracket =\MTunderbracket - } - } + }% end of AtBeginDocument % \end{macrocode} % \end{macro} % \end{macro} @@ -505,4 +506,4 @@ % % \begin{macrocode} %</compat> -% \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 69eeeaccc20..4513ee78eaf 100644 --- a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx @@ -69,7 +69,7 @@ This work is "maintained" by Will Robertson. %<preamble&XE>\ProvidesPackage{unicode-math-xetex} %<preamble&LU>\ProvidesPackage{unicode-math-luatex} %<*preamble> - [2017/01/27 v0.8d Unicode maths in XeLaTeX and LuaLaTeX] + [2017/07/30 v0.8e Unicode maths in XeLaTeX and LuaLaTeX] %</preamble> %<*internal> \def\DOCUMENTEND{F} @@ -759,9 +759,11 @@ This work is "maintained" by Will Robertson. % \begin{macrocode} \cs_set:Nn \@@_set_mathsymbol:nNNn { - \bool_if:nT + \bool_lazy_and:nnT + { + \int_compare_p:nNn {#4} > {127} + } { - \int_compare_p:nNn {#4} > {127} && \int_compare_p:nNn { \char_value_catcode:n {#4} } = {11} } { \char_set_catcode_other:n {#4} } @@ -1980,7 +1982,7 @@ This work is "maintained" by Will Robertson. \seq_if_in:NnTF \g_@@_mathclasses_seq {##1} { \seq_put_right:Nn \l_@@_mclass_range_seq {##1} } { - \bool_if:nTF { \tl_if_single_p:n {##1} && \token_if_cs_p:N ##1 } + \bool_lazy_and:nnTF { \tl_if_single_p:n {##1} } { \token_if_cs_p:N ##1 } { \seq_put_right:Nn \l_@@_cmd_range_seq {##1} } { \seq_put_right:Nn \l_@@_char_range_seq {##1} } } @@ -3633,11 +3635,11 @@ This work is "maintained" by Will Robertson. % \begin{macrocode} \cs_new:Npn \@@_peek_execute_branches_ss: { - \bool_if:nTF + \bool_lazy_any:nTF { - \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token || - \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token || - \token_if_eq_meaning_p:NN \l_peek_token \c_space_token + { \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token } + { \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token } + { \token_if_eq_meaning_p:NN \l_peek_token \c_space_token } } { \__peek_false:w } { \@@_peek_execute_branches_ss_aux: } 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 e0913a4d904..069b1d7b397 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 @@ -39,9 +39,11 @@ } \cs_set:Nn \__um_set_mathsymbol:nNNn { - \bool_if:nT + \bool_lazy_and:nnT + { + \int_compare_p:nNn {#4} > {127} + } { - \int_compare_p:nNn {#4} > {127} && \int_compare_p:nNn { \char_value_catcode:n {#4} } = {11} } { \char_set_catcode_other:n {#4} } @@ -659,7 +661,7 @@ \seq_if_in:NnTF \g__um_mathclasses_seq {##1} { \seq_put_right:Nn \l__um_mclass_range_seq {##1} } { - \bool_if:nTF { \tl_if_single_p:n {##1} && \token_if_cs_p:N ##1 } + \bool_lazy_and:nnTF { \tl_if_single_p:n {##1} } { \token_if_cs_p:N ##1 } { \seq_put_right:Nn \l__um_cmd_range_seq {##1} } { \seq_put_right:Nn \l__um_char_range_seq {##1} } } @@ -1605,11 +1607,11 @@ } \cs_new:Npn \__um_peek_execute_branches_ss: { - \bool_if:nTF + \bool_lazy_any:nTF { - \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token || - \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token || - \token_if_eq_meaning_p:NN \l_peek_token \c_space_token + { \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token } + { \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token } + { \token_if_eq_meaning_p:NN \l_peek_token \c_space_token } } { \__peek_false:w } { \__um_peek_execute_branches_ss_aux: } @@ -1928,8 +1930,6 @@ } \AtEndOfPackageFile * { mathtools } { -\AtEndOfPackageFile * { mathtools } - { \cs_set_eq:NN \MToverbracket \overbracket \cs_set_eq:NN \MTunderbracket \underbracket @@ -1955,8 +1955,7 @@ \let\Uunderbracket=\underbracket \let\overbracket =\MToverbracket \let\underbracket =\MTunderbracket - } - } + }% end of AtBeginDocument \msg_warning:nn { unicode-math } { mathtools-colon } \NewDocumentCommand \dblcolon { } { \Colon } \NewDocumentCommand \coloneqq { } { \coloneq } 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 23e9cfa199f..aaa8d27b550 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 @@ -345,6 +345,7 @@ \UnicodeMathSymbol{"02218}{\vysmwhtcircle }{\mathbin}{composite function (small circle)}% \UnicodeMathSymbol{"02219}{\vysmblkcircle }{\mathbin}{bullet operator}% \UnicodeMathSymbol{"0221A}{\sqrt }{\mathopen}{radical}% +\UnicodeMathSymbol{"0221A}{\surd }{\mathord}{radical}% \UnicodeMathSymbol{"0221B}{\cuberoot }{\mathopen}{cube root}% \UnicodeMathSymbol{"0221C}{\fourthroot }{\mathopen}{fourth root}% \UnicodeMathSymbol{"0221D}{\propto }{\mathrel}{is proportional to}% @@ -387,6 +388,8 @@ \UnicodeMathSymbol{"02242}{\eqsim }{\mathrel}{equals, similar}% \UnicodeMathSymbol{"02243}{\simeq }{\mathrel}{similar, equals}% \UnicodeMathSymbol{"02244}{\nsime }{\mathrel}{not similar, equals}% +\UnicodeMathSymbol{"02243}{\sime }{\mathrel}{similar, equals (alias)}% +\UnicodeMathSymbol{"02244}{\nsimeq }{\mathrel}{not similar, equals (alias)}% \UnicodeMathSymbol{"02245}{\cong }{\mathrel}{congruent with}% \UnicodeMathSymbol{"02246}{\simneqq }{\mathrel}{similar, not equals [vert only for 9573 entity]}% \UnicodeMathSymbol{"02247}{\ncong }{\mathrel}{not congruent with}% 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 6ce8f49063f..b95c0b88525 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 @@ -37,9 +37,11 @@ } \cs_set:Nn \__um_set_mathsymbol:nNNn { - \bool_if:nT + \bool_lazy_and:nnT + { + \int_compare_p:nNn {#4} > {127} + } { - \int_compare_p:nNn {#4} > {127} && \int_compare_p:nNn { \char_value_catcode:n {#4} } = {11} } { \char_set_catcode_other:n {#4} } @@ -684,7 +686,7 @@ \seq_if_in:NnTF \g__um_mathclasses_seq {##1} { \seq_put_right:Nn \l__um_mclass_range_seq {##1} } { - \bool_if:nTF { \tl_if_single_p:n {##1} && \token_if_cs_p:N ##1 } + \bool_lazy_and:nnTF { \tl_if_single_p:n {##1} } { \token_if_cs_p:N ##1 } { \seq_put_right:Nn \l__um_cmd_range_seq {##1} } { \seq_put_right:Nn \l__um_char_range_seq {##1} } } @@ -1646,11 +1648,11 @@ } \cs_new:Npn \__um_peek_execute_branches_ss: { - \bool_if:nTF + \bool_lazy_any:nTF { - \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token || - \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token || - \token_if_eq_meaning_p:NN \l_peek_token \c_space_token + { \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token } + { \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token } + { \token_if_eq_meaning_p:NN \l_peek_token \c_space_token } } { \__peek_false:w } { \__um_peek_execute_branches_ss_aux: } @@ -2037,7 +2039,6 @@ } \AtEndOfPackageFile * { mathtools } { - \newfam \g__um_empty_fam \__um_check_and_fix:NNnnn \MT_cramped_internal:Nn \cs_set_nopar:Npn { #1 #2 } { @@ -2078,7 +2079,7 @@ \m@th #1 \dim_zero:N \nulldelimiterspace - \XeTeXradical \g__um_empty_fam \c_zero { #2 } + \XeTeXradical \c_two_hundred_fifty_five \c_zero { #2 } \c_math_toggle_token \color@endgroup } @@ -2089,6 +2090,7 @@ } \box_use_clear:N \l_tmpa_box } + } \AtEndOfPackageFile * { mathtools } { \cs_set_eq:NN \MToverbracket \overbracket @@ -2116,8 +2118,7 @@ \let\Uunderbracket=\underbracket \let\overbracket =\MToverbracket \let\underbracket =\MTunderbracket - } - } + }% end of AtBeginDocument \msg_warning:nn { unicode-math } { mathtools-colon } \NewDocumentCommand \dblcolon { } { \Colon } \NewDocumentCommand \coloneqq { } { \coloneq } 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 62ee5eff1af..34cddda2e48 100644 --- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty +++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty @@ -19,7 +19,7 @@ %% %% This work is "maintained" by Will Robertson. \ProvidesPackage{unicode-math} - [2017/01/27 v0.8d Unicode maths in XeLaTeX and LuaLaTeX] + [2017/07/30 v0.8e Unicode maths in XeLaTeX and LuaLaTeX] \usepackage{ifxetex,ifluatex} \ifxetex \ifdim\number\XeTeXversion\XeTeXrevision in<0.9998in% |