diff options
Diffstat (limited to 'Master/texmf-dist/tex')
3 files changed, 66 insertions, 45 deletions
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 |