From 541c4ddf7c5b402b9cfe8af5ef4e49ffa15d3e83 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 5 Mar 2019 22:33:41 +0000 Subject: unicode-math (5mar19) git-svn-id: svn://tug.org/texlive/trunk@50245 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/unicode-math/CHANGES.md | 11 +++++++++- Master/texmf-dist/doc/latex/unicode-math/README.md | 2 +- .../doc/latex/unicode-math/unicode-math-code.pdf | Bin 331900 -> 332100 bytes .../doc/latex/unicode-math/unicode-math.pdf | Bin 162907 -> 162882 bytes .../doc/latex/unicode-math/unimath-example.pdf | Bin 22095 -> 22157 bytes .../doc/latex/unicode-math/unimath-symbols.pdf | Bin 1203889 -> 1203926 bytes .../latex/unicode-math/um-code-fontparam.dtx | 12 +++++------ .../source/latex/unicode-math/um-code-main.dtx | 16 ++++++++------ .../source/latex/unicode-math/unicode-math.dtx | 6 +++--- .../tex/latex/unicode-math/unicode-math-luatex.sty | 24 ++++++++++----------- .../tex/latex/unicode-math/unicode-math-xetex.sty | 24 ++++++++++----------- .../tex/latex/unicode-math/unicode-math.sty | 2 +- 12 files changed, 54 insertions(+), 43 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/unicode-math/CHANGES.md b/Master/texmf-dist/doc/latex/unicode-math/CHANGES.md index 619f7c46c77..ffe61e18a88 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/CHANGES.md +++ b/Master/texmf-dist/doc/latex/unicode-math/CHANGES.md @@ -1,7 +1,16 @@ CHANGE HISTORY ============== -## v0.8n (2019/02/15) +## v0.8o (2019/03/04) + + * Avoid `'Dimension too large' error` for some (unpredictable) combinations of font + choice and the `Scale` option. Problems are still known to occur for very large or + very small values of `Scale`. + * Documentation is now run through ‘continuous integration’ (viz, *Travis* for the time being) + as well as the test suite. + + +## v0.8n (2019/01/26) * Add note to readme that the `lm-math` package is required for minimal functionality. * Spacing fixed for maths fonts loaded with the `Scale` fontspec feature (#287). diff --git a/Master/texmf-dist/doc/latex/unicode-math/README.md b/Master/texmf-dist/doc/latex/unicode-math/README.md index 95bf728b726..7208d667998 100644 --- a/Master/texmf-dist/doc/latex/unicode-math/README.md +++ b/Master/texmf-dist/doc/latex/unicode-math/README.md @@ -90,7 +90,7 @@ DEVELOPMENT and MAINTENANCE --------------------------- The current release version is available from CTAN: -> +> Latest developmental and archived historical versions are available from Github: > 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 index 8e8ae8878d2..bf0ca20ed5d 100644 Binary files a/Master/texmf-dist/doc/latex/unicode-math/unicode-math-code.pdf and b/Master/texmf-dist/doc/latex/unicode-math/unicode-math-code.pdf differ diff --git a/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf b/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf index 991f4326aaf..05d2817a78c 100644 Binary files a/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf and b/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf differ diff --git a/Master/texmf-dist/doc/latex/unicode-math/unimath-example.pdf b/Master/texmf-dist/doc/latex/unicode-math/unimath-example.pdf index 2e960bcc5a8..82fdbee8f9f 100644 Binary files a/Master/texmf-dist/doc/latex/unicode-math/unimath-example.pdf and b/Master/texmf-dist/doc/latex/unicode-math/unimath-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf index 05e28b4216b..dcb99c16db5 100644 Binary files a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf and b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf differ 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 9d43d0c18c1..b801b6c0b96 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 @@ -279,21 +279,21 @@ % \subsection{Historical commands} % % \begin{macro}{\@@_fontdimen_to_percent:nN} -% \begin{macro}{\@@_fontdimen_to_scale:nN} +% \begin{macro}{\@@_fontdimen_pc_to_pt:nN} % \darg{Font dimen number} % \darg{Font `variable'} % \cmd\fontdimen s |10|, |11|, and |65| aren't actually dimensions, they're percentage values given in units of |sp|. % \cs{@@_fontdimen_to_percent:nn} takes a font dimension number and outputs the decimal value of the associated parameter. -% \cs{@@_fontdimen_to_scale:nn} returns a dimension correspond to the current +% \cs{@@_fontdimen_pc_to_pt:nn} returns a dimension correspond to the current % font size relative proportion based on that percentage. % \begin{macrocode} -\cs_new:Nn \@@_fontdimen_to_percent:nN +\cs_set:Nn \@@_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 \@@_fontdimen_to_scale:nN +\cs_new:Nn \@@_fontdimen_pc_to_pt:nN { - \fp_eval:n { \@@_fontdimen_to_percent:nN {#1} #2 * \f@size } + \fp_eval:n { \dim_to_decimal_in_sp:n { \fontdimen #1 #2 } / 100 * \f@size } } % \end{macrocode} % \end{macro} 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 aec2eb3d5a0..2c6e7bb7db9 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 @@ -127,10 +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 \@@_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 \@@_sf_size: { \@@_fontdimen_pc_to_pt:nN {10} \g_@@_trial_font } +\cs_new:Nn \@@_ssf_size: { \@@_fontdimen_pc_to_pt:nN {11} \g_@@_trial_font } \@@_cs_new:Nn \@@_declare_math_sizes: { + \fp_gset:Nn \g_@@_size_tfsf_fp { (\f@size + \@@_sf_size: )/2 } + \fp_gset:Nn \g_@@_size_sfssf_fp { (\@@_sf_size: + \@@_ssf_size:)/2 } + \dim_compare:nF { \fontdimen 10 \g_@@_trial_font == 0pt } { \DeclareMathSizes { \f@size } { \f@size } { \@@_sf_size: } { \@@_ssf_size: } @@ -175,9 +178,6 @@ % \begin{macrocode} \@@_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 } - \tl_set:Nx \l_@@_font_keyval_tl { % Renderer = Basic, @@ -282,13 +282,15 @@ % % \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. +% Note that for extreme font sizes, this scaling value might need to be adjusted. +% 1.0001 should be enough for reasonable use cases however. % \begin{macrocode} \@@_cs_new:Nn \@@_setup_legacy_fam_two: { \fontspec_set_family:Nxn \l_@@_fam_two_tl { \l_@@_font_keyval_tl, - ScaleAgain = 1.00001, + ScaleAgain = 1.0001, FontAdjustment = { \@@_copy_fontdimen:nnN { 8} {43} \g_@@_main_font_cmd_tl @@ -329,7 +331,7 @@ \fontspec_set_family:Nxn \l_@@_fam_three_tl { \l_@@_font_keyval_tl, - ScaleAgain = 0.99999, + ScaleAgain = 0.9999, FontAdjustment = { \@@_copy_fontdimen:nnN { 8} {48} \g_@@_main_font_cmd_tl \@@_copy_fontdimen:nnN { 9} {28} \g_@@_main_font_cmd_tl 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 004cf213432..59cf98b1885 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} -% {2019/02/15} {0.8n} {Unicode maths in XeLaTeX and LuaLaTeX} +% {2019/03/04} {0.8o} {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/02/15} - \def\fileversion{0.8n} + \def\filedate{2019/03/04} + \def\fileversion{0.8o} \filedate \qquad \fileversion } % 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 %%^^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 %%^^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 -- cgit v1.2.3