From ede692845206e4cfc8766d44677ca2304016e362 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 16 Jun 2017 22:09:57 +0000 Subject: lualatex-math (16jun17) git-svn-id: svn://tug.org/texlive/trunk@44621 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/lualatex/lualatex-math/lualatex-math.pdf | Bin 185784 -> 190271 bytes .../lualatex/lualatex-math/lualatex-math.dtx | 37 +++++++++++++++------ .../lualatex/lualatex-math/lualatex-math.ins | 6 ++-- .../tex/lualatex/lualatex-math/lualatex-math.lua | 2 +- .../tex/lualatex/lualatex-math/lualatex-math.sty | 26 +++++++++++---- 5 files changed, 50 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist') 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 eecf02ba079..19b07a1e2b4 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 ec3812c4e4a..dab4669b4d5 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–2016 by Philipp Stephani +% Copyright 2011–2017 by Philipp Stephani % % This file may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -31,7 +31,7 @@ % % \fi % -% \CheckSum{267} +% \CheckSum{280} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -148,7 +148,7 @@ %<@@=lltxmath> \NeedsTeXFormat{LaTeX2e}[2009/09/24] \RequirePackage{expl3}[2015/09/07] -\ProvidesExplPackage{lualatex-math}{2016/04/16}{1.6}% +\ProvidesExplPackage{lualatex-math}{2017/06/15}{1.7}% {Patches for mathematics typesetting with LuaLaTeX} \RequirePackage { etoolbox } [ 2007/10/08 ] \cs_if_exist:NF \newluabytecode @@ -516,22 +516,39 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@genfrac} -% Generalized fractions are typeset by the internal \cmd{\@genfrac} command. +% \begin{macro}{\genfrac} +% Generalized fractions are typeset by the \cmd{\genfrac} command. +% 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}} % \begin{macrocode} - \@@_patch:NNnnn \@genfrac \cs_set_nopar:Npn { - #1 #2 #3 #4 #5 + \@@_patch:cNnnn { genfrac~ } \cs_set:Npn { + #1 #2 #3 #4 #5 #6 } { { - #1 { \begingroup #4 \endgroup #2 #3 \relax #5 } + \@mathstyle { #4 } + \genfrac@choice o { #1 } + { + \begingroup #5 \endgroup +%<@@=> + \ifx @ #3 @ \@@over \else \@@above \fi #3 \relax + #6 + } + \genfrac@choice c { #2 } } } { { - #1 { + \@mathstyle { #4 } + \genfrac@choice o { #1 } + { \utex_stack:D { - \group_begin: #4 \group_end: #2 #3 \scan_stop: #5 + \group_begin: #5 \group_end: + \tl_if_empty:nTF { #3 } { \@@over } { \@@above #3 \scan_stop: } +%<@@=lltxmath> + #6 } } + \genfrac@choice c { #2 } } } } diff --git a/Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.ins b/Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.ins index 871bbff5f9f..175173b1a62 100644 --- a/Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.ins +++ b/Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.ins @@ -1,5 +1,5 @@ % lualatex-math.ins -% Copyright 2011, 2012, 2013 Philipp Stephani +% Copyright 2011, 2012, 2013, 2017 Philipp Stephani % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -26,7 +26,7 @@ This is a generated file. -Copyright 2011, 2012, 2013 Philipp Stephani +Copyright 2011-2017 Philipp Stephani This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either @@ -50,7 +50,7 @@ LaTeX version 2009/09/24 or later. This is a generated file. -Copyright 2011, 2012, 2013 Philipp Stephani +Copyright 2011-2017 Philipp Stephani This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either diff --git a/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.lua b/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.lua index 030c9a4b8dc..e26e696b3b2 100644 --- a/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.lua +++ b/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.lua @@ -8,7 +8,7 @@ -- -- This is a generated file. -- --- Copyright 2011, 2012, 2013 Philipp Stephani +-- Copyright 2011-2017 Philipp Stephani -- -- This file may be distributed and/or modified under the -- conditions of the LaTeX Project Public License, either 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 050f57da0dd..c85ea67dc6d 100644 --- a/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.sty +++ b/Master/texmf-dist/tex/lualatex/lualatex-math/lualatex-math.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright 2011, 2012, 2013 Philipp Stephani +%% Copyright 2011-2017 Philipp Stephani %% %% This file may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2009/09/24] \RequirePackage{expl3}[2015/09/07] -\ProvidesExplPackage{lualatex-math}{2016/04/16}{1.6}% +\ProvidesExplPackage{lualatex-math}{2017/06/15}{1.7}% {Patches for mathematics typesetting with LuaLaTeX} \RequirePackage { etoolbox } [ 2007/10/08 ] \cs_if_exist:NF \newluabytecode @@ -173,19 +173,31 @@ \utex_stack:D { \group_begin: #1 \group_end: \@@over #2 } } } - \__lltxmath_patch:NNnnn \@genfrac \cs_set_nopar:Npn { - #1 #2 #3 #4 #5 + \__lltxmath_patch:cNnnn { genfrac~ } \cs_set:Npn { + #1 #2 #3 #4 #5 #6 } { { - #1 { \begingroup #4 \endgroup #2 #3 \relax #5 } + \@mathstyle { #4 } + \genfrac@choice o { #1 } + { + \begingroup #5 \endgroup + \ifx @ #3 @ \@@over \else \@@above \fi #3 \relax + #6 + } + \genfrac@choice c { #2 } } } { { - #1 { + \@mathstyle { #4 } + \genfrac@choice o { #1 } + { \utex_stack:D { - \group_begin: #4 \group_end: #2 #3 \scan_stop: #5 + \group_begin: #5 \group_end: + \tl_if_empty:nTF { #3 } { \@@over } { \@@above #3 \scan_stop: } + #6 } } + \genfrac@choice c { #2 } } } } -- cgit v1.2.3