texlive[53833] Master/texmf-dist: breqn (18feb20)
commits+karl at tug.org
commits+karl at tug.org
Tue Feb 18 23:31:01 CET 2020
Revision: 53833
http://tug.org/svn/texlive?view=revision&revision=53833
Author: karl
Date: 2020-02-18 23:31:00 +0100 (Tue, 18 Feb 2020)
Log Message:
-----------
breqn (18feb20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/breqn/CHANGES.md
trunk/Master/texmf-dist/doc/latex/breqn/breqn.pdf
trunk/Master/texmf-dist/doc/latex/breqn/flexisym.pdf
trunk/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf
trunk/Master/texmf-dist/source/latex/breqn/breqn.dtx
trunk/Master/texmf-dist/source/latex/breqn/breqnbundle.ins
trunk/Master/texmf-dist/source/latex/breqn/flexisym.dtx
trunk/Master/texmf-dist/source/latex/breqn/mathstyle.dtx
trunk/Master/texmf-dist/tex/latex/breqn/breqn.sty
trunk/Master/texmf-dist/tex/latex/breqn/flexisym.sty
trunk/Master/texmf-dist/tex/latex/breqn/mathstyle.sty
Modified: trunk/Master/texmf-dist/doc/latex/breqn/CHANGES.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/breqn/CHANGES.md 2020-02-18 22:30:45 UTC (rev 53832)
+++ trunk/Master/texmf-dist/doc/latex/breqn/CHANGES.md 2020-02-18 22:31:00 UTC (rev 53833)
@@ -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.
Modified: trunk/Master/texmf-dist/doc/latex/breqn/breqn.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/breqn/flexisym.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/breqn/breqn.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/breqn/breqn.dtx 2020-02-18 22:30:45 UTC (rev 53832)
+++ trunk/Master/texmf-dist/source/latex/breqn/breqn.dtx 2020-02-18 22:31:00 UTC (rev 53833)
@@ -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 at 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 at 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 at showmeasurements{%
\breqn at debugmsg{=> \number\eq at lines\space lines}%
\begingroup
- \def\@elt##1X##2{\MessageBreak==== \space\space##1/##2}%
- \let\@endelt\@empty
+ \def\breqn at elt##1X##2{\MessageBreak==== \space\space##1/##2}%
+ \let\breqn at endelt\@empty
\breqn at debugmsg{=> trial info:\eq at measurements}%
\breqn at debugmsg{=> bounding box: \the\eq at wdT x\the\eq at vspan, badness=\the\eq at badness}%
- \let\@elt\relax \let\@endelt\relax
+ \let\breqn at elt\relax \let\breqn at endelt\relax
\endgroup
}
\def\debug at showmeasurements{%
\begingroup
- \def\@elt##1X##2{\MessageBreak==== ##1/##2}%
- \let\@endelt\@empty
+ \def\breqn at elt##1X##2{\MessageBreak==== ##1/##2}%
+ \let\breqn at endelt\@empty
\breqn at debugmsg{===> Measurements: \number\eq at lines\space lines
\eq at measurements
\MessageBreak
@@ -4417,9 +4406,9 @@
% \begin{macrocode}
\def\eq at trial@save#1{%
%<*trace>
-% \begingroup \def\@elt##1X##2{\MessageBreak==== \space\space##1/##2}\let\@endelt\@empty\breqn at debugmsg{=> trial info:\eq at measurements}%
+% \begingroup \def\breqn at elt##1X##2{\MessageBreak==== \space\space##1/##2}\let\breqn at endelt\@empty\breqn at debugmsg{=> trial info:\eq at measurements}%
% \breqn at debugmsg{=> bounding box: \the\eq at wdT x\the\eq at vspan, badness=\the\eq at badness\MessageBreak}%
-% \let\@elt\relax \let\@endelt\relax
+% \let\breqn at elt\relax \let\breqn at endelt\relax
% \endgroup
%</trace>
\xdef#1{%
@@ -4571,7 +4560,7 @@
% \begin{macrocode}
\def\eq at recalc{%
\eq at wdT\z@ \eq at wdMin\maxdimen \eq at vspan\z at skip \eq at badness\z@
- \let\@elt\eq at recalc@a \eq at measurements \let\@elt\relax
+ \let\breqn at elt\eq at recalc@a \eq at measurements \let\breqn at elt\relax
}
% \end{macrocode}
% \end{macro}
@@ -4579,10 +4568,10 @@
%
% \begin{macro}{\eq at recalc@a}
% \begin{macrocode}
-\def\eq at recalc@a#1x#2+#3\@endelt{%
+\def\eq at recalc@a#1x#2+#3\breqn at endelt{%
\eq at firstht#2\relax
- \let\@elt\eq at recalc@b
- \@elt#1x#2+#3\@endelt
+ \let\breqn at elt\eq at recalc@b
+ \breqn at elt#1x#2+#3\breqn at endelt
}
% \end{macrocode}
% \end{macro}
@@ -4590,7 +4579,7 @@
%
% \begin{macro}{\eq at recalc@b}
% \begin{macrocode}
-\def\eq at recalc@b#1X#2,#3x#4+#5@#6\@endelt{%
+\def\eq at recalc@b#1X#2,#3x#4+#5@#6\breqn at endelt{%
\setlength\dim at a{#2+#3}%
\ifdim\dim at a>\eq at wdT \eq at wdT\dim at a \fi
\ifdim\dim at a<\eq at wdMin \eq at wdMin\dim at a \fi
@@ -5001,12 +4990,12 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@endelt}
+% \begin{macro}{\breqn at 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 at 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 at elt\relax
+\let\breqn at endelt\relax
\def\eq at measurements{%
- \@elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt at 27\@endelt
+ \breqn at elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt at 27\breqn at endelt
...
}
% \end{macrocode}
@@ -5074,7 +5065,7 @@
\fi
}%
\fi
- \edef\eq at measurements{\@elt
+ \edef\eq at measurements{\breqn at elt
\the\skip at a\space X% extra space to facilitate extracting only the
% dimen part later
\csname eq at i%
@@ -5081,7 +5072,7 @@
\ifnum\eq at curline<\parshape \number\eq at curline
\else\number\parshape
\fi
- \endcsname,\the\dim at a x\the\ht\tw at +\the\dp\tw@ @\the\eq at badness\@endelt
+ \endcsname,\the\dim at a x\the\ht\tw at +\the\dp\tw@ @\the\eq at badness\breqn at endelt
\eq at measurements
}%
\advance\eq at curline\m at ne
@@ -5170,7 +5161,7 @@
\ifnum\eq at lines>\sixt@@n
\eq at dense@enough at b
\else
- \dim at b\z@ \let\@elt\eq at delt \eq at measurements
+ \dim at b\z@ \let\breqn at elt\eq at delt \eq at measurements
\dim at c\eq at density@factor\eq at wdT \multiply\dim at c\eq at lines
%<trace> \breqn at debugmsg{Density check: black \the\dim at b/\eq at density@factor total \the\dim at c}%
\ifdim\dim at b>\dim at c \true at false@true \else \false at false@false \fi
@@ -5183,7 +5174,7 @@
% \begin{macro}{\eq at delt}
% Args are space-above, indent, width, height, depth, badness.
% \begin{macrocode}
-\def\eq at delt#1X#2,#3x#4+#5@#6\@endelt{\addtolength\dim at b{#3}}%
+\def\eq at delt#1X#2,#3x#4+#5@#6\breqn at endelt{\addtolength\dim at b{#3}}%
% \end{macrocode}
% \end{macro}
%
@@ -6526,7 +6517,7 @@
% \begin{macrocode}
\def\grp at push{%
\global\GRP at queue\@xp\@xp\@xp{\@xp\the\@xp\GRP at queue
- \@xp\@elt\@xp{\EQ at trial}%
+ \@xp\breqn at elt\@xp{\EQ at trial}%
}%
\global\setbox\GRP at box\vbox{%
\hbox{\box\EQ at box\box\EQ at copy\penalty\@ne\copy\EQ at numbox}%
@@ -6606,7 +6597,7 @@
% in a \cs{vbox}
% \begin{macrocode}
\setbox\GRP at wholebox\vbox{%
- \let\@elt\eqgrp at elt
+ \let\breqn at elt\eqgrp at elt
\the\GRP at queue
}%
% \end{macrocode}
@@ -6647,7 +6638,7 @@
%\debug at box\GRP at wholebox
%</trace>
\unvbox\GRP at wholebox
- \let\@elt\relax
+ \let\breqn at 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 at queue}.
% \begin{macrocode}
\global\GRP at queue\@xp{\the\GRP at queue
- \@elt{\gdef\EQ at trial{}}%
+ \breqn at elt{\gdef\EQ at trial{}}%
}%
}
% \end{macrocode}
@@ -6942,8 +6933,8 @@
\unvbox\GRP at box
}%
\global\GRP at queue\@xp{\the\GRP at queue
-% \@elt{\gdef\EQ at trial{\let\eq at isIntertext\@True}}%
- \@elt{\let\eq at isIntertext\@True}%
+% \breqn at elt{\gdef\EQ at trial{\let\eq at isIntertext\@True}}%
+ \breqn at elt{\let\eq at isIntertext\@True}%
}%
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/breqn/breqnbundle.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/breqn/breqnbundle.ins 2020-02-18 22:30:45 UTC (rev 53832)
+++ trunk/Master/texmf-dist/source/latex/breqn/breqnbundle.ins 2020-02-18 22:31:00 UTC (rev 53833)
@@ -34,13 +34,11 @@
\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 @@
}
\generate{%
- \file{mathstyle.ins}{\from{mathstyle.dtx}{install}}%
\usedir{tex/latex/breqn}%
\file{mathstyle.sty}{\from{mathstyle.dtx}{package}}%
}
Modified: trunk/Master/texmf-dist/source/latex/breqn/flexisym.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/breqn/flexisym.dtx 2020-02-18 22:30:45 UTC (rev 53832)
+++ trunk/Master/texmf-dist/source/latex/breqn/flexisym.dtx 2020-02-18 22:31:00 UTC (rev 53833)
@@ -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{%
Modified: trunk/Master/texmf-dist/source/latex/breqn/mathstyle.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/breqn/mathstyle.dtx 2020-02-18 22:30:45 UTC (rev 53832)
+++ trunk/Master/texmf-dist/source/latex/breqn/mathstyle.dtx 2020-02-18 22:31:00 UTC (rev 53833)
@@ -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}
%
Modified: trunk/Master/texmf-dist/tex/latex/breqn/breqn.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/breqn/breqn.sty 2020-02-18 22:30:45 UTC (rev 53832)
+++ trunk/Master/texmf-dist/tex/latex/breqn/breqn.sty 2020-02-18 22:31:00 UTC (rev 53833)
@@ -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 at 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 at recalc{%
\eq at wdT\z@ \eq at wdMin\maxdimen \eq at vspan\z at skip \eq at badness\z@
- \let\@elt\eq at recalc@a \eq at measurements \let\@elt\relax
+ \let\breqn at elt\eq at recalc@a \eq at measurements \let\breqn at elt\relax
}
-\def\eq at recalc@a#1x#2+#3\@endelt{%
+\def\eq at recalc@a#1x#2+#3\breqn at endelt{%
\eq at firstht#2\relax
- \let\@elt\eq at recalc@b
- \@elt#1x#2+#3\@endelt
+ \let\breqn at elt\eq at recalc@b
+ \breqn at elt#1x#2+#3\breqn at endelt
}
-\def\eq at recalc@b#1X#2,#3x#4+#5@#6\@endelt{%
+\def\eq at recalc@b#1X#2,#3x#4+#5@#6\breqn at endelt{%
\setlength\dim at a{#2+#3}%
\ifdim\dim at a>\eq at wdT \eq at wdT\dim at a \fi
\ifdim\dim at a<\eq at wdMin \eq at wdMin\dim at a \fi
@@ -1182,9 +1179,11 @@
\def\@tempc##1##2 {\int at b##2\afterassignment\@tempa\dim at a}%
\@xp\@tempc\@parshape
}
-\chardef\@endelt=`\?
+\chardef\breqn at endelt=`\?
+\let\breqn at elt\relax
+\let\breqn at endelt\relax
\def\eq at measurements{%
- \@elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt at 27\@endelt
+ \breqn at elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt at 27\breqn at endelt
...
}
\def\eq at measure@lines{%
@@ -1212,7 +1211,7 @@
\fi
}%
\fi
- \edef\eq at measurements{\@elt
+ \edef\eq at measurements{\breqn at elt
\the\skip at a\space X% extra space to facilitate extracting only the
% dimen part later
\csname eq at i%
@@ -1219,7 +1218,7 @@
\ifnum\eq at curline<\parshape \number\eq at curline
\else\number\parshape
\fi
- \endcsname,\the\dim at a x\the\ht\tw at +\the\dp\tw@ @\the\eq at badness\@endelt
+ \endcsname,\the\dim at a x\the\ht\tw at +\the\dp\tw@ @\the\eq at badness\breqn at endelt
\eq at measurements
}%
\advance\eq at curline\m at ne
@@ -1249,12 +1248,12 @@
\ifnum\eq at lines>\sixt@@n
\eq at dense@enough at b
\else
- \dim at b\z@ \let\@elt\eq at delt \eq at measurements
+ \dim at b\z@ \let\breqn at elt\eq at delt \eq at measurements
\dim at c\eq at density@factor\eq at wdT \multiply\dim at c\eq at lines
\ifdim\dim at b>\dim at c \true at false@true \else \false at false@false \fi
\fi
}
-\def\eq at delt#1X#2,#3x#4+#5@#6\@endelt{\addtolength\dim at b{#3}}%
+\def\eq at delt#1X#2,#3x#4+#5@#6\breqn at endelt{\addtolength\dim at b{#3}}%
\def\eq at dense@enough at b{%
\int at b\eq at wdT \divide\int at b\p@
\dim at b\eq at wdL \divide\dim at b\int at b
@@ -1806,7 +1805,7 @@
\newbox\GRP at wholebox
\def\grp at push{%
\global\GRP at queue\@xp\@xp\@xp{\@xp\the\@xp\GRP at queue
- \@xp\@elt\@xp{\EQ at trial}%
+ \@xp\breqn at elt\@xp{\EQ at trial}%
}%
\global\setbox\GRP at box\vbox{%
\hbox{\box\EQ at box\box\EQ at copy\penalty\@ne\copy\EQ at numbox}%
@@ -1849,7 +1848,7 @@
\global\advance\grp at wdT\grp at wdR
\fi
\setbox\GRP at wholebox\vbox{%
- \let\@elt\eqgrp at elt
+ \let\breqn at elt\eqgrp at elt
\the\GRP at queue
}%
\global\let\eq at GRP@first at dmath\@True
@@ -1872,7 +1871,7 @@
\fi
\fi
\unvbox\GRP at wholebox
- \let\@elt\relax
+ \let\breqn at elt\relax
\eq at botspace % not needed unless bottom number?
}
\def\eqgrp at elt#1{%
@@ -2001,7 +2000,7 @@
\unvbox\GRP at box
}%
\global\GRP at queue\@xp{\the\GRP at queue
- \@elt{\gdef\EQ at trial{}}%
+ \breqn at elt{\gdef\EQ at trial{}}%
}%
}
\newenvironment{dsuspend}{%
@@ -2015,7 +2014,7 @@
\unvbox\GRP at box
}%
\global\GRP at queue\@xp{\the\GRP at queue
- \@elt{\let\eq at isIntertext\@True}%
+ \breqn at elt{\let\eq at isIntertext\@True}%
}%
}
\newcommand\breqn at intertext[1]{\dsuspend#1\enddsuspend}
Modified: trunk/Master/texmf-dist/tex/latex/breqn/flexisym.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/breqn/flexisym.sty 2020-02-18 22:30:45 UTC (rev 53832)
+++ trunk/Master/texmf-dist/tex/latex/breqn/flexisym.sty 2020-02-18 22:31:00 UTC (rev 53833)
@@ -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{%
Modified: trunk/Master/texmf-dist/tex/latex/breqn/mathstyle.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/breqn/mathstyle.sty 2020-02-18 22:30:45 UTC (rev 53832)
+++ trunk/Master/texmf-dist/tex/latex/breqn/mathstyle.sty 2020-02-18 22:31:00 UTC (rev 53833)
@@ -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
More information about the tex-live-commits
mailing list.