From 0d39df3b97aa2eb5d240cc57f440d1e963be9c6e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 28 Oct 2021 19:45:22 +0000 Subject: breqn (28oct21) git-svn-id: svn://tug.org/texlive/trunk@60881 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/breqn/breqn.dtx | 69 ++++++++++++++++++---- Master/texmf-dist/source/latex/breqn/flexisym.dtx | 6 +- Master/texmf-dist/source/latex/breqn/mathstyle.dtx | 6 +- 3 files changed, 62 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/source') 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} % -- cgit v1.2.3