breqn (11aug15)

git-svn-id: svn://tug.org/texlive/trunk@38099 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 69 insertions, 30 deletions

diff --git a/Master/texmf-dist/tex/latex/breqn/breqn.sty b/Master/texmf-dist/tex/latex/breqn/breqn.sty
index 0ea7e1d2c1b..588455c22d7 100644
--- a/Master/texmf-dist/tex/latex/breqn/breqn.sty
+++ b/Master/texmf-dist/tex/latex/breqn/breqn.sty
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}[2009/08/05]
-\ProvidesExplPackage{breqn}{2012/05/10}{0.98b}{Breaking equations}
+\ProvidesExplPackage{breqn}{2015/08/11}{0.98d}{Breaking equations}
 \ExplSyntaxOff
 \edef\breqnpopcats{%
   \catcode\number`\"=\number\catcode`\"
diff --git a/Master/texmf-dist/tex/latex/breqn/flexisym.sty b/Master/texmf-dist/tex/latex/breqn/flexisym.sty
index 13dcf8c1335..694d0e2d593 100644
--- a/Master/texmf-dist/tex/latex/breqn/flexisym.sty
+++ b/Master/texmf-dist/tex/latex/breqn/flexisym.sty
@@ -31,7 +31,7 @@
 %%    cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym.
 %% 
 \RequirePackage{expl3}[2009/08/05]
-\ProvidesExplPackage{flexisym}{2013/03/16}{0.97c}{Make math characters macros}
+\ProvidesExplPackage{flexisym}{2015/08/11}{0.98d}{Make math characters macros}
 
 \edef\do{%
   \noexpand\AtEndOfPackage{%
diff --git a/Master/texmf-dist/tex/latex/breqn/mathstyle.sty b/Master/texmf-dist/tex/latex/breqn/mathstyle.sty
index ed91944417d..70feea50762 100644
--- a/Master/texmf-dist/tex/latex/breqn/mathstyle.sty
+++ b/Master/texmf-dist/tex/latex/breqn/mathstyle.sty
@@ -12,6 +12,7 @@
 %% Copyright (C) 2007-2011 by Morten Hoegholm et al
 %% Copyright (C) 2007-2014 by Lars Madsen
 %% Copyright (C) 2007-2014 by Will Robertson
+%% Copyright (C) 2015 by Will Robertson, Joseph Wright
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -31,7 +32,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{mathstyle}
-  [2014/06/10 v0.90a Tracking mathstyle implicitly]
+  [2015/08/11 v0.98d Tracking mathstyle implicitly]
 \providecommand\@saveprimitive[2]{%
   \begingroup
   \edef\@tempa{\string#1}\edef\@tempb{\meaning#1}%
@@ -66,8 +67,16 @@
   \fi
   \endgroup
 }
-\everydisplay=\expandafter{\the\everydisplay\chardef\mathstyle\z@}
-\chardef\mathstyle\@ne
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname directlua\endcsname\relax
+  \everydisplay=\expandafter{\the\everydisplay\chardef\mathstyle\z@}
+\fi
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname directlua\endcsname\relax
+  \chardef\mathstyle\@ne
+\else
+  \directlua{tex.enableprimitives("", {"mathstyle"})}
+\fi
 \@saveprimitive\displaystyle\@@displaystyle
 \@saveprimitive\textstyle\@@textstyle
 \@saveprimitive\scriptstyle\@@scriptstyle
@@ -79,14 +88,17 @@
 \@saveprimitive\overwithdelims\@@overwithdelims
 \@saveprimitive\atopwithdelims\@@atopwithdelims
 \@saveprimitive\abovewithdelims\@@abovewithdelims
-\DeclareRobustCommand{\displaystyle}{%
-  \@@displaystyle \chardef\mathstyle\z@}
-\DeclareRobustCommand{\textstyle}{%
-  \@@textstyle \chardef\mathstyle\@ne}
-\DeclareRobustCommand{\scriptstyle}{%
-  \@@scriptstyle \chardef\mathstyle\tw@}
-\DeclareRobustCommand{\scriptscriptstyle}{%
-  \@@scriptscriptstyle \chardef\mathstyle\thr@@}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname directlua\endcsname\relax
+  \DeclareRobustCommand{\displaystyle}{%
+    \@@displaystyle \chardef\mathstyle\z@}
+  \DeclareRobustCommand{\textstyle}{%
+    \@@textstyle \chardef\mathstyle\tw@}
+  \DeclareRobustCommand{\scriptstyle}{%
+    \@@scriptstyle \chardef\mathstyle4 }
+  \DeclareRobustCommand{\scriptscriptstyle}{%
+    \@@scriptscriptstyle \chardef\mathstyle6 }
+\fi
 \begingroup \catcode`\^=7\relax \catcode`\_=8\relax % just in case
 \lowercase{\endgroup
 \let\@@superscript=^ \let\@@subscript=_
@@ -95,24 +107,35 @@
 \lowercase{\endgroup
 \let\@@superscript@other=^ \let\@@subscript@other=_
 }%
-\def\subsupstyle{%
-  \ifnum\mathstyle<\tw@ \chardef\mathstyle\tw@
-  \else \chardef\mathstyle\thr@@
-  \fi
-}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname directlua\endcsname\relax
+  \def\subsupstyle{%
+    \ifnum\mathstyle<5 \chardef\mathstyle4 %
+    \else \chardef\mathstyle6 %
+    \fi
+  }
+\else
+  \def\subsupstyle{}
+\fi
 \let\mathsup=\@@superscript
 \let\mathsub=\@@subscript
 \def\sb#1{\mathsub{\protect\subsupstyle#1}}%
 \def\sp#1{\mathsup{\protect\subsupstyle#1}}%
 \def\mathchoice{%
   \relax\ifcase\mathstyle
-    \expandafter\@firstoffour
+    \expandafter\@firstoffour % Display
+  \or
+    \expandafter\@firstoffour % Cramped display
   \or
-    \expandafter\@secondoffour
+    \expandafter\@secondoffour % Text
   \or
-    \expandafter\@thirdoffour
+    \expandafter\@secondoffour % Cramped text
+  \or
+    \expandafter\@thirdoffour % Script
+  \or
+    \expandafter\@thirdoffour % Cramped script
   \else
-    \expandafter\@fourthoffour
+    \expandafter\@fourthoffour % (Cramped) Scriptscript
   \fi
 }
 \providecommand\@firstoffour[4]{#1}
@@ -138,22 +161,38 @@
 \renewcommand{\binom}{\genfrac{}(){0pt}}
 \renewcommand{\dbinom}{\genfrac\displaystyle(){0pt}}
 \renewcommand{\tbinom}{\genfrac\textstyle(){0pt}}
-\def\fracstyle{\ifcase\mathstyle
-    \chardef\mathstyle=\@ne
-  \or
-    \chardef\mathstyle=\tw@
-  \else
-    \chardef\mathstyle=\thr@@
-  \fi
-}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname directlua\endcsname\relax
+  \def\fracstyle{%
+    \ifcase\mathstyle
+      \chardef\mathstyle=\@ne
+    \or
+      \chardef\mathstyle=\@ne
+    \or
+      \chardef\mathstyle=\tw@
+    \or
+      \chardef\mathstyle=\tw@
+    \else
+      \chardef\mathstyle=\thr@@
+    \fi
+  }
+\else
+  \def\fracstyle{}
+\fi
 \def\currentmathstyle{%
   \ifcase\mathstyle
     \@@displaystyle
   \or
+    \@@displaystyle
+  \or
+    \@@textstyle
+  \or
     \@@textstyle
   \or
     \@@scriptstyle
   \or
+    \@@scriptstyle
+  \else
     \@@scriptscriptstyle
   \fi}
 \DeclareOption{mathactivechars}{%