From a340b6ccbdc7ac8f174570c9618d1b6e7a0cfd54 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 18 Feb 2020 22:31:00 +0000 Subject: breqn (18feb20) git-svn-id: svn://tug.org/texlive/trunk@53833 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/breqn/CHANGES.md | 5 ++ Master/texmf-dist/doc/latex/breqn/breqn.pdf | Bin 661796 -> 661613 bytes Master/texmf-dist/doc/latex/breqn/flexisym.pdf | Bin 286251 -> 286070 bytes Master/texmf-dist/doc/latex/breqn/mathstyle.pdf | Bin 185385 -> 185205 bytes Master/texmf-dist/source/latex/breqn/breqn.dtx | 69 +++++++++------------ .../texmf-dist/source/latex/breqn/breqnbundle.ins | 3 - Master/texmf-dist/source/latex/breqn/flexisym.dtx | 6 +- Master/texmf-dist/source/latex/breqn/mathstyle.dtx | 6 +- Master/texmf-dist/tex/latex/breqn/breqn.sty | 39 ++++++------ Master/texmf-dist/tex/latex/breqn/flexisym.sty | 2 +- Master/texmf-dist/tex/latex/breqn/mathstyle.sty | 2 +- 11 files changed, 62 insertions(+), 70 deletions(-) diff --git a/Master/texmf-dist/doc/latex/breqn/CHANGES.md b/Master/texmf-dist/doc/latex/breqn/CHANGES.md index 7d823015d6d..bad962a4b75 100644 --- a/Master/texmf-dist/doc/latex/breqn/CHANGES.md +++ b/Master/texmf-dist/doc/latex/breqn/CHANGES.md @@ -1,5 +1,10 @@ # Release notes for the `breqn` packages +## v0.98i (2020/02/18) + + * Fix clash with new version of `babel` around use of the generic `\\@elt` command. + + ## v0.98h (2020/02/16) * No longer redefine LaTeX2e's `\\@ifstar` command, use a custom prefix instead. diff --git a/Master/texmf-dist/doc/latex/breqn/breqn.pdf b/Master/texmf-dist/doc/latex/breqn/breqn.pdf index 6491bca5f89..900eee86368 100644 Binary files a/Master/texmf-dist/doc/latex/breqn/breqn.pdf and b/Master/texmf-dist/doc/latex/breqn/breqn.pdf differ diff --git a/Master/texmf-dist/doc/latex/breqn/flexisym.pdf b/Master/texmf-dist/doc/latex/breqn/flexisym.pdf index 54f47e4ab46..0fddf92710d 100644 Binary files a/Master/texmf-dist/doc/latex/breqn/flexisym.pdf and b/Master/texmf-dist/doc/latex/breqn/flexisym.pdf differ diff --git a/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf b/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf index 39e9fe34569..c9d84aee9a4 100644 Binary files a/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf and b/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf differ diff --git a/Master/texmf-dist/source/latex/breqn/breqn.dtx b/Master/texmf-dist/source/latex/breqn/breqn.dtx index 3222bb89451..9f344f3d1ee 100644 --- a/Master/texmf-dist/source/latex/breqn/breqn.dtx +++ b/Master/texmf-dist/source/latex/breqn/breqn.dtx @@ -150,8 +150,8 @@ % % % \title{The \pkg{breqn} package} -% \def\fileversion{0.98h} -% \def\filedate{2020/02/16} +% \def\fileversion{0.98i} +% \def\filedate{2020/02/18} % \date{\pkg{breqn} bundle: \filedate\space\fileversion} % \author{Authors: Michael J. Downes, Morten H\o gholm\\ Maintained by Morten H\o gholm, Will Robertson\\ Feedback: \texttt{https://github.com/wspr/breqn/issues}} % @@ -1381,7 +1381,7 @@ % Declare package name and date. % \begin{macrocode} \RequirePackage{expl3} -\ProvidesExplPackage{breqn}{2020/02/16}{0.98h}{Breaking equations} +\ProvidesExplPackage{breqn}{2020/02/18}{0.98i}{Breaking equations} % \end{macrocode} % Regrettably, \pkg{breqn} is internally a mess, so we have to take % some odd steps. @@ -1786,17 +1786,6 @@ % \end{macro} % % -% \begin{macro}{\eq@cons} -% -% \latex 's \cs{@cons} appends to the end of a list, but we need -% a function that adds material at the beginning. -% \begin{macrocode} -\def\eq@cons#1#2{% - \begingroup \let\@elt\relax \xdef#1{\@elt{#2}#1}\endgroup -} -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\@saveprimitive} % If some preceding package redefined one of the % primitives that we must change, we had better do some checking to make @@ -4238,17 +4227,17 @@ \def\debug@showmeasurements{% \breqn@debugmsg{=> \number\eq@lines\space lines}% \begingroup - \def\@elt##1X##2{\MessageBreak==== \space\space##1/##2}% - \let\@endelt\@empty + \def\breqn@elt##1X##2{\MessageBreak==== \space\space##1/##2}% + \let\breqn@endelt\@empty \breqn@debugmsg{=> trial info:\eq@measurements}% \breqn@debugmsg{=> bounding box: \the\eq@wdT x\the\eq@vspan, badness=\the\eq@badness}% - \let\@elt\relax \let\@endelt\relax + \let\breqn@elt\relax \let\breqn@endelt\relax \endgroup } \def\debug@showmeasurements{% \begingroup - \def\@elt##1X##2{\MessageBreak==== ##1/##2}% - \let\@endelt\@empty + \def\breqn@elt##1X##2{\MessageBreak==== ##1/##2}% + \let\breqn@endelt\@empty \breqn@debugmsg{===> Measurements: \number\eq@lines\space lines \eq@measurements \MessageBreak @@ -4417,9 +4406,9 @@ % \begin{macrocode} \def\eq@trial@save#1{% %<*trace> -% \begingroup \def\@elt##1X##2{\MessageBreak==== \space\space##1/##2}\let\@endelt\@empty\breqn@debugmsg{=> trial info:\eq@measurements}% +% \begingroup \def\breqn@elt##1X##2{\MessageBreak==== \space\space##1/##2}\let\breqn@endelt\@empty\breqn@debugmsg{=> trial info:\eq@measurements}% % \breqn@debugmsg{=> bounding box: \the\eq@wdT x\the\eq@vspan, badness=\the\eq@badness\MessageBreak}% -% \let\@elt\relax \let\@endelt\relax +% \let\breqn@elt\relax \let\breqn@endelt\relax % \endgroup % \xdef#1{% @@ -4571,7 +4560,7 @@ % \begin{macrocode} \def\eq@recalc{% \eq@wdT\z@ \eq@wdMin\maxdimen \eq@vspan\z@skip \eq@badness\z@ - \let\@elt\eq@recalc@a \eq@measurements \let\@elt\relax + \let\breqn@elt\eq@recalc@a \eq@measurements \let\breqn@elt\relax } % \end{macrocode} % \end{macro} @@ -4579,10 +4568,10 @@ % % \begin{macro}{\eq@recalc@a} % \begin{macrocode} -\def\eq@recalc@a#1x#2+#3\@endelt{% +\def\eq@recalc@a#1x#2+#3\breqn@endelt{% \eq@firstht#2\relax - \let\@elt\eq@recalc@b - \@elt#1x#2+#3\@endelt + \let\breqn@elt\eq@recalc@b + \breqn@elt#1x#2+#3\breqn@endelt } % \end{macrocode} % \end{macro} @@ -4590,7 +4579,7 @@ % % \begin{macro}{\eq@recalc@b} % \begin{macrocode} -\def\eq@recalc@b#1X#2,#3x#4+#5@#6\@endelt{% +\def\eq@recalc@b#1X#2,#3x#4+#5@#6\breqn@endelt{% \setlength\dim@a{#2+#3}% \ifdim\dim@a>\eq@wdT \eq@wdT\dim@a \fi \ifdim\dim@a<\eq@wdMin \eq@wdMin\dim@a \fi @@ -5001,12 +4990,12 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@endelt} +% \begin{macro}{\breqn@endelt} % This is a scan marker. % It should get a non-expandable definition. % It could be \cs{relax}, but let's try a chardef instead. % \begin{macrocode} -\chardef\@endelt=`\? +\chardef\breqn@endelt=`\? % \end{macrocode} % \end{macro} % @@ -5015,8 +5004,10 @@ % This is similar to a parshape spec but for each line we record more % info: space above, indent, width x height + dp, and badness. % \begin{macrocode} +\let\breqn@elt\relax +\let\breqn@endelt\relax \def\eq@measurements{% - \@elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt@27\@endelt + \breqn@elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt@27\breqn@endelt ... } % \end{macrocode} @@ -5074,14 +5065,14 @@ \fi }% \fi - \edef\eq@measurements{\@elt + \edef\eq@measurements{\breqn@elt \the\skip@a\space X% extra space to facilitate extracting only the % dimen part later \csname eq@i% \ifnum\eq@curline<\parshape \number\eq@curline \else\number\parshape \fi - \endcsname,\the\dim@a x\the\ht\tw@+\the\dp\tw@ @\the\eq@badness\@endelt + \endcsname,\the\dim@a x\the\ht\tw@+\the\dp\tw@ @\the\eq@badness\breqn@endelt \eq@measurements }% \advance\eq@curline\m@ne @@ -5170,7 +5161,7 @@ \ifnum\eq@lines>\sixt@@n \eq@dense@enough@b \else - \dim@b\z@ \let\@elt\eq@delt \eq@measurements + \dim@b\z@ \let\breqn@elt\eq@delt \eq@measurements \dim@c\eq@density@factor\eq@wdT \multiply\dim@c\eq@lines % \breqn@debugmsg{Density check: black \the\dim@b/\eq@density@factor total \the\dim@c}% \ifdim\dim@b>\dim@c \true@false@true \else \false@false@false \fi @@ -5183,7 +5174,7 @@ % \begin{macro}{\eq@delt} % Args are space-above, indent, width, height, depth, badness. % \begin{macrocode} -\def\eq@delt#1X#2,#3x#4+#5@#6\@endelt{\addtolength\dim@b{#3}}% +\def\eq@delt#1X#2,#3x#4+#5@#6\breqn@endelt{\addtolength\dim@b{#3}}% % \end{macrocode} % \end{macro} % @@ -6526,7 +6517,7 @@ % \begin{macrocode} \def\grp@push{% \global\GRP@queue\@xp\@xp\@xp{\@xp\the\@xp\GRP@queue - \@xp\@elt\@xp{\EQ@trial}% + \@xp\breqn@elt\@xp{\EQ@trial}% }% \global\setbox\GRP@box\vbox{% \hbox{\box\EQ@box\box\EQ@copy\penalty\@ne\copy\EQ@numbox}% @@ -6606,7 +6597,7 @@ % in a \cs{vbox} % \begin{macrocode} \setbox\GRP@wholebox\vbox{% - \let\@elt\eqgrp@elt + \let\breqn@elt\eqgrp@elt \the\GRP@queue }% % \end{macrocode} @@ -6647,7 +6638,7 @@ %\debug@box\GRP@wholebox % \unvbox\GRP@wholebox - \let\@elt\relax + \let\breqn@elt\relax % \end{macrocode} % We'd need to handle shifted, right number here, too!!! % \begin{macrocode} @@ -6925,7 +6916,7 @@ % Need to add a dummy element to \cs{GRP@queue}. % \begin{macrocode} \global\GRP@queue\@xp{\the\GRP@queue - \@elt{\gdef\EQ@trial{}}% + \breqn@elt{\gdef\EQ@trial{}}% }% } % \end{macrocode} @@ -6942,8 +6933,8 @@ \unvbox\GRP@box }% \global\GRP@queue\@xp{\the\GRP@queue -% \@elt{\gdef\EQ@trial{\let\eq@isIntertext\@True}}% - \@elt{\let\eq@isIntertext\@True}% +% \breqn@elt{\gdef\EQ@trial{\let\eq@isIntertext\@True}}% + \breqn@elt{\let\eq@isIntertext\@True}% }% } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/breqn/breqnbundle.ins b/Master/texmf-dist/source/latex/breqn/breqnbundle.ins index e48619eeb21..69b303c5e5e 100644 --- a/Master/texmf-dist/source/latex/breqn/breqnbundle.ins +++ b/Master/texmf-dist/source/latex/breqn/breqnbundle.ins @@ -34,13 +34,11 @@ flexisym.dtx, and mathstyle.dtx. \endpreamble \generate{% - \file{breqn.ins}{\from{breqn.dtx}{install}}% \usedir{tex/latex/breqn}% \file{breqn.sty}{\from{breqn.dtx}{package}}% } \generate{% - \file{flexisym.ins}{\from{flexisym.dtx}{install}}% \usedir{tex/latex/breqn}% \file{flexisym.sty}{\from{flexisym.dtx}{package}}% \file{cmbase.sym}{\from{flexisym.dtx}{cmbase}}% @@ -50,7 +48,6 @@ flexisym.dtx, and mathstyle.dtx. } \generate{% - \file{mathstyle.ins}{\from{mathstyle.dtx}{install}}% \usedir{tex/latex/breqn}% \file{mathstyle.sty}{\from{mathstyle.dtx}{package}}% } diff --git a/Master/texmf-dist/source/latex/breqn/flexisym.dtx b/Master/texmf-dist/source/latex/breqn/flexisym.dtx index caf76eea740..cb9206c14e1 100644 --- a/Master/texmf-dist/source/latex/breqn/flexisym.dtx +++ b/Master/texmf-dist/source/latex/breqn/flexisym.dtx @@ -78,8 +78,8 @@ % \fi % % \title{The \textsf{flexisym} package} -% \def\fileversion{0.98h} -% \def\filedate{2020/02/16} +% \def\fileversion{0.98i} +% \def\filedate{2020/02/18} % \date{\filedate\space\fileversion} % \author{Authors: Michael J. Downes, Morten H\o gholm\\ Maintained by Morten H\o gholm, Will Robertson\\ Feedback: \texttt{https://github.com/wspr/breqn/issues}} % @@ -97,7 +97,7 @@ % \begin{macrocode} %<*package> \RequirePackage{expl3}[2009/08/05] -\ProvidesExplPackage{flexisym}{2020/02/16}{0.98h}{Make math characters macros} +\ProvidesExplPackage{flexisym}{2020/02/18}{0.98i}{Make math characters macros} \edef\do{% \noexpand\AtEndOfPackage{% diff --git a/Master/texmf-dist/source/latex/breqn/mathstyle.dtx b/Master/texmf-dist/source/latex/breqn/mathstyle.dtx index 6a3e99e0018..6df4e9426ac 100644 --- a/Master/texmf-dist/source/latex/breqn/mathstyle.dtx +++ b/Master/texmf-dist/source/latex/breqn/mathstyle.dtx @@ -57,8 +57,8 @@ % \fi % % \title{The \textsf{mathstyle} package} -% \def\fileversion{0.98h} -% \def\filedate{2020/02/16} +% \def\fileversion{0.98i} +% \def\filedate{2020/02/18} % \date{\filedate\quad\fileversion} % \author{Authors: Michael J. Downes, Morten H\o gholm\\ Maintained by Morten H\o gholm, Will Robertson\\ Feedback: \texttt{https://github.com/wspr/breqn/issues}} % @@ -151,7 +151,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\ProvidesExplPackage{mathstyle}{2020/02/16}{0.98h}{Tracking mathstyle implicitly} +\ProvidesExplPackage{mathstyle}{2020/02/18}{0.98i}{Tracking mathstyle implicitly} \ExplSyntaxOff % \end{macrocode} % diff --git a/Master/texmf-dist/tex/latex/breqn/breqn.sty b/Master/texmf-dist/tex/latex/breqn/breqn.sty index 13c927d6afc..034ece7f26d 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} -\ProvidesExplPackage{breqn}{2020/02/16}{0.98h}{Breaking equations} +\ProvidesExplPackage{breqn}{2020/02/18}{0.98i}{Breaking equations} \ExplSyntaxOff \edef\breqnpopcats{% \catcode\number`\"=\number\catcode`\" @@ -120,9 +120,6 @@ \cs_set_eq:NN \math_csym_DeB:Nn \use_ii:nn } \ExplSyntaxOff -\def\eq@cons#1#2{% - \begingroup \let\@elt\relax \xdef#1{\@elt{#2}#1}\endgroup -} \providecommand{\@saveprimitive}[2]{% \begingroup \edef\@tempa{\string#1}\edef\@tempb{\meaning#1}% @@ -1002,14 +999,14 @@ } \def\eq@recalc{% \eq@wdT\z@ \eq@wdMin\maxdimen \eq@vspan\z@skip \eq@badness\z@ - \let\@elt\eq@recalc@a \eq@measurements \let\@elt\relax + \let\breqn@elt\eq@recalc@a \eq@measurements \let\breqn@elt\relax } -\def\eq@recalc@a#1x#2+#3\@endelt{% +\def\eq@recalc@a#1x#2+#3\breqn@endelt{% \eq@firstht#2\relax - \let\@elt\eq@recalc@b - \@elt#1x#2+#3\@endelt + \let\breqn@elt\eq@recalc@b + \breqn@elt#1x#2+#3\breqn@endelt } -\def\eq@recalc@b#1X#2,#3x#4+#5@#6\@endelt{% +\def\eq@recalc@b#1X#2,#3x#4+#5@#6\breqn@endelt{% \setlength\dim@a{#2+#3}% \ifdim\dim@a>\eq@wdT \eq@wdT\dim@a \fi \ifdim\dim@a<\eq@wdMin \eq@wdMin\dim@a \fi @@ -1182,9 +1179,11 @@ \def\@tempc##1##2 {\int@b##2\afterassignment\@tempa\dim@a}% \@xp\@tempc\@parshape } -\chardef\@endelt=`\? +\chardef\breqn@endelt=`\? +\let\breqn@elt\relax +\let\breqn@endelt\relax \def\eq@measurements{% - \@elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt@27\@endelt + \breqn@elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt@27\breqn@endelt ... } \def\eq@measure@lines{% @@ -1212,14 +1211,14 @@ \fi }% \fi - \edef\eq@measurements{\@elt + \edef\eq@measurements{\breqn@elt \the\skip@a\space X% extra space to facilitate extracting only the % dimen part later \csname eq@i% \ifnum\eq@curline<\parshape \number\eq@curline \else\number\parshape \fi - \endcsname,\the\dim@a x\the\ht\tw@+\the\dp\tw@ @\the\eq@badness\@endelt + \endcsname,\the\dim@a x\the\ht\tw@+\the\dp\tw@ @\the\eq@badness\breqn@endelt \eq@measurements }% \advance\eq@curline\m@ne @@ -1249,12 +1248,12 @@ \ifnum\eq@lines>\sixt@@n \eq@dense@enough@b \else - \dim@b\z@ \let\@elt\eq@delt \eq@measurements + \dim@b\z@ \let\breqn@elt\eq@delt \eq@measurements \dim@c\eq@density@factor\eq@wdT \multiply\dim@c\eq@lines \ifdim\dim@b>\dim@c \true@false@true \else \false@false@false \fi \fi } -\def\eq@delt#1X#2,#3x#4+#5@#6\@endelt{\addtolength\dim@b{#3}}% +\def\eq@delt#1X#2,#3x#4+#5@#6\breqn@endelt{\addtolength\dim@b{#3}}% \def\eq@dense@enough@b{% \int@b\eq@wdT \divide\int@b\p@ \dim@b\eq@wdL \divide\dim@b\int@b @@ -1806,7 +1805,7 @@ \newbox\GRP@wholebox \def\grp@push{% \global\GRP@queue\@xp\@xp\@xp{\@xp\the\@xp\GRP@queue - \@xp\@elt\@xp{\EQ@trial}% + \@xp\breqn@elt\@xp{\EQ@trial}% }% \global\setbox\GRP@box\vbox{% \hbox{\box\EQ@box\box\EQ@copy\penalty\@ne\copy\EQ@numbox}% @@ -1849,7 +1848,7 @@ \global\advance\grp@wdT\grp@wdR \fi \setbox\GRP@wholebox\vbox{% - \let\@elt\eqgrp@elt + \let\breqn@elt\eqgrp@elt \the\GRP@queue }% \global\let\eq@GRP@first@dmath\@True @@ -1872,7 +1871,7 @@ \fi \fi \unvbox\GRP@wholebox - \let\@elt\relax + \let\breqn@elt\relax \eq@botspace % not needed unless bottom number? } \def\eqgrp@elt#1{% @@ -2001,7 +2000,7 @@ \unvbox\GRP@box }% \global\GRP@queue\@xp{\the\GRP@queue - \@elt{\gdef\EQ@trial{}}% + \breqn@elt{\gdef\EQ@trial{}}% }% } \newenvironment{dsuspend}{% @@ -2015,7 +2014,7 @@ \unvbox\GRP@box }% \global\GRP@queue\@xp{\the\GRP@queue - \@elt{\let\eq@isIntertext\@True}% + \breqn@elt{\let\eq@isIntertext\@True}% }% } \newcommand\breqn@intertext[1]{\dsuspend#1\enddsuspend} diff --git a/Master/texmf-dist/tex/latex/breqn/flexisym.sty b/Master/texmf-dist/tex/latex/breqn/flexisym.sty index edcf24790f6..19d104ee0c0 100644 --- a/Master/texmf-dist/tex/latex/breqn/flexisym.sty +++ b/Master/texmf-dist/tex/latex/breqn/flexisym.sty @@ -30,7 +30,7 @@ %% flexisym.dtx, and mathstyle.dtx. %% \RequirePackage{expl3}[2009/08/05] -\ProvidesExplPackage{flexisym}{2020/02/16}{0.98h}{Make math characters macros} +\ProvidesExplPackage{flexisym}{2020/02/18}{0.98i}{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 aeb749dc8ad..c6186311701 100644 --- a/Master/texmf-dist/tex/latex/breqn/mathstyle.sty +++ b/Master/texmf-dist/tex/latex/breqn/mathstyle.sty @@ -31,7 +31,7 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\ProvidesExplPackage{mathstyle}{2020/02/16}{0.98h}{Tracking mathstyle implicitly} +\ProvidesExplPackage{mathstyle}{2020/02/18}{0.98i}{Tracking mathstyle implicitly} \ExplSyntaxOff \providecommand\@saveprimitive[2]{% \begingroup -- cgit v1.2.3