summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/unicode-math
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-30 22:21:18 +0000
committerKarl Berry <karl@freefriends.org>2020-01-30 22:21:18 +0000
commitdd475bb681af7e9e30dc6f78375cf141a894895d (patch)
treef0ee851159daea8a0ebe5b6636837025c378b22a /Master/texmf-dist/source/latex/unicode-math
parent109e4bdbf6b08b4b28058faad75931a9eb80e5be (diff)
unicode-math (30jan20)
git-svn-id: svn://tug.org/texlive/trunk@53609 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/um-code-main.dtx14
-rw-r--r--Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx37
-rw-r--r--Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx23
3 files changed, 46 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx
index 2c6e7bb7db9..ff132044e05 100644
--- a/Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx
+++ b/Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx
@@ -264,17 +264,17 @@
\cs_if_exist:cF { sym \l_@@_symfont_label_tl }
{
\DeclareSymbolFont{\l_@@_symfont_label_tl}
- {\encodingdefault}{\l_@@_family_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l_@@_family_tl}{\mddefault}{\shapedefault}
}
\SetSymbolFont{\l_@@_symfont_label_tl}{\l_@@_mversion_tl}
- {\encodingdefault}{\l_@@_family_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l_@@_family_tl}{\mddefault}{\shapedefault}
% \end{macrocode}
% Set the bold math version.
% \begin{macrocode}
\str_if_eq:eeT {\l_@@_mversion_tl} {normal}
{
\SetSymbolFont{\l_@@_symfont_label_tl}{bold}
- {\encodingdefault}{\l_@@_family_tl}{\bfdefault}{\updefault}
+ {\encodingdefault}{\l_@@_family_tl}{\bfdefault}{\shapedefault}
}
}
% \end{macrocode}
@@ -312,12 +312,12 @@
} {\l_@@_fontname_tl}
\SetSymbolFont{symbols}{\l_@@_mversion_tl}
- {\encodingdefault}{\l_@@_fam_two_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l_@@_fam_two_tl}{\mddefault}{\shapedefault}
\str_if_eq:eeT {\l_@@_mversion_tl} {normal}
{
\SetSymbolFont{symbols}{bold}
- {\encodingdefault}{\l_@@_fam_two_tl}{\bfdefault}{\updefault}
+ {\encodingdefault}{\l_@@_fam_two_tl}{\bfdefault}{\shapedefault}
}
}
% \end{macrocode}
@@ -343,12 +343,12 @@
} {\l_@@_fontname_tl}
\SetSymbolFont{largesymbols}{\l_@@_mversion_tl}
- {\encodingdefault}{\l_@@_fam_three_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l_@@_fam_three_tl}{\mddefault}{\shapedefault}
\str_if_eq:eeT {\l_@@_mversion_tl} {normal}
{
\SetSymbolFont{largesymbols}{bold}
- {\encodingdefault}{\l_@@_fam_three_tl}{\bfdefault}{\updefault}
+ {\encodingdefault}{\l_@@_fam_three_tl}{\bfdefault}{\shapedefault}
}
}
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx
index 602ba013524..d0024833780 100644
--- a/Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx
+++ b/Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx
@@ -32,10 +32,10 @@
\tl_if_empty:NT \l_@@_mversion_tl
{
\tl_set:Nn \l_@@_mversion_tl {normal}
- \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l_@@_tmpa_tl} {\mddefault} {\updefault}
+ \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l_@@_tmpa_tl} {\mddefault} {\shapedefault}
}
- \SetMathAlphabet #1 {\l_@@_mversion_tl} {\g_fontspec_encoding_tl} {\l_@@_tmpa_tl} {\mddefault} {\updefault}
+ \SetMathAlphabet #1 {\l_@@_mversion_tl} {\g_fontspec_encoding_tl} {\l_@@_tmpa_tl} {\mddefault} {\shapedefault}
% integrate with fontspec's \setmathrm etc:
\tl_case:Nn #1
@@ -169,35 +169,48 @@
%
% \subsubsection{Maths font}
%
-% If the maths fonts are set explicitly, then the text commands above will not execute their branches to set the maths font alphabets.
+% If the maths fonts are set explicitly, then the text commands above will not execute
+% their branches to set the maths font alphabets.
+%
+% Helper macro for looking up customisable series' by family (new \LaTeXe\ feature 2020).
+% \begin{macrocode}
+\cs_new:Nn \@@_rm_series_default:n
+ {
+ \ifcsname #1series@rm\endcsname
+ \csname #1series@rm\endcsname
+ \else
+ \csname #1default\endcsname
+ \fi
+ }
+% \end{macrocode}
% \begin{macrocode}
\@@_cs_set:Nn \__fontspec_setmathrm_hook:nn
{
- \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault
- \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\itdefault
- \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault
+ \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\@@_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\@@_rm_series_default:n {md}}\itdefault
+ \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\@@_rm_series_default:n {bf}}\shapedefault
}
% \end{macrocode}
% \begin{macrocode}
\@@_cs_set:Nn \__fontspec_setboldmathrm_hook:nn
{
- \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\updefault
- \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\bfdefault\updefault
+ \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\@@_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\@@_rm_series_default:n {bf}}\shapedefault
\SetMathAlphabet\mathit{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\itdefault
}
% \end{macrocode}
% \begin{macrocode}
\@@_cs_set:Nn \__fontspec_setmathsf_hook:nn
{
- \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl\mddefault\updefault
- \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl\bfdefault\updefault
+ \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\@@_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\@@_rm_series_default:n {bf}}\shapedefault
}
% \end{macrocode}
% \begin{macrocode}
\@@_cs_set:Nn \__fontspec_setmathtt_hook:nn
{
- \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault
- \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault
+ \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\@@_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\@@_rm_series_default:n {bf}}\shapedefault
}
% \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 3aee6d530b0..1253cab5d49 100644
--- a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
+++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
@@ -60,15 +60,15 @@
%<base>\ProvidesExplPackage{unicode-math}
%<package&XE>\ProvidesExplPackage{unicode-math-xetex}
%<package&LU>\ProvidesExplPackage{unicode-math-luatex}
-%<base|package> {2019/09/26} {0.8p} {Unicode maths in XeLaTeX and LuaLaTeX}
+%<base|package> {2020/01/31} {0.8q} {Unicode maths in XeLaTeX and LuaLaTeX}
% \end{macrocode}
%
% Here the version and date are setup for typesetting the documentation.
% \begin{macrocode}
%<*dtx>
\date{
- \def\filedate{2019/09/26}
- \def\fileversion{0.8p}
+ \def\filedate{2020/01/31}
+ \def\fileversion{0.8q}
\filedate \qquad \fileversion
}
%</dtx>
@@ -80,14 +80,19 @@
% and then splits into a XeTeX- or LuaTeX-specific version of the package.
%
% \begin{macrocode}
-%<base>\sys_if_engine_luatex:T { \RequirePackageWithOptions{unicode-math-luatex} }
-%<base>\sys_if_engine_xetex:T { \RequirePackageWithOptions{unicode-math-xetex} }
-%<base>\sys_if_engine_pdftex:T
+%<base>\sys_if_engine_luatex:T
%<base> {
-%<base> \msg_new:nnn {unicode-math} {not-pdftex}
-%<base> { Cannot~ be~ run~ with~ pdfLaTeX!\\ Use~ XeLaTeX~ or~ LuaLaTeX~ instead. }
-%<base> \msg_error:nn {unicode-math} {not-pdftex}
+%<base> \RequirePackageWithOptions{unicode-math-luatex}
+%<base> \endinput
%<base> }
+%<base>\sys_if_engine_xetex:T
+%<base> {
+%<base> \RequirePackageWithOptions{unicode-math-xetex}
+%<base> \endinput
+%<base> }
+%<base>\msg_new:nnn {unicode-math} {unsupported-engine}
+%<base> { Cannot~ be~ run~ with~ \c_sys_engine_str!\\ Use~ XeLaTeX~ or~ LuaLaTeX~ instead. }
+%<base>\msg_error:nn {unicode-math} {unsupported-engine}
%<base>\endinput
% \end{macrocode}