2 files changed, 20 insertions, 8 deletions
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 }
     }
   }
 }