From 89621c1ee7abdb0d7e8e8fa92d4f582093fb7dac Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Sep 2018 21:37:43 +0000 Subject: breqn (16sep18) git-svn-id: svn://tug.org/texlive/trunk@48679 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/breqn/CHANGES.md | 10 +++ Master/texmf-dist/doc/latex/breqn/README.md | 39 +++++---- Master/texmf-dist/doc/latex/breqn/breqn.pdf | Bin 654174 -> 655285 bytes Master/texmf-dist/doc/latex/breqn/flexisym.pdf | Bin 286197 -> 286197 bytes Master/texmf-dist/doc/latex/breqn/mathstyle.pdf | Bin 205238 -> 205238 bytes Master/texmf-dist/source/latex/breqn/breqn.dtx | 40 +++++++-- Master/texmf-dist/source/latex/breqn/breqn.ins | 91 +++++++++++++++++++ Master/texmf-dist/source/latex/breqn/flexisym.ins | 96 +++++++++++++++++++++ Master/texmf-dist/source/latex/breqn/mathstyle.ins | 90 +++++++++++++++++++ Master/texmf-dist/tex/latex/breqn/breqn.sty | 21 ++++- 10 files changed, 356 insertions(+), 31 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/breqn/CHANGES.md create mode 100644 Master/texmf-dist/source/latex/breqn/breqn.ins create mode 100644 Master/texmf-dist/source/latex/breqn/flexisym.ins create mode 100644 Master/texmf-dist/source/latex/breqn/mathstyle.ins (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/breqn/CHANGES.md b/Master/texmf-dist/doc/latex/breqn/CHANGES.md new file mode 100644 index 00000000000..fb079f78cc8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/breqn/CHANGES.md @@ -0,0 +1,10 @@ +# Release notes for the `breqn` packages + +* v0.98f (2018/09/14) + + * Insert `\nolinenumbers` inside maths environments if the `lineno` package is loaded. + It would be better to insert a line number, but at least with this the document still compiles! + +* v0.98e (2017/01/27) + + * Fix in `\mathchoice` to allow use under recent versions of LuaTeX diff --git a/Master/texmf-dist/doc/latex/breqn/README.md b/Master/texmf-dist/doc/latex/breqn/README.md index 276fab16d00..ab25e9bf71d 100644 --- a/Master/texmf-dist/doc/latex/breqn/README.md +++ b/Master/texmf-dist/doc/latex/breqn/README.md @@ -1,34 +1,39 @@ + # The BREQN packages -This is the latest repository for the breqn package, originally developed by Michael J. Downes and later taken over by Morten Høgholm. +This is the latest repository for the breqn package, originally developed by +Michael J. Downes and later taken over by Morten Høgholm. +Will Robertson currently manages the code but without time for major development. -The version of the package here will be used as the source for current CTAN releases. +* CTAN URL: +* Feedback/bugs: +* Change history: [CHANGES.md](./CHANGES.md) -Internal updates are planned but no major development is expected. Contributors welcome — if you dare. +## Installation -Feedback should be directed to the Issue Tracker at: - +The `breqn` packages are distributed in the major TeX distributions so manual installation +is only necessary if you wish to install pre-release versions or contribute to the development +of the package. -## Installation +Individually, running `pdftex` on each dtx file extracts the runtime files. +As a package, `l3build install` will extract the needed files and install them locally. -Running TeX on each dtx file extracts the runtime files. See the dtx -files for details. -## The code -### breqn +# The code + +## breqn The breqn package facilitates automatic line-breaking of displayed -math expressions. The package was originally developed by Michael -J. Downes. +math expressions. -### flexisym +## flexisym This package turns math symbols into macros. -Is is required by breqn so that breqn can make intelligent decisions +It is required by breqn so that breqn can make intelligent decisions with respect to line-breaking and other details. -### mathstyle +## mathstyle Ensures uniform syntax for math subscript (_) and superscript (^) operations so that they always take exactly one argument. @@ -36,8 +41,4 @@ Grants access to the current mathstyle which eases several tasks such as avoiding the many pitfalls of \mathchoice and \mathpalette. This package is used by flexisym. -## Release notes - -* v0.98e (2017/01/27) - * Fix in `\mathchoice` to allow use under recent versions of LuaTeX diff --git a/Master/texmf-dist/doc/latex/breqn/breqn.pdf b/Master/texmf-dist/doc/latex/breqn/breqn.pdf index 441bd80c44d..90f25a563aa 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 627bc038953..216df9adabb 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 ac8f9a08c9a..39d577182c0 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 8f23f28cf76..6b93a18506d 100644 --- a/Master/texmf-dist/source/latex/breqn/breqn.dtx +++ b/Master/texmf-dist/source/latex/breqn/breqn.dtx @@ -78,7 +78,7 @@ This is a generated file. Copyright (C) 1997-2003 by Michael J. Downes Copyright (C) 2007-2008 by Morten Hoegholm Copyright (C) 2007-2014 by Lars Madsen -Copyright (C) 2007-2017 by Will Robertson +Copyright (C) 2007-2018 by Will Robertson Copyright (C) 2010-2017 by Joseph Wright This work may be distributed and/or modified under the @@ -124,7 +124,7 @@ and the derived files % %<*driver> \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{breqn.drv}[2017/01/27 0.98e breqn] +\ProvidesFile{breqn.drv}[2018/09/14 0.98f breqn] \documentclass{ltxdoc} \CodelineIndex \EnableCrossrefs @@ -1457,8 +1457,6 @@ and the derived files % % \section{Prelim} % -% This package doesn't work with \latex 2.09, nor with other -% versions of \latex earlier than 1994/12/01. % \begin{macrocode} %<*package> \NeedsTeXFormat{LaTeX2e} @@ -1466,8 +1464,8 @@ and the derived files % % Declare package name and date. % \begin{macrocode} -\RequirePackage{expl3}[2009/08/05] -\ProvidesExplPackage{breqn}{2017/01/27}{0.98e}{Breaking equations} +\RequirePackage{expl3} +\ProvidesExplPackage{breqn}{2018/09/14}{0.98f}{Breaking equations} % \end{macrocode} % Regrettably, \pkg{breqn} is internally a mess, so we have to take % some odd steps. @@ -2041,12 +2039,13 @@ and the derived files % \begin{macrocode} %<*trace> \errorcontextlines=2000\relax +\typeout{BREQN DEBUGGING MODE ACTIVE} % \end{macrocode} % % \begin{macro}{\breqn@debugmsg} % Print a debugging message. % \begin{macrocode} -\long\def\breqn@debugmsg#1{\GenericInfo{||}{||=\space#1}} +\long\def\breqn@debugmsg#1{\GenericWarning{||}{||=\space#1}} % \end{macrocode} % \end{macro} % @@ -2969,6 +2968,15 @@ and the derived files % 1) modifications supplied by MJD to fix the eaten \cs{paragraph} problem. % 2) Added \cs{display@setup} here, rather than globally. % +% \begin{macro}{\@dmath@start@hook} +% \begin{macro}{\@dgroup@start@hook} +% \begin{macrocode} +\let\@dmath@start@hook\@empty +\let\@dgroup@start@hook\@empty +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \begin{macro}{\dmath} % \begin{macro}{\enddmath} % For the \env{dmath} environment we don't want the standard @@ -2977,6 +2985,7 @@ and the derived files % for math material. So we call \cs{@optarg} instead. % \begin{macrocode} \newenvironment{dmath}{% + \@dmath@start@hook \let\eq@hasNumber\@True \@optarg\@dmath{}}{} \def\@dmath[#1]{% % \breqn@debugmsg{=== DMATH ==================================================}% @@ -3005,7 +3014,9 @@ and the derived files % \cs{enddmath} needs to look ahead for punctuation (and % \cs{qed}?). % \begin{macrocode} -\def\enddmath#1{\check@punct@or@qed} +\def\enddmath#1{% + \check@punct@or@qed +} \def\end@dmath{% \gdef\EQ@setwdL{}% Occasionally undefined ??? \eq@capture @@ -3035,6 +3046,7 @@ and the derived files % Ah yes, now the lovely \env{dmath*} environment. % \begin{macrocode} \newenvironment{dmath*}{% + \@dmath@start@hook \let\eq@hasNumber\@False \@optarg\@dmath{}% }{} \@namedef{end@dmath*}{\end@dmath} @@ -6520,6 +6532,7 @@ and the derived files % Definition of the \env{dgroup} environment. % \begin{macrocode} \newenvironment{dgroup}{% + \@dgroup@start@hook \let\grp@hasNumber\@True\@optarg\@dgroup{}% }{% \end@dgroup @@ -7107,6 +7120,17 @@ and the derived files % \end{macro} % % +% \section{Compatibility} +% +% \paragraph{lineno} (or at the very least, allow documents to compile!) +% \begin{macrocode} +\AtBeginDocument{% + \@ifpackageloaded{lineno}{% + \g@addto@macro\@dmath@start@hook{\nolinenumbers}% + \g@addto@macro\@dgroup@start@hook{\nolinenumbers}% + }{}% +} +% \end{macrocode} % % % diff --git a/Master/texmf-dist/source/latex/breqn/breqn.ins b/Master/texmf-dist/source/latex/breqn/breqn.ins new file mode 100644 index 00000000000..4c1c5b316f9 --- /dev/null +++ b/Master/texmf-dist/source/latex/breqn/breqn.ins @@ -0,0 +1,91 @@ +%% +%% This is file `breqn.ins', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% breqn.dtx (with options: `install') +%% +%% This is a generated file. +%% +%% Copyright (C) 1997-2003 by Michael J. Downes +%% Copyright (C) 2007-2008 by Morten Hoegholm +%% Copyright (C) 2007-2014 by Lars Madsen +%% Copyright (C) 2007-2018 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Will Robertson. +%% +%% This work consists of the main source file breqn.dtx +%% and the derived files +%% breqn.sty, breqn.pdf, breqn.ins. +%% +\input docstrip.tex +\Msg{************************************************************************} +\Msg{* Installation: breqn} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\preamble + +This is a generated file. + +Copyright (C) 1997-2003 by Michael J. Downes +Copyright (C) 2007-2008 by Morten Hoegholm +Copyright (C) 2007-2014 by Lars Madsen +Copyright (C) 2007-2018 by Will Robertson +Copyright (C) 2010-2017 by Joseph Wright + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either +version 1.3 of this license or (at your option) any later +version. The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of +LaTeX version 2005/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +The Current Maintainer of this work is Will Robertson. + +This work consists of the main source file breqn.dtx +and the derived files + breqn.sty, breqn.pdf, breqn.ins. + +\endpreamble + +\generate{% + \file{breqn.ins}{\from{breqn.dtx}{install}}% + \usedir{tex/latex/breqn}% + \file{breqn.sty}{\from{breqn.dtx}{package}}% +} + +\obeyspaces +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* file into a directory searched by TeX:} +\Msg{*} +\Msg{* breqn.sty} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile + +\endinput +%% +%% End of file `breqn.ins'. diff --git a/Master/texmf-dist/source/latex/breqn/flexisym.ins b/Master/texmf-dist/source/latex/breqn/flexisym.ins new file mode 100644 index 00000000000..bed8a528d5b --- /dev/null +++ b/Master/texmf-dist/source/latex/breqn/flexisym.ins @@ -0,0 +1,96 @@ +%% +%% This is file `flexisym.ins', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% flexisym.dtx (with options: `install') +%% +%% This is a generated file. +%% +%% Copyright (C) 1997-2003 by Michael J. Downes +%% Copyright (C) 2007-2010 by Morten Hoegholm +%% Copyright (C) 2007-2014 by Lars Madsen +%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Will Robertson. +%% +%% This work consists of the main source file flexisym.dtx +%% and the derived files +%% flexisym.sty, flexisym.pdf, flexisym.ins, +%% cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym. +%% +\input docstrip.tex +\Msg{************************************************************************} +\Msg{* Installation: flexisym} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\preamble + +This is a generated file. + +Copyright (C) 1997-2003 by Michael J. Downes +Copyright (C) 2007-2010 by Morten Hoegholm +Copyright (C) 2007-2014 by Lars Madsen +Copyright (C) 2007-2017 by Will Robertson +Copyright (C) 2010-2017 by Joseph Wright + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either +version 1.3 of this license or (at your option) any later +version. The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of +LaTeX version 2005/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +The Current Maintainer of this work is Will Robertson. + +This work consists of the main source file flexisym.dtx +and the derived files + flexisym.sty, flexisym.pdf, flexisym.ins, + cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym. + +\endpreamble + +\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}}% + \file{mathpazo.sym}{\from{flexisym.dtx}{mathpazo}}% + \file{mathptmx.sym}{\from{flexisym.dtx}{mathptmx}}% + \file{msabm.sym}{\from{flexisym.dtx}{msabm}}% +} + +\obeyspaces +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* files into a directory searched by TeX:} +\Msg{*} +\Msg{* flexisym.sty, cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile +\endinput +%% +%% End of file `flexisym.ins'. diff --git a/Master/texmf-dist/source/latex/breqn/mathstyle.ins b/Master/texmf-dist/source/latex/breqn/mathstyle.ins new file mode 100644 index 00000000000..79d6f7390c6 --- /dev/null +++ b/Master/texmf-dist/source/latex/breqn/mathstyle.ins @@ -0,0 +1,90 @@ +%% +%% This is file `mathstyle.ins', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% mathstyle.dtx (with options: `install') +%% +%% This is a generated file. +%% +%% Copyright (C) 1997-2003 by Michael J. Downes +%% Copyright (C) 2007-2011 by Morten Hoegholm et al +%% Copyright (C) 2007-2014 by Lars Madsen +%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2010-2017 by Joseph Wright +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3 of this license or (at your option) any later +%% version. The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainer of this work is Will Robertson. +%% +%% This work consists of the main source file mathstyle.dtx +%% and the derived files +%% mathstyle.sty, mathstyle.pdf, mathstyle.ins. +%% +\input docstrip.tex +\Msg{************************************************************************} +\Msg{* Installation for package: mathstyle} +\Msg{************************************************************************} + +\keepsilent +\askforoverwritefalse + +\preamble + +This is a generated file. + +Copyright (C) 1997-2003 by Michael J. Downes +Copyright (C) 2007-2011 by Morten Hoegholm et al +Copyright (C) 2007-2014 by Lars Madsen +Copyright (C) 2007-2017 by Will Robertson +Copyright (C) 2010-2017 by Joseph Wright + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License, either +version 1.3 of this license or (at your option) any later +version. The latest version of this license is in + http://www.latex-project.org/lppl.txt +and version 1.3 or later is part of all distributions of +LaTeX version 2005/12/01 or later. + +This work has the LPPL maintenance status "maintained". + +The Current Maintainer of this work is Will Robertson. + +This work consists of the main source file mathstyle.dtx +and the derived files + mathstyle.sty, mathstyle.pdf, mathstyle.ins. + +\endpreamble + +\generate{% + \file{mathstyle.ins}{\from{mathstyle.dtx}{install}}% + \usedir{tex/latex/breqn}% + \file{mathstyle.sty}{\from{mathstyle.dtx}{package}}% +} + +\obeyspaces +\Msg{************************************************************************} +\Msg{*} +\Msg{* To finish the installation you have to move the following} +\Msg{* file into a directory searched by TeX:} +\Msg{*} +\Msg{* mathstyle.sty} +\Msg{*} +\Msg{* Happy TeXing!} +\Msg{*} +\Msg{************************************************************************} + +\endbatchfile +\endinput +%% +%% End of file `mathstyle.ins'. diff --git a/Master/texmf-dist/tex/latex/breqn/breqn.sty b/Master/texmf-dist/tex/latex/breqn/breqn.sty index 075b653229d..93b49aa70b8 100644 --- a/Master/texmf-dist/tex/latex/breqn/breqn.sty +++ b/Master/texmf-dist/tex/latex/breqn/breqn.sty @@ -11,7 +11,7 @@ %% Copyright (C) 1997-2003 by Michael J. Downes %% Copyright (C) 2007-2008 by Morten Hoegholm %% Copyright (C) 2007-2014 by Lars Madsen -%% Copyright (C) 2007-2017 by Will Robertson +%% Copyright (C) 2007-2018 by Will Robertson %% Copyright (C) 2010-2017 by Joseph Wright %% %% This work may be distributed and/or modified under the @@ -31,8 +31,8 @@ %% breqn.sty, breqn.pdf, breqn.ins. %% \NeedsTeXFormat{LaTeX2e} -\RequirePackage{expl3}[2009/08/05] -\ProvidesExplPackage{breqn}{2017/01/27}{0.98e}{Breaking equations} +\RequirePackage{expl3} +\ProvidesExplPackage{breqn}{2018/09/14}{0.98f}{Breaking equations} \ExplSyntaxOff \edef\breqnpopcats{% \catcode\number`\"=\number\catcode`\" @@ -444,7 +444,10 @@ \define@key{breqn}{cols}{\global\let\@preamble\@empty \darray@mkpream#1\@percentchar } +\let\@dmath@start@hook\@empty +\let\@dgroup@start@hook\@empty \newenvironment{dmath}{% + \@dmath@start@hook \let\eq@hasNumber\@True \@optarg\@dmath{}}{} \def\@dmath[#1]{% \everydisplay\expandafter{\the\everydisplay \display@setup}% @@ -458,7 +461,9 @@ \eq@setup@a \eq@startup } -\def\enddmath#1{\check@punct@or@qed} +\def\enddmath#1{% + \check@punct@or@qed +} \def\end@dmath{% \gdef\EQ@setwdL{}% Occasionally undefined ??? \eq@capture @@ -468,6 +473,7 @@ \if\eq@group \grp@push \else \eq@finish\fi } \newenvironment{dmath*}{% + \@dmath@start@hook \let\eq@hasNumber\@False \@optarg\@dmath{}% }{} \@namedef{end@dmath*}{\end@dmath} @@ -1751,6 +1757,7 @@ \let\grp@eqs@numbered\@False \let\grp@aligned\@True \newenvironment{dgroup}{% + \@dgroup@start@hook \let\grp@hasNumber\@True\@optarg\@dgroup{}% }{% \end@dgroup @@ -2035,6 +2042,12 @@ \def\nref#1{\@xp\@nref\csname r@#1\endcsname} \def\@nref#1#2{\ifx\relax#1??\else \@xp\@firstoftwo#1\fi} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\AtBeginDocument{% + \@ifpackageloaded{lineno}{% + \g@addto@macro\@dmath@start@hook{\nolinenumbers}% + \g@addto@macro\@dgroup@start@hook{\nolinenumbers}% + }{}% +} \endinput %% -- cgit v1.2.3