From 70f1230b0deac2dcd3fa9acb96a5b8618c0acf80 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 1 Feb 2019 22:25:11 +0000 Subject: lualatex-math (1feb19) git-svn-id: svn://tug.org/texlive/trunk@49904 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/lualatex/lualatex-math/lualatex-math.pdf | Bin 190271 -> 190559 bytes .../lualatex/lualatex-math/lualatex-math.dtx | 43 ++++++++++++--------- .../tex/lualatex/lualatex-math/lualatex-math.sty | 30 +++++++------- 3 files changed, 40 insertions(+), 33 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/lualatex/lualatex-math/lualatex-math.pdf b/Master/texmf-dist/doc/lualatex/lualatex-math/lualatex-math.pdf index 19b07a1e2b4..c1728ca5183 100644 Binary files a/Master/texmf-dist/doc/lualatex/lualatex-math/lualatex-math.pdf and b/Master/texmf-dist/doc/lualatex/lualatex-math/lualatex-math.pdf differ diff --git a/Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.dtx b/Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.dtx index dab4669b4d5..2ac5af66a54 100644 --- a/Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.dtx +++ b/Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 2011–2017 by Philipp Stephani +% Copyright 2011–2019 by Philipp Stephani, Joseph Wright, and Will Robertson % % This file may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -135,7 +135,7 @@ % % % \section{Implementation of the \hologo{LaTeX2e} package} -% +% % \changes{v1.4a}{2015/08/24}{Use \pkg{expl3} versions of \hologo{LuaTeX} % math primitives} % \changes{v1.4a}{2015/08/24}{Avoid \cs{RequireLuaModule}} @@ -147,8 +147,8 @@ %<*package> %<@@=lltxmath> \NeedsTeXFormat{LaTeX2e}[2009/09/24] -\RequirePackage{expl3}[2015/09/07] -\ProvidesExplPackage{lualatex-math}{2017/06/15}{1.7}% +\RequirePackage{expl3}[2018/06/18] +\ProvidesExplPackage{lualatex-math}{2019/01/21}{1.8}% {Patches for mathematics typesetting with LuaLaTeX} \RequirePackage { etoolbox } [ 2007/10/08 ] \cs_if_exist:NF \newluabytecode @@ -300,10 +300,12 @@ % \changes{v1.3a}{2014/06/18}{\pkg{l3kernel} has (currently) dropped % \cs{lua_now_x:n}} % \changes{v1.4a}{2015/08/24}{\cs{lua_now_x:n} is back} +% \changes{v1.8}{2019/01/21}{\cs{lua_now_x:n} is now called \cs{lua_now:e}} +% \changes{v1.8}{2019/01/21}{Stop using \cs{…:D} control sequences} % \begin{macrocode} \cs_new_protected_nopar:Npn \@@_set_mathchar:NN #1 #2 { - \utex_mathchardef:D #1 - \lua_now_x:n { + \Umathchardef #1 + \lua_now:e { lualatex.math.print_class_fam_slot( \int_eval:n { `#2 } ) } \scan_stop: @@ -341,9 +343,10 @@ } { % \end{macrocode} % To do: do we need the additional set of braces around \cmd{\Ustack}? +% \changes{v1.8}{2019/01/21}{Stop using \cs{…:D} control sequences} % \begin{macrocode} { - \utex_stack:D { \group_begin: #1 \group_end: \over #2 } + \Ustack { \group_begin: #1 \group_end: \over #2 } } } } @@ -417,9 +420,10 @@ % \end{macro} % \end{macro} % Finally, we restore the original mathematical codes of the two signs. +% \changes{v1.8}{2019/01/21}{Stop using \cs{…:D} control sequences} % \begin{macrocode} - \utex_mathcodenum:D `\- \l_@@_minus_mathchar - \utex_mathcodenum:D `\= \l_@@_equal_mathchar + \Umathcodenum `\- \l_@@_minus_mathchar + \Umathcodenum `\= \l_@@_equal_mathchar } } % \end{macrocode} @@ -453,6 +457,7 @@ % for the default vertical baseline distance (\cmd{\baselineskip}) and the % minimum vertical gap for stack for the minimum baseline distance % (\cmd{\lineskip}). +% \changes{v1.8}{2019/01/21}{Stop using \cs{…:D} control sequences} % \begin{macrocode} \@@_patch:NNnnn \subarray \cs_set:Npn { #1 } { \vcenter @@ -479,19 +484,19 @@ \restore@math@cr \default@tag \skip_set:Nn \baselineskip { - \utex_stacknumup:D \scriptstyle - + \utex_stackdenomdown:D \scriptstyle + \Umathstacknumup \scriptstyle + + \Umathstackdenomdown \scriptstyle } - \lineskip \utex_stackvgap:D \scriptstyle + \lineskip \Umathstackvgap \scriptstyle \lineskiplimit \lineskip \ialign \c_group_begin_token \token_if_eq_meaning:NNT c #1 { \hfil } - \utex_startmath:D + \Ustartmath \m@th \scriptstyle - \luatex_alignmark:D \luatex_alignmark:D - \utex_stopmath:D + \tex_alignmark:D \tex_alignmark:D + \Ustopmath \hfil \crcr } @@ -501,6 +506,7 @@ % \begin{macro}{\frac} % Since \cmd{\frac} is declared by \cmd{\DeclareRobustCommand}, we must patch % the macro \cmd{\frac\textvisiblespace}. +% \changes{v1.8}{2019/01/21}{Stop using \cs{…:D} control sequences} % \begin{macrocode} \@@_patch:cNnnn { frac~ } \cs_set:Npn { #1 #2 } { { @@ -509,7 +515,7 @@ } } { { - \utex_stack:D { \group_begin: #1 \group_end: \@@over #2 } + \Ustack { \group_begin: #1 \group_end: \@@over #2 } %<@@=lltxmath> } } @@ -521,6 +527,7 @@ % Since \cmd{\genfrac} is declared by \cmd{\DeclareRobustCommand}, % we have to patch the macro \cmd{\genfrac\textvisiblespace}. % \changes{v1.7}{2017/06/15}{Adapt patch to changes in \pkg{amsmath}} +% \changes{v1.8}{2019/01/21}{Stop using \cs{…:D} control sequences} % \begin{macrocode} \@@_patch:cNnnn { genfrac~ } \cs_set:Npn { #1 #2 #3 #4 #5 #6 @@ -541,7 +548,7 @@ \@mathstyle { #4 } \genfrac@choice o { #1 } { - \utex_stack:D { + \Ustack { \group_begin: #5 \group_end: \tl_if_empty:nTF { #3 } { \@@over } { \@@above #3 \scan_stop: } %<@@=lltxmath> @@ -681,7 +688,7 @@ local unpack = unpack or table.unpack % \changes{v1.4a}{2015/08/24}{Pick up new name for string catcode table % where available} % \begin{macrocode} -local cctb = luatexbase.catcodetables or +local cctb = luatexbase.catcodetables or {string = luatexbase.registernumber("catcodetable@string")} % \end{macrocode} % diff --git a/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.sty b/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.sty index c85ea67dc6d..9dd29f5ce33 100644 --- a/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.sty +++ b/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.sty @@ -21,8 +21,8 @@ %% LaTeX version 2009/09/24 or later. %% \NeedsTeXFormat{LaTeX2e}[2009/09/24] -\RequirePackage{expl3}[2015/09/07] -\ProvidesExplPackage{lualatex-math}{2017/06/15}{1.7}% +\RequirePackage{expl3}[2018/06/18] +\ProvidesExplPackage{lualatex-math}{2019/01/21}{1.8}% {Patches for mathematics typesetting with LuaLaTeX} \RequirePackage { etoolbox } [ 2007/10/08 ] \cs_if_exist:NF \newluabytecode @@ -82,8 +82,8 @@ } \cs_generate_variant:Nn \__lltxmath_patch:NNnnn { c } \cs_new_protected_nopar:Npn \__lltxmath_set_mathchar:NN #1 #2 { - \utex_mathchardef:D #1 - \lua_now_x:n { + \Umathchardef #1 + \lua_now:e { lualatex.math.print_class_fam_slot( \int_eval:n { `#2 } ) } \scan_stop: @@ -96,7 +96,7 @@ } } { { - \utex_stack:D { \group_begin: #1 \group_end: \over #2 } + \Ustack { \group_begin: #1 \group_end: \over #2 } } } } @@ -113,8 +113,8 @@ \AtEndOfPackageFile { amsmath } { \cs_set_eq:NN \std@minus \l__lltxmath_minus_mathchar \cs_set_eq:NN \std@equal \l__lltxmath_equal_mathchar - \utex_mathcodenum:D `\- \l__lltxmath_minus_mathchar - \utex_mathcodenum:D `\= \l__lltxmath_equal_mathchar + \Umathcodenum `\- \l__lltxmath_minus_mathchar + \Umathcodenum `\= \l__lltxmath_equal_mathchar } } \AtEndOfPackageFile * { amsmath } { @@ -148,19 +148,19 @@ \restore@math@cr \default@tag \skip_set:Nn \baselineskip { - \utex_stacknumup:D \scriptstyle - + \utex_stackdenomdown:D \scriptstyle + \Umathstacknumup \scriptstyle + + \Umathstackdenomdown \scriptstyle } - \lineskip \utex_stackvgap:D \scriptstyle + \lineskip \Umathstackvgap \scriptstyle \lineskiplimit \lineskip \ialign \c_group_begin_token \token_if_eq_meaning:NNT c #1 { \hfil } - \utex_startmath:D + \Ustartmath \m@th \scriptstyle - \luatex_alignmark:D \luatex_alignmark:D - \utex_stopmath:D + \tex_alignmark:D \tex_alignmark:D + \Ustopmath \hfil \crcr } @@ -170,7 +170,7 @@ } } { { - \utex_stack:D { \group_begin: #1 \group_end: \@@over #2 } + \Ustack { \group_begin: #1 \group_end: \@@over #2 } } } \__lltxmath_patch:cNnnn { genfrac~ } \cs_set:Npn { @@ -191,7 +191,7 @@ \@mathstyle { #4 } \genfrac@choice o { #1 } { - \utex_stack:D { + \Ustack { \group_begin: #5 \group_end: \tl_if_empty:nTF { #3 } { \@@over } { \@@above #3 \scan_stop: } #6 -- cgit v1.2.3