diff options
author | Karl Berry <karl@freefriends.org> | 2020-01-30 22:21:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-01-30 22:21:18 +0000 |
commit | dd475bb681af7e9e30dc6f78375cf141a894895d (patch) | |
tree | f0ee851159daea8a0ebe5b6636837025c378b22a /Master | |
parent | 109e4bdbf6b08b4b28058faad75931a9eb80e5be (diff) |
unicode-math (30jan20)
git-svn-id: svn://tug.org/texlive/trunk@53609 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/CHANGES.md | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/unicode-math-code.pdf | bin | 323520 -> 325165 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf | bin | 162731 -> 162723 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/unimath-example.pdf | bin | 22002 -> 21851 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf | bin | 1208308 -> 1194223 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/unicode-math/um-code-main.dtx | 14 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx | 37 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx | 23 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty | 46 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty | 46 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty | 19 |
11 files changed, 118 insertions, 73 deletions
diff --git a/Master/texmf-dist/doc/latex/unicode-math/CHANGES.md b/Master/texmf-dist/doc/latex/unicode-math/CHANGES.md index 01dcd8a4627..facafe80802 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/CHANGES.md +++ b/Master/texmf-dist/doc/latex/unicode-math/CHANGES.md @@ -1,6 +1,12 @@ CHANGE HISTORY ============== +## v0.8q (2020/01/31) + + * Update to adapt to / support new features in the upcoming 2e kernel. + * Give a better error message if used on non-supported engines that are not pdfTeX. + + ## v0.8p (2019/09/26) * Remove dependency on `filehook` package. Just to simplify. diff --git a/Master/texmf-dist/doc/latex/unicode-math/unicode-math-code.pdf b/Master/texmf-dist/doc/latex/unicode-math/unicode-math-code.pdf Binary files differindex c251d66a182..9d870971734 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/unicode-math-code.pdf +++ b/Master/texmf-dist/doc/latex/unicode-math/unicode-math-code.pdf 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 41da2850e61..1d2cf0948a8 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-example.pdf b/Master/texmf-dist/doc/latex/unicode-math/unimath-example.pdf Binary files differindex 315e19f2683..a339e72f9dd 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/unimath-example.pdf +++ b/Master/texmf-dist/doc/latex/unicode-math/unimath-example.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 Binary files differindex bd55866e6bb..c2b54bc2577 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/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} 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 15c2acd6122..93f2092c73d 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 @@ -43,7 +43,7 @@ %%^^A%% Metadata for the package code, including files and versioning \ProvidesExplPackage{unicode-math-luatex} - {2019/09/26} {0.8p} {Unicode maths in XeLaTeX and LuaLaTeX} + {2020/01/31} {0.8q} {Unicode maths in XeLaTeX and LuaLaTeX} %%^^A%% um-code-opening.dtx -- part of UNICODE-MATH <wspr.io/unicode-math> %%^^A%% Assorted initialisation tasks, including some low-level function definitions. @@ -1108,10 +1108,10 @@ \tl_if_empty:NT \l__um_mversion_tl { \tl_set:Nn \l__um_mversion_tl {normal} - \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault} + \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\shapedefault} } - \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault} + \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\shapedefault} % integrate with fontspec's \setmathrm etc: \tl_case:Nn #1 @@ -1173,27 +1173,35 @@ \__fontspec_setmathtt_hook:nn {#1} {#2} } } +\cs_new:Nn \__um_rm_series_default:n + { + \ifcsname #1series@rm\endcsname + \csname #1series@rm\endcsname + \else + \csname #1default\endcsname + \fi + } \__um_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{\__um_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {md}}\itdefault + \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {bf}}\shapedefault } \__um_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{\__um_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\__um_rm_series_default:n {bf}}\shapedefault \SetMathAlphabet\mathit{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\itdefault } \__um_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{\__um_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\__um_rm_series_default:n {bf}}\shapedefault } \__um_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{\__um_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\__um_rm_series_default:n {bf}}\shapedefault } \tl_if_eq:onF {\g__fontspec_mathrm_tl} {\rmdefault} { \__fontspec_setmathrm_hook:nn {} {} } \tl_if_eq:onF {\g__fontspec_mathsf_tl} {\sfdefault} { \__fontspec_setmathsf_hook:nn {} {} } @@ -1385,14 +1393,14 @@ \cs_if_exist:cF { sym \l__um_symfont_label_tl } { \DeclareSymbolFont{\l__um_symfont_label_tl} - {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l__um_family_tl}{\mddefault}{\shapedefault} } \SetSymbolFont{\l__um_symfont_label_tl}{\l__um_mversion_tl} - {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l__um_family_tl}{\mddefault}{\shapedefault} \str_if_eq:eeT {\l__um_mversion_tl} {normal} { \SetSymbolFont{\l__um_symfont_label_tl}{bold} - {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault} + {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\shapedefault} } } \__um_cs_new:Nn \__um_setup_legacy_fam_two: @@ -1422,12 +1430,12 @@ } {\l__um_fontname_tl} \SetSymbolFont{symbols}{\l__um_mversion_tl} - {\encodingdefault}{\l__um_fam_two_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l__um_fam_two_tl}{\mddefault}{\shapedefault} \str_if_eq:eeT {\l__um_mversion_tl} {normal} { \SetSymbolFont{symbols}{bold} - {\encodingdefault}{\l__um_fam_two_tl}{\bfdefault}{\updefault} + {\encodingdefault}{\l__um_fam_two_tl}{\bfdefault}{\shapedefault} } } \__um_cs_new:Nn \__um_setup_legacy_fam_three: @@ -1447,12 +1455,12 @@ } {\l__um_fontname_tl} \SetSymbolFont{largesymbols}{\l__um_mversion_tl} - {\encodingdefault}{\l__um_fam_three_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l__um_fam_three_tl}{\mddefault}{\shapedefault} \str_if_eq:eeT {\l__um_mversion_tl} {normal} { \SetSymbolFont{largesymbols}{bold} - {\encodingdefault}{\l__um_fam_three_tl}{\bfdefault}{\updefault} + {\encodingdefault}{\l__um_fam_three_tl}{\bfdefault}{\shapedefault} } } \__um_cs_new:Nn \__um_onceoff_setup: 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 ef94a2d76f0..7940047c1a6 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 @@ -43,7 +43,7 @@ %%^^A%% Metadata for the package code, including files and versioning \ProvidesExplPackage{unicode-math-xetex} - {2019/09/26} {0.8p} {Unicode maths in XeLaTeX and LuaLaTeX} + {2020/01/31} {0.8q} {Unicode maths in XeLaTeX and LuaLaTeX} %%^^A%% um-code-opening.dtx -- part of UNICODE-MATH <wspr.io/unicode-math> %%^^A%% Assorted initialisation tasks, including some low-level function definitions. @@ -1099,10 +1099,10 @@ \tl_if_empty:NT \l__um_mversion_tl { \tl_set:Nn \l__um_mversion_tl {normal} - \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault} + \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\shapedefault} } - \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault} + \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\shapedefault} % integrate with fontspec's \setmathrm etc: \tl_case:Nn #1 @@ -1164,27 +1164,35 @@ \__fontspec_setmathtt_hook:nn {#1} {#2} } } +\cs_new:Nn \__um_rm_series_default:n + { + \ifcsname #1series@rm\endcsname + \csname #1series@rm\endcsname + \else + \csname #1default\endcsname + \fi + } \__um_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{\__um_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {md}}\itdefault + \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {bf}}\shapedefault } \__um_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{\__um_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\__um_rm_series_default:n {bf}}\shapedefault \SetMathAlphabet\mathit{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\itdefault } \__um_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{\__um_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\__um_rm_series_default:n {bf}}\shapedefault } \__um_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{\__um_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\__um_rm_series_default:n {bf}}\shapedefault } \tl_if_eq:onF {\g__fontspec_mathrm_tl} {\rmdefault} { \__fontspec_setmathrm_hook:nn {} {} } \tl_if_eq:onF {\g__fontspec_mathsf_tl} {\sfdefault} { \__fontspec_setmathsf_hook:nn {} {} } @@ -1349,14 +1357,14 @@ \cs_if_exist:cF { sym \l__um_symfont_label_tl } { \DeclareSymbolFont{\l__um_symfont_label_tl} - {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l__um_family_tl}{\mddefault}{\shapedefault} } \SetSymbolFont{\l__um_symfont_label_tl}{\l__um_mversion_tl} - {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l__um_family_tl}{\mddefault}{\shapedefault} \str_if_eq:eeT {\l__um_mversion_tl} {normal} { \SetSymbolFont{\l__um_symfont_label_tl}{bold} - {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault} + {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\shapedefault} } } \__um_cs_new:Nn \__um_setup_legacy_fam_two: @@ -1386,12 +1394,12 @@ } {\l__um_fontname_tl} \SetSymbolFont{symbols}{\l__um_mversion_tl} - {\encodingdefault}{\l__um_fam_two_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l__um_fam_two_tl}{\mddefault}{\shapedefault} \str_if_eq:eeT {\l__um_mversion_tl} {normal} { \SetSymbolFont{symbols}{bold} - {\encodingdefault}{\l__um_fam_two_tl}{\bfdefault}{\updefault} + {\encodingdefault}{\l__um_fam_two_tl}{\bfdefault}{\shapedefault} } } \__um_cs_new:Nn \__um_setup_legacy_fam_three: @@ -1411,12 +1419,12 @@ } {\l__um_fontname_tl} \SetSymbolFont{largesymbols}{\l__um_mversion_tl} - {\encodingdefault}{\l__um_fam_three_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l__um_fam_three_tl}{\mddefault}{\shapedefault} \str_if_eq:eeT {\l__um_mversion_tl} {normal} { \SetSymbolFont{largesymbols}{bold} - {\encodingdefault}{\l__um_fam_three_tl}{\bfdefault}{\updefault} + {\encodingdefault}{\l__um_fam_three_tl}{\bfdefault}{\shapedefault} } } \__um_cs_new:Nn \__um_onceoff_setup: 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 26759e8d0a9..24aa8c32739 100644 --- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty +++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty @@ -24,14 +24,19 @@ \RequirePackage{expl3} \ProvidesExplPackage{unicode-math} - {2019/09/26} {0.8p} {Unicode maths in XeLaTeX and LuaLaTeX} -\sys_if_engine_luatex:T { \RequirePackageWithOptions{unicode-math-luatex} } -\sys_if_engine_xetex:T { \RequirePackageWithOptions{unicode-math-xetex} } -\sys_if_engine_pdftex:T + {2020/01/31} {0.8q} {Unicode maths in XeLaTeX and LuaLaTeX} +\sys_if_engine_luatex:T { - \msg_new:nnn {unicode-math} {not-pdftex} - { Cannot~ be~ run~ with~ pdfLaTeX!\\ Use~ XeLaTeX~ or~ LuaLaTeX~ instead. } - \msg_error:nn {unicode-math} {not-pdftex} + \RequirePackageWithOptions{unicode-math-luatex} + \endinput } +\sys_if_engine_xetex:T + { + \RequirePackageWithOptions{unicode-math-xetex} + \endinput + } +\msg_new:nnn {unicode-math} {unsupported-engine} + { Cannot~ be~ run~ with~ \c_sys_engine_str!\\ Use~ XeLaTeX~ or~ LuaLaTeX~ instead. } +\msg_error:nn {unicode-math} {unsupported-engine} \endinput |