From b12bc2332f229d9a6b10ce0e6ae81cd2870d644d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 Feb 2019 22:23:04 +0000 Subject: unicode-math (15feb19) git-svn-id: svn://tug.org/texlive/trunk@50032 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/unicode-math/um-code-alphabets.dtx | 2 +- .../source/latex/unicode-math/um-code-amsmath.dtx | 5 +- .../source/latex/unicode-math/um-code-api.dtx | 2 +- .../source/latex/unicode-math/um-code-compat.dtx | 20 ++-- .../source/latex/unicode-math/um-code-epilogue.dtx | 8 +- .../source/latex/unicode-math/um-code-fontopt.dtx | 7 +- .../latex/unicode-math/um-code-fontparam.dtx | 10 +- .../source/latex/unicode-math/um-code-main.dtx | 94 +++++++--------- .../source/latex/unicode-math/um-code-mathmap.dtx | 18 +-- .../source/latex/unicode-math/um-code-mathtext.dtx | 39 +++---- .../source/latex/unicode-math/um-code-msg.dtx | 11 +- .../source/latex/unicode-math/um-code-opening.dtx | 121 ++++++++++----------- .../source/latex/unicode-math/um-code-pkgopt.dtx | 2 +- .../source/latex/unicode-math/um-code-primes.dtx | 4 +- .../source/latex/unicode-math/um-code-setchar.dtx | 24 ++-- .../source/latex/unicode-math/um-code-sscript.dtx | 8 +- .../latex/unicode-math/um-code-sym-commands.dtx | 19 ++-- .../source/latex/unicode-math/um-code-ui.dtx | 2 +- .../source/latex/unicode-math/um-code-usv.dtx | 2 +- .../latex/unicode-math/um-code-variables.dtx | 15 ++- .../source/latex/unicode-math/unicode-math.dtx | 8 +- .../source/latex/unicode-math/unicode-math.ins | 2 +- 22 files changed, 212 insertions(+), 211 deletions(-) (limited to 'Master/texmf-dist/source/latex/unicode-math') diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-alphabets.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-alphabets.dtx index f36613f05da..fd6dd322c8e 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-alphabets.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-alphabets.dtx @@ -925,7 +925,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-amsmath.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-amsmath.dtx index e75bc6a0b45..bc782ba88c4 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-amsmath.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-amsmath.dtx @@ -107,8 +107,7 @@ { \bool_if:nTF { - \int_compare_p:nNn { \uproot@ } = { \c_zero } - && \int_compare_p:nNn { \leftroot@ } = { \c_zero } + \@@_int_if_zero_p:n \uproot@ && \@@_int_if_zero_p:n \leftroot@ } { \Uroot \c_@@_radical_sqrt_tl { #1 } { #2 } @@ -216,7 +215,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-api.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-api.dtx index c319601fb2b..69a6f5a0311 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-api.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-api.dtx @@ -34,7 +34,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-compat.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-compat.dtx index 3e97d36c183..a5f05c81b39 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-compat.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-compat.dtx @@ -52,21 +52,17 @@ % \section{Patching/augmenting 3rd-party packages} % % \subsection{\pkg{url}} -% -% Simply need to get \pkg{url} in a state such that +% Here we need to get \pkg{url} in a state such that % when it switches to math mode and enters \ascii\ characters, the maths % setup (i.e., \pkg{unicode-math}) doesn't remap the symbols into Plane 1. -% Which is, of course, what \cs{mathup} is doing. -% -% This is the same as writing, e.g., |\def\UrlFont{\ttfamily\@@_switchto_up:}| -% but activates automatically so old documents that might change the \cs{url} -% font still work correctly. -% -% TODO: check still needed now we have symup vs mathrm +% Which is what \cs{symliteral} is intended to do. +% This is the same as writing, e.g., |\def\UrlFont{\ttfamily\@@_switch_to:n{literal}}| +% but activates automatically so documents that might change the \cs{url} +% font through the standard interface still work correctly. % \begin{macrocode} \AtEndOfPackageFile * {url} { - \tl_put_left:Nn \Url@FormatString { \@@_switch_to:n {up} } + \tl_put_left:Nn \Url@FormatString { \@@_switch_to:n {literal} } \tl_put_right:Nn \UrlSpecials { \do \` { \mathchar`\` } @@ -119,7 +115,7 @@ \color@setgroup \c_math_toggle_token \m@th #1 \dim_zero:N \nulldelimiterspace - \XeTeXradical \c_two_hundred_fifty_five \c_zero { #2 } + \XeTeXradical 255 ~ 0 ~ { #2 } \c_math_toggle_token \color@endgroup } \box_set_ht:Nn \l_tmpa_box @@ -246,7 +242,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-epilogue.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-epilogue.dtx index 75fc6ec9b80..9c10ee0ddfc 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-epilogue.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-epilogue.dtx @@ -383,6 +383,12 @@ \@@_undeclare_symbol:N \bracevert % \end{macrocode} % +% \section{A secret hook} +% This will be executed after most if not all of the standard unicode-math setup. +% \begin{macrocode} +\AtBeginDocument{\g_@@_secret_hook_tl} +% \end{macrocode} +% % \begin{macrocode} % % \end{macrocode} @@ -405,7 +411,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-fontopt.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-fontopt.dtx index db6edd40b0a..acd1117e34f 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-fontopt.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-fontopt.dtx @@ -41,7 +41,7 @@ range .code:n = { \bool_if:NF \g_@@_main_font_defined_bool { \@@_error:n {no-main-font} } - \bool_set_false:N \l_@@_init_bool + \bool_gset_false:N \g_@@_init_bool \@@_range_init: \group_begin: \seq_map_inline:Nn \g_@@_mathclasses_seq @@ -64,7 +64,7 @@ % Math symbols are defined with \cmd\_@@_sym:nnn; see \secref{mathsymbol} % for the individual definitions % \begin{macrocode} -\cs_new:Nn \@@_range_init: +\@@_cs_new:Nn \@@_range_init: { \int_gincr:N \g_@@_fam_int \tl_set:Nx \l_@@_symfont_label_tl {@@_fam\int_use:N\g_@@_fam_int} @@ -111,7 +111,6 @@ % \begin{macrocode} \cs_new:Nn \@@_mathalph_decl:nF { - \tl_set:Nn \l_@@_tmpa_tl {#1} \tl_clear:N \l_@@_tmpb_tl \tl_clear:N \l_@@_tmpc_tl @@ -318,7 +317,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-fontparam.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-fontparam.dtx index 18006feaddb..9d43d0c18c1 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-fontparam.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-fontparam.dtx @@ -36,7 +36,7 @@ % For \XeTeX, define \meta{command} as a new quark. % \begin{macrocode} \cs_new_protected_nopar:Nn \@@_new_cramped_style:N -% { \quark_new:N #1 } +% { \tl_const:Nn #1 { \use_none:n #1 } } % { % \cs_if_exist:NF #1 % { \cs_new_eq:Nc #1 { luatex \cs_to_str:N #1 } } @@ -114,7 +114,7 @@ % \end{macrocode} % Which family to use? % \begin{macrocode} - \c_two + 2~ } % % \end{macrocode} @@ -289,11 +289,11 @@ % \begin{macrocode} \cs_new:Nn \@@_fontdimen_to_percent:nN { - \fp_eval:n { \dim_to_decimal:n { \fontdimen #1 #2 } * 65536 / 100 } + \fp_eval:n { \dim_to_decimal:n { 65536 \fontdimen #1 #2 } / 100 } } \cs_new:Nn \@@_fontdimen_to_scale:nN { - \fp_eval:n { \@@_fontdimen_to_percent:nN {#1} #2 * \f@size } pt + \fp_eval:n { \@@_fontdimen_to_percent:nN {#1} #2 * \f@size } } % \end{macrocode} % \end{macro} @@ -336,7 +336,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 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 907556283fb..aec2eb3d5a0 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 @@ -11,7 +11,7 @@ % \darg{keyval options} % \darg{font name/file} % \begin{macrocode} -\cs_set:Nn \@@_setmathfont:nn +\@@_cs_new:Nn \@@_setmathfont:nn { % \end{macrocode} % \begin{itemize} @@ -35,14 +35,12 @@ \keys_set_known:nnN {unicode-math} {#1} \l_@@_unknown_keys_clist - \bool_if:NT \l_@@_init_bool - { - \@@_fontspec_trial_font: - \@@_declare_math_sizes: - } + \bool_if:NT \g_@@_init_bool \@@_fontspec_trial_font: + \bool_if:NT \g_@@_init_bool \@@_declare_math_sizes: + \@@_fontspec_select_font: \@@_setup_math_fam: - \bool_if:NT \l_@@_init_bool + \bool_if:NT \g_@@_init_bool { \@@_setup_legacy_fam_two: \@@_setup_legacy_fam_three: @@ -60,7 +58,7 @@ % this is an extensive part of the code; see Section~\ref{sec:mathmap}; % \end{itemize} % \begin{macrocode} - \bool_if:NT \l_@@_init_bool \@@_onceoff_setup: + \bool_if:NT \g_@@_init_bool \@@_onceoff_setup: \@@_remap_symbols: \@@_setup_mathactives: \@@_setup_delcodes: @@ -68,7 +66,7 @@ %% TODO: what of the above should only be run for the "default"/"main" font? - \bool_if:NTF \l_@@_init_bool + \bool_if:NTF \g_@@_init_bool { \bool_gset_true:N \g_@@_main_font_defined_bool % \@@_mathparam_store: @@ -87,16 +85,10 @@ % This needs to happen early so that all of the font-loading machinery executes before % the other `AtBeginDocument' code. % \begin{macrocode} -\AtBeginDocument { \@@_load_lm_if_necessary: } -\cs_new:Nn \@@_load_lm_if_necessary: +\AtBeginDocument { \bool_if:NF \g_@@_main_font_defined_bool \@@_load_lm: } +\@@_cs_new:Nn \@@_load_lm: { - \bool_if:NF \g_@@_main_font_defined_bool - { -%\typeout{SETTING~ DEFAULT~ FONT~(latinmodern-math)} - \setmathfont{latinmodern-math.otf} - [BoldFont={latinmodern-math.otf}] -%\typeout{END~ DEFAULT~ FONT)} - } + \setmathfont{latinmodern-math.otf}[BoldFont={latinmodern-math.otf}] } % \end{macrocode} % @@ -104,7 +96,7 @@ % Reset local variables. % Default to defining the font for every math symbol character. % \begin{macrocode} -\cs_new:Nn \@@_init:n +\@@_cs_new:Nn \@@_init:n { \tl_set:Nn \l_@@_fontname_tl {#1} \bool_gset_true:N \g_@@_ot_math_bool @@ -116,7 +108,7 @@ \tl_set_eq:NN \l_@@_script_font_tl \l_@@_fontname_tl \tl_set_eq:NN \l_@@_sscript_font_tl \l_@@_fontname_tl - \bool_set_true:N \l_@@_init_bool + \bool_gset_true:N \g_@@_init_bool \seq_gclear:N \g_@@_char_range_seq \clist_clear:N \l_@@_mathmap_charints_clist \seq_gclear:N \g_@@_mathalph_seq @@ -135,13 +127,13 @@ % Set the math sizes according to the recommended font parameters. % \begin{macrocode} \tl_new:N \g_@@_main_font_cmd_tl -\cs_new:Nn \@@_declare_math_sizes: +\cs_new:Nn \@@_sf_size: { \@@_fontdimen_to_scale:nN {10} \g_@@_trial_font } +\cs_new:Nn \@@_ssf_size: { \@@_fontdimen_to_scale:nN {11} \g_@@_trial_font } +\@@_cs_new:Nn \@@_declare_math_sizes: { \dim_compare:nF { \fontdimen 10 \g_@@_trial_font == 0pt } { - \DeclareMathSizes { \f@size } { \f@size } - { \@@_fontdimen_to_scale:nN {10} \g_@@_trial_font } - { \@@_fontdimen_to_scale:nN {11} \g_@@_trial_font } + \DeclareMathSizes { \f@size } { \f@size } { \@@_sf_size: } { \@@_ssf_size: } } } % \end{macrocode} @@ -151,12 +143,12 @@ % % \begin{macro}{\@@_fontspec_trial_font:} % \begin{macrocode} -\cs_new:Nn \@@_fontspec_trial_font: +\@@_cs_new:Nn \@@_fontspec_trial_font: { \tl_set:Nx \l_@@_font_keyval_tl { % Renderer = Basic, - BoldItalicFont = {}, ItalicFont = {}, + BoldItalicFont = {}, ItalicFont = {}, SmallCapsFont = {}, Script = Math, % FontAdjustment = { \@@_luatex_copy_fontdimens: }, \l_@@_unknown_keys_clist @@ -169,6 +161,7 @@ \exp_last_unbraced:NNo \@@_fontface_gset_eq:NN \g_@@_trial_font \font@name \fontspec_if_script:nF {math} { + \@@_warning:n {not-ot-math} \bool_gset_false:N \g_@@_ot_math_bool \bool_gset_false:N \g_@@_init_bool } @@ -180,15 +173,15 @@ % % \begin{macro}{\@@_fontspec_select_font:} % \begin{macrocode} -\cs_new:Nn \@@_fontspec_select_font: +\@@_cs_new:Nn \@@_fontspec_select_font: { - \fp_gset:Nn \g_@@_size_tfsf_fp { (\f@size +\sf@size )/2 } - \fp_gset:Nn \g_@@_size_sfssf_fp { (\sf@size+\ssf@size)/2 } + \fp_gset:Nn \g_@@_size_tfsf_fp { (\f@size + \@@_sf_size: )/2 } + \fp_gset:Nn \g_@@_size_sfssf_fp { (\@@_sf_size: + \@@_ssf_size:)/2 } \tl_set:Nx \l_@@_font_keyval_tl { % Renderer = Basic, - BoldItalicFont = {}, ItalicFont = {}, + BoldItalicFont = {}, ItalicFont = {}, SmallCapsFont = {}, Script = Math, SizeFeatures = { @@ -217,15 +210,10 @@ \fontfamily { \l_@@_family_tl } \selectfont \exp_last_unbraced:Nno \@@_fontface_gset_eq:cN {g_@@_mathfont_ \int_use:N \g_@@_fonts_used_int _font} \font@name \tl_gset:Nx \g_@@_curr_font_cmd_tl { \exp_not:c {g_@@_mathfont_ \int_use:N \g_@@_fonts_used_int _font} } - \bool_if:NT \l_@@_init_bool + \bool_if:NT \g_@@_init_bool { \exp_last_unbraced:NNo \@@_fontface_gset_eq:NN \l_@@_font \font@name } - \fontspec_if_script:nF {math} - { - \bool_gset_false:N \g_@@_ot_math_bool - \bool_gset_false:N \g_@@_init_bool - } \group_end: } % \end{macrocode} @@ -244,7 +232,7 @@ % might change the math params, which wouldn't be reflected in the fontdimens. % \begin{macrocode} %<*LU> -\cs_new_protected:Nn \@@_luatex_copy_fontdimens: +\@@_cs_new:Nn \@@_luatex_copy_fontdimens: { \@@_fontdimen_from_param:nn {10} {ScriptPercentScaleDown} \@@_fontdimen_from_param:nn {11} {ScriptScriptPercentScaleDown} @@ -271,7 +259,7 @@ % % \begin{macro}{\@@_setup_math_fam:} % \begin{macrocode} -\cs_new:Nn \@@_setup_math_fam: +\@@_cs_new:Nn \@@_setup_math_fam: { \cs_if_exist:cF { sym \l_@@_symfont_label_tl } { @@ -283,7 +271,7 @@ % \end{macrocode} % Set the bold math version. % \begin{macrocode} - \str_if_eq_x:nnT {\l_@@_mversion_tl} {normal} + \str_if_eq:eeT {\l_@@_mversion_tl} {normal} { \SetSymbolFont{\l_@@_symfont_label_tl}{bold} {\encodingdefault}{\l_@@_family_tl}{\bfdefault}{\updefault} @@ -295,12 +283,12 @@ % \begin{macro}{\@@_setup_legacy_fam_two:} % \TeX\ won't load the same font twice at the same scale, so we need to magnify this one by an imperceptable amount. % \begin{macrocode} -\cs_new:Nn \@@_setup_legacy_fam_two: +\@@_cs_new:Nn \@@_setup_legacy_fam_two: { \fontspec_set_family:Nxn \l_@@_fam_two_tl { \l_@@_font_keyval_tl, - Scale=1.00001, + ScaleAgain = 1.00001, FontAdjustment = { \@@_copy_fontdimen:nnN { 8} {43} \g_@@_main_font_cmd_tl @@ -324,7 +312,7 @@ \SetSymbolFont{symbols}{\l_@@_mversion_tl} {\encodingdefault}{\l_@@_fam_two_tl}{\mddefault}{\updefault} - \str_if_eq_x:nnT {\l_@@_mversion_tl} {normal} + \str_if_eq:eeT {\l_@@_mversion_tl} {normal} { \SetSymbolFont{symbols}{bold} {\encodingdefault}{\l_@@_fam_two_tl}{\bfdefault}{\updefault} @@ -336,12 +324,12 @@ % \begin{macro}{\@@_setup_legacy_fam_three:} % Similarly, this font is shrunk by an imperceptable amount for \TeX\ to load it again. % \begin{macrocode} -\cs_new:Nn \@@_setup_legacy_fam_three: +\@@_cs_new:Nn \@@_setup_legacy_fam_three: { \fontspec_set_family:Nxn \l_@@_fam_three_tl { \l_@@_font_keyval_tl, - Scale=0.99999, + ScaleAgain = 0.99999, FontAdjustment = { \@@_copy_fontdimen:nnN { 8} {48} \g_@@_main_font_cmd_tl \@@_copy_fontdimen:nnN { 9} {28} \g_@@_main_font_cmd_tl @@ -355,7 +343,7 @@ \SetSymbolFont{largesymbols}{\l_@@_mversion_tl} {\encodingdefault}{\l_@@_fam_three_tl}{\mddefault}{\updefault} - \str_if_eq_x:nnT {\l_@@_mversion_tl} {normal} + \str_if_eq:eeT {\l_@@_mversion_tl} {normal} { \SetSymbolFont{largesymbols}{bold} {\encodingdefault}{\l_@@_fam_three_tl}{\bfdefault}{\updefault} @@ -366,9 +354,9 @@ % % \begin{macro}{\@@_onceoff_setup:} % \begin{macrocode} -\cs_new:Nn \@@_onceoff_setup: +\@@_cs_new:Nn \@@_onceoff_setup: { - \@@_set_delcode:nnn {operators} {`\.} {\c_zero} + \@@_set_delcode:nnn {operators} {`\.} {0} } % \end{macrocode} % \end{macro} @@ -403,7 +391,7 @@ % This function is used to define the mathcodes for those chars which should % be mapped to a different glyph than themselves. % \begin{macrocode} -\cs_new:Nn \@@_remap_symbols: +\@@_cs_new:Nn \@@_remap_symbols: { \@@_remap_symbol:nnn {`\-} {\mathbin} {"2212} \@@_remap_symbol:nnn {`\*} {\mathbin} {"02217}% text asterisk to "centred asterisk" @@ -443,7 +431,7 @@ % TODO: if not an OpenType math font, we should ignore doing anything with primes. % This needs a revamped `range` feature, I think. % \begin{macrocode} -\cs_new:Npn \@@_setup_mathactives: +\@@_cs_new:Nn \@@_setup_mathactives: { \@@_make_mathactive:nNN {"2032} \@@_prime_single_mchar \mathord \@@_make_mathactive:nNN {"2033} \@@_prime_double_mchar \mathord @@ -514,7 +502,7 @@ % On the other hand, many fonts won't support them all being stretchy. % And some of them are probably not meant to stretch, either. But adding them here doesn't hurt. % \begin{macrocode} -\cs_new:Npn \@@_setup_delcodes: +\@@_cs_new:Nn \@@_setup_delcodes: { \@@_assign_delcode:nn {`\/} {\g_@@_slash_delimiter_usv} \@@_assign_delcode:nn {"2044} {\g_@@_slash_delimiter_usv} % fracslash @@ -605,7 +593,7 @@ % If the maths font were to be loaded later it would clobber our mathparam settings, so % this seems like a sensible move. % \begin{macrocode} -\cs_set:Nn \@@_mathparam_restore: +\@@_cs_new:Nn \@@_mathparam_restore: { \glb@settings \tl_use:N \g_@@_mathparam_settings_tl @@ -617,7 +605,7 @@ % \cs{glb@settings} is called to force maths fonts loading \emph{now} so the mathparams % are up-to-date. % \begin{macrocode} -\cs_set:Nn \@@_mathparam_store: +\@@_cs_new:Nn \@@_mathparam_store: { \glb@settings \tl_gset:Nx \g_@@_mathparam_settings_tl @@ -701,7 +689,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-mathmap.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-mathmap.dtx index acd876a40df..e55fe07c2ca 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-mathmap.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-mathmap.dtx @@ -20,9 +20,9 @@ % The INHERIT mode saves less time than I was hoping for but is still beneficial % in simple cases. % \begin{macrocode} -\cs_new:Npn \@@_setup_alphabets: +\@@_cs_new:Nn \@@_setup_alphabets: { - \bool_if:NTF \l_@@_init_bool { \@@_setup_alphabets_implicit: } + \bool_if:NTF \g_@@_init_bool { \@@_setup_alphabets_implicit: } { \seq_if_empty:NF \g_@@_mathalph_seq { \@@_setup_alphabets_explicit: } \clist_if_empty:NF \l_@@_mathmap_charints_clist { \@@_setup_alphabets_inherit: } @@ -33,7 +33,7 @@ % % \begin{macro}{ \@@_setup_alphabets_implicit:} % \begin{macrocode} -\cs_new:Nn \@@_setup_alphabets_implicit: +\@@_cs_new:Nn \@@_setup_alphabets_implicit: { \@@_log:n {setup-implicit} \seq_gset_eq:NN \g_@@_mathalph_seq \g_@@_default_mathalph_seq @@ -51,7 +51,7 @@ % % \begin{macro}{ \@@_setup_alphabets_explicit:} % \begin{macrocode} -\cs_new:Nn \@@_setup_alphabets_explicit: +\@@_cs_new:Nn \@@_setup_alphabets_explicit: { \@@_log:n {setup-explicit} \bool_set_false:N \l_@@_implicit_alph_bool @@ -65,7 +65,7 @@ % % \begin{macro}{ \@@_setup_alphabets_inherit:} % \begin{macrocode} -\cs_new:Nn \@@_setup_alphabets_inherit: +\@@_cs_new:Nn \@@_setup_alphabets_inherit: { \seq_gclear:N \g_@@_mathalph_seq \seq_map_inline:Nn \g_@@_default_mathalph_seq @@ -135,7 +135,7 @@ \tl_set:Nn \l_@@_alphabet_tl {##1} \@@_if_alphabet_exists:nnTF \l_@@_style_tl \l_@@_alphabet_tl { - \str_if_eq_x:nnTF {\l_@@_alphabet_tl} {misc} + \str_if_eq:eeTF {\l_@@_alphabet_tl} {misc} { \@@_maybe_init_alphabet:n \l_@@_style_tl \clist_map_break: @@ -162,13 +162,13 @@ % \dots and then loop through them defining the individual ranges: % (currently this process is slow) % \begin{macrocode} -\cs_new:Nn \@@_setup_math_alphabet: +\@@_cs_new:Nn \@@_setup_math_alphabet: { \clist_map_inline:Nn \l_@@_alphabet_clist { \tl_set:Nx \l_@@_alphabet_tl { \tl_trim_spaces:n {##1} } -%\typeout{_setup_math_alphabet:~\l_@@_style_tl/\l_@@_alphabet_tl} +%\@@_debug:n {_setup_math_alphabet:~\l_@@_style_tl/\l_@@_alphabet_tl} \@@_if_alphabet_exists:nnT {\l_@@_style_tl} {\l_@@_alphabet_tl} { @@ -586,7 +586,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 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} { -% \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {#1} {#2} -% \fontspec_set_family:Nnn \g__fontspec_mathrm_tl {Renderer=Basic,#1} {#2} +% \fontspec_gset_family:Nnn \g__fontspec_mathrm_tl {#1} {#2} +% \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} { -% \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {#1} {#2} -% \fontspec_set_family:Nnn \g__fontspec_mathsf_tl {Renderer=Basic,#1} {#2} +% \fontspec_gset_family:Nnn \g__fontspec_mathsf_tl {#1} {#2} +% \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} { -% \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {#1} {#2} -% \fontspec_set_family:Nnn \g__fontspec_mathtt_tl {Renderer=Basic,#1} {#2} +% \fontspec_gset_family:Nnn \g__fontspec_mathtt_tl {#1} {#2} +% \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): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-msg.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-msg.dtx index 9e51fd6600a..c93809cf4f4 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-msg.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-msg.dtx @@ -49,7 +49,7 @@ } \@@_msg_new:nn {missing-alphabets} { - Missingmathalphabetsinfont "\fontname\g_@@_curr_font_cmd_tl" \\ \\ + Missing math alphabets in font "\fontname\g_@@_curr_font_cmd_tl" \\ \\ \seq_map_function:NN \l_@@_missing_alph_seq \@@_print_indent:n } \cs_new:Nn \@@_print_indent:n { \space\space\space\space #1 \\ } @@ -119,6 +119,13 @@ No main maths font has been set up yet.\\If you simply want ‘the default’, use: \\ \iow_indent:n {\token_to_str:N\setmathfont{latinmodern-math.otf}} } +\@@_msg_new:nn {not-ot-math} + { + The first font loaded by unicode-math must be an OpenType Math font (with script=math). + If you simply want ‘the default’ before loading supplementary fonts over the top for certain + ranges, use: \\ + \iow_indent:n {\token_to_str:N\setmathfont{latinmodern-math.otf}} + } % \end{macrocode} % % \begin{macrocode} @@ -140,7 +147,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-opening.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-opening.dtx index 76fe65e33e3..b739fa6deae 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-opening.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-opening.dtx @@ -20,7 +20,6 @@ \RequirePackage{filehook} \RequirePackage{fix-cm} %\RequirePackage{lualatex-math} -%\RequirePackage{l3benchmark} % \end{macrocode} % % \subsection{\pkg{expl3} variants} @@ -32,7 +31,7 @@ % % For \pkg{fontspec}: % \begin{macrocode} -\cs_generate_variant:Nn \fontspec_set_family:Nnn {Nx} +\cs_generate_variant:Nn \fontspec_set_family:Nnn {Nx,Nxx} \cs_generate_variant:Nn \prop_get:NnNTF {cx} \cs_generate_variant:Nn \tl_if_eq:nnF {o} % \end{macrocode} @@ -56,7 +55,7 @@ % \begin{macrocode} \prg_new_conditional:Nnn \@@_glyph_if_exist:Nn {p,TF,T,F} { - \etex_iffontchar:D #1 #2 \scan_stop: + \tex_iffontchar:D #1 #2 \scan_stop: \prg_return_true: \else: \prg_return_false: @@ -231,6 +230,29 @@ % \end{macrocode} % \end{macro} % +%^^A \begin{function}[EXP, added = 2019-01-19]{\@@_int_if_zero_p:n, \@@_int_if_zero:nTF} +%^^A \begin{syntax} +%^^A \cs{int_if_zero_p:n} \Arg{intexpr} +%^^A \cs{int_if_zero:nTF} \Arg{intexpr} \Arg{true code} \Arg{false code} +%^^A \end{syntax} +%^^A A conditional for testing if the \meta{intexpr} evaluates to zero. +%^^A This is simply a shorthand for +%^^A \begin{verbatim} +%^^A \int_compare_p:nNn {intexpr} = {0} +%^^A \end{verbatim} +%^^A \end{function} +% +% \begin{macro}{\@@_int_if_zero_p:n} +% \begin{macro}{\@@_int_if_zero:nTF} +% \begin{macrocode} +\prg_new_conditional:Nnn \@@_int_if_zero:n {p,TF,T,F} + { + \int_compare:nNnTF {#1} = 0 {\prg_return_true:} {\prg_return_false:} + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% % % \subsection{Alphabet Unicode positions (USVs)} % @@ -284,7 +306,7 @@ % \end{macrocode} % % -% \subsection{Wrappers for message functions} +% \subsection{Wrappers for kernel commands} % % Messages themselves are defined in \secref{codemsg}. % @@ -304,80 +326,55 @@ % \end{macrocode} % % +% \begin{macro}{\@@_cs_new:Nn} % \begin{macrocode} -% -% \end{macrocode} - -\endinput - - -% \subsection{Sow/reap} -% -% This might make it into the kernel; not sure. -% Not actually used yet in the package! -% -% \begin{macro}{\__@@_sow_item:Nn} -% Helper variables for constructing \verb|c|-type arguments. -% \begin{macrocode} -\cs_new:Nn \__@@_sow_item:Nn { l___sow___ \token_to_str:N #1 ___ #2 ___tl } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\__@@_sow_int:N} -% Helper variables for constructing \verb|c|-type arguments. -% \begin{macrocode} -\cs_new:Nn \__@@_sow_int:N { l___sow___ \token_to_str:N #1 ___int } -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@@_sow_prepare:N} -% \begin{macrocode} -\cs_new:Nn \@@_sow_prepare:N +%<*debug> +\int_new:N \g_@@_debug_nest_int +\cs_new:Nn \@@_debug:n + { + \typeout{ ~\prg_replicate:nn \g_@@_debug_nest_int {::}~ #1} + } +\cs_new:Nn \@@_debug_start:n + { + \int_gincr:N \g_@@_debug_nest_int + \@@_debug:n {#1} + } +\cs_new:Nn \@@_debug_end:n { - \tl_clear:N #1 - \int_zero_new:c { \__@@_sow_int:N #1 } + \int_gdecr:N \g_@@_debug_nest_int } +% % \end{macrocode} -% \end{macro} % -% \begin{macro}{\@@_sow:Nn} % \begin{macrocode} -\cs_new:Nn \@@_sow:Nn +\cs_new:Npn \@@_cs_set:Nn #1 #2 { - \int_incr:c { \__@@_sow_int:N #1 } - \tl_clear_new:c + \cs_if_exist:NF #1 { \ERROR{CS~ DOES~ NOT~ EXIST,~ USE~ "NEW"} } + \cs_set_protected:Nn #1 { - \__@@_sow_item:Nn #1 - { \int_use:c { \__@@_sow_int:N #1 } } +%\@@_debug_start:n { \cs_to_str:N #1 } + #2 +%\@@_debug_end:n { \cs_to_str:N #1 } } - \tl_set:cn + } +\cs_new:Npn \@@_cs_new:Nn #1 #2 + { + \cs_new_protected:Nn #1 { - \__@@_sow_item:Nn #1 - { \int_use:c { \__@@_sow_int:N #1 } } +%\@@_debug_start:n { \cs_to_str:N #1 } + #2 +%\@@_debug_end:n { \cs_to_str:N #1 } } - { #2 } } % \end{macrocode} % \end{macro} % -% \begin{macro}{\@@_sow_reap:N} +% % \begin{macrocode} -\cs_new:Nn \@@_sow_reap:N - { - \cs_set:Npn \__@@_sow_tmp:n ##1 - { - \exp_not:v { \__@@_sow_item:Nn #1 {##1} } - } - \tl_set:Nx #1 - { - \int_step_function:nnnN {1} {1} - { \int_use:c { \__@@_sow_int:N #1 } } - \__@@_sow_tmp:n - } - - } +% % \end{macrocode} -% \end{macro} + +\endinput % /© @@ -389,7 +386,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-pkgopt.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-pkgopt.dtx index d159a1360eb..68d265674a2 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-pkgopt.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-pkgopt.dtx @@ -321,7 +321,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-primes.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-primes.dtx index 395ec6a796a..ad3f3be6425 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-primes.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-primes.dtx @@ -18,7 +18,7 @@ % However, in a correctly behaving OpenType font, % we also see different behaviour after the \texttt{ssty} feature is applied: % \begin{quote} -% \font\1="[xits-math.otf]:script=math,+ssty=0"\1 +% \font\1="[XITSMath-Regular.otf]:script=math,+ssty=0"\1 % \char"1D465\char"2032\quad % \char"1D465\char"2033\quad % \char"1D465\char"2034\quad @@ -376,7 +376,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-setchar.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-setchar.dtx index 58870922ed9..8d2ba46e2a5 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-setchar.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-setchar.dtx @@ -17,25 +17,23 @@ % % In time, the case statement inside |set_mathsymbol| will be moved in here % to avoid re-running it every time. -% \begin{macrocode} -\cs_new:Npn \@@_symbol_setup: - { - \cs_set:Npn \UnicodeMathSymbol ##1##2##3##4 - { - \exp_not:n { \_@@_sym:nnn {##1} {##2} {##3} } - } - } -% \end{macrocode} % % \begin{macrocode} -\tl_gset_from_file_x:Nnn \g_@@_mathtable_tl {\@@_symbol_setup:} {unicode-math-table.tex} +\group_begin: + \file_get:nnN {unicode-math-table.tex} {} \l_@@_mathtable_tl + \cs_set:Npn \UnicodeMathSymbol #1#2#3#4 + { + \exp_not:n { \_@@_sym:nnn {#1} {#2} {#3} } + } + \tl_gset:Nx \g_@@_mathtable_tl {\l_@@_mathtable_tl} +\group_end: % \end{macrocode} % % % \begin{macro}{\@@_input_math_symbol_table:} % This function simply expands to the token list containing all the data. % \begin{macrocode} -\cs_new:Nn \@@_input_math_symbol_table: {\g_@@_mathtable_tl} +\@@_cs_new:Nn \@@_input_math_symbol_table: {\g_@@_mathtable_tl} % \end{macrocode} % \end{macro} % @@ -46,7 +44,7 @@ % make sure |#| is an `other' so that we don't get confused with \cs{mathoctothorpe}. % \begin{macrocode} \AtBeginDocument{\@@_define_math_chars:} -\cs_new:Nn \@@_define_math_chars: +\@@_cs_new:Nn \@@_define_math_chars: { \group_begin: \cs_set:Npn \_@@_sym:nnn ##1##2##3 @@ -291,7 +289,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-sscript.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-sscript.dtx index bae6bf0e4cc..a2192714dda 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-sscript.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-sscript.dtx @@ -59,7 +59,7 @@ % Collects a chain of subscripts or a chain % of superscripts and then typesets what it has collected. % \begin{macrocode} -\cs_new:Nn \@@_scan_sscript: +\@@_cs_new:Nn \@@_scan_sscript: { \@@_scan_sscript:TF { \@@_scan_sscript: } @@ -76,7 +76,7 @@ % The \cs{group_align_safe_begin:} and \cs{group_align_safe_end:} are % needed in case |#3| is |&|. % \begin{macrocode} -\cs_new:Nn \@@_scan_sscript:TF +\@@_cs_new:Nn \@@_scan_sscript:TF { \peek_N_type:TF { @@ -88,7 +88,7 @@ % \end{macrocode} % The look-ahead for the sscripts doesn't try to peek inside the lookahead. % \begin{macrocode} -\cs_new:Nn \@@_scan_sscript_aux:nnN +\@@_cs_new:Nn \@@_scan_sscript_aux:nnN { \tl_set:Nx \l_@@_tmpa_key_tl { \tl_to_str:n {#3} } \prop_get:cxNTF {g_@@_\l_@@_tmpa_tl _prop} @@ -229,7 +229,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-sym-commands.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-sym-commands.dtx index 833b4936bad..b2450878fe8 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-sym-commands.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-sym-commands.dtx @@ -53,7 +53,7 @@ % The flag \cs{l_@@_mathstyle_tl} is for other applications to query the % current math style. % \begin{macrocode} -\cs_new:Nn \@@_prepare_mathstyle:n +\@@_cs_new:Nn \@@_prepare_mathstyle:n { \seq_gput_right:Nn \g_@@_mathstyles_seq {#1} \@@_init_alphabet:n {#1} @@ -80,7 +80,7 @@ % First used when the math alphabet macro is first defined, but then used % later when redefining a particular maths alphabet. % \begin{macrocode} -\cs_set:Nn \@@_init_alphabet:n +\@@_cs_new:Nn \@@_init_alphabet:n { \@@_log:nx {alph-initialise} {#1} \tl_gclear_new:c {g_@@_switchto_#1_tl} @@ -100,7 +100,7 @@ % It’s currently not using all of the machinery we’re in the process of setting up above. % Baby steps. % \begin{macrocode} -\cs_new:Nn \@@_default_mathalph:nnn +\@@_cs_new:Nn \@@_default_mathalph:nnn { \prop_new:c {g_@@_named_range_#1_prop} \seq_gput_right:Nn \g_@@_default_mathalph_seq {{#1}{#2}{#3}} @@ -169,16 +169,17 @@ % \subsubsection{New commands for ambiguous alphabets} % % \begin{macrocode} -\AtBeginDocument +\AtBeginDocument { \@@_setup_mathtext: } +\@@_cs_new:Nn \@@_setup_mathtext: { \clist_map_inline:nn { rm, it, bf, sf, tt } { - \cs_set_protected:cpx { math #1 } + \cs_set_protected:cpx { math ##1 } { - \exp_not:n { \bool_if:NTF } \exp_not:c { g_@@_ math #1 _text_bool} - { \exp_not:c { mathtext #1 } } - { \exp_not:c { sym #1 } } + \exp_not:n { \bool_if:NTF } \exp_not:c { g_@@_ math ##1 _text_bool} + { \exp_not:c { mathtext ##1 } } + { \exp_not:c { sym ##1 } } } } } @@ -206,7 +207,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-ui.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-ui.dtx index 58a64a448a0..38c257d1dcf 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-ui.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-ui.dtx @@ -92,7 +92,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-usv.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-usv.dtx index 954ba649206..ce24cc4267a 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-usv.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-usv.dtx @@ -583,7 +583,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/um-code-variables.dtx b/Master/texmf-dist/source/latex/unicode-math/um-code-variables.dtx index 17b35a7332a..840b1ebec52 100644 --- a/Master/texmf-dist/source/latex/unicode-math/um-code-variables.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/um-code-variables.dtx @@ -21,7 +21,7 @@ % \end{macrocode} % % \begin{macrocode} -\bool_new:N \l_@@_init_bool +\bool_new:N \g_@@_init_bool \bool_new:N \l_@@_implicit_alph_bool % \end{macrocode} % For \opt{math-style}: @@ -70,6 +70,10 @@ % % \subsection{tl} % +% \begin{macrocode} +\tl_if_exist:NF \g_@@_secret_hook_tl { \tl_new:N \g_@@_secret_hook_tl } +% \end{macrocode} +% % For displaying in warning messages, etc.: % \begin{macrocode} \tl_const:Nn \c_@@_math_alphabet_name_latin_tl {Latin,~lowercase} @@ -94,10 +98,14 @@ % % \begin{macrocode} \tl_new:N \l_@@_tmpa_tl +\tl_new:N \l_@@_tmpb_tl +\tl_new:N \l_@@_tmpc_tl \tl_new:N \l_@@_mathstyle_tl \tl_new:N \l_@@_radicals_tl \tl_new:N \l_@@_nolimits_tl \tl_new:N \l_@@_trial_family_tl +\tl_new:N \l_@@_ss_chain_tl +\tl_new:N \l_@@_tmpa_key_tl % \end{macrocode} % % Used to store the font switch for the \cs{operator@font}. @@ -108,6 +116,7 @@ % \begin{macrocode} \tl_new:N \g_@@_slash_delimiter_usv \tl_new:N \g_@@_mathparam_settings_tl +\tl_new:N \l_@@_mathtable_tl \tl_new:N \g_@@_mathtable_tl \tl_new:N \g_@@_fontname_tl \tl_new:N \g_@@_mversion_tl @@ -141,7 +150,7 @@ \clist_new:N \g_@@_alphabet_clist \clist_new:N \l_@@_mathmap_charints_clist \clist_new:N \l_@@_unknown_keys_clist -\clist_new:N \l_@@_font_keyval_clist +\clist_new:N \l_@@_keyval_clist \clist_new:N \l_@@_alphabet_clist % \end{macrocode} % @@ -239,7 +248,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 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 d112dc09f26..004cf213432 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 @@ %\ProvidesExplPackage{unicode-math} %\ProvidesExplPackage{unicode-math-xetex} %\ProvidesExplPackage{unicode-math-luatex} -% {2018/07/29} {v0.8m} {Unicode maths in XeLaTeX and LuaLaTeX} +% {2019/02/15} {0.8n} {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{2018/07/29} - \def\fileversion{v0.8m} + \def\filedate{2019/02/15} + \def\fileversion{0.8n} \filedate \qquad \fileversion } % @@ -102,7 +102,7 @@ % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 diff --git a/Master/texmf-dist/source/latex/unicode-math/unicode-math.ins b/Master/texmf-dist/source/latex/unicode-math/unicode-math.ins index b87abd1a53a..d0b4dc08d17 100644 --- a/Master/texmf-dist/source/latex/unicode-math/unicode-math.ins +++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math.ins @@ -55,7 +55,7 @@ Copyright 2012-2015 Khaled Hosny % the conditions of the LaTeX Project Public License, version 1.3c or higher % (your choice): . % ------------------------------------------------ -% 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 -- cgit v1.2.3