summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/amsmath
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-22 23:37:33 +0000
committerKarl Berry <karl@freefriends.org>2017-01-22 23:37:33 +0000
commitb2ba0afced5c10391750914c16a2aa06cfaa6a96 (patch)
tree8a87b0b92f0038639e1078486bb4c2a56bcea2d3 /Master/texmf-dist/source/latex/amsmath
parentbc46c8f4627710df445115626d25161dcb2df985 (diff)
latex2e (22jan17)
git-svn-id: svn://tug.org/texlive/trunk@43024 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/amsmath')
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amsbsy.dtx2
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amscd.dtx2
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amsgen.dtx2
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amsmath.dtx165
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amsopn.dtx2
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amstext.dtx2
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amsxtra.dtx2
7 files changed, 163 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/latex/amsmath/amsbsy.dtx b/Master/texmf-dist/source/latex/amsmath/amsbsy.dtx
index 0cb877b225c..213d995347f 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsbsy.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsbsy.dtx
@@ -39,7 +39,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
%\fi
%
% \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
%
% \MakeShortVerb\|
%
diff --git a/Master/texmf-dist/source/latex/amsmath/amscd.dtx b/Master/texmf-dist/source/latex/amsmath/amscd.dtx
index 10009e4815e..8dab799b486 100644
--- a/Master/texmf-dist/source/latex/amsmath/amscd.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amscd.dtx
@@ -41,7 +41,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
%\fi
%
% \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
%
% \MakeShortVerb\|
% \newcommand{\operatorname}[1]{\mathop{\mathrm{#1}}}
diff --git a/Master/texmf-dist/source/latex/amsmath/amsgen.dtx b/Master/texmf-dist/source/latex/amsmath/amsgen.dtx
index e3c50bde63c..7cc1b11bbc0 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsgen.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsgen.dtx
@@ -39,7 +39,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% \fi
%
% \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
%
% \MakeShortVerb\|
%
diff --git a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
index 21368f69bde..64b3d8073fc 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
@@ -35,7 +35,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
\begin{document}
\title{The \pkg{amsmath} package}
\author{Frank Mittelbach\and Rainer Sch\"opf\and Michael Downes\and
- David M. Jones}
+ David M. Jones\and David Carlisle}
\date{Version \fileversion, \filedate}
\providecommand{\histnote}{}
\renewenvironment{histnote}{%
@@ -49,7 +49,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
%\fi
%
% \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
%
% \MakeShortVerb\|
%
@@ -74,7 +74,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
[1994/12/01]% LaTeX date must be December 1994 or later
-\ProvidesPackage{amsmath}[2016/06/28 v2.15d AMS math features]
+\ProvidesPackage{amsmath}[2016/11/05 v2.16a AMS math features]
% \end{macrocode}
%
% \section{Catcode defenses}
@@ -217,12 +217,51 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% alternative is to penalize a lot of other users with a known
% handicap.
%
+% \section{Spacing around \cn{aligned} and \cn{gathered}}
+%
+% [dpc, 2016] Option to control the space to the left of aligned and gathered.
+%
+% Previously \cn{aligned} and \cn{gathered} inserted a thin space on
+% their left but not their right, there is no good reason for this
+% that anyone can remember, it has just always been that way
+% inherited from amstex. The usual advice to authors has bben to use
+% |\!\begin{aligned}| to get better spacing.
+%
+% Here introduce:
+%
+% \opt{alignedleftspaceyes} to keep the behaviour of adding this space.
+%
+% \opt{alignedleftspaceno} to disable adding this space.
+%
+% \opt{alignedleftspaceyesifneg} the new default behaviour, do not add
+% the space unless the environment is preceded by a negative skip or
+% kern, so that |\!\begin{aligned}| works as before.
+%
+% \changes{v2.16a}{2016/11/05}{New options to control aligned spacing}
+% \begin{macrocode}
+\DeclareOption{alignedleftspaceyes}{\def\alignedspace@left{\null\,}}
+\DeclareOption{alignedleftspaceno}{\def\alignedspace@left{\null}}
+\DeclareOption{alignedleftspaceyesifneg}{%
+\def\alignedspace@left{%
+ \edef\@tempa{\expandafter\@car\the\lastskip\@nil}%
+ \if-\@tempa\null\,%
+ \else
+ \edef\@tempa{\expandafter\@car\the\lastkern\@nil}%
+ \if-\@tempa\null\,%
+ \else\null
+ \fi
+ \fi}%
+}
+% \end{macrocode}
+%
+%
% \begin{macrocode}
\DeclareOption{?}{}
% \end{macrocode}
%
% \begin{macrocode}
-\ExecuteOptions{nointlimits,sumlimits,namelimits,centertags}
+\ExecuteOptions{%
+ nointlimits,sumlimits,namelimits,centertags,alignedleftspaceyesifneg}
% \end{macrocode}
% The \cs{par} after \cs{ProcessOptions} is to ensure the correct
% line number on screen if an error occurs during option processing;
@@ -542,6 +581,8 @@ Foreign command \@backslashchar#1;\MessageBreak
% \end{macrocode}
%
% \begin{macro}{\genfrac}
+% \changes{v2.16a}{2016/11/05}{New genfrac implementation for extended
+% TeXs}
% This command provides access to \tex/'s generalized fraction
% primitives. Args: \arg{1} left delim, \arg{2} right delim, \arg{3}
% line thickness, \arg{4} mathstyle override, \arg{5} numerator,
@@ -550,6 +591,22 @@ Foreign command \@backslashchar#1;\MessageBreak
% fraction primitive. Any of those four args could be empty, and when
% empty the obvious defaults are selected (no delimiters, default
% line thickness (normally .4pt), and no mathstyle override).
+%
+% the |withdelims| primitives do not work in xetex with OpenType
+% fonts, and the relevant font dimen parameters are often not set
+% in luatex as theer are no matching values in the OpenType Math
+% table, so here we use variants that use the font parameters if
+% they are set, but scale using |\left\right| rather than the
+% |withdelims| primitives.
+%
+% \begin{macrocode}
+\ifx\directlua\@undefined
+% \end{macrocode}
+%
+% \begin{macrocode}
+\ifx\XeTeXcharclass\@undefined
+% \end{macrocode}
+% Classic version
% \begin{macrocode}
\DeclareRobustCommand{\genfrac}[4]{%
\def\@tempa{#1#2}%
@@ -558,6 +615,98 @@ Foreign command \@backslashchar#1;\MessageBreak
\ifx\@tempa\@empty \else withdelims\fi\endcsname}
\@tempb{#1#2#3}}
% \end{macrocode}
+%
+% \begin{macrocode}
+\else
+% \end{macrocode}
+% XeTeX version
+% \begin{macrocode}
+\def\genfrac@rule#1#2#3#4{%
+\hbox{$\left#1\vcenter{\hrule \@width\z@
+ \@height
+ \ifdim\fontdimen#2#3\tw@=\z@
+ #4\fontdimen6#3\tw@
+ \else
+ \fontdimen#2#3\tw@
+ \fi
+ }\right.$}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\def\genfrac@choice#1#2{%
+\ifx @#2@\else
+{\delimitershortfall\z@\delimiterfactor\@m
+ \mathsurround\z@\nulldelimiterspace\z@
+\ifx c#1\kern-\nulldelimiterspace\fi
+\mathchoice
+{\genfrac@rule{#2}{20}\textfont{2.39}}%
+{\genfrac@rule{#2}{21}\textfont{1}}%
+{\genfrac@rule{#2}{21}\scriptfont{1.45}}%
+{\genfrac@rule{#2}{21}\scriptscriptfont{1.35}}%
+}%
+\ifx o#1\kern-\nulldelimiterspace\fi
+\fi
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareRobustCommand{\genfrac}[6]{{%
+\@mathstyle{#4}%
+\genfrac@choice o{#1}%
+{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}%
+\genfrac@choice c{#2}%
+}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\fi
+\else
+% \end{macrocode}
+% LuaTeX version
+% \begin{macrocode}
+\def\genfrac@rule#1#2#3{%
+\hbox{$\left#1\vcenter{\hrule \@width\z@
+ \@height
+ \ifdim\Umathfractiondelsize#2=\z@
+ #3\fontdimen6#3\tw@
+ \else
+ \Umathfractiondelsize#2%
+ \fi
+ }\right.$}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\def\genfrac@choice#1#2{%
+\ifx @#2@\else
+{\delimitershortfall\z@\delimiterfactor\@m
+ \mathsurround\z@\nulldelimiterspace\z@
+\ifx c#1\kern-\nulldelimiterspace\fi
+\mathchoice
+{\genfrac@rule{#2}\displaystyle{2.39}}%
+{\genfrac@rule{#2}\textstyle{1}}%
+{\genfrac@rule{#2}\scriptstyle{1.45}}%
+{\genfrac@rule{#2}\scriptscriptstyle{1.35}}%
+}%
+\ifx o#1\kern-\nulldelimiterspace\fi
+\fi
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\DeclareRobustCommand{\genfrac}[6]{{%
+\@mathstyle{#4}%
+\genfrac@choice o{#1}%
+{\begingroup#5\endgroup\ifx @#3@\@@over\else\@@above\fi#3\relax#6}%
+\genfrac@choice c{#2}%
+}}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\fi
+% \end{macrocode}
+%
+% End of test for Lua\TeX/Xe\TeX.
+%
% \cs{@genfrac} takes the preceding arguments and reads the
% numerator and denominator. Note that there's no convenient way to
% make the numerator and denominator \emph{contents}
@@ -927,8 +1076,8 @@ Foreign command \@backslashchar#1;\MessageBreak
% \begin{macrocode}
\xdef\meaning@{\meaning\@let@token. .........}%
% \end{macrocode}
-% In previous versions \verb|\long| macros were not seen
-% bad as this file uses \verb|\(re)newcommand| for \verb|\implies| etc.
+% In previous versions \verb|\long| macros were not seen by the lokkahead.
+% That was bad as this file uses \verb|\(re)newcommand| for \verb|\implies| etc.
% \begin{macrocode}
\xdef\meaning@@{\@xp\striplong@\meaning@\relax\meaning@}%
% \end{macrocode}
@@ -3424,7 +3573,7 @@ and fix things up.}
% algorithm that can cause an equation to be shifted all the way over
% to the margin.
% \begin{macrocode}
- \null\,%
+ \alignedspace@left
\if #1t\vtop \else \if#1b \vbox \else \vcenter \fi \fi \bgroup
\maxfields@#2\relax
\ifnum\maxfields@>\m@ne
@@ -3551,7 +3700,7 @@ and fix things up.}
\RIfM@\else
\nonmatherr@{\begin{gathered}}%
\fi
- \null\,%
+ \alignedspace@left
\if #1t\vtop \else \if#1b\vbox \else \vcenter \fi\fi \bgroup
\Let@ \chardef\dspbrk@context\@ne \restore@math@cr
\spread@equation
diff --git a/Master/texmf-dist/source/latex/amsmath/amsopn.dtx b/Master/texmf-dist/source/latex/amsmath/amsopn.dtx
index 7ab916387bd..f3709e6ddc2 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsopn.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsopn.dtx
@@ -41,7 +41,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
%\fi
%
% \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
%
% \MakeShortVerb\|
%
diff --git a/Master/texmf-dist/source/latex/amsmath/amstext.dtx b/Master/texmf-dist/source/latex/amsmath/amstext.dtx
index dae31efd464..2a3691d2ef9 100644
--- a/Master/texmf-dist/source/latex/amsmath/amstext.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amstext.dtx
@@ -39,7 +39,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% \fi
%
% \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
%
% \MakeShortVerb\|
%
diff --git a/Master/texmf-dist/source/latex/amsmath/amsxtra.dtx b/Master/texmf-dist/source/latex/amsmath/amsxtra.dtx
index c9abb4585f3..4a436116c7c 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsxtra.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsxtra.dtx
@@ -39,7 +39,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
%\fi
%
% \maketitle
-% \MaintainedByLaTeXTeam{amsmath}
+% \MaintainedByLaTeXTeam{amslatex}
%
% \MakeShortVerb\|
%