diff options
Diffstat (limited to 'Master/texmf-dist/tex')
3 files changed, 25 insertions, 25 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 a82e463debc..1da955739d6 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/02/15} {0.8n} {Unicode maths in XeLaTeX and LuaLaTeX} + {2019/03/04} {0.8o} {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. @@ -1267,10 +1267,13 @@ \cs_set_eq:NN \__um_make_mathactive:nNN \__um_make_mathactive_noparse:nNN } \tl_new:N \g__um_main_font_cmd_tl -\cs_new:Nn \__um_sf_size: { \__um_fontdimen_to_scale:nN {10} \g__um_trial_font } -\cs_new:Nn \__um_ssf_size: { \__um_fontdimen_to_scale:nN {11} \g__um_trial_font } +\cs_new:Nn \__um_sf_size: { \__um_fontdimen_pc_to_pt:nN {10} \g__um_trial_font } +\cs_new:Nn \__um_ssf_size: { \__um_fontdimen_pc_to_pt:nN {11} \g__um_trial_font } \__um_cs_new:Nn \__um_declare_math_sizes: { + \fp_gset:Nn \g__um_size_tfsf_fp { (\f@size + \__um_sf_size: )/2 } + \fp_gset:Nn \g__um_size_sfssf_fp { (\__um_sf_size: + \__um_ssf_size:)/2 } + \dim_compare:nF { \fontdimen 10 \g__um_trial_font == 0pt } { \DeclareMathSizes { \f@size } { \f@size } { \__um_sf_size: } { \__um_ssf_size: } @@ -1303,9 +1306,6 @@ } \__um_cs_new:Nn \__um_fontspec_select_font: { - \fp_gset:Nn \g__um_size_tfsf_fp { (\f@size + \__um_sf_size: )/2 } - \fp_gset:Nn \g__um_size_sfssf_fp { (\__um_sf_size: + \__um_ssf_size:)/2 } - \tl_set:Nx \l__um_font_keyval_tl { Renderer = Basic, @@ -1388,7 +1388,7 @@ \fontspec_set_family:Nxn \l__um_fam_two_tl { \l__um_font_keyval_tl, - ScaleAgain = 1.00001, + ScaleAgain = 1.0001, FontAdjustment = { \__um_copy_fontdimen:nnN { 8} {43} \g__um_main_font_cmd_tl @@ -1423,7 +1423,7 @@ \fontspec_set_family:Nxn \l__um_fam_three_tl { \l__um_font_keyval_tl, - ScaleAgain = 0.99999, + ScaleAgain = 0.9999, FontAdjustment = { \__um_copy_fontdimen:nnN { 8} {48} \g__um_main_font_cmd_tl \__um_copy_fontdimen:nnN { 9} {28} \g__um_main_font_cmd_tl @@ -1884,13 +1884,13 @@ \__um_font_param:nn { underbar_rule } { 57 } \__um_font_param:nn { underbar_vgap } { 56 } \__um_font_param:n { connector_overlap_min } -\cs_new:Nn \__um_fontdimen_to_percent:nN +\cs_set:Nn \__um_fontdimen_to_percent:nN { - \fp_eval:n { \dim_to_decimal:n { 65536 \fontdimen #1 #2 } / 100 } + \fp_eval:n { \dim_to_decimal_in_sp:n { \fontdimen #1 #2 } / 100 } } -\cs_new:Nn \__um_fontdimen_to_scale:nN +\cs_new:Nn \__um_fontdimen_pc_to_pt:nN { - \fp_eval:n { \__um_fontdimen_to_percent:nN {#1} #2 * \f@size } + \fp_eval:n { \dim_to_decimal_in_sp:n { \fontdimen #1 #2 } / 100 * \f@size } } \cs_new:Nn \__um_mathstyle_scale:NnnN { 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 bb03a4a40cb..a1461f7a112 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/02/15} {0.8n} {Unicode maths in XeLaTeX and LuaLaTeX} + {2019/03/04} {0.8o} {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. @@ -1257,10 +1257,13 @@ \cs_set_eq:NN \__um_make_mathactive:nNN \__um_make_mathactive_noparse:nNN } \tl_new:N \g__um_main_font_cmd_tl -\cs_new:Nn \__um_sf_size: { \__um_fontdimen_to_scale:nN {10} \g__um_trial_font } -\cs_new:Nn \__um_ssf_size: { \__um_fontdimen_to_scale:nN {11} \g__um_trial_font } +\cs_new:Nn \__um_sf_size: { \__um_fontdimen_pc_to_pt:nN {10} \g__um_trial_font } +\cs_new:Nn \__um_ssf_size: { \__um_fontdimen_pc_to_pt:nN {11} \g__um_trial_font } \__um_cs_new:Nn \__um_declare_math_sizes: { + \fp_gset:Nn \g__um_size_tfsf_fp { (\f@size + \__um_sf_size: )/2 } + \fp_gset:Nn \g__um_size_sfssf_fp { (\__um_sf_size: + \__um_ssf_size:)/2 } + \dim_compare:nF { \fontdimen 10 \g__um_trial_font == 0pt } { \DeclareMathSizes { \f@size } { \f@size } { \__um_sf_size: } { \__um_ssf_size: } @@ -1291,9 +1294,6 @@ } \__um_cs_new:Nn \__um_fontspec_select_font: { - \fp_gset:Nn \g__um_size_tfsf_fp { (\f@size + \__um_sf_size: )/2 } - \fp_gset:Nn \g__um_size_sfssf_fp { (\__um_sf_size: + \__um_ssf_size:)/2 } - \tl_set:Nx \l__um_font_keyval_tl { BoldItalicFont = {}, ItalicFont = {}, SmallCapsFont = {}, @@ -1353,7 +1353,7 @@ \fontspec_set_family:Nxn \l__um_fam_two_tl { \l__um_font_keyval_tl, - ScaleAgain = 1.00001, + ScaleAgain = 1.0001, FontAdjustment = { \__um_copy_fontdimen:nnN { 8} {43} \g__um_main_font_cmd_tl @@ -1388,7 +1388,7 @@ \fontspec_set_family:Nxn \l__um_fam_three_tl { \l__um_font_keyval_tl, - ScaleAgain = 0.99999, + ScaleAgain = 0.9999, FontAdjustment = { \__um_copy_fontdimen:nnN { 8} {48} \g__um_main_font_cmd_tl \__um_copy_fontdimen:nnN { 9} {28} \g__um_main_font_cmd_tl @@ -1813,13 +1813,13 @@ \__um_font_param:nn { underbar_rule } { 57 } \__um_font_param:nn { underbar_vgap } { 56 } \__um_font_param:n { connector_overlap_min } -\cs_new:Nn \__um_fontdimen_to_percent:nN +\cs_set:Nn \__um_fontdimen_to_percent:nN { - \fp_eval:n { \dim_to_decimal:n { 65536 \fontdimen #1 #2 } / 100 } + \fp_eval:n { \dim_to_decimal_in_sp:n { \fontdimen #1 #2 } / 100 } } -\cs_new:Nn \__um_fontdimen_to_scale:nN +\cs_new:Nn \__um_fontdimen_pc_to_pt:nN { - \fp_eval:n { \__um_fontdimen_to_percent:nN {#1} #2 * \f@size } + \fp_eval:n { \dim_to_decimal_in_sp:n { \fontdimen #1 #2 } / 100 * \f@size } } \cs_new:Nn \__um_mathstyle_scale:NnnN { 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 d9e8e51913a..5e5a1b7f361 100644 --- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty +++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty @@ -24,7 +24,7 @@ \RequirePackage{expl3} \ProvidesExplPackage{unicode-math} - {2019/02/15} {0.8n} {Unicode maths in XeLaTeX and LuaLaTeX} + {2019/03/04} {0.8o} {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 |