summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-15 22:23:04 +0000
committerKarl Berry <karl@freefriends.org>2019-02-15 22:23:04 +0000
commitb12bc2332f229d9a6b10ce0e6ae81cd2870d644d (patch)
tree8efe6d848317f5b0b179949e8c8eae42e5b7ec11 /Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx
parentc8f41ea19d9e98226e6da3d4544f848440659030 (diff)
unicode-math (15feb19)
git-svn-id: svn://tug.org/texlive/trunk@50032 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx')
-rw-r--r--Master/texmf-dist/source/latex/unicode-math/um-code-mathtext.dtx39
1 files changed, 20 insertions, 19 deletions
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 a12a8b6dabe..602ba013524 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
@@ -19,14 +19,15 @@
% \end{macrocode}
%
% \begin{macrocode}
-\cs_set:Nn \@@_setmathfontface:Nnn
+\@@_cs_new:Nn \@@_setmathfontface:Nnn
{
\tl_clear:N \l_@@_mversion_tl
\keys_set_known:nnN {@@_mathface} {#2} \l_@@_keyval_clist
- \exp_args:Nnx \fontspec_set_family:Nxn \l_@@_tmpa_tl
- { ItalicFont={}, BoldFont={}, \exp_not:V \l_@@_keyval_clist } {#3}
+ \fontspec_set_family:Nxx \l_@@_tmpa_tl
+ { ItalicFont={}, BoldFont={}, SmallCapsFont={}, \exp_not:V \l_@@_keyval_clist }
+ { #3 }
\tl_if_empty:NT \l_@@_mversion_tl
{
@@ -113,8 +114,8 @@
{
\cs_set_eq:NN \@@_group_begin: \@@_group_begin_frozen:
\cs_set_eq:NN \@@_group_end:n \@@_group_end_frozen:n
- \cs_set_eq:NN \math@bgroup \@@math@bgroup
- \cs_set_eq:NN \math@egroup \@@math@egroup
+ \cs_set_eq:NN \math@bgroup \@@@@math@bgroup
+ \cs_set_eq:NN \math@egroup \@@@@math@egroup
}
\cs_set_eq:NN \math@egroup \@@_group_end:n
#1 \scan_stop:
@@ -133,34 +134,34 @@
%
% \begin{macrocode}
\cs_generate_variant:Nn \tl_if_eq:nnT {o}
-\cs_set:Nn \__fontspec_setmainfont_hook:nn
+\@@_cs_set:Nn \__fontspec_setmainfont_hook:nn
{
\tl_if_eq:onT {\g__fontspec_mathrm_tl} {\rmdefault}
{
-%<XE> \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {#1} {#2}
-%<LU> \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {Renderer=Basic,#1} {#2}
+%<XE> \fontspec_gset_family:Nnn \g__fontspec_mathrm_tl {#1} {#2}
+%<LU> \fontspec_gset_family:Nnn \g__fontspec_mathrm_tl {Renderer=Basic,#1} {#2}
\__fontspec_setmathrm_hook:nn {#1} {#2}
}
}
% \end{macrocode}
% \begin{macrocode}
-\cs_set:Nn \__fontspec_setsansfont_hook:nn
+\@@_cs_set:Nn \__fontspec_setsansfont_hook:nn
{
\tl_if_eq:onT {\g__fontspec_mathsf_tl} {\sfdefault}
{
-%<XE> \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {#1} {#2}
-%<LU> \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {Renderer=Basic,#1} {#2}
+%<XE> \fontspec_gset_family:Nnn \g__fontspec_mathsf_tl {#1} {#2}
+%<LU> \fontspec_gset_family:Nnn \g__fontspec_mathsf_tl {Renderer=Basic,#1} {#2}
\__fontspec_setmathsf_hook:nn {#1} {#2}
}
}
% \end{macrocode}
% \begin{macrocode}
-\cs_set:Nn \__fontspec_setmonofont_hook:nn
+\@@_cs_set:Nn \__fontspec_setmonofont_hook:nn
{
\tl_if_eq:onT {\g__fontspec_mathtt_tl} {\ttdefault}
{
-%<XE> \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {#1} {#2}
-%<LU> \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {Renderer=Basic,#1} {#2}
+%<XE> \fontspec_gset_family:Nnn \g__fontspec_mathtt_tl {#1} {#2}
+%<LU> \fontspec_gset_family:Nnn \g__fontspec_mathtt_tl {Renderer=Basic,#1} {#2}
\__fontspec_setmathtt_hook:nn {#1} {#2}
}
}
@@ -170,7 +171,7 @@
%
% If the maths fonts are set explicitly, then the text commands above will not execute their branches to set the maths font alphabets.
% \begin{macrocode}
-\cs_set:Nn \__fontspec_setmathrm_hook:nn
+\@@_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
@@ -178,7 +179,7 @@
}
% \end{macrocode}
% \begin{macrocode}
-\cs_set:Nn \__fontspec_setboldmathrm_hook:nn
+\@@_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
@@ -186,14 +187,14 @@
}
% \end{macrocode}
% \begin{macrocode}
-\cs_set:Nn \__fontspec_setmathsf_hook:nn
+\@@_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
}
% \end{macrocode}
% \begin{macrocode}
-\cs_set:Nn \__fontspec_setmathtt_hook:nn
+\@@_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
@@ -236,7 +237,7 @@
% the conditions of the LaTeX Project Public License, version 1.3c or higher
% (your choice): <http://www.latex-project.org/lppl/>.
% ------------------------------------------------
-% Copyright 2006-2018 Will Robertson, LPPL "maintainer"
+% Copyright 2006-2019 Will Robertson, LPPL "maintainer"
% Copyright 2010-2017 Philipp Stephani
% Copyright 2011-2017 Joseph Wright
% Copyright 2012-2015 Khaled Hosny