summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-10-28 19:45:22 +0000
committerKarl Berry <karl@freefriends.org>2021-10-28 19:45:22 +0000
commit0d39df3b97aa2eb5d240cc57f440d1e963be9c6e (patch)
tree2425df14b35725dabdc80ff585ba5315fd9a4e38
parent7f745b20372ecfef8165353b25137e9874c117a8 (diff)
breqn (28oct21)
git-svn-id: svn://tug.org/texlive/trunk@60881 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/breqn/CHANGES.md6
-rw-r--r--Master/texmf-dist/doc/latex/breqn/breqn.pdfbin661840 -> 663299 bytes
-rw-r--r--Master/texmf-dist/doc/latex/breqn/flexisym.pdfbin285950 -> 286026 bytes
-rw-r--r--Master/texmf-dist/doc/latex/breqn/mathstyle.pdfbin186678 -> 186681 bytes
-rw-r--r--Master/texmf-dist/source/latex/breqn/breqn.dtx69
-rw-r--r--Master/texmf-dist/source/latex/breqn/flexisym.dtx6
-rw-r--r--Master/texmf-dist/source/latex/breqn/mathstyle.dtx6
-rw-r--r--Master/texmf-dist/tex/latex/breqn/breqn.sty42
-rw-r--r--Master/texmf-dist/tex/latex/breqn/flexisym.sty2
-rw-r--r--Master/texmf-dist/tex/latex/breqn/mathstyle.sty2
10 files changed, 101 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/latex/breqn/CHANGES.md b/Master/texmf-dist/doc/latex/breqn/CHANGES.md
index 26d5849594b..db0f313bcc9 100644
--- a/Master/texmf-dist/doc/latex/breqn/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/breqn/CHANGES.md
@@ -1,5 +1,11 @@
# Release notes for the `breqn` packages
+
+## v0.98l (2021/10/28)
+
+ * Prevent new LaTeX paragraph hooks from running and interfering unnecessarily with breqn internals (thanks Frank)
+
+
## v0.98k (2020/09/24)
* Update patch code for new 2e kernel (thanks Ulrike)
diff --git a/Master/texmf-dist/doc/latex/breqn/breqn.pdf b/Master/texmf-dist/doc/latex/breqn/breqn.pdf
index 5db6488b0b8..2bb8adfda5f 100644
--- a/Master/texmf-dist/doc/latex/breqn/breqn.pdf
+++ b/Master/texmf-dist/doc/latex/breqn/breqn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/breqn/flexisym.pdf b/Master/texmf-dist/doc/latex/breqn/flexisym.pdf
index f48961bd2a2..906adcb9c31 100644
--- a/Master/texmf-dist/doc/latex/breqn/flexisym.pdf
+++ b/Master/texmf-dist/doc/latex/breqn/flexisym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf b/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf
index 62fe0c3bd71..fb554077593 100644
--- a/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf
+++ b/Master/texmf-dist/doc/latex/breqn/mathstyle.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/breqn/breqn.dtx b/Master/texmf-dist/source/latex/breqn/breqn.dtx
index ce68c555b6b..bd33b11cfdb 100644
--- a/Master/texmf-dist/source/latex/breqn/breqn.dtx
+++ b/Master/texmf-dist/source/latex/breqn/breqn.dtx
@@ -151,8 +151,8 @@
%
%
% \title{The \pkg{breqn} package}
-% \def\fileversion{0.98k}
-% \def\filedate{2020/09/24}
+% \def\fileversion{0.98l}
+% \def\filedate{2021/10/28}
% \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}}
%
@@ -1377,7 +1377,7 @@
% Declare package name and date.
% \begin{macrocode}
\RequirePackage{expl3}
-\ProvidesExplPackage{breqn}{2020/09/24}{0.98k}{Breaking equations}
+\ProvidesExplPackage{breqn}{2021/10/28}{0.98l}{Breaking equations}
% \end{macrocode}
% Regrettably, \pkg{breqn} is internally a mess, so we have to take
% some odd steps.
@@ -1458,6 +1458,30 @@
%
% \section{Some useful tools}
%
+%
+%
+% \begin{macro}{\MaybeRawNoindent}
+% Breqn does a lot of low-level paragraph stuff which iesn't
+% supposed to execute paragraph hooks, so with a newer \LaTeX{} it
+% needs to run the versions that prevent the hooks from executing.
+% \begin{macrocode}
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\IfFormatAtLeastTF{2021/06/01}
+ {%
+ \def\MaybeRawNoindent{\ifvmode\expandafter\RawNoindent\fi}%
+ }%
+ {%
+ \let\MaybeRawNoindent\noindent
+ \let\RawParEnd\@@par
+ }
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
% \begin{macro}{\@nx}
% \begin{macro}{\@xp}
% The comparative brevity of \cs{@nx} and \cs{@xp} is
@@ -3114,19 +3138,25 @@
\def\eq@typeset@L@single{%
\nobreak
\eq@params\eq@parshape
- \nointerlineskip\noindent
+ \nointerlineskip
+% \noindent
+ \MaybeRawNoindent
\add@grp@label
\rlap{\kern-\leftskip\box\EQ@numbox}%
\if F\eq@frame
\else
\rlap{\raise\eq@firstht\hbox to\z@{\eq@addframe\hss}}%
\fi
- \eq@dump@box\unhbox\EQ@box \@@par
+ \eq@dump@box\unhbox\EQ@box
+ %\@@par
+ \RawParEnd
}
\def\eq@typeset@R@single{%
\nobreak
\eq@params\eq@parshape
- \nointerlineskip\noindent
+ \nointerlineskip
+% \noindent
+ \MaybeRawNoindent
\add@grp@label
\if F\eq@frame
\else
@@ -3134,7 +3164,8 @@
\fi
\rlap{\kern-\leftskip\kern\linewidth\kern-\wd\EQ@numbox\copy\EQ@numbox}%
\eq@dump@box\unhbox\EQ@box
- \@@par
+ %\@@par
+ \RawParEnd
}
% \end{macrocode}
%
@@ -3535,7 +3566,9 @@
\def\eq@startup{%
\global\let\EQ@hasLHS\@False
\setbox\z@\vbox\bgroup
- \noindent \@@math \displaystyle
+% \noindent
+ \MaybeRawNoindent % no matching \RawParEnd (implicit at box end)
+ \@@math \displaystyle
\penalty-\@Mi
}
% \end{macrocode}
@@ -5332,7 +5365,9 @@
% \begin{macrocode}
\def\eq@dump@box#1#2{%
%\debug@box#1%
- \noindent #1#2\setbox\f@ur\lastbox \setbox\tw@\lastbox
+% \noindent
+ \MaybeRawNoindent % did not find the end yet
+ #1#2\setbox\f@ur\lastbox \setbox\tw@\lastbox
% \end{macrocode}
% If the LHS contains shrinkable glue, in an L layout the alignment
% could be thrown off if the first line is shrunk noticeably.
@@ -5609,9 +5644,13 @@
\def\eq@typeset@equation{%
\nobreak
\eq@params\eq@parshape
- \nointerlineskip\noindent
+ \nointerlineskip
+% \noindent
+ \MaybeRawNoindent
\add@grp@label
- \eq@dump@box\unhbox\EQ@box\@@par
+ \eq@dump@box\unhbox\EQ@box
+% \@@par
+ \RawParEnd
}
% \end{macrocode}
%
@@ -6007,7 +6046,9 @@
% 10000, it means a sub and/or superscript is present on the right
% delimiter and the box containing them must be taken off first.
% \begin{macrocode}
- \noindent\unhbox\z@ \unskip
+% \noindent
+ \MaybeRawNoindent
+ \unhbox\z@ \unskip
\subsup@flag-\lastpenalty \unpenalty
\xdef\right@delim@code{\number\lastpenalty}%
\unpenalty
@@ -6029,7 +6070,9 @@
% this complication. The penalty value $-10001$ is a no-op case
% in the case statement of \cs{eq@repacka}.
% \begin{macrocode}
- \penalty-\@Mi\z@rule\@@par
+ \penalty-\@Mi\z@rule
+% \@@par
+ \RawParEnd
\setbox\z@\lastbox \unskip\unpenalty
%%{\showboxbreadth\maxdimen\showboxdepth99\showlists}%
}
diff --git a/Master/texmf-dist/source/latex/breqn/flexisym.dtx b/Master/texmf-dist/source/latex/breqn/flexisym.dtx
index b827447fc60..2973f3abc6d 100644
--- a/Master/texmf-dist/source/latex/breqn/flexisym.dtx
+++ b/Master/texmf-dist/source/latex/breqn/flexisym.dtx
@@ -79,8 +79,8 @@
% \fi
%
% \title{The \textsf{flexisym} package}
-% \def\fileversion{0.98k}
-% \def\filedate{2020/09/24}
+% \def\fileversion{0.98l}
+% \def\filedate{2021/10/28}
% \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}}
%
@@ -98,7 +98,7 @@
% \begin{macrocode}
%<*package>
\RequirePackage{expl3}[2009/08/05]
-\ProvidesExplPackage{flexisym}{2020/09/24}{0.98k}{Make math characters macros}
+\ProvidesExplPackage{flexisym}{2021/10/28}{0.98l}{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 479b95b91db..b2c2e472713 100644
--- a/Master/texmf-dist/source/latex/breqn/mathstyle.dtx
+++ b/Master/texmf-dist/source/latex/breqn/mathstyle.dtx
@@ -58,8 +58,8 @@
% \fi
%
% \title{The \textsf{mathstyle} package}
-% \def\fileversion{0.98k}
-% \def\filedate{2020/09/24}
+% \def\fileversion{0.98l}
+% \def\filedate{2021/10/28}
% \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}}
%
@@ -152,7 +152,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{mathstyle}{2020/09/24}{0.98k}{Tracking mathstyle implicitly}
+\ProvidesExplPackage{mathstyle}{2021/10/28}{0.98l}{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 aaccfbcd3ce..90ff9feeb5e 100644
--- a/Master/texmf-dist/tex/latex/breqn/breqn.sty
+++ b/Master/texmf-dist/tex/latex/breqn/breqn.sty
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{breqn}{2020/09/24}{0.98k}{Breaking equations}
+\ProvidesExplPackage{breqn}{2021/10/28}{0.98l}{Breaking equations}
\ExplSyntaxOff
\edef\breqnpopcats{%
\catcode\number`\"=\number\catcode`\"
@@ -55,6 +55,15 @@
}
\RequirePackage{keyval,calc}\relax
\newcommand{\breqnsetup}[1]{\setkeys{breqn}{#1}}
+\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+\IfFormatAtLeastTF{2021/06/01}
+ {%
+ \def\MaybeRawNoindent{\ifvmode\expandafter\RawNoindent\fi}%
+ }%
+ {%
+ \let\MaybeRawNoindent\noindent
+ \let\RawParEnd\@@par
+ }
\let\@nx\noexpand
\let\@xp\expandafter
\@ifundefined{@emptytoks}{\newtoks\@emptytoks}{}
@@ -545,19 +554,23 @@
\def\eq@typeset@L@single{%
\nobreak
\eq@params\eq@parshape
- \nointerlineskip\noindent
+ \nointerlineskip
+ \MaybeRawNoindent
\add@grp@label
\rlap{\kern-\leftskip\box\EQ@numbox}%
\if F\eq@frame
\else
\rlap{\raise\eq@firstht\hbox to\z@{\eq@addframe\hss}}%
\fi
- \eq@dump@box\unhbox\EQ@box \@@par
+ \eq@dump@box\unhbox\EQ@box
+ %\@@par
+ \RawParEnd
}
\def\eq@typeset@R@single{%
\nobreak
\eq@params\eq@parshape
- \nointerlineskip\noindent
+ \nointerlineskip
+ \MaybeRawNoindent
\add@grp@label
\if F\eq@frame
\else
@@ -565,7 +578,8 @@
\fi
\rlap{\kern-\leftskip\kern\linewidth\kern-\wd\EQ@numbox\copy\EQ@numbox}%
\eq@dump@box\unhbox\EQ@box
- \@@par
+ %\@@par
+ \RawParEnd
}
\def\peek@branch#1#2{%
\let\peek@b#1\let\peek@space#2\futurelet\@let@token\peek@a
@@ -709,7 +723,8 @@
\def\eq@startup{%
\global\let\EQ@hasLHS\@False
\setbox\z@\vbox\bgroup
- \noindent \@@math \displaystyle
+ \MaybeRawNoindent % no matching \RawParEnd (implicit at box end)
+ \@@math \displaystyle
\penalty-\@Mi
}
\def\eq@setup@a{%
@@ -1274,7 +1289,8 @@
\tolerance9999 \pretolerance\m@ne
}
\def\eq@dump@box#1#2{%
- \noindent #1#2\setbox\f@ur\lastbox \setbox\tw@\lastbox
+ \MaybeRawNoindent % did not find the end yet
+ #1#2\setbox\f@ur\lastbox \setbox\tw@\lastbox
\if L\eq@layout \box\tw@ \else\unhbox\tw@\fi
\adjust@rel@penalty \unhbox\f@ur
}
@@ -1451,9 +1467,11 @@
\def\eq@typeset@equation{%
\nobreak
\eq@params\eq@parshape
- \nointerlineskip\noindent
+ \nointerlineskip
+ \MaybeRawNoindent
\add@grp@label
- \eq@dump@box\unhbox\EQ@box\@@par
+ \eq@dump@box\unhbox\EQ@box
+ \RawParEnd
}
\newcommand\eqframe[2]{%
\begingroup
@@ -1617,7 +1635,8 @@
}
\def\eq@lrunpack{\setbox\z@\lastbox
\unskip \nointerlineskip
- \noindent\unhbox\z@ \unskip
+ \MaybeRawNoindent
+ \unhbox\z@ \unskip
\subsup@flag-\lastpenalty \unpenalty
\xdef\right@delim@code{\number\lastpenalty}%
\unpenalty
@@ -1630,7 +1649,8 @@
\ifvoid\tw@ \unhbox\z@
\else \lrss@reattach % uses \subsup@flag, box\z@, box\tw@
\fi
- \penalty-\@Mi\z@rule\@@par
+ \penalty-\@Mi\z@rule
+ \RawParEnd
\setbox\z@\lastbox \unskip\unpenalty
%%{\showboxbreadth\maxdimen\showboxdepth99\showlists}%
}
diff --git a/Master/texmf-dist/tex/latex/breqn/flexisym.sty b/Master/texmf-dist/tex/latex/breqn/flexisym.sty
index beac414fa82..e6cf3db1049 100644
--- a/Master/texmf-dist/tex/latex/breqn/flexisym.sty
+++ b/Master/texmf-dist/tex/latex/breqn/flexisym.sty
@@ -31,7 +31,7 @@
%% flexisym.dtx, and mathstyle.dtx.
%%
\RequirePackage{expl3}[2009/08/05]
-\ProvidesExplPackage{flexisym}{2020/09/24}{0.98k}{Make math characters macros}
+\ProvidesExplPackage{flexisym}{2021/10/28}{0.98l}{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 7d2e4c97c1a..884eb41e841 100644
--- a/Master/texmf-dist/tex/latex/breqn/mathstyle.sty
+++ b/Master/texmf-dist/tex/latex/breqn/mathstyle.sty
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{mathstyle}{2020/09/24}{0.98k}{Tracking mathstyle implicitly}
+\ProvidesExplPackage{mathstyle}{2021/10/28}{0.98l}{Tracking mathstyle implicitly}
\ExplSyntaxOff
\providecommand\@saveprimitive[2]{%
\begingroup