summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/lualatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-16 22:09:57 +0000
committerKarl Berry <karl@freefriends.org>2017-06-16 22:09:57 +0000
commitede692845206e4cfc8766d44677ca2304016e362 (patch)
treee92d158dc74b803e2eff74320b303eda97f4a10c /Master/texmf-dist/source/lualatex
parentded0ead2388e3879a1c24c439b7795ff9cc0efb0 (diff)
lualatex-math (16jun17)
git-svn-id: svn://tug.org/texlive/trunk@44621 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/lualatex')
-rw-r--r--Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.dtx37
-rw-r--r--Master/texmf-dist/source/lualatex/lualatex-math/lualatex-math.ins6
2 files changed, 30 insertions, 13 deletions
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 @@
%</driver>
% \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