amsmath (7apr18)

git-svn-id: svn://tug.org/texlive/trunk@47349 c570f23f-e606-0410-a88d-b1316a301751

15 files changed, 930 insertions, 804 deletions

diff --git a/Master/texmf-dist/doc/latex/amsmath/README.txt b/Master/texmf-dist/doc/latex/amsmath/README.md
index ceee2968d15..4bbba9630cd 100644
--- a/Master/texmf-dist/doc/latex/amsmath/README.txt
+++ b/Master/texmf-dist/doc/latex/amsmath/README.md
@@ -1,31 +1,7 @@
-README for latex-amsmath bundle
-American Mathematical Society, LaTeX3 Project
+## README for latex-amsmath bundle
 
-Copyright 2001-2004, 2007, 2008, 2010, 2011, 2013 American Mathematical Society.
-Copyright 2016-2017 LaTeX3 Project and American Mathematical Society.
 
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3c
-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.3c 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 the LaTeX3 Project.
-
-
-                               CONTENTS
-I.   OVERVIEW
-II.  INSTALLATION AND GETTING STARTED
-III. SUBMITTING BUG REPORTS
-IV.  REMARKS ON THIS RELEASE
-V.   CHANGE LOG
-
-========================================================================
-I. OVERVIEW
+### OVERVIEW
 
 The amsmath package is an extension package for LaTeX that provides
 additional features to facilitate mathematical typesetting. It has been
@@ -37,19 +13,20 @@ Effective in 2016, maintenance of amsmath was transferred from AMS to
 the LaTeX3 Project; as amsmath is considered a "required" package, this
 centralizes control over the core LaTeX components.
 
-========================================================================
-II. INSTALLATION AND GETTING STARTED
+
+### INSTALLATION AND GETTING STARTED
 
 In order to use amsmath you need to have TeX installed first.
 For information on getting TeX see one of the following:
 
-    http://www.tug.org/
-    http://www.ams.org/tex/tex-resources
+ - [LaTeX Project Website](https://www.latex-project.org/)
+ - [TeX User Group](https://www.tug.org/)
+ - [TeX resources (AMS infos for authors)](https://www.ams.org/tex/tex-resources)
 
 It is recommended to install a comprehensive distribution, such as
 TeX Live, MiKTeX for Windows, or MacTeX for Macintosh.
 As part of the "required" LaTeX package subset, amsmath
-will already be available if one of these distributions is chosen,
+will already be available if one of these distributions is chosen.
 
 If you are installing amsmath manually, the most recent version
 will be available from the CTAN archives
@@ -58,50 +35,72 @@ https://www.ctan.org/pkg/amsmath
 
 The primary documentation for amsmath is in
 
-    amsldoc.pdf
+ - amsldoc.pdf
 
 Additional documentation files include:
 
-    diffs-m.txt
-    subeqn.pdf
-    technote.pdf
-    testmath.pdf
+ - diffs-m.txt
+ - subeqn.pdf
+ - technote.pdf
+ - testmath.pdf
 
 which are included in the collection.  All of these can be accessed
-easily with most distributions by entering "texdoc filename" at the
-command line, or via "TeXdoc Online" at http://texdoc.net .
+easily with most distributions by entering `texdoc` *filename* at the
+command line, or via [TeXdoc Online](http://texdoc.net).
 
-========================================================================
-III. SUBMITTING BUG REPORTS
 
-Bug reports should be submitted using the standard LaTeX bug reporting
-system:
 
-See the form at
+### REMARKS ON THIS RELEASE
 
-http://www.latex-project.org/bugs/
+#### Version 2.17
 
-and follow the resulting instructions. Select "amslatex" when asked
-for a category.
-
-Questions regarding usage can be posted at http://tex.stackexchange.com .
-Check first to see whether your question has already been answered.
-
-========================================================================
-IV. REMARKS ON THIS RELEASE
-
-Version 2.17
 Fixes a bug in the spacing around the closing delimiter in generalised
 fractions in xetex and luatex version added in release 2.16.
 Fixes a bug that overfull lines did not always produce warnings.
 
 
-========================================================================
-V. CHANGE LOG
+### CHANGE LOG
 
-The file changes.txt lists recent changes in reverse chronological order.
+The file `changes.txt` lists recent changes in reverse chronological order.
 
-The file diffs-m.txt contains information on development and changes
+The file `diffs-m.txt` contains information on development and changes
 prior to 2000.
 
-[end]
+
+### Reporting Bugs
+
+If you wish to report a problem or bug in any of these packages
+please use the 
+[Issue Tracker for LaTeX2e on GitHub](https://github.com/latex3/latex2e/issues)
+and follow the guidelines that pop up if you press the `New issue` button.
+
+
+In particular, to check that you are really seeing a bug, please write
+a short, self-contained document that shows the problem. This should
+include the `latexbug` package, which will warn if your test file is
+not suitable for one or the other reason. See the [CONTRIBUTING
+guide](https://github.com/latex3/latex2e/blob/master/CONTRIBUTING.md)
+for further details, or if you need to obtain the `latexbug` package.
+
+If the bug turns out to be with third-party software then please
+contact the developer, and not us!
+
+
+### Copyright
+
+Copyright 2001-2004, 2007, 2008, 2010, 2011, 2013 American Mathematical Society.
+Copyright 2016-2017 LaTeX3 Project and American Mathematical Society.
+
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3c
+of this license or (at your option) any later version.
+The latest version of this license is in
+  https://www.latex-project.org/lppl.txt
+and version 1.3c 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 the LaTeX3 Project.
+
+This README file is copyright 2016-2017 The LaTeX3 Project.
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsbsy.pdf b/Master/texmf-dist/doc/latex/amsmath/amsbsy.pdf
index b7649d8d501..f96445f48bc 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsbsy.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsbsy.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amscd.pdf b/Master/texmf-dist/doc/latex/amsmath/amscd.pdf
index 4b4e9723fb0..48c7d0d6a2f 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amscd.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amscd.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsgen.pdf b/Master/texmf-dist/doc/latex/amsmath/amsgen.pdf
index 1719ddee46a..eefafeb74f5 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsgen.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsgen.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsldoc.pdf b/Master/texmf-dist/doc/latex/amsmath/amsldoc.pdf
index d589e2612fd..c532044c403 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsldoc.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsldoc.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsldoc.tex b/Master/texmf-dist/doc/latex/amsmath/amsldoc.tex
index d787f87c55f..1f46924b132 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsldoc.tex
+++ b/Master/texmf-dist/doc/latex/amsmath/amsldoc.tex
@@ -1,12 +1,12 @@
 %
 % Copyright 1995, 2000, 2013 American Mathematical Society.
-% Copyright 2016 LaTeX3 Project and American Mathematical Society.
+% Copyright 2016-2018 LaTeX3 Project and American Mathematical Society.
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
 % 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
+%   https://www.latex-project.org/lppl.txt
 % and version 1.3c or later is part of all distributions of LaTeX
 % version 2005/12/01 or later.
 % 
@@ -21,17 +21,50 @@
 \fbox{\fbox{\begin{tabular}{@{}l@{}}%
 This file is maintained by the \LaTeX{} Project team.\\%
 Bug reports can be opened (category \texttt{#1}) at\\%
-\url{http://latex-project.org/bugs.html}.\end{tabular}}}\end{center}}
+\url{https://latex-project.org/bugs/}.\end{tabular}}}\end{center}}
 
 \ifx\UndEfiNed\url
   \ClassError{amsldoc}{%
     This version of amsldoc.tex must be processed\MessageBreak
-    with a newer version of amsldoc.cls (2.02 or later)}{}
+    with a newer version of amsldoc.cls (2.02 or later).}{}
 \fi
 
-\title{User's Guide for the \pkg{amsmath} Package (Version~2.0)}
+\renewcommand\bibname{References}
+
+%    Definitions that should be moved to amsldoc.cls
+%    when it is next updated
+\makeatletter
+\let\cleardouble@page\cleardoublepage
+\AtBeginDocument{%
+  \ifx\cleardouble@page\cleardoublepage
+    \def\cleardoublepage{\clearpage{\pagestyle{empty}\cleardouble@page}}
+  \fi
+}
+
+% #1 is empty or one of class, environment, option, package
+% could use different font in each case
+\makeatletter
+\def\@category@index#1#2{%
+    \autoindex{%
+        #2\actualchar\string\index#1font{#2}%
+        \ifx\@nil#1\@nil\else\space#1\fi
+    }%
+}
+
+\let\indexpackagefont\textsf
+\let\indexclassfont\textsf
+\let\indexoptionfont\texttt
+\let\indexenvironmentfont\texttt
+\let\indexfont\texttt
+\makeatother
+%    For a package that won't be indexed, i.e. amsmath
+\newcommand{\nipkg}{\textsf}
+\def\tikz/{Ti\textit{k}Z}
+%    End definitions for amsldoc.cls
+
+\title{User's Guide for the \nipkg{amsmath} Package (Version~2.1)}
 \author{American Mathematical Society, \LaTeX3 Project}
-\date{1999-12-13 (revised 2002-02-25, 2016-11-14)}
+\date{1999-12-13 (revised 2002-02-25, 2016-11-14, 2018-04-05)}
 \makeatletter
 \def\@thanks{\bigskip\MaintainedByLaTeXTeam{amslatex}}
 \makeatother
@@ -41,7 +74,21 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 \usepackage{amsmath}
 \usepackage{amscd}
 
-\makeindex % generate index data
+\usepackage{imakeidx}
+%    Need alternate coding for vertical bar to get it into index.
+%    Based on \qcbang and \cnbang in amsldoc.cls, refined by David Carlisle.
+%    Give it a sort field that will be at the end of the symbols;
+%    must avoid " and | which have special meanings.
+\DeclareRobustCommand{\qcvert}{\qc\|\index{{z1}@{\ntt\char'174}}}
+\DeclareRobustCommand{\cnvert}{%
+  \ncn{\|}\index{{z0}@{\ntt\bslchar\char'174}}}
+%    Need alternate index sort field for bang to allow & to sort first
+\DeclareRobustCommand{\altcnbang}{%
+  \ncn{\!}\index{"!b@{\ntt\bslchar\qcbang}}}
+\DeclareRobustCommand{\cnamp}{%
+  \index{"!a@\texttt{\&}}}
+
+\makeindex[intoc] % generate index data
 \providecommand{\see}[2]{\textit{see} #1}
 
 %    The amsldoc class includes a number of features useful for
@@ -116,6 +163,18 @@ Bug reports can be opened (category \texttt{#1}) at\\%
   \par\addvspace\medskipamount
 }
 
+%    Errors in output shouldn't be \texttt, and they may also be longer
+%    than one line, but they should be identified by the "errorbullet".
+%    (They were formerly labeled as aubsections.)
+\newenvironment{erroro}[1]{%
+  \par\addvspace\medskipamount
+  \noindent\hangindent\parindent
+  \hbox to\parindent{\errorbullet\hfil}\ignorespaces
+  #1\par\vspace{\smallskipamount}
+}{%
+  \par\addvspace\medskipamount
+}
+
 %    The chapters are so short, perhaps we shouldn't call them by the
 %    name `Chapter'. We make \chaptername read an argument in order to
 %    remove a following \space or "{} " (both possibilities are present
@@ -168,6 +227,16 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 %    Include down to \section but not \subsection, in toc:
 \setcounter{tocdepth}{1}
 
+%    Subheadings for the bibliography
+\newif\iffirstbibsubhead \firstbibsubheadtrue
+\newcommand{\bibsubhead}[1]{%
+  \iffirstbibsubhead \firstbibsubheadfalse
+  \else \addvspace{\medskipamount}
+  \fi
+  \item[]\hspace*{-\leftmargin}\textbf{#1}\par
+  \vspace{\smallskipamount}
+}
+
 \DeclareMathOperator{\ix}{ix}
 \DeclareMathOperator{\nul}{nul}
 \DeclareMathOperator{\End}{End}
@@ -195,34 +264,34 @@ Bug reports can be opened (category \texttt{#1}) at\\%
 \mainmatter
 \chapter{Introduction}
 
-The \pkg{amsmath} package is a \LaTeX{} package that provides
+\index{amsmath@\texttt{amsmath} package|(}
+
+The \nipkg{amsmath} package is a \LaTeX{} package that provides
 miscellaneous enhancements for improving the information structure and
 printed output of documents that contain mathematical formulas. Readers
 unfamiliar with \LaTeX{} should refer to \cite{lamport}. If you have an
-up-to-date version of \LaTeX{}, the \pkg{amsmath} package is normally
+up-to-date version of \LaTeX{}, the \nipkg{amsmath} package is normally
 provided along with it. Upgrading when a newer version of the
-\pkg{amsmath} package is released can be done via
-\url{http://www.ams.org/tex/amsmath.html} or
-\url{ftp://ftp.ams.org/pub/tex/}.
+\nipkg{amsmath} package is released can be done via
+\url{http://mirror.ctan.org/macros/latex/required/amsmath.zip}.
 
-This documentation describes the features of the \pkg{amsmath} package
+This documentation describes the features of the \nipkg{amsmath} package
 and discusses how they are intended to be used. It also covers some
 ancillary packages:
-\begin{ctab}{ll}
-\pkg{amsbsy}& \pkg{amstext}\\
-\pkg{amscd}& \pkg{amsxtra}\\
-\pkg{amsopn}
+\begin{ctab}{lll}
+\pkg{amsbsy}& \pkg{amsopn}& \pkg{amsxtra}\\
+\pkg{amscd}& \pkg{amstext}\\
 \end{ctab}
 These all have something to do with the contents of math formulas. For
 information on extra math symbols and math fonts, see \cite{amsfonts}
-and \url{http://www.ams.org/tex/amsfonts.html}. For documentation of the
+and \url{https://www.ams.org/tex/amsfonts.html}. For documentation of the
 \pkg{amsthm} package or AMS document classes (\cls{amsart},
-\cls{amsbook}, etc.\@) see \cite{amsthdoc} or \cite{instr-l} and
-\url{http://www.ams.org/tex/author-info.html}.
+\cls{amsbook}, etc.\@) see \cite{amsthdoc} or \cite{amshandbk} and
+\url{https://www.ams.org/tex/author-info.html}.
 
 If you are a long-time \latex/ user and have lots of mathematics in what
 you write, then you may recognize solutions for some familiar problems
-in this list of \pkg{amsmath} features:
+in this list of \nipkg{amsmath} features:
 \begin{itemize}
 
 \item A convenient way to define new `operator name' commands analogous
@@ -250,10 +319,10 @@ equation instead of the automatically supplied number.
 
 \end{itemize}
 
-The \pkg{amsmath} package is distributed together with some small
+The \nipkg{amsmath} package is distributed together with some small
 auxiliary packages:
 \begin{description}
-\item[\pkg{amsmath}] Primary package, provides various features for
+\item[\nipkg{amsmath}] Primary package, provides various features for
   displayed equations and other mathematical constructs.
 
 \item[\pkg{amstext}] Provides a \cn{text} command for
@@ -275,23 +344,33 @@ is recommended instead.
 
 \end{description}
 
-The \pkg{amsmath} package incorporates \pkg{amstext}, \pkg{amsopn}, and
+The \nipkg{amsmath} package incorporates \pkg{amstext}, \pkg{amsopn}, and
 \pkg{amsbsy}. The features of \pkg{amscd} and \pkg{amsxtra}, however,
 are available only by invoking those packages separately.
 
-\chapter{Options for the \pkg{amsmath} package}\label{options}
+The independent \pkg{mathtools} package \cite{mt} provides some
+enhancements to \nipkg{amsmath}; \pkg{mathtools} loads \nipkg{amsmath}
+automatically, so there is no need to separately load \nipkg{amsmath}
+if \pkg{mathtools} is used.  Some \pkg{mathtools} facilities
+will be noted below as appropriate.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\chapter{Options for the \nipkg{amsmath} package}\label{options}
 
-The \pkg{amsmath} package has the following options:
+The \nipkg{amsmath} package has the following options:
+\index{options!amsmath@\texttt{amsmath} package options|(}
 \begin{description}
 
-\item[\opt{centertags}] (default) For a split equation, place equation
-numbers\index{equation numbers!vertical placement} vertically centered
-on the total height of the equation.
+\item[\opt{centertags}] (default) For an equation containing a
+\env{split} environment, place equation
+numbers\index{equationn@equation numbers!vertical placement}
+vertically centered on the total height of the equation.
 
-\item[\opt{tbtags}] `Top-or-bottom tags': For a split equation, place
-equation numbers\index{equation numbers!vertical placement} level with
-the last (resp.\@ first) line, if numbers are on the right (resp.\@
-left).
+\item[\opt{tbtags}] `Top-or-bottom tags': For an equation containing
+a \env{split} environment, place equation
+numbers\index{equationn@equation numbers!vertical placement} level with the last
+(resp.\ first) line, if numbers are on the right (resp.\ left).
 
 \item[\opt{sumlimits}] (default) Place the subscripts and
 superscripts\index{subscripts and superscripts!placement}\relax
@@ -310,14 +389,16 @@ integral\index{integrals!placement of limits} symbols.
 
 \item[\opt{namelimits}] (default) Like \opt{sumlimits}, but for certain
 `operator names' such as $\det$, $\inf$, $\lim$, $\max$, $\min$, that
-traditionally have subscripts \index{subscripts and
-superscripts!placement} placed underneath when they occur in a displayed
-equation.
+traditionally have subscripts%
+\index{subscripts and superscripts!placement} placed underneath when
+they occur in a displayed equation.
 
 \item[\opt{nonamelimits}] Opposite of \opt{namelimits}.
 
 \end{description}
 
+\goodbreak
+
 \begin{description}
 \item[\opt{alignedleftspaceyes}]
 \item[\opt{alignedleftspaceno}]
@@ -327,21 +408,25 @@ equation.
 To use one of these package options, put the option name in the optional
 argument of the \cn{usepackage} command\mdash e.g.,
 \verb"\usepackage[intlimits]{amsmath}".
+For AMS document classes and any other classes that preload \nipkg{amsmath}
+desired options must be specified with the \cn{documentclass}\mdash
+e.g.,\\
+\verb+\documentclass[intlimits,tbtags,reqno]{amsart}+.
 
-The \pkg{amsmath} package also recognizes the following options which
+The \nipkg{amsmath} package also recognizes the following options which
 are normally selected (implicitly or explicitly) through the
 \cn{documentclass} command, and thus need not be repeated in the option
 list of the \cn{usepackage}|{amsmath}| statement.
 \begin{description}
 
-\item[\opt{leqno}] Place equation numbers on the left.\index{equation
-numbers!left or right placement}
+\item[\opt{leqno}] Place equation numbers on the left.%
+\index{equationn@equation numbers!left or right placement}
 
 \item[\opt{reqno}] Place equation numbers on the right.
 
 \item[\opt{fleqn}] Position equations at a fixed indent from the left
-margin rather than centered in the text column.\index{displayed
-equations!centering}
+margin rather than centered in the text column.%
+\index{displayed equations!centering}
 
 \end{description}
 
@@ -349,7 +434,7 @@ Three options have been added to control the space to the left of
 \env{aligned} and \env{gathered} environments. Prior to the 2017 release
 a thin space was added to the left but not the right of these constructs.
 This appears to have been an accidental feature of the implementation and
-was typically corrected by prefixing the environments with \cn{\!}.
+was typically corrected by prefixing the environments with \altcnbang.
 
 The new default behavior is aimed to ensure that the environments do
 not have a thin space added in most cases, and that existing documents
@@ -361,50 +446,75 @@ using |\!\begin{aligned}| continue to work as before.
 \item[\opt{alignedleftspaceyesifneg}] Only add \cn{\,} if the environment is prefixed by negative space. (New default behavior.)
 \end{description}
 
-
+\index{options!amsmath@\texttt{amsmath} package options|)}
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \chapter{Displayed equations}
 
 \section{Introduction}
-The \pkg{amsmath} package provides a number of additional displayed
-equation structures\index{displayed
-  equations}\index{equations|see{displayed equations}} beyond the ones
+The \nipkg{amsmath} package provides a number of additional displayed
+equation structures\index{displayed equations}%
+\index{equations|see{displayed equations}} beyond the ones
 provided in basic \latex/. The augmented set includes:
 \begin{verbatim}
   equation     equation*     align       align*
-  gather       gather*       flalign     flalign*
-  multline     multline*     alignat     alignat*
+  gather       gather*       alignat     alignat*
+  multline     multline*     flalign     flalign*
   split
 \end{verbatim}
 (Although the standard \env{eqnarray} environment remains available,
-it is better to use \env{align} or \env{equation}+\env{split} instead.)
+it is better to use \env{align} or \env{equation}+\env{split} instead.
+Within \env{eqnarray}, spacing\index{horizontal spacing} around signs
+of relation is not the preferred mathematical spacing, and is
+inconsistent with that spacing as it appears in other environments.
+Long lines in this environment may result in misplaced or overprinted
+equation numbers. This environment also does not support the use of
+\cn{qed} or \cn{qedhere} as provided by theorem packages.)
 
 Except for \env{split}, each environment has both starred and unstarred
 forms, where the unstarred forms have automatic numbering using
 \latex/'s \env{equation} counter. You can suppress the number on any
-particular line by putting \cn{notag} before the \cn{\\}; you can also
-override\index{equation numbers!overriding} it with a tag of your own
-using \cn{tag}|{|\<label>|}|, where \<label> means arbitrary text such
-as |$*$| or |ii| used to \qq{number} the equation. There is also a
+particular line by putting \cn{notag} before the end of that line;
+\cn{notag} should not be used outside a display environment as it will
+mess up the numbering.  You can also
+override\index{equationn@equation numbers!overriding} a number with a tag
+of your own using \cn{tag}|{|\<label>|}|, where \<label> means arbitrary
+text such as |$*$| or |ii| used to \qq{number} the equation.
+A tag can reference a different tagged display by use of
+|\tag{\ref{|\<label>|}|\<modifier>|}| where \<modifier> is optional.
+If you are using \pkg{hyperref}, use \cn{ref*};
+use of the starred form of \cn{ref} prevents a reference to a modified
+tag containing a nested link from linking to the original display.
+
+There is also a
 \cn{tag*} command that causes the text you supply to be typeset
 literally, without adding parentheses around it. \cn{tag} and \cn{tag*}
-can also be used within the unnumbered versions of all the \pkg{amsmath}
+can also be used within the unnumbered versions of all the \nipkg{amsmath}
 alignment structures. Some examples of the use of \cn{tag} may be found
 in the sample files \fn{testmath.tex} and \fn{subeqn.tex} provided with
-the \pkg{amsmath} package.
+the \nipkg{amsmath} package.
 
 The \env{split} environment is a special subordinate form that is used
 only \emph{inside} one of the others. It cannot be used inside
-\env{multline}, however.
+\env{multline}, however. \env{split} supports only one alignment (|&|)
+column; if more are needed, \env{aligned} or \env{alignedat} should be
+used. The width of a \env{split} structure is the full line width.
 
 In the structures that do alignment (\env{split}, \env{align} and
-variants), relation symbols have an \verb'&' before them but not
-after\mdash unlike \env{eqnarray}. Putting the \verb'&' after the
+variants), relation symbols have an |&| before them but not
+after\mdash unlike \env{eqnarray}. Putting the |&| after the
 relation symbol will interfere with the normal spacing; it has to go
 before.
 
+In all multiline environments, lines are divided by \cn{\\}.  The \cn{\\}
+should \emph{not} be used to end the last line.  Using it there will
+result in unwanted extra vertical space following the display.
+
+In \emph{all} math environments (inline or display), blank lines
+(equivalent to \cn{par}) are not permitted, and will result in an error.
+
 \begin{table}[p]
 \caption[]{Comparison of displayed equation environments (vertical lines
 indicating nominal margins)}\label{displays}
@@ -518,22 +628,25 @@ a_{21}& =b_{21}&
 \begin{eqxample}
 \begin{verbatim}
 \begin{flalign*}
-a_{11}& =b_{11}&
+a_{11} + b_{11}& = c_{11}&
   a_{12}& =b_{12}\\
-a_{21}& =b_{21}&
+b_{21}& = c_{21}&
   a_{22}& =b_{22}+c_{22}
 \end{flalign*}
 \end{verbatim}
 \producing
 \begin{flalign*}
-a_{11}& =b_{11}&
+a_{11} + b_{11}& = c_{11}&
   a_{12}& =b_{12}\\
-a_{21}& =b_{21}&
+b_{21}& = c_{21}&
   a_{22}& =b_{22}+c_{22}
 \end{flalign*}
 \end{eqxample}
 \end{table}
 
+%% ------------------------------------------------------------------ %%
+\enlargethispage{1\baselineskip}
+
 \section{Single equations}
 
 The \env{equation} environment is for a single equation with an
@@ -543,6 +656,10 @@ same except for omitting the number.%
 \footnote{Basic \latex/ doesn't provide an \env{equation*} environment,
 but rather a functionally equivalent environment named
 \env{displaymath}.}
+The wrapper \verb+\[ ... \]+ is equivalent to \env{equation*}.%
+\index{[@\verb+\[ ... \]+}
+
+%% ------------------------------------------------------------------ %%
 
 \section{Split equations without alignment}
 
@@ -552,13 +669,15 @@ first line of a \env{multline} will be at the left margin and the last
 line at the right margin, except for an indention on both sides in the
 amount of \cn{multlinegap}. Any additional lines in between will be
 centered independently within the display width (unless the \opt{fleqn}
-option is in effect).
+option is in effect).%
+\index{options!behavior of particular options}
 
 Like \env{equation}, \env{multline} has only a single equation number
 (thus, none of the individual lines should be marked with \cn{notag}).
 The equation number is placed on the last line (\opt{reqno} option) or
 first line (\opt{leqno} option); vertical centering as for \env{split}
-is not supported by \env{multline}.
+is not supported by \env{multline}.%
+\index{options!behavior of particular options}
 
 It's possible to force one of the middle lines to the left or right with
 commands \cn{shoveleft}, \cn{shoveright}. These commands take the entire
@@ -582,31 +701,33 @@ example
 The value of \cn{multlinegap} can be changed with the usual \latex/
 commands \cn{setlength} or \cn{addtolength}.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Split equations with alignment}
 
 Like \env{multline}, the \env{split} environment is for \emph{single}
 equations that are too long to fit on one line and hence must be split
 into multiple lines.  Unlike \env{multline}, however, the \env{split}
 environment provides for alignment among the split lines, using |&| to
-mark alignment points. Unlike the other \pkg{amsmath} equation
+mark alignment points. Unlike the other \nipkg{amsmath} equation
 structures, the \env{split} environment provides no numbering, because
 it is intended to be used \emph{only inside some other displayed
   equation structure}, usually an \env{equation}, \env{align}, or
 \env{gather} environment, which provides the numbering. For example:
 \begin{equation}\label{e:barwq}\begin{split}
 H_c&=\frac{1}{2n} \sum^n_{l=0}(-1)^{l}(n-{l})^{p-2}
-\sum_{l _1+\dots+ l _p=l}\prod^p_{i=1} \binom{n_i}{l _i}\\
+  \sum_{l _1+\dots+ l _p=l}\prod^p_{i=1} \binom{n_i}{l _i}\\
 &\quad\cdot[(n-l )-(n_i-l _i)]^{n_i-l _i}\cdot
-\Bigl[(n-l )^2-\sum^p_{j=1}(n_i-l _i)^2\Bigr].
-\kern-2em % adjust equation body to the right [mjd,13-Nov-1994]
+  \Bigl[(n-l )^2-\sum^p_{j=1}(n_i-l _i)^2\Bigr].
+  \kern-2em % adjust equation body to the right [mjd,13-Nov-1994]
 \end{split}\end{equation}
 
 \begin{verbatim}
 \begin{equation}\label{e:barwq}\begin{split}
 H_c&=\frac{1}{2n} \sum^n_{l=0}(-1)^{l}(n-{l})^{p-2}
-\sum_{l _1+\dots+ l _p=l}\prod^p_{i=1} \binom{n_i}{l _i}\\
+  \sum_{l _1+\dots+ l _p=l}\prod^p_{i=1} \binom{n_i}{l _i}\\
 &\quad\cdot[(n-l )-(n_i-l _i)]^{n_i-l _i}\cdot
-\Bigl[(n-l )^2-\sum^p_{j=1}(n_i-l _i)^2\Bigr].
+  \Bigl[(n-l )^2-\sum^p_{j=1}(n_i-l _i)^2\Bigr].
 \end{split}\end{equation}
 \end{verbatim}
 
@@ -614,6 +735,8 @@ The \env{split} structure should constitute the entire body of the
 enclosing structure, apart from commands like \cn{label} that produce no
 visible material.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Equation groups without alignment}
 
 The \env{gather} environment is used for a group of consecutive
@@ -634,6 +757,8 @@ Any equation in a \env{gather} may consist of a \verb'\begin{split}'
 \end{gather}
 \end{verbatim}
 
+%% ------------------------------------------------------------------ %%
+
 \section{Equation groups with mutual alignment}
 
 The \env{align} environment is used for two or more equations when
@@ -674,8 +799,9 @@ x& = y_1-y_2+y_3-y_5+y_8-\dots
 \end{verbatim}
 A variant environment \env{alignat} allows the horizontal space between
 equations to be explicitly specified. This environment takes one argument,
-the number of \qq{equation columns}: count the maximum number of \verb'&'s
-in any row, add 1 and divide by 2.
+the number of \qq{equation columns} (the number of pairs of right-left
+aligned columns; the argument is the number of pairs): count the maximum
+number of \verb'&'s in any row, add~1 and divide by~2.
 \begin{alignat}{2}
 x& = y_1-y_2+y_3-y_5+y_8-\dots
                   &\quad& \text{by \eqref{eq:C}}\\
@@ -691,13 +817,46 @@ x& = y_1-y_2+y_3-y_5+y_8-\dots
  & = y(0) y'      && \text {by Axiom 1.}
 \end{alignat}
 \end{verbatim}
+The environment \env{flalign} (``full length alignment'') stretches the
+space between the equation columns to the maximum possible width, leaving
+only enough space at the margin for the equation number, if present.
+\begin{flalign}
+x&=y       & X&=Y\\
+x'&=y'     & X'&=Y'\\
+x+x'&=y+y' & X+X'&=Y+Y'
+\end{flalign}
+%
+\begin{verbatim}
+\begin{flalign}
+x&=y       & X&=Y\\
+x'&=y'     & X'&=Y'\\
+x+x'&=y+y' & X+X'&=Y+Y'
+\end{flalign}
+\end{verbatim}
+%
+\begin{flalign*}
+x&=y       & X&=Y\\
+x'&=y'     & X'&=Y'\\
+x+x'&=y+y' & X+X'&=Y+Y'
+\end{flalign*}
+%
+\begin{verbatim}
+\begin{flalign*}
+x&=y       & X&=Y\\
+x'&=y'     & X'&=Y'\\
+x+x'&=y+y' & X+X'&=Y+Y'
+\end{flalign*}
+\end{verbatim}
+
+%% ------------------------------------------------------------------ %%
 
 \section{Alignment building blocks}
 
 Like \env{equation}, the multi-equation environments \env{gather},
 \env{align}, and \env{alignat} are designed to produce a structure
 whose width is the full line width. This means, for example, that one
-cannot readily add parentheses around the entire structure. But variants
+cannot readily add parentheses around the entire structure. But
+variants\index{ed env@\texttt{-ed} environments|(}
 \env{gathered}, \env{aligned}, and \env{alignedat} are provided whose
 total width is the actual width of the contents; thus they can be used
 as a component in a containing expression. E.g.,
@@ -720,8 +879,16 @@ as a component in a containing expression. E.g.,
 \end{equation*}
 \end{verbatim}
 Like the \env{array} environment, these \texttt{-ed} variants also take
-an optional \verb'[t]' or \verb'[b]' argument to specify vertical
-positioning.
+an optional\index{options!positioning of \texttt{-ed} environments}
+|[t]|\index{t option@\texttt{t} (top) option},
+|[b]|\index{b option@\texttt{b} (bottom) option} or the default
+|[c]|\index{c option@\texttt{c} (center) option}
+argument to specify vertical
+positioning.  For maximum interoperability, do not insert a
+space\index{options!space before \texttt{[}}
+or line break\index{line break} before the option.  See
+also the note on page~\pageref{breaknote} regarding page breaking
+within the \texttt{-ed} environments.
 
 \qq{Cases} constructions like the following are common in
 mathematics:
@@ -732,7 +899,7 @@ P_{r-j}=
     r!\,(-1)^{(r-j)/2}&  \text{if $r-j$ is even}.
   \end{cases}
 \end{equation}
-and in the \pkg{amsmath} package there is a \env{cases} environment to
+and in the \nipkg{amsmath} package there is a \env{cases} environment to
 make them easy to write:
 \begin{verbatim}
 P_{r-j}=\begin{cases}
@@ -740,58 +907,82 @@ P_{r-j}=\begin{cases}
     r!\,(-1)^{(r-j)/2}&  \text{if $r-j$ is even}.
   \end{cases}
 \end{verbatim}
-Notice the use of \cn{text} (cf.~\secref{text}) and the nested
-math formulas.
+Notice the use of \cn{text} (cf.~\secref{text}) and the nested math
+formulas. \env{cases} is set in \cn{textstyle}. If \cn{displaystyle}
+is wanted, it must be requested explicitly; \pkg{mathtools} provides
+a \env{dcases} environment for this purpose.
+
+The |-ed|\index{ed env@\texttt{-ed} environments|)} and \env{cases}
+environments must appear within an enclosing math environment, which can
+be either in text, between |$...$|, or in any of the display environments.
+
+%% ------------------------------------------------------------------ %%
 
 \section{Adjusting tag placement}
 
 Placing equation numbers can be a rather complex problem in multiline
-displays. The environments of the \pkg{amsmath} package try hard to
+displays. The environments of the \nipkg{amsmath} package try hard to
 avoid overprinting an equation number on the equation contents, if
 necessary moving the number down or up to a separate line. Difficulties
 in accurately calculating the profile of an equation can occasionally
-result in number movement that doesn't look right. There is a
-\cn{raisetag} command provided to adjust the vertical position of the
+result in number movement that doesn't look right.
+A \cn{raisetag} command is provided to adjust the vertical position of the
 current equation number, if it has been shifted away from its normal
 position. To move a particular number up by six points, write
-|\raisetag{6pt}|. This kind of adjustment is fine tuning like line
+|\raisetag{6pt}|. (At the end of a display, this also shifts up the
+text following the display.)
+This kind of adjustment is fine tuning like line
 breaks and page breaks, and should therefore be left undone until your
 document is nearly finalized, or you may end up redoing the fine tuning
 several times to keep up with changing document contents.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Vertical spacing and page breaks in multiline displays}
 
-You can use the \cn{\\}|[|\<dimension>|]| command to get extra vertical
-space between lines in all the \pkg{amsmath} displayed equation
-environments, as is usual in \latex/.  When the \pkg{amsmath} package is
+You can use the \cn{\\}|[|\<dimension>|]|%
+\index{options!extra vertical space after \cn{\\}}
+command to get extra vertical
+space between lines in all the \nipkg{amsmath} displayed equation
+environments, as is usual in \latex/. Do not type a space between the%
+\index{options!space before \texttt{[}}
+\cn{\\} and the following |[|; \emph{only} for display environments
+defined by \nipkg{amsmath} the space is interpreted to mean that the
+bracketed material is part of the document content.
+
+When the \nipkg{amsmath} package is
 in use \ii{page breaks} between equation lines are normally disallowed;
 the philosophy is that page breaks in such material should receive
 individual attention from the author. To get an individual page break
 inside a particular displayed equation, a \cn{displaybreak} command is
 provided. \cn{displaybreak} is best placed immediately before the
 \cn{\\} where it is to take effect.  Like \latex/'s \cn{pagebreak},
-\cn{displaybreak} takes an optional argument between 0 and 4 denoting
+\cn{displaybreak} takes an optional argument%
+\index{options!behavior of particular options} between 0 and 4 denoting
 the desirability of the pagebreak. |\displaybreak[0]| means \qq{it is
   permissible to break here} without encouraging a break;
 \cn{displaybreak} with no optional argument is the same as
 |\displaybreak[4]| and forces a break.
 
 If you prefer a strategy of letting page breaks fall where they may,
-even in the middle of a multi-line equation, then you might put
+even in the middle of a multiline equation, then you might put
 \cn{allowdisplaybreaks}\texttt{[1]} in the preamble of your document. An
-optional argument 1\ndash 4 can be used for finer control: |[1]| means
+optional argument\index{options!behavior of particular options}
+1\ndash 4 can be used for finer control: |[1]| means
 allow page breaks, but avoid them as much as possible; values of 2,3,4
 mean increasing permissiveness. When display breaks are enabled with
 \cn{allowdisplaybreaks}, the \cn{\\*} command can be used to prohibit a
 pagebreak after a given line, as usual.
 
 \begin{bfseries}
-Note: Certain equation environments wrap their contents in an
-unbreakable box, with the consequence that neither \cn{displaybreak} nor
-\cn{allowdisplaybreaks} will have any effect on them. These include
+Note:\label{breaknote} Certain equation environments wrap their contents
+in an unbreakable box, with the consequence that neither \cn{displaybreak}
+nor \cn{allowdisplaybreaks} will have any effect on them. These include
 \env{split}, \env{aligned}, \env{gathered}, and \env{alignedat}.
 \end{bfseries}
 
+%% ------------------------------------------------------------------ %%
+
 \section{Interrupting a display}
 
 The command \cn{intertext} is used for a short interjection of one or
@@ -803,20 +994,28 @@ it up again afterwards. \cn{intertext} may only appear right after a
 \cn{\\} or \cn{\\*} command. Notice the position of the word \qq{and} in
 this example.
 \begin{align}
-A_1&=N_0(\lambda;\Omega')-\phi(\lambda;\Omega'),\\
-A_2&=\phi(\lambda;\Omega')-\phi(\lambda;\Omega),\\
+  A_1&=N_0(\lambda;\Omega')-\phi(\lambda;\Omega'),\\
+  A_2&=\phi(\lambda;\Omega')-\phi(\lambda;\Omega),\\
 \intertext{and}
-A_3&=\mathcal{N}(\lambda;\omega).
+  A_3&=\mathcal{N}(\lambda;\omega).
 \end{align}
 \begin{verbatim}
 \begin{align}
-A_1&=N_0(\lambda;\Omega')-\phi(\lambda;\Omega'),\\
-A_2&=\phi(\lambda;\Omega')-\phi(\lambda;\Omega),\\
+  A_1&=N_0(\lambda;\Omega')-\phi(\lambda;\Omega'),\\
+  A_2&=\phi(\lambda;\Omega')-\phi(\lambda;\Omega),\\
 \intertext{and}
-A_3&=\mathcal{N}(\lambda;\omega).
+  A_3&=\mathcal{N}(\lambda;\omega).
 \end{align}
 \end{verbatim}
 
+The \pkg{mathtools} package provides a command \cn{shortintertext} that
+is intended for use when the interjected text is only a few words; it uses
+less vertical space than \cn{intertext}. This
+is most effective when equation numbers are on the right.%
+\index{equationn@equation numbers!left or right placement}
+
+%% ------------------------------------------------------------------ %%
+
 \section{Equation numbering}
 
 \subsection{Numbering hierarchy}
@@ -833,9 +1032,10 @@ C.8.4]{lamport}:
 This works pretty well, except that the equation counter won't be reset
 to zero at the beginning of a new section or chapter, unless you do it
 yourself using \cn{setcounter}. To make this a little more convenient,
-the \pkg{amsmath} package provides a command\index{equation
-numbers!hierarchy} \cn{numberwithin}. To have equation numbering tied to
-section numbering, with automatic reset of the equation counter, write
+the \nipkg{amsmath} package provides a 
+command\index{equationn@equation numbers!hierarchy} \cn{numberwithin}.
+To have equation numbering tied to section numbering, with automatic
+reset of the equation counter, write
 \begin{verbatim}
 \numberwithin{equation}{section}
 \end{verbatim}
@@ -845,17 +1045,18 @@ any counter, not just the \texttt{equation} counter.
 \subsection{Cross references to equation numbers}
 
 To make cross-references to equations easier, an \cn{eqref}
-command\index{equation numbers!cross-references} is provided. This
+command\index{equationn@equation numbers!cross-references} is provided. This
 automatically supplies the parentheses around the equation number. I.e.,
 if \verb'\ref{abc}' produces 3.2 then \verb'\eqref{abc}' produces
-(3.2).
+(3.2). The parentheses around an \cn{eqref} equation number will be
+set in upright type regardless of type style of the context.
 
 \subsection{Subordinate numbering sequences}
 
-The \pkg{amsmath} package provides also a \env{subequations}
-environment\index{equation numbers!subordinate numbering} to make it
-easy to number equations in a particular group with a subordinate
-numbering scheme. For example
+The \nipkg{amsmath} package provides also a wrapper environment,
+\env{subequations}\index{equationn@equation numbers!subordinate numbering}, to make it
+easy to number equations in a particular \cn{align} or similar group with
+a subordinate numbering scheme. For example
 \begin{verbatim}
 \begin{subequations}
 ...
@@ -878,18 +1079,36 @@ redefining \cn{theequation} as follows will produce roman numerals.
 ...
 \end{verbatim}
 
+\subsection{Numbering style}
+
+The default equation number is set in \cn{normalfont}.  This means that
+in bold section headings, bold is suppressed; a workaround for this is
+to use \verb+(\ref{+\ldots\verb+})+ rather than \verb+\eqref{+\ldots\verb+}+.
+
+If smaller type is specified for a numbered display, the size of the
+equation number will also be small.  The default size can be ensured
+throughout a document by applying this patch in the preamble:
+\begin{verbatim}
+\makeatletter
+\renewcommand{\maketag@@@}[1]{\hbox{\m@th\normalsize\normalfont#1}}%
+\makeatother
+\end{verbatim}
+(This modification may be included in a future version of
+\nipkg{amsmath}.)
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \chapter{Miscellaneous mathematical features}
 
 \section{Matrices}\label{ss:matrix}
 
-The \pkg{amsmath} package provides some environments for
+The \nipkg{amsmath} package provides some environments for
 matrices\index{matrices} beyond the basic \env{array} environment of
 \latex/. The \env{pmatrix}, \env{bmatrix}, \env{Bmatrix}, \env{vmatrix}
 and \env{Vmatrix} have (respectively) $(\,)$, $[\,]$, $\lbrace\,\rbrace$,
-$\lvert\,\rvert$, and
-$\lVert\,\rVert$ delimiters built in. For naming consistency there is a
+$\lvert\,\rvert$, and $\lVert\,\rVert$ delimiters\index{delimiters}
+built in. For naming consistency there is a
 \env{matrix} environment sans delimiters. This is not entirely redundant
 with the \env{array} environment; the matrix environments all use more
 economical horizontal spacing than the rather prodigal spacing of the
@@ -903,7 +1122,11 @@ if necessary using \latex/'s \cn{setcounter} or \cn{addtocounter}
 commands.%
 }\space%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 (If you need left or right alignment in a column or other special
-formats you must resort to \env{array}.)
+formats you may use \env{array}, or the \pkg{mathtools}
+package which provides \verb+*+ variants%
+\index{matrix@\indexenvironmentfont{matrix} environment!\verb+*+ variants}
+of these environments with
+an optional argument to specify left or right alignment.)
 
 To produce a small matrix suitable for use in text, there is a
 \env{smallmatrix} environment (e.g.,
@@ -913,8 +1136,14 @@ To produce a small matrix suitable for use in text, there is a
 \end{smallmatrix} \bigr)
 \end{math})
 that comes closer to fitting within a single text line than a normal
-matrix. Delimiters must be provided; there are no |p|,|b|,|B|,|v|,|V|
-versions of \env{smallmatrix}. The above example was produced by
+matrix. Delimiters\index{delimiters} must be provided. (The
+\pkg{mathtools} package provides |p|,|b|,|B|,|v|,|V| versions of
+\env{smallmatrix},%
+\index{smallmatrix@\indexenvironmentfont{smallmatrix} environment!variant delimiters}
+as well as |*| variants%
+\index{smallmatrix@\indexenvironmentfont{smallmatrix} environment!\verb+*+ variants}
+as described above.)
+The above example was produced by
 \begin{verbatim}
 \bigl( \begin{smallmatrix}
   a&b\\ c&d
@@ -940,7 +1169,8 @@ e&\hdotsfor{3} \end{matrix}
 \end{center}
 
 The spacing of the dots can be varied through use of a square-bracket
-option, for example, |\hdotsfor[1.5]{3}|.  The number in square brackets
+option,\index{options!behavior of particular options}
+for example, |\hdotsfor[1.5]{3}|.  The number in square brackets
 will be used as a multiplier (i.e., the normal value is 1.0).
 \begin{equation}\label{eq:D}
 \begin{pmatrix} D_1t&-a_{12}t_2&\dots&-a_{1n}t_n\\
@@ -955,10 +1185,12 @@ will be used as a multiplier (i.e., the normal value is 1.0).
 -a_{n1}t_1&-a_{n2}t_2&\dots&D_nt\end{pmatrix}
 \end{verbatim}
 
+%% ------------------------------------------------------------------ %%
+
 \section{Math spacing commands}
 
-The \pkg{amsmath} package slightly extends the set of math
-spacing\index{horizontal space!in math mode} commands, as shown below.
+The \nipkg{amsmath} package slightly extends the set of math
+spacing\index{horizontal spacing} commands, as shown below.
 Both the spelled-out and abbreviated forms of these commands are robust,
 and they can also be used outside of math.
 \begin{ctab}{lll|lll}
@@ -967,7 +1199,7 @@ Abbrev.& Spelled out& Example & Abbrev.& Spelled out& Example\\
 \vstrut{2.5ex}
 & no space& \spx{}& & no space & \spx{}\\
 \cn{\,}& \cn{thinspace}& \spx{\,}&
-  \cnbang& \cn{negthinspace}& \spx{\!}\\
+  \altcnbang& \cn{negthinspace}& \spx{\!}\\
 \cn{\:}& \cn{medspace}& \spx{\:}&
   & \cn{negmedspace}& \spx{\negmedspace}\\
 \cn{\;}& \cn{thickspace}& \spx{\;}&
@@ -979,6 +1211,8 @@ For the greatest possible control over math spacing, use \cn{mspace}
 and `math units'. One math unit, or |mu|, is equal to 1/18 em. Thus to
 get a negative \cn{quad} you could write |\mspace{-18.0mu}|.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Dots}
 
 For preferred placement of ellipsis dots (raised or on-line) in various
@@ -1019,30 +1253,38 @@ and the infinite integral
 \end{minipage}
 \end{tabular}
 \end{center}
+For most situations, the undifferentiated \cn{dots} can be used, and
+\nipkg{amsmath} will output the most suitable form based on the
+immediate context; if an inappropriate form results, it can be corrected
+after examining the output.
+
+%% ------------------------------------------------------------------ %%
 
 \section{Nonbreaking dashes}
 
-A command \cn{nobreakdash} is provided to suppress the possibility
-of a linebreak after the following hyphen or dash. For example, if you
-write `pages 1\ndash 9' as |pages 1\nobreakdash--9| then a linebreak will
-never occur between the dash and the 9. You can also use
-\cn{nobreakdash} to prevent undesirable hyphenations in combinations
-like |$p$-adic|. For frequent use, it's advisable to make abbreviations,
-e.g.,
+A command \cn{nobreakdash} is provided to suppress the possibility of a
+line break\index{line break|(} after the following hyphen or dash. For
+example, if you write `pages 1\ndash 9' as |pages 1\nobreakdash--9|
+then a line break will never occur between the dash and the 9. You can
+also use \cn{nobreakdash} to prevent undesirable hyphenations in
+combinations like |$p$-adic|. For frequent use, it's advisable to make
+abbreviations, e.g.,
 \begin{verbatim}
 \newcommand{\p}{$p$\nobreakdash}% for "\p-adic"
 \newcommand{\Ndash}{\nobreakdash--}% for "pages 1\Ndash 9"
 %    For "\n dimensional" ("n-dimensional"):
 \newcommand{\n}[1]{$n$\nobreakdash-\hspace{0pt}}
 \end{verbatim}
-The last example shows how to prohibit a linebreak after the hyphen but
-allow normal hyphenation in the following word. (It suffices to add a
-zero-width space after the hyphen.)
+The last example shows how to prohibit a line break\index{line break|)}
+after the hyphen but allow normal hyphenation in the following
+word. (It suffices to add a zero-width space after the hyphen.)
+
+%% ------------------------------------------------------------------ %%
 
 \section{Accents in math}
 
 In ordinary \LaTeX{} the placement of the second accent in doubled math
-accents is often poor. With the \pkg{amsmath} package you
+accents is often poor. With the \nipkg{amsmath} package you
 will get improved placement of the second accent:
 $\hat{\hat{A}}$ (\cn{hat}|{\hat{A}}|).
 
@@ -1054,15 +1296,20 @@ To get a superscripted hat or tilde character, load the \pkg{amsxtra}
 package and use \cn{sphat} or \cn{sptilde}. Usage is \verb'A\sphat'
 (note the absence of the \verb'^' character).
 
+
 To place an arbitrary symbol in math accent position, or to get under
-accents, see the \pkg{accents} package by Javier Bezos.
+accents, see the \pkg{accents} package by Javier Bezos. (\nipkg{amsmath}
+must be loaded before \pkg{accents}.)
+
+%% ------------------------------------------------------------------ %%
 
 \section{Roots}
 
 In ordinary \latex/ the placement of root indices is sometimes not so
 good: $\sqrt[\beta]{k}$ (|\sqrt||[\beta]{k}|).  In the
-\pkg{amsmath} package \cn{leftroot} and \cn{uproot} allow you to adjust
-the position of the root:
+\nipkg{amsmath} package \cn{leftroot} and \cn{uproot} allow you to adjust
+the position of the root:%
+\index{options!adjust positioning}
 \begin{verbatim}
   \sqrt[\leftroot{-2}\uproot{2}\beta]{k}
 \end{verbatim}
@@ -1071,6 +1318,8 @@ $\sqrt[\leftroot{-2}\uproot{2}\beta]{k}$. The negative argument used
 with \cn{leftroot} moves the $\beta$ to the right. The units are a small
 amount that is a useful size for such adjustments.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Boxed formulas}
 
 The command \cn{boxed} puts a box around its
@@ -1082,11 +1331,13 @@ argument, like \cn{fbox} except that the contents are in math mode:
   \boxed{\eta \leq C(\delta(\eta) +\Lambda_M(0,\delta))}
 \end{verbatim}
 
+%% ------------------------------------------------------------------ %%
+
 \section{Over and under arrows}
 
 Basic \latex/ provides \cn{overrightarrow} and \cn{overleftarrow}
 commands. Some additional over and under arrow commands are provided
-by the \pkg{amsmath} package to extend the set:
+by the \nipkg{amsmath} package to extend the set:
 
 \begin{tabbing}
 \qquad\=\ncn{overleftrightarrow}\qquad\=\kill
@@ -1095,12 +1346,15 @@ by the \pkg{amsmath} package to extend the set:
    \cn{overleftrightarrow}\> \cn{underleftrightarrow}
 \end{tabbing}
 
+%% ------------------------------------------------------------------ %%
+
 \section{Extensible arrows}
 
 \cn{xleftarrow} and \cn{xrightarrow} produce
 arrows\index{arrows!extensible} that extend automatically to accommodate
 unusually wide subscripts or superscripts. These commands take one
-optional argument (the subscript) and one mandatory argument (the
+optional argument\index{options!behavior of particular options}
+(the subscript) and one mandatory argument (the
 superscript, possibly empty):
 \begin{equation}
 A\xleftarrow{n+\mu-1}B \xrightarrow[T]{n\pm i-1}C
@@ -1109,11 +1363,13 @@ A\xleftarrow{n+\mu-1}B \xrightarrow[T]{n\pm i-1}C
   \xleftarrow{n+\mu-1}\quad \xrightarrow[T]{n\pm i-1}
 \end{verbatim}
 
+%% ------------------------------------------------------------------ %%
+
 \section{Affixing symbols to other symbols}
 
 \latex/ provides \cn{stackrel} for placing a
 superscript\index{subscripts and superscripts} above a binary relation.
-In the \pkg{amsmath} package there are somewhat more general commands,
+In the \nipkg{amsmath} package there are somewhat more general commands,
 \cn{overset} and \cn{underset}, that can be used to place one symbol
 above or below another symbol, whether it's a relation or something
 else. The input |\overset{*}{X}| will place a superscript-size $*$ above
@@ -1122,14 +1378,16 @@ symbol underneath.
 
 See also the description of \cn{sideset} in \secref{sideset}.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Fractions and related constructions}
 
 \subsection{The \cn{frac}, \cn{dfrac}, and \cn{tfrac} commands}
 
 The \cn{frac} command, which is in the basic command set of
-\latex/,\index{fractions} takes two arguments\mdash numerator and
+\latex/,\index{fractions|(} takes two arguments\mdash numerator and
 denominator\mdash and typesets them in normal fraction form. The
-\pkg{amsmath} package provides also \cn{dfrac} and \cn{tfrac} as
+\nipkg{amsmath} package provides also \cn{dfrac} and \cn{tfrac} as
 convenient abbreviations for |{\displaystyle\frac| |...| |}|
 and\indexcs{textstyle}\relax
 \indexcs{displaystyle} |{\textstyle\frac| |...| |}|.
@@ -1147,7 +1405,7 @@ and\indexcs{textstyle}\relax
 \subsection{The \cn{binom}, \cn{dbinom}, and \cn{tbinom} commands}
 
 For binomial expressions\index{binomials} such as $\binom{n}{k}$
-\pkg{amsmath} has \cn{binom}, \cn{dbinom} and \cn{tbinom}:
+\nipkg{amsmath} has \cn{binom}, \cn{dbinom} and \cn{tbinom}:
 \begin{equation}
 2^k-\binom{k}{1}2^{k-1}+\binom{k}{2}2^{k-2}
 \end{equation}
@@ -1160,12 +1418,12 @@ For binomial expressions\index{binomials} such as $\binom{n}{k}$
 The capabilities of \cn{frac}, \cn{binom}, and their variants are
 subsumed by a generalized fraction command \cn{genfrac} with six
 arguments. The last two correspond to \cn{frac}'s numerator and
-denominator; the first two are optional delimiters (as seen in
-\cn{binom}); the third is a line thickness override (\cn{binom} uses
-this to set the fraction line thickness to 0\mdash i.e., invisible); and
-the fourth argument is a mathstyle override: integer values 0\ndash 3 select
-respectively \cn{displaystyle}, \cn{textstyle}, \cn{scriptstyle}, and
-\cn{scriptscriptstyle}. If the third argument is left empty, the line
+denominator; the first two are optional delimiters\index{delimiters} (as
+seen in \cn{binom}); the third is a line thickness override (\cn{binom}
+uses this to set the fraction line thickness to 0\mdash i.e., invisible);
+and the fourth argument is a mathstyle override: integer values 0\ndash 3
+select respectively \cn{displaystyle}, \cn{textstyle}, \cn{scriptstyle},
+and \cn{scriptscriptstyle}. If the third argument is left empty, the line
 thickness defaults to `normal'.
 
 \begin{center}\begin{minipage}{.85\columnwidth}
@@ -1189,9 +1447,11 @@ notation, along the lines of \cn{frac} and \cn{binom}.
 
 The primitive generalized fraction commands \cs{over}, \cs{overwithdelims},
 \cs{atop}, \cs{atopwithdelims}, \cs{above}, \cs{abovewithdelims} produce
-warning  messages if used with the \pkg{amsmath} package, for reasons
+warning  messages if used with the \nipkg{amsmath} package, for reasons
 discussed in \fn{technote.tex}.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Continued fractions}
 
 The continued fraction\index{continued fractions}
@@ -1213,26 +1473,36 @@ can be obtained by typing
 This produces better-looking results than straightforward use of
 \cn{frac}. Left or right placement of any of the numerators is
 accomplished by using \cn{cfrac}|[l]| or \cn{cfrac}|[r]| instead of
-\cn{cfrac}.
+\cn{cfrac}.\index{options!adjust positioning}%
+\index{fractions|)}
+
+%% ------------------------------------------------------------------ %%
 
 \section{Smash options}
 
-The command \cn{smash} is used to typeset a subformula with an effective height and depth of zero, which is sometimes
+The command \cn{smash} is used to typeset a subformula with an
+effective height and depth of zero, which is sometimes
 useful in adjusting the subformula's position with respect to adjacent
-symbols. With the \pkg{amsmath} package \cn{smash} has optional
-arguments |t| and |b|, because occasionally it is advantageous to be
-able to \qq{smash} only the top or only the bottom of something while
-retaining the natural depth or height. For example, when adjacent
-radical symbols are unevenly sized or positioned because of differences
-in the height and depth of their contents, \cn{smash} can be employed to
-make them more consistent. Compare
+symbols. With the \nipkg{amsmath} package \cn{smash} has optional
+arguments\index{options!behavior of particular options}
+|[t]|\index{t option@\texttt{t} (top) option} and
+|[b]|\index{b option@\texttt{b} (bottom) option} because occasionally it is
+advantageous to be able to \qq{smash} only the top or only the bottom
+of something while retaining the natural depth or height. For example,
+when adjacent radical symbols are unevenly sized or positioned because
+of differences in the height and depth of their contents, \cn{smash}
+can be employed to make them more consistent. Compare
 $\sqrt{x}+\sqrt{y}+\sqrt{z}$ and $\sqrt{x}+\sqrt{\smash[b]{y}}+\sqrt{z}$,
 where the latter was produced by
 \verb"$\sqrt{x}" \verb"+"
 \verb"\sqrt{"\5\verb"\smash[b]{y}}" \verb"+" \verb"\sqrt{z}$".
 
+%% ------------------------------------------------------------------ %%
+
 \section{Delimiters}
 
+\index{delimiters|(}
+
 \subsection{Delimiter sizes}\label{bigdel}
 
 The automatic delimiter sizing done by \cn{left} and \cn{right} has two
@@ -1243,7 +1513,8 @@ quantum jumps. This means that a math fragment that is infinitesimally
 too large for a given delimiter size will get the next larger size, a
 jump of 3pt or so in normal-sized text. There are two or three
 situations where the delimiter size is commonly adjusted, using a set of
-commands that have `big' in their names.
+commands that have `big' in their names.%
+\index{delimiters!fixed size|(}
 \begin{ctab}{l|llllll}
 Delimiter&
   text& \ncn{left}& \ncn{bigl}& \ncn{Bigl}& \ncn{biggl}& \ncn{Biggl}\\
@@ -1301,13 +1572,15 @@ $\bigl\lvert\frac{b'}{d'}\bigr\rvert$.
 
 In ordinary \latex/ \ncn{big}, \ncn{bigg}, \ncn{Big}, and \ncn{Bigg}
 delimiters aren't scaled properly over the full range of \latex/ font
-sizes.  With the \pkg{amsmath} package they are.
+sizes.  With the \nipkg{amsmath} package they are.%
+\index{delimiters!fixed size|)}
 
 \subsection{Vertical bar notations}
 
-The \pkg{amsmath} package provides commands \cn{lvert}, \cn{rvert},
+The \nipkg{amsmath} package provides commands \cn{lvert}, \cn{rvert},
 \cn{lVert}, \cn{rVert} (compare \cn{langle}, \cn{rangle}) to address the
-problem of overloading for the vert bar character \qc{\|}. This
+%problem of overloading for the vert bar character \qc{\|}. This
+problem of overloading for the vert bar character \qcvert. This
 character is currently used in \latex/ documents to represent a wide
 variety of mathematical objects: the `divides' relation in a
 number-theory expression like $p\vert q$, or the absolute-value
@@ -1319,10 +1592,13 @@ treatment, and that the complex discriminatory powers of a knowledgeable
 reader cannot be replicated in computer processing of mathematical
 documents. It is recommended therefore that there should be a one-to-one
 correspondence in any given document between the vert bar character
-\qc{\|} and a selected mathematical notation, and similarly for the
-double-bar command \ncn{\|}\index{"|@\verb"*+"\"|+}. This immediately
+%\qc{\|} and a selected mathematical notation, and similarly for the
+\qcvert\ and a selected mathematical notation, and similarly for the
+%double-bar command \ncn{\|}\index{"|@\verb"*+"\"|+}. This immediately
+double-bar command \cnvert. This immediately
 rules out the use of \qc{|}
-and \ncn{\|}\index{"|@\verb"*+"\"|+} for delimiters, because left and right
+%and \ncn{\|}\index{"|@\verb"*+"\"|+} for delimiters, because left and right
+and \cnvert\ for delimiters, because left and right
 delimiters are distinct usages that do not relate in the same way to
 adjacent symbols; recommended practice is therefore to define suitable
 commands in the document preamble for any paired-delimiter use of vert
@@ -1333,6 +1609,11 @@ bar symbols:
 \end{verbatim}
 whereupon the document would contain |\abs{z}| to produce $\lvert
 z\rvert$ and |\norm{v}| to produce $\lVert v\rVert$.
+The \pkg{mathools} provides the command \cn{DeclarePairedDelimiter}
+for defining |\abs|-like macros with scaling delimiters.
+\index{delimiters|)}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \chapter{Operator names}
 
@@ -1344,7 +1625,7 @@ traditionally typeset in roman type to make them visually more distinct
 from one-letter math variables, which are set in math italic. The more
 common ones have predefined names, \cn{log}, \cn{sin}, \cn{lim}, and so
 forth, but new ones come up all the time in mathematical papers, so the
-\pkg{amsmath} package provides a general mechanism for defining new
+\nipkg{amsmath} package provides a general mechanism for defining new
 `operator names'. To define a math function \ncn{xxx} to work like
 \cn{sin}, you write
 \begin{verbatim}
@@ -1352,7 +1633,7 @@ forth, but new ones come up all the time in mathematical papers, so the
 \end{verbatim}
 whereupon ensuing uses of \ncn{xxx} will produce {\upshape xxx} in the
 proper font and automatically add proper spacing\index{horizontal
-space!around operator names} on either side when necessary, so that you
+spacing!around operator names} on either side when necessary, so that you
 get $A\xxx B$ instead of $A\mathrm{xxx}B$. In the second argument of
 \cn{DeclareMathOperator} (the name text), a pseudo-text mode prevails:
 the hyphen character \qc{\-} will print as a text hyphen rather than a
@@ -1362,6 +1643,7 @@ instead of a centered math star. (Compare
 text is printed in math mode, so that you can use, e.g., subscripts and
 superscripts there.
 
+%%%%xxx%%%\enlargethispage{1\baselineskip}
 If the new operator should have subscripts and superscripts placed in
 `limits' position above and below as with $\lim$, $\sup$, or $\max$, use
 the \qc{\*} form of the \cn{DeclareMathOperator} command:
@@ -1371,8 +1653,12 @@ the \qc{\*} form of the \cn{DeclareMathOperator} command:
 See also the discussion of subscript placement in
 Section~\ref{subplace}.
 
+\goodbreak
+
 The following operator names are predefined:
-\begin{ctab}{rlrlrlrl}
+
+\vspace{-1\baselineskip}
+\begin{ctab}{@{}rlrlrlrl}
 \cn{arccos}& $\arccos$ &\cn{deg}& $\deg$ &      \cn{lg}& $\lg$ &        \cn{projlim}& $\projlim$\\
 \cn{arcsin}& $\arcsin$ &\cn{det}& $\det$ &      \cn{lim}& $\lim$ &      \cn{sec}& $\sec$\\
 \cn{arctan}& $\arctan$ &\cn{dim}& $\dim$ &      \cn{liminf}& $\liminf$ &\cn{sin}& $\sin$\\
@@ -1383,11 +1669,13 @@ The following operator names are predefined:
 \cn{coth}& $\coth$ &    \cn{injlim}& $\injlim$ &\cn{min}& $\min$\\
 \cn{csc}& $\csc$ &      \cn{ker}& $\ker$ &      \cn{Pr}& $\Pr$
 \end{ctab}
+\par\nobreak
+\vspace{-1.2\baselineskip}
 \begin{ctab}{rlrl}
-\cn{varlimsup}&  $\displaystyle\varlimsup$&
-  \cn{varinjlim}&  $\displaystyle\varinjlim$\\
-\cn{varliminf}&  $\displaystyle\varliminf$&
-  \cn{varprojlim}& $\displaystyle\varprojlim$
+\cn{varinjlim}&  $\displaystyle\varinjlim$&
+\cn{varliminf}&  $\displaystyle\varliminf$\\
+\cn{varprojlim}& $\displaystyle\varprojlim$&
+\cn{varlimsup}&  $\displaystyle\varlimsup$
 \end{ctab}
 
 There is also a command \cn{operatorname} such that using
@@ -1399,11 +1687,13 @@ in a math formula is equivalent to a use of \ncn{abc} defined by
 constructing more complex notation or other purposes. (Use the variant
 \cn{operatorname*} to get limits.)
 
+%% ------------------------------------------------------------------ %%
+
 \section{\cn{mod} and its relatives}
 
 Commands \cn{mod}, \cn{bmod}, \cn{pmod}, \cn{pod} are provided to deal
 with the special spacing conventions of \qq{mod} notation. \cn{bmod} and
-\cn{pmod} are available in \latex/, but with the \pkg{amsmath} package
+\cn{pmod} are available in \latex/, but with the \nipkg{amsmath} package
 the spacing of \cn{pmod} will adjust to a smaller value if it's used in
 a non-display-mode formula. \cn{mod} and \cn{pod} are variants of
 \cn{pmod} preferred by some authors; \cn{mod} omits the parentheses,
@@ -1417,15 +1707,20 @@ whereas \cn{pod} omits the \qq{mod} and retains the parentheses.
 \quad x\equiv y\mod c;\quad x\equiv y\pod d
 \end{verbatim}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\enlargethispage{1\baselineskip}
+
 \chapter{The \cn{text} command}\label{text}
 
 The main use of the command \cn{text} is for words or
 phrases\index{text fragments inside math} in a display. It is very
 similar to the \latex/ command \cn{mbox} in its effects, but has a
 couple of advantages. If you want a word or phrase of text in a
-subscript, you can type |..._{\text{word or phrase}}|, which is slightly
-easier than the \cn{mbox} equivalent: |..._{\mbox{\scriptsize| |word|
-|or| |phrase}}|. The other advantage is the more descriptive name.
+subscript, you can type |..._{\textrm{word or phrase}}|, which is slightly
+easier than the \cn{mbox} equivalent: |..._{\mbox{\rmfamily\scriptsize| |word|
+|or| |phrase}}|. Note that the standard \cn{textrm} command will use the
+\nipkg{amsmath} \cn{text} definition, but ensure the \verb+\rmfamily+
+font is used.
 \begin{equation}
 f_{[x_{i-1},x_i]} \text{ is monotonic,}
 \quad i = 1,\dots,c+1
@@ -1435,12 +1730,36 @@ f_{[x_{i-1},x_i]} \text{ is monotonic,}
 \quad i = 1,\dots,c+1
 \end{verbatim}
 
+The font used for \cn{text} is the same as that of the surrounding
+environment; i.e., within a theorem, the contents of \cn{text} will
+be set in italic.
+
+If a math expression is included in a \cn{text} string, it must be
+explicitly marked as math (|$...$|).
+\[
+\partial_s f(x) = \frac{\partial}{\partial x_0} f(x)\quad
+  \text{for $x= x_0 + I x_1$.}
+\]
+\begin{verbatim}
+\partial_s f(x) = \frac{\partial}{\partial x_0} f(x)\quad
+  \text{for $x= x_0 + I x_1$.}
+\end{verbatim}
+
+Function names should \emph{not} be entered as \cn{text}.  Instead,
+use \cn{mathrm} or \cn{DeclareMathOperator} as appropriate.  These are
+fixed entities that should not change depending on outside content
+(such as appearing within a theorem that is set in italic), and in the
+case of declared operators, proper spacing\index{horizontal
+spacing!around operator names} is applied automatically.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \chapter{Integrals and sums}
 
 \section{Multiline subscripts and superscripts}
 
 The \cn{substack} command can be used to produce a multiline subscript
-or superscript:\index{subscripts and superscripts!multi-line}\relax
+or superscript:\index{subscripts and superscripts!multiline}\relax
 \index{superscripts|see{subscripts and superscripts}} for example
 \begin{ctab}{ll}
 \begin{minipage}[t]{.6\columnwidth}
@@ -1475,13 +1794,16 @@ $\displaystyle
  P(i,j)$
 \end{ctab}
 
+%% ------------------------------------------------------------------ %%
+
 \section{The \cn{sideset} command}\label{sideset}
 
 There's also a command called \cn{sideset}, for a rather special
 purpose: putting symbols at the subscript and
 superscript\index{subscripts and superscripts!on sums} corners of a
 large operator symbol such as $\sum$ or $\prod$. \emph{Note: this
-command is not designed to be applied to anything other than sum-class symbols.} The prime
+command is not designed to be applied to anything other than sum-class
+symbols.} The prime
 example is the case when you want to put a prime on a sum symbol. If
 there are no limits above or below the sum, you could just use
 \cn{nolimits}: here's
@@ -1520,6 +1842,8 @@ product symbol, you would type
 $
 \end{ctab}
 
+%% ------------------------------------------------------------------ %%
+
 \section{Placement of subscripts and limits}\label{subplace}
 
 The default positioning for subscripts depends on the
@@ -1531,7 +1855,8 @@ the side, to avoid unsightly and wasteful spreading of the
 surrounding text lines.
 The default for integral-class symbols is to have sub- and
 superscripts always to the side, even in displayed formulas.
-(See the discussion of the \opt{intlimits} and related options in
+(See the discussion of the \opt{intlimits} and related
+options\index{options!behavior of particular options} in
 Section~\ref{options}.)
 
 Operator names such as $\sin$ or $\lim$ may have either `displaylimits'
@@ -1550,6 +1875,8 @@ same `displaylimits' behavior as \cn{sum}, put
 instances of \cn{limits}, \cn{nolimits}, or \cn{displaylimits} occur
 consecutively, the last one takes precedence.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Multiple integral signs}
 
 \cn{iint}, \cn{iiint}, and \cn{iiiint} give multiple integral
@@ -1563,24 +1890,29 @@ f(x,y,z)\,dx\,dy\,dz\\
 f(w,x,y,z)\,dw\,dx\,dy\,dz\qquad\idotsint\limits_A f(x_1,\dots,x_k)
 \end{gather}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \chapter{Commutative diagrams}\label{s:commdiag}
+\index{commutative diagrams}
 
 Some commutative diagram commands like the ones in \amstex/ are
 available as a separate package, \pkg{amscd}. For complex commutative
 diagrams authors will need to turn to more comprehensive packages like
-\pkg{kuvio} or \xypic/, but for simple diagrams without diagonal
+\tikz/\index{TikZ@\tikz/ package} (in particular, \pkg{tikz-cd})
+or \xypic/\index{XY-pic@\xypic/ package},
+but for simple diagrams without diagonal
 arrows\index{arrows!in commutative diagrams} the \pkg{amscd} commands
 may be more convenient. Here is one example.
 \begin{equation*}
 \begin{CD}
-S^{{\mathcal{W}}_\Lambda}\otimes T   @>j>>   T\\
+S^{\mathcal{W}_\Lambda}\otimes T   @>j>>   T\\
 @VVV                                    @VV{\End P}V\\
 (S\otimes T)/I                  @=      (Z\otimes T)/J
 \end{CD}
 \end{equation*}
 \begin{verbatim}
 \begin{CD}
-S^{{\mathcal{W}}_\Lambda}\otimes T   @>j>>   T\\
+S^{\mathcal{W}_\Lambda}\otimes T   @>j>>   T\\
 @VVV                                    @VV{\End P}V\\
 (S\otimes T)/I                  @=      (Z\otimes T)/J
 \end{CD}
@@ -1597,13 +1929,14 @@ A \qq{null arrow} command |@.| can be used instead of a visible arrow
 to fill out an array where needed.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \chapter{Using math fonts}
 
 \section{Introduction}
 
 For more comprehensive information on font use in \latex/, see the
 \latex/ font guide (\fn{fntguide.tex}) or \booktitle{The \latex/
-Companion} \cite{tlc}. The basic set of math font commands\index{math
+Companion} \cite{tlc2}. The basic set of math font commands\index{math
 fonts}\relax \index{math symbols|see{math fonts}} in \latex/ includes
 \cn{mathbf}, \cn{mathrm}, \cn{mathcal}, \cn{mathsf}, \cn{mathtt},
 \cn{mathit}. Additional math alphabet commands such as
@@ -1611,6 +1944,9 @@ fonts}\relax \index{math symbols|see{math fonts}} in \latex/ includes
 \cn{mathscr} for Euler script are available through the packages
 \pkg{amsfonts} and \pkg{euscript} (distributed separately).
 
+%% ------------------------------------------------------------------ %%
+\enlargethispage{1\baselineskip}
+
 \section{Recommended use of math font commands}
 
 If you find yourself employing math font commands frequently in your
@@ -1659,6 +1995,9 @@ command:\indexcs{mathbb}
 \newcommand{\R}{\field{R}}
 \end{verbatim}
 
+%% ------------------------------------------------------------------ %%
+\enlargethispage{3\baselineskip}
+
 \section{Bold math symbols}
 
 The \cn{mathbf} command is commonly used to obtain bold Latin letters in
@@ -1671,8 +2010,8 @@ example, writing
 produces $\Delta \mathbf{\Delta}\mathbf{+}\delta
 \mathbf{\delta}$; the \cn{mathbf} has no effect on the plus
 sign or the small delta.
-
-The \pkg{amsmath} package therefore provides two additional commands,
+% should be paragraph break; avoid overfull box on next line
+The \nipkg{amsmath} package therefore provides two additional commands,
 \cn{boldsymbol} and \cn{pmb}, that can be applied to other kinds of math
 symbols. \cn{boldsymbol} can be used for a math symbol that remains
 unaffected by \cn{mathbf} if (and only if) your current math font set
@@ -1684,8 +2023,8 @@ with slight offsets. The quality of the output is inferior, especially
 for symbols that contain any hairline strokes. When the standard default set of
 \latex/ math fonts are in use (Computer Modern), the only symbols that
 are likely to require \cn{pmb} are large operator symbols like \cn{sum},
-extended delimiter symbols, or the extra math symbols provided by
-the \pkg{amssymb} package \cite{amsfonts}.
+extended delimiter\index{delimiters} symbols, or the extra math symbols
+provided by the \pkg{amssymb} package \cite{amsfonts}.
 
 The following formula shows some of the results that are possible:
 \begin{verbatim}
@@ -1701,10 +2040,12 @@ A_\infty + \pi A_0
 \sim\pmb{A}_{\pmb{\infty}} \pmb{+}\pmb{\pi} \pmb{A}_{\pmb{0}}
 \end{equation*}
 If you want to use only the \cn{boldsymbol} command without loading the
-whole \pkg{amsmath} package, the \pkg{bm} package is recommended (this
+whole \nipkg{amsmath} package, the \pkg{bm} package is recommended (this
 is a standard \latex/ package, not an AMS package; you probably have it
 already if you have a 1997 or newer version of \latex/).
 
+%% ------------------------------------------------------------------ %%
+
 \section{Italic Greek letters}
 
 For italic versions of the capital Greek letters, the following commands
@@ -1718,13 +2059,18 @@ are provided:
 \cn{varPi}& $\varPi$
 \end{ctab}
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 \chapter{Error messages and output problems}
 
 \section{General remarks}
 
-This is a supplement to Chapter~8 of the \latex/ manual \cite{lamport} (first
-edition: Chapter~6). For the reader's convenience, the set of error
-messages discussed here overlaps somewhat with the set in that chapter,
+This is a supplement to Chapter~8 of the \latex/ manual \cite{lamport}
+(first edition: Chapter~6). Appendix~B of the
+\textit{Companion}~\cite{tlc2} lists all \latex/ errors including those
+for \nipkg{amsmath} with likely causes for each.  For the reader's
+convenience, the set of error messages discussed here overlaps
+somewhat with the set in those references,
 but please be aware that we don't provide exhaustive coverage here.
 The error messages are arranged in alphabetical order, disregarding
 unimportant text such as |! LaTeX Error:| at the beginning, and
@@ -1732,10 +2078,22 @@ nonalphabetical characters such as \qc{\\}. Where examples are given, we
 show also the help messages that appear on screen when you respond to an
 error message prompt by entering |h|.
 
-There is also a section discussing some output errors, i.e., instances
-where the printed document has something wrong but there was no \latex/
+Remember that the important error message is the first for a given line.
+When running in nonstop mode, errors accumulate, and the first error
+may create a further error condition from which it is impossible to
+recover.  In such a situation processing will stop after 100~errors,
+so the reporting of genuine errors may not be complete, and it may be
+impossible to determine which reported errors are genuine and which
+are not.
+
+A final section discusses some output errors, i.e., instances where
+the printed document has something wrong but there was no \latex/
 error during typesetting.
 
+%% ------------------------------------------------------------------ %%
+%% **********
+\enlargethispage{-2\baselineskip}
+
 \section{Error messages}
 
 \begin{error}{\begin{split} won't work here.}
@@ -1758,6 +2116,27 @@ equation; it needs to be used within some other environment such as
 
 \end{error}
 
+\begin{error}{Erroneous nesting of equation structures}
+\errexa
+\begin{verbatim}
+! Package amsmath Error: Erroneous nesting of equation structures;
+(amsmath)                trying to recover with `aligned'.
+
+See the amsmath package documentation for explanation.
+Type  H <return>  for immediate help.
+ ...
+
+l.260 \end{alignat*}
+                    \end{equation*}
+\end{verbatim}
+\errexpl
+The structures \env{align}, \env{alignat}, etc., are designed
+for top-level use and for the most part cannot be nested inside some
+other displayed equation structure. The chief exception is that
+\env{align} and most of its variants can be used inside the
+\env{gather} environment.
+\end{error}
+
 \begin{error}{Extra & on this line}
 \errexa
 \begin{verbatim}
@@ -1782,28 +2161,8 @@ accidentally left out a newline command \cn{\\} and the above error is
 issued.
 \end{error}
 
-\begin{error}{Improper argument for math accent}
-\errexa
-\begin{verbatim}
-! Package amsmath Error: Improper argument for math accent:
-(amsmath)                Extra braces must be added to
-(amsmath)                prevent wrong output.
-
-See the amsmath package documentation for explanation.
-Type  H <return>  for immediate help.
- ...
-
-l.415 \tilde k_{\lambda_j} = P_{\tilde \mathcal
-                                               {M}}
-?
-\end{verbatim}
-\errexpl
-Non-simple arguments for any \LaTeX{} command should be enclosed in
-braces. In this example extra braces are needed as follows:
-\begin{verbatim}
-... P_{\tilde{\mathcal{M}}}
-\end{verbatim}
-\end{error}
+%% **********
+\enlargethispage{1.5\baselineskip}
 
 \begin{error}{Font OMX/cmex/m/n/7=cmex7 not loadable ...}
 \errexa
@@ -1823,7 +2182,7 @@ e.g., type `I\font<same font id>=<substitute font name>'.
 \end{verbatim}
 \errexpl
 Certain extra sizes of some Computer Modern fonts that were formerly
-available mainly through the AMSFonts\index{AMSFonts collection}
+available mainly through the AMSFonts\index{amsfont@AMSFonts collection}
 distribution are considered part of standard \latex/ (as of June 1994):
 \fn{cmex7}\ndash \texttt{9}, \fn{cmmib5}\ndash \texttt{9}, and
 \fn{cmbsy5}\ndash \texttt{9}. If these extra sizes are missing on your
@@ -1835,8 +2194,9 @@ Type 1 format, directory
 \nfn{/tex-archive/fonts/cm/ps-type1/bakoma}\index{BaKoMa fonts}\relax
 \index{PostScript fonts}).
 
-If the font name begins with \fn{cmex}, there is a special option
-\fn{cmex10} for the \pkg{amsmath} package that provides a temporary
+If the font name begins with \fn{cmex}, there is a special option%
+\index{options!behavior of particular options}
+\opt{cmex10} for the \nipkg{amsmath} package that provides a temporary
 workaround. I.e., change the \cn{usepackage} to
 \begin{verbatim}
 \usepackage[cmex10]{amsmath}
@@ -1846,6 +2206,30 @@ all cases. Depending on the contents of your document this may be
 adequate.
 \end{error}
 
+\enlargethispage{1\baselineskip}
+\begin{error}{Improper argument for math accent}
+\errexa
+\begin{verbatim}
+! Package amsmath Error: Improper argument for math accent:
+(amsmath)                Extra braces must be added to
+(amsmath)                prevent wrong output.
+
+See the amsmath package documentation for explanation.
+Type  H <return>  for immediate help.
+ ...
+
+l.415 \tilde k_{\lambda_j} = P_{\tilde \mathcal
+                                               {M}}
+?
+\end{verbatim}
+\errexpl
+Non-simple arguments for any \LaTeX{} command should be enclosed in
+braces. In this example extra braces are needed as follows:
+\begin{verbatim}
+... P_{\tilde{\mathcal{M}}}
+\end{verbatim}
+\end{error}
+
 \begin{error}{Math formula deleted: Insufficient extension fonts}
 \errexa
 \begin{verbatim}
@@ -1859,6 +2243,7 @@ This usually follows a previous error |Font ... not loadable|; see the
 discussion of that error (above) for solutions.
 \end{error}
 
+\enlargethispage{1\baselineskip}
 \begin{error}{Missing number, treated as zero}
 \errexa
 \begin{verbatim}
@@ -1876,7 +2261,7 @@ look up `weird error' in the index to The TeXbook.)
 \end{verbatim}
 \errexpl
 There are many possibilities that can lead to this error. However, one
-possibility that is relevant for the \pkg{amsmath} package is that you
+possibility that is relevant for the \nipkg{amsmath} package is that you
 forgot to give the number argument of an \env{alignat} environment, as
 in:
 \begin{verbatim}
@@ -1891,13 +2276,13 @@ where the first line should read instead
 \end{verbatim}
 
 Another possibility is that you have a left bracket character |[|
-following a linebreak command \cn{\\} in a multiline construction such
-as \env{array}, \env{tabular}, or \env{eqnarray}. This will be
-interpreted by \latex/ as the beginning of an `additional vertical
-space' request \cite[\S C.1.6]{lamport}, even if it occurs on the following
-line and is intended to be part of the contents. For example
+following a line break\index{line break} command \cn{\\} in a multiline
+construction such as \env{array}, \env{tabular}, or \env{eqnarray}.
+This will be interpreted by \latex/ as the beginning of an `additional
+vertical space request \cite[\S C.1.6]{lamport}, even if it occurs on the
+following line and is intended to be part of the contents. For example,
 \begin{verbatim}
-\begin{array}
+\begin{array}{c}
 a+b\\
 [f,g]\\
 m+n
@@ -1906,15 +2291,17 @@ m+n
 To prevent the error message in such a case, you can
 add braces as discussed in the \latex/ manual \cite[\S C.1.1]{lamport}:
 \begin{verbatim}
-\begin{array}
+\begin{array}{c}
 a+b\\
 {[f,g]}\\
 m+n
 \end{array}
 \end{verbatim}
-
+or precede the bracketed expression by \cn{relax}.
 \end{error}
 
+\goodbreak
+
 \begin{error}{Missing \right. inserted}
 \errexa
 \begin{verbatim}
@@ -1931,9 +2318,10 @@ really didn't forget anything, try typing `2' now; then
 my insertion and my current dilemma will both disappear.
 \end{verbatim}
 \errexpl
-This error typically arises when you try to insert a linebreak inside a
-\cn{left}-\cn{right} pair of delimiters in a \env{multline} or
-\env{split} environment:
+This error typically arises when you try to insert a
+line break\index{line break} or |&|\cnamp\ between a
+\cn{left}-\cn{right} pair of delimiters\index{delimiters} in any
+multiline environment, including \env{split}.
 \begin{verbatim}
 \begin{multline}
 AAA\left(BBB\\
@@ -1941,25 +2329,81 @@ AAA\left(BBB\\
 \end{multline}
 \end{verbatim}
 There are two possible solutions: (1)~instead of using \cn{left} and
-\cn{right}, use `big' delimiters of fixed size (\cn{bigl} \cn{bigr}
-\cn{biggl} \cn{biggr} \dots; see \secref{bigdel}); or (2)~use null
-delimiters to break up the \cn{left}-\cn{right} pair into parts for each
-line:
+\cn{right}, use `big' delimiters\index{delimiters!fixed size} of fixed
+size (\cn{bigl} \cn{bigr} \cn{biggl} \cn{biggr} \dots; see
+\secref{bigdel}); or (2)~use null delimiters\index{delimiters!null} to
+break up the \cn{left}-\cn{right} pair into parts for each line (or cell):
 \begin{verbatim}
 AAA\left(BBB\right.\\
   \left.CCC\right)
 \end{verbatim}
-The latter solution may result in mismatched delimiter sizes;
-ensuring that they match requires using \cn{vphantom} in the line
-that has the smaller delimiter (or possibly \cn{smash} in the line that
-has the larger delimiter). In the argument of \cn{vphantom} put a copy
-of the tallest element that occurs in the other line, e.g.,
+The latter solution may result in mismatched
+delimiter\index{delimiters!mismatched sizes} sizes;
+ensuring that they match requires using \cn{vphantom} in the segment
+that has the smaller delimiter (or possibly \cn{smash} in the segment
+that has the larger delimiter). In the argument of \cn{vphantom} put a
+copy of the tallest element that occurs in the other segment, e.g.,
 \begin{verbatim}
 xxx \left(\int_t yyy\right.\\
   \left.\vphantom{\int_t} zzz ... \right)
 \end{verbatim}
 \end{error}
 
+\goodbreak
+
+\begingroup
+\lccode`M=`M
+\lccode`@=`\}
+\lowercase{\endgroup
+\begin{error}{Missing @ inserted}}
+
+\errexa
+\begin{verbatim}
+! Missing } inserted.
+<inserted text>
+                \right .
+l.10 \end{multline}
+
+? h
+I've inserted something that you may have forgotten.
+(See the <inserted text> above.)
+With luck, this will get me unwedged. But if you
+really didn't forget anything, try typing `2' now; then
+my insertion and my current dilemma will both disappear.
+\end{verbatim}
+\errexpl
+This error is often the result of using \verb+$+ within a multiline
+display environment.  Remove such \verb+$+ signs (except when they
+appear within \verb+\text{...}+).
+\end{error}
+
+\begin{error}{Old form `\pmatrix' should be \begin{pmatrix}.}
+\errexa
+\begin{verbatim}
+! Package amsmath Error: Old form `\pmatrix' should be
+                         \begin{pmatrix}.
+
+See the amsmath package documentation for explanation.
+Type  H <return>  for immediate help.
+ ...
+
+\pmatrix ->\left (\matrix@check \pmatrix
+                                         \env@matrix
+l.16 \pmatrix
+             {a&b\cr c&d\cr}
+? h
+`\pmatrix{...}' is old Plain-TeX syntax whose use is
+ill-advised in LaTeX.
+?
+\end{verbatim}
+\errexpl
+When the \nipkg{amsmath} package is used, the old forms of \cn{pmatrix},
+\cn{matrix}, and \cn{cases} cannot be used any longer because of naming
+conflicts. Their syntax did not conform with standard \LaTeX{} syntax
+in any case.
+\end{error}
+
+\enlargethispage{2\baselineskip}
 \begin{error}{Paragraph ended before \xxx was complete}
 \errexa
 \begin{verbatim}
@@ -1977,7 +2421,8 @@ My plan is to forget the whole thing and hope for the best.
 ?
 \end{verbatim}
 \errexpl
-This might be produced by a misspelling in the |\end{multline}| command,
+This might be produced by a blank line between the |\begin| and |\end|.
+Another possibility is a misspelling in the |\end{multline}| command,
 e.g.,
 \begin{verbatim}
 \begin{multline}
@@ -1992,8 +2437,8 @@ or by using abbreviations for certain environments, such as |\bal| and
 \eal
 \end{verbatim}
 For technical reasons that kind of abbreviation does not work with
-the more complex displayed equation environments of the \pkg{amsmath} package
-(\env{gather}, \env{align}, \env{split}, etc.; cf.\@ \fn{technote.tex}).
+the more complex displayed equation environments of the \nipkg{amsmath} package
+(\env{gather}, \env{align}, \env{split}, etc.; cf.\ \fn{technote.tex}).
 \end{error}
 
 \begin{error}{Runaway argument?}
@@ -2012,73 +2457,15 @@ misspelled its name. Try typing  <return>  to proceed.
 ?
 \end{verbatim}
 \errexpl
-This means that you misspelled the option name, or the package simply
-does not have an option that you expected it to have. Consult the
-documentation for the given package.
+This means that you misspelled the option\index{options!unknown}
+name, or the package simply does not have an option that you expected
+it to have. Consult the documentation for the given package.
 \end{error}
 
-\begin{error}{Old form `\pmatrix' should be \begin{pmatrix}.}
-\errexa
-\begin{verbatim}
-! Package amsmath Error: Old form `\pmatrix' should be
-                         \begin{pmatrix}.
-
-See the amsmath package documentation for explanation.
-Type  H <return>  for immediate help.
- ...
-
-\pmatrix ->\left (\matrix@check \pmatrix
-                                         \env@matrix
-l.16 \pmatrix
-             {a&b\cr c&d\cr}
-? h
-`\pmatrix{...}' is old Plain-TeX syntax whose use is
-ill-advised in LaTeX.
-?
-\end{verbatim}
-\errexpl
-When the \pkg{amsmath} package is used, the old forms of \cn{pmatrix},
-\cn{matrix}, and \cn{cases} cannot be used any longer because of naming
-conflicts. Their syntax did not conform with standard \LaTeX{} syntax
-in any case.
-\end{error}
-
-\begin{error}{Erroneous nesting of equation structures}
-\errexa
-\begin{verbatim}
-! Package amsmath Error: Erroneous nesting of equation structures;
-(amsmath)                trying to recover with `aligned'.
-
-See the amsmath package documentation for explanation.
-Type  H <return>  for immediate help.
- ...
-
-l.260 \end{alignat*}
-                    \end{equation*}
-\end{verbatim}
-\errexpl
-The structures \env{align}, \env{alignat}, etc., are designed
-for top-level use and for the most part cannot be nested inside some
-other displayed equation structure. The chief exception is that
-\env{align} and most of its variants can be used inside the
-\env{gather} environment.
-\end{error}
+%% ------------------------------------------------------------------ %%
 
 \section{Warning messages}
 
-\begin{error}{Foreign command \over [or \atop or \above]}
-\errexa
-\begin{verbatim}
-Package amsmath Warning: Foreign command \over; \frac or \genfrac
-(amsmath)                should be used instead.
-\end{verbatim}
-\errexpl The primitive generalized fraction commands of \tex/\mdash
-\cs{over}, \cs{atop}, \cs{above}\mdash are deprecated when the
-\pkg{amsmath} package is used because their syntax is foreign to \latex/
-and \pkg{amsmath} provides native \latex/ equivalents. See
-\fn{technote.tex} for further information.
-\end{error}
-
 \begin{error}{Cannot use `split' here}
 \errexa
 \begin{verbatim}
@@ -2100,11 +2487,25 @@ after it within the same enclosing structure:
 \end{verbatim}
 \end{error}
 
-\section{Wrong output}
+\begin{error}{Foreign command \over [or \atop or \above]}
+\errexa
+\begin{verbatim}
+Package amsmath Warning: Foreign command \over; \frac or \genfrac
+(amsmath)                should be used instead.
+\end{verbatim}
+\errexpl The primitive generalized fraction commands of \tex/\mdash
+\cs{over}, \cs{atop}, \cs{above}\mdash are deprecated when the
+\nipkg{amsmath} package is used because their syntax is foreign to \latex/
+and \nipkg{amsmath} provides native \latex/ equivalents. See
+\fn{technote.tex} for further information.
+\end{error}
+
+%% ------------------------------------------------------------------ %%
 
-\subsection{Section numbers 0.1, 5.1, 8.1 instead of 1, 2, 3}
-\label{numinverse}
+\section{Wrong output}
 
+\begin{erroro}{Section numbers 0.1, 5.1, 8.1 instead of 1, 2, 3}
+%
 This most likely means that you have the arguments for \cn{numberwithin}
 in reverse order:
 \begin{verbatim}
@@ -2116,28 +2517,78 @@ occurs' when what you probably wanted was the inverse
 \begin{verbatim}
 \numberwithin{equation}{section}
 \end{verbatim}
+\end{erroro}
 
-\subsection{The \cn{numberwithin} command had no effect on equation
-numbers}
-
+\begin{erroro}{The \cn{numberwithin} command had no effect on equation
+  numbers}
+%
 Are you looking at the first section in your document? Check the section
-numbers elsewhere to see if the problem is the one described in
-\secref{numinverse}.
+numbers elsewhere to see if the problem is the one described in the
+previous item.
+\end{erroro}
+
+\begin{erroro}{Bracketed material disappears at the beginning of
+  \env{aligned} or \env{gathered}}
+%
+For most multiline equation environments, \nipkg{amsmath} disables the
+\latex/ convention to recognize a [bracketed] expression as an option%
+\index{ed env@\texttt{-ed} environments}%
+\index{options!positioning of \texttt{-ed} environments}%
+\index{options!space before \texttt{[}}
+when it occurs at the beginning of an environment or immediately
+following \cn{\\}, provided a space intervenes.  This fails at the
+beginning of \env{aligned} and \env{gathered}, and is a bug.  Insert
+\cn{relax} before the opening brace to restore the desired result.
+\end{erroro}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \chapter{Additional information}
 
+\section{Compatibility with other packages}
+
+Several packages have already been mentioned as providing facilities
+lacking in \nipkg{amsmath}.
+
+\begin{itemize}
+\item \pkg{bm} is recommended for specifying bold math symbols.
+\item \pkg{mathtools} provides enhancements to some \nipkg{amsmath}
+  environments as well as additional compatible features, such as
+  \env{rcases} (similar to \env{cases} but with the brace on the
+  right-hand side), \env{multlined} (a subsidiary environment
+  comparable to \env{multline}), and \cn{shortintertext} (more
+  compact spacing than \cn{intertext}).  If \pkg{mathtools} is used,
+  \nipkg{amsmath} is loaded automatically, so it is not necessary
+  to load it separately.
+\item \pkg{unicode-math} provides commands for (most?)\ math symbols
+  in Unicode.
+%\item \pkg{empheq}
+\end{itemize}
+
+These packages have known problems when used with \nipkg{amsmath}.
+\begin{itemize}
+\item \pkg{lineno} may omit numbers before display environments.
+\item \pkg{breqn} redefines a number of commands from other packages,
+  so is best loaded after \nipkg{amsmath} and other packages with math
+  facilities.\\ \pkg{breqn} is not yet totally stable, and a number of
+  bugs have been reported via \texttt{tex.stackexchange} \cite{tex-sx}.
+\item \pkg{wasysym}, \pkg{mathabx} and perhaps other font packages also
+  define multiple integrals\index{integrals!multiple} using the same
+  names as \nipkg{amsmath}.
+\end{itemize}
+
+%% ------------------------------------------------------------------ %%
+
 \section{Converting existing documents}
 
 \subsection{Converting from plain \LaTeX{}}
 
 A \LaTeX{} document will typically continue to work the same in most
 respects if \verb'\usepackage{amsmath}' is added in the document
-preamble. By default, however, the \pkg{amsmath} package suppresses page
+preamble. By default, however, the \nipkg{amsmath} package suppresses page
 breaks inside multiple-line displayed equation structures such as
 \env{eqnarray}, \env{align}, and \env{gather}. To continue allowing page
-breaks inside \env{eqnarray} after switching to \pkg{amsmath}, you will
+breaks inside \env{eqnarray} after switching to \nipkg{amsmath}, you will
 need to add the following line in your document preamble:
 \begin{verbatim}
 \allowdisplaybreaks[1]
@@ -2146,64 +2597,80 @@ To ensure normal spacing around relation symbols, you might also want to
 change \env{eqnarray} to \env{align}, \env{multline}, or
 \env{equation}\slash\env{split} as appropriate.
 
-Most of the other differences in \pkg{amsmath} usage can be considered
+Most of the other differences in \nipkg{amsmath} usage can be considered
 optional refinements, e.g., using
 \begin{verbatim}
 \DeclareMathOperator{\Hom}{Hom}
 \end{verbatim}
 instead of \verb'\newcommand{\Hom}{\mbox{Hom}}'.
 
-\subsection{Converting from \amslatex/ 1.1}
+\subsection{Converting from \texorpdfstring{\amslatex/}{amslatex} 1.1}
 See \fn{diffs-m.txt}.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Technical notes}
 The file \fn{technote.tex} contains some remarks on miscellaneous
 technical questions that are less likely to be of general interest.
 
+%% ------------------------------------------------------------------ %%
+
 \section{Getting help}
 
-Questions or comments regarding \pkg{amsmath} and related packages
-should be sent to:
-\begin{infoaddress}
-American Mathematical Society\\
-Technical Support\\
-Electronic Products and Services\\
-P. O. Box 6248\\
-Providence, RI 02940\\[3pt]
-Phone: 800-321-4AMS (321-4267) \quad or \quad 401-455-4080\\
-Internet: \mail{tech-support@ams.org}
-\end{infoaddress}
-If you are reporting a problem you should include
-the following information to make proper investigation possible:
-\begin{enumerate}
-\item The source file where the problem occurred, preferably reduced
-  to minimum size by removing any material that can be removed without
-  affecting the observed problem.
-\item A \latex/ log file showing the error message (if applicable) and
-  the version numbers of the document class and option files being used.
-\end{enumerate}
+The \nipkg{amsmath} collection of packages is maintained by the \latex/
+team \cite{ltx-team}.  Bugs should be reported using the instructions
+at \url{https://www.latex-project.org/bugs/}.
+Please be careful not to confuse \nipkg{amsmath} with the AMS document
+classes (\cls{amsart}, \cls{amsbook}, and \cls{amsproc}), which
+automatically incorporate \nipkg{amsmath}; bugs in the classes should
+be reported directly to AMS, by email to \mail{tech-support@ams.org}.
+
+%Questions or comments regarding \nipkg{amsmath} and related packages
+%should be sent to:
+%\begin{infoaddress}
+%American Mathematical Society\\
+%Technical Support\\
+%Electronic Products and Services\\
+%P. O. Box 6248\\
+%Providence, RI 02940\\[3pt]
+%Phone: 800-321-4AMS (321-4267) \quad or \quad 401-455-4080\\
+%Internet: \mail{tech-support@ams.org}
+%\end{infoaddress}
+%If you are reporting a problem you should include
+%the following information to make proper investigation possible:
+%\begin{enumerate}
+%\item The source file where the problem occurred, preferably reduced
+%  to minimum size by removing any material that can be removed without
+%  affecting the observed problem.
+%\item A \latex/ log file showing the error message (if applicable) and
+%  the version numbers of the document class and option files being used.
+%\end{enumerate}
+
+The online forum\index{online Q\,\&\,A forum} \texttt{tex.stackexchange}
+\cite{tex-sx} is a good source of answers to common questions on usage.
+Look first in the archive to see if your question has already been asked
+and answered; if it has not, post your own question.
+
+There is an online discussion group called \fn{comp.text.tex} \cite{ctt}
+that is a fairly good source of information about \latex/ and \tex/ in
+general. This group, formerly a Unix newsgroup, predates
+\texttt{tex.stackexchange} by decades, and the archives can be a useful
+resource for historical investigation.
+
+%% ------------------------------------------------------------------ %%
 
 \section{Of possible interest}\label{a:possible-interest}
 Information about obtaining AMSFonts or other \tex/-related
-software from the AMS Internet archive \fn{e-math.ams.org}
-can be obtained by sending a request through electronic mail to:
-\mail{webmaster@ams.org}.
-
-Information about obtaining the \pkg{amsmath} distribution on diskette
-from the AMS is available from:
-\begin{infoaddress}
-American Mathematical Society\\
-Customer Services\\
-P. O. Box 6248\\
-Providence, RI 02940\\[3pt]
-Phone: 800-321-4AMS (321-4267) \quad or \quad 401-455-4000\\
-Internet: \mail{cust-serv@ams.org}
-\end{infoaddress}
+software from the AMS web server at \fn{www.ams.org}
+can be obtained by sending an email request to
+\mail{tech-support@ams.org}.  This software is also posted on
+CTAN\index{CTAN (Comprehensive \TeX\ Archive Network)} and included
+in distributions based on \TeX\,Live\index{TEX Live@\TeX\,Live}.
 
 The \tex/ Users Group\index{TeX Users@\tex/ Users Group} is a nonprofit
 organization that publishes a journal
 (\journalname{TUGboat}\index{TUGboat@\journalname{TUGboat}}), holds
-meetings, and serves as a clearing-house of general information about
+meetings, and serves as a clearinghouse for general information about
 \tex/ and \tex/-related software.
 \begin{infoaddress}
 \tex/ Users Group\\
@@ -2218,38 +2685,27 @@ development of free \tex/-related software. There are also many local
 \tex/ user groups in other countries; information about contacting a
 local user group can be gotten from the \tex/ Users Group.
 
-There is a Usenet newsgroup called \fn{comp.text.tex} that is a fairly
-good source of information about \latex/ and \tex/ in general. If you
-don't know about reading newsgroups, check with your local system
-administrator to see if newsgroup service is available at your site.
-
-\begin{thebibliography}{9}
-\addcontentsline{toc}{chapter}{Bibliography}
+\index{amsmath@\texttt{amsmath} package|)}
 
-\bibitem{amsfonts}\booktitle{AMSFonts version \textup{2.2}\mdash user's guide},
-Amer. Math. Soc., Providence, RI, 1994; distributed
-with the AMSFonts package.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newpage
 
-\bibitem{instr-l}\booktitle{Instructions for preparation of
-papers and monographs\mdash \amslatex/},
-Amer. Math. Soc., Providence, RI, 1996, 1999.
+\begin{thebibliography}{10}
+\addcontentsline{toc}{chapter}{\bibname}
 
-\bibitem{amsthdoc}\booktitle{Using the \pkg{amsthm} Package},
-Amer. Math. Soc., Providence, RI, 1999.
+\raggedright
 
-\bibitem{tlc} Michel Goossens, Frank Mittelbach, and Alexander Samarin,
-\booktitle{The \latex/ companion}, Addison-Wesley, Reading, MA, 1994.
-  [\emph{Note: The 1994 edition is not a reliable guide for the
-    \pkg{amsmath} package unless you refer to the errata for Chapter
-    8\mdash file \fn{compan.err}, distributed with \LaTeX{}.}]
+\bibsubhead{References in print}
 
+\bibitem{mil} George Gr\"atzer, \booktitle{More Math into \latex/}, fifth ed.,
+Springer, New York, 2016.
 % Deal with a line breaking problem
-\begin{raggedright}
-\bibitem{mil} G. Gr\"{a}tzer,
-\emph{Math into \LaTeX{}: An Introduction to \LaTeX{} and AMS-\LaTeX{}}
-  \url{http://www.ams.org/cgi-bin/bookstore/bookpromo?fn=91&arg1=bookvideo&itmc=MLTEX},
-Birkh\"{a}user, Boston, 1995.\par
-\end{raggedright}
+%\begin{raggedright}
+%\bibitem{mil} G. Gr\"{a}tzer,
+%\emph{Math into \LaTeX{}: An Introduction to \LaTeX{} and AMS-\LaTeX{}}
+%  \url{https://www.ams.org/cgi-bin/bookstore/bookpromo?fn=91&arg1=bookvideo&itmc=MLTEX},
+%Birkh\"{a}user, Boston, 1995.\par
+%\end{raggedright}
 
 \bibitem{kn} Donald E. Knuth, \booktitle{The \tex/book},
 Addison-Wesley, Reading, MA, 1984.
@@ -2257,6 +2713,18 @@ Addison-Wesley, Reading, MA, 1984.
 \bibitem{lamport} Leslie Lamport, \booktitle{\latex/: A document preparation
 system}, 2nd revised ed., Addison-Wesley, Reading, MA, 1994.
 
+\bibitem{tlc2} Frank Mittelbach, Michel Goossens, et al.,
+\booktitle{The \latex/ companion}, second ed., Addison-Wesley, Reading,
+MA, 2004.  This is now also available as an ebook, in both English and
+German; see \url{https://www.latex-project.org/help/books/}.
+The front matter, including the full Table of Contents, can be viewed
+online, from a link on the same page.
+%Michel Goossens, Frank Mittelbach, and Alexander Samarin,
+%\booktitle{The \latex/ companion}, Addison-Wesley, Reading, MA, 1994.
+%  [\emph{Note: The 1994 edition is not a reliable guide for the
+%    \nipkg{amsmath} package unless you refer to the errata for Chapter
+%    8\mdash file \fn{compan.err}, distributed with \LaTeX{}.}]
+
 \bibitem{msf} Frank Mittelbach and Rainer Sch\"opf,
 \textit{The new font family selection\mdash user
 interface to standard \latex/}, \journalname{TUGboat} \textbf{11},
@@ -2265,378 +2733,38 @@ no.~2 (June 1990), pp.~297\ndash 305.
 \bibitem{jt} Michael Spivak, \booktitle{The joy of \tex/}, 2nd revised ed.,
 Amer. Math. Soc., Providence, RI, 1990.
 
+\bibsubhead{Package documentation}
+
+\bibitem{amshandbk}\booktitle{AMS author handbook}, separate versions
+for journal articles, monographs and proceedings articles, Amer. Math.
+Soc., Providence, RI, 2017;
+\url{https://www.ams.org/publications/authors/tex/author-handbook}.
+
+\bibitem{amsfonts}\booktitle{AMSFonts version \textup{2.2d}\mdash user's guide},
+Amer. Math. Soc., Providence, RI, 2002; distributed
+with the AMSFonts package
+\url{http://mirror.ctan.org/tex-archive/fonts/amsfonts/doc/amsfndoc.pdf}.
+
+\bibitem{amsthdoc}\booktitle{Using the \pkg{amsthm} Package}, version 2.20.3,
+Amer. Math. Soc., Providence, RI, 2017;
+\url{http://mirror.ctan.org/tex-archive/macros/latex/required/amscls/doc/amsthdoc.pdf}.
+
+\bibitem{mt} Morten H{\o}gholm, Lars Madsen, \booktitle{The \pkg{mathtools}
+package}, 2018;
+\url{http://mirror.ctan.org/tex-archive/macros/latex/contrib/mathtools/mathtools.pdf}.
+
+\bibsubhead{Online resources}
+
+\bibitem{ltx-team} The \latex/ Project, \url{https://www.latex-project.org}.
+
+\bibitem{ctt} Online discussion group \texttt{comp.text.tex},
+\url{https://groups.google.com/forum/\#!forum/comp.text.tex}.
+
+\bibitem{tex-sx} Online question and answer forum \texttt{tex.stackexchange},
+\url{https://tex.stackexchange.com}.
+
 \end{thebibliography}
 
-\begin{theindex}
-
-  \item {\normalfont  \ttfamily  \bslchar \qcbang  }, 11
-  \item \verb*+\,+, 11
-  \item \verb*+\:+, 11
-  \item \verb*+\;+, 11
-  \item \verb*+\\+, 3, 5, 6, 8, 9, 24, 26
-  \item \verb*+\\*+, 9
-  \item \verb*+\|+, 16
-
-  \indexspace
-
-  \item \verb*+\above+, 14, 29
-  \item \verb*+\abovewithdelims+, 14
-  \item \verb*+\accentedsymbol+, 2
-  \item \texttt{accents} package, 12
-  \item \verb*+\addtocounter+, 10
-  \item \verb*+\addtolength+, 5
-  \item \texttt{align} environment, 3, 5--7, 28--30
-  \item \texttt{alignat} environment, 7, 24, 26, 29
-  \item \texttt{aligned} environment, 7, 9
-  \item \texttt{alignedat} environment, 7, 9
-  \item \verb*+\allowdisplaybreaks+, 8, 9
-  \item \texttt{amsart} class, 1
-  \item \texttt{amsbook} class, 1
-  \item \texttt{amsbsy} package, 1, 2
-  \item \texttt{amscd} package, 1, 2, 20
-  \item \texttt{amsfonts} package, 21
-  \item AMSFonts collection, 25
-  \item \texttt{amsmath} package, i, 1--3, 5, 8--18, 22, 23, 25, 26,
-		28--32
-  \item \texttt{amsopn} package, 1, 2
-  \item \texttt{amssymb} package, 22
-  \item \texttt{amstext} package, 1, 2
-  \item \texttt{amsthm} package, 1, 32
-  \item \texttt{amsxtra} package, 1, 2, 12
-  \item \verb*+\arccos+, 18
-  \item \verb*+\arcsin+, 18
-  \item \verb*+\arctan+, 18
-  \item \verb*+\arg+, 18
-  \item \texttt{array} environment, 8, 10, 26
-  \item arrows
-    \subitem extensible, 13
-    \subitem in commutative diagrams, 20
-  \item \verb*+\atop+, 14, 29
-  \item \verb*+\atopwithdelims+, 14
-
-  \indexspace
-
-  \item BaKoMa fonts, 25
-  \item \cn{big}, \cn{Big}, \cn{bigg}, \dots\ delimiters, 16
-  \item \verb*+\biggl+, 27
-  \item \verb*+\biggr+, 27
-  \item \verb*+\bigl+, 27
-  \item \verb*+\bigr+, 27
-  \item \verb*+\binom+, 14
-  \item binomials, 14
-  \item \texttt{bm} package, 2, 23
-  \item \texttt{Bmatrix} environment, 10
-  \item \texttt{bmatrix} environment, 10
-  \item \verb*+\bmod+, 18
-  \item \verb*+\boldsymbol+, 22, 23
-  \item \verb*+\boxed+, 13
-
-  \indexspace
-
-  \item \verb*+\C+, 22
-  \item \texttt{cases} environment, 8
-  \item \verb*+\cases+, 28
-  \item \texttt{CD} environment, 2, 21
-  \item \verb*+\cdots+, 12
-  \item \texttt{centertags} option, 2
-  \item \verb*+\cfrac+, 15
-  \item \texttt{cmbsy5}, 25
-  \item \texttt{cmex}, 25
-  \item \texttt{cmex10}, 25
-  \item \texttt{cmex7}, 25
-  \item \texttt{cmmib5}, 25
-  \item \texttt{comp.text.tex}, 31
-  \item \texttt{compan.err}, 32
-  \item continued fractions, 15
-  \item \verb*+\cos+, 18
-  \item \verb*+\cosh+, 18
-  \item \verb*+\cot+, 18
-  \item \verb*+\coth+, 18
-  \item \verb*+\csc+, 18
-
-  \indexspace
-
-  \item \verb*+\dbinom+, 14
-  \item \verb*+\ddddot+, 12
-  \item \verb*+\dddot+, 12
-  \item \verb*+\ddot+, 12
-  \item \verb*+\DeclareMathOperator+, 2, 17, 18
-  \item \verb*+\deg+, 18
-  \item \verb*+\det+, 18
-  \item \verb*+\dfrac+, 14
-  \item \texttt{diffs-m.txt}, 30
-  \item \verb*+\dim+, 18
-  \item \verb*+\displaybreak+, 8, 9
-  \item displayed   equations, 3
-  \item displayed equations
-    \subitem centering, 3
-  \item \verb*+\displaylimits+, 20
-  \item \texttt{displaymath} environment, 3
-  \item \verb*+\displaystyle+, 14
-  \item \verb*+\documentclass+, 2
-  \item \verb*+\dot+, 12
-  \item dots, \see{ellipsis dots}{11}
-  \item \verb*+\dotsb+, 12
-  \item \verb*+\dotsc+, 12
-  \item \verb*+\dotsi+, 12
-  \item \verb*+\dotsm+, 12
-  \item \verb*+\dotso+, 12
-
-  \indexspace
-
-  \item \texttt{e-math.ams.org}, 31
-  \item ellipsis dots
-    \subitem in matrices, 11
-  \item \texttt{eqnarray} environment, 1, 3, 26, 30
-  \item \verb*+\eqref+, 10
-  \item \texttt{equation} environment, 1, 3, 5, 7, 24, 30
-  \item equation numbers
-    \subitem cross-references, 10
-    \subitem hierarchy, 9
-    \subitem left or right placement, 3
-    \subitem overriding, 3
-    \subitem subordinate numbering, 10
-    \subitem vertical placement, 2
-  \item \texttt{equation*} environment, 3
-  \item equations, \see{displayed equations}{3}
-  \item \texttt{euscript} package, 21
-  \item \verb*+\exp+, 18
-
-  \indexspace
-
-  \item \verb*+\fbox+, 13
-  \item \texttt{fleqn} option, 3, 5
-  \item \texttt{fntguide.tex}, 21
-  \item \verb*+\frac+, 14, 15
-  \item fractions, 14
-  \item \verb*+\fracwithdelims+, 2
-  \item function names, \see{operator names}{17}
-
-  \indexspace
-
-  \item \texttt{gather} environment, 5--7, 24, 28--30
-  \item \texttt{gathered} environment, 7, 9
-  \item \verb*+\gcd+, 18
-  \item \verb*+\genfrac+, 14
-
-  \indexspace
-
-  \item \verb*+\hat+, 12
-  \item \verb*+\hdotsfor+, 11
-  \item \verb*+\hom+, 18
-  \item horizontal space
-    \subitem around operator names, 17
-    \subitem in math mode, 11
-
-  \indexspace
-
-  \item \verb*+\idotsint+, 20
-  \item \verb*+\iiiint+, 20
-  \item \verb*+\iiint+, 20
-  \item \verb*+\iint+, 20
-  \item \verb*+\inf+, 18
-  \item \verb*+\injlim+, 18
-  \item integrals
-    \subitem multiple, 20
-    \subitem placement of limits, 2
-  \item \verb*+\intertext+, 9
-  \item \texttt{intlimits} option, 2, 20
-
-  \indexspace
-
-  \item \verb*+\ker+, 18
-  \item \texttt{kuvio} package, 20
-
-  \indexspace
-
-  \item \verb*+\label+, 6, 10
-  \item \verb*+\langle+, 16
-  \item \verb*+\ldots+, 12
-  \item \verb*+\left+, 15, 16, 27
-  \item \verb*+\leftroot+, 13
-  \item \texttt{leqno} option, 3, 5
-  \item \verb*+\lg+, 18
-  \item \verb*+\lim+, 1, 2, 17, 18
-  \item \verb*+\liminf+, 18
-  \item limits, \see{subscripts and superscripts}{2}
-  \item \verb*+\limits+, 20
-  \item \verb*+\limsup+, 18
-  \item \verb*+\ln+, 18
-  \item \verb*+\log+, 17, 18
-  \item \verb*+\lVert+, 16
-  \item \verb*+\lvert+, 16
-
-  \indexspace
-
-  \item math fonts, 21
-  \item math symbols, \see{math fonts}{21}
-  \item \verb*+\mathbb+, 21, 22
-  \item \verb*+\mathbf+, 21, 22
-  \item \verb*+\mathcal+, 21
-  \item \verb*+\mathfrak+, 21
-  \item \verb*+\mathit+, 21
-  \item \verb*+\mathrm+, 21
-  \item \verb*+\mathscr+, 21
-  \item \verb*+\mathsf+, 21
-  \item \verb*+\mathtt+, 21
-  \item matrices, 10
-    \subitem ellipsis dots, 11
-  \item \texttt{matrix} environment, 10
-  \item \verb*+\matrix+, 28
-  \item \verb*+\max+, 18
-  \item \verb*+\mbox+, 18
-  \item \verb*+\medspace+, 11
-  \item Metafont source files, 25
-  \item \verb*+\min+, 18
-  \item \verb*+\mod+, 18
-  \item \verb*+\mspace+, 11
-  \item \texttt{multline} environment, 3, 5, 27, 30
-  \item \verb*+\multlinegap+, 5
-
-  \indexspace
-
-  \item \texttt{namelimits} option, 2
-  \item \verb*+\negmedspace+, 11
-  \item \verb*+\negthickspace+, 11
-  \item \verb*+\negthinspace+, 11
-  \item \verb*+\newcommand+, 21
-  \item \verb*+\nobreakdash+, 12
-  \item \texttt{nointlimits} option, 2
-  \item \verb*+\nolimits+, 19, 20
-  \item \texttt{nonamelimits} option, 2
-  \item \texttt{nosumlimits} option, 2
-  \item \verb*+\notag+, 3, 5
-  \item \verb*+\numberwithin+, 9, 29, 30
-
-  \indexspace
-
-  \item operator names, 17
-  \item \verb*+\operatorname+, 18
-  \item \verb*+\operatorname*+, 18
-  \item \verb*+\over+, 14, 29
-  \item \verb*+\overleftarrow+, 13
-  \item \verb*+\overleftrightarrow+, 13
-  \item \verb*+\overrightarrow+, 13
-  \item \verb*+\overset+, 13
-  \item \verb*+\overwithdelims+, 14
-
-  \indexspace
-
-  \item page breaks, 8
-  \item \verb*+\pagebreak+, 8
-  \item \texttt{pmatrix} environment, 10
-  \item \verb*+\pmatrix+, 28
-  \item \verb*+\pmb+, 22
-  \item \verb*+\pmod+, 18
-  \item \verb*+\pod+, 18
-  \item PostScript fonts, 25
-  \item \verb*+\Pr+, 18
-  \item \verb*+\projlim+, 18
-
-  \indexspace
-
-  \item \verb*+\qquad+, 11
-  \item \verb*+\quad+, 11
-
-  \indexspace
-
-  \item \verb*+\R+, 22
-  \item \verb*+\raisetag+, 8
-  \item \verb*+\rangle+, 16
-  \item \verb*+\ref+, 10
-  \item \texttt{reqno} option, 3, 5
-  \item \verb*+\right+, 15, 16, 27
-  \item \verb*+\rVert+, 16
-  \item \verb*+\rvert+, 16
-
-  \indexspace
-
-  \item \verb*+\scriptscriptstyle+, 14
-  \item \verb*+\scriptstyle+, 14
-  \item \verb*+\sec+, 18
-  \item \verb*+\setcounter+, 9, 10
-  \item \verb*+\setlength+, 5
-  \item \verb*+\shoveleft+, 5
-  \item \verb*+\shoveright+, 5
-  \item \verb*+\sideset+, 13, 19
-  \item \verb*+\sin+, 1, 2, 17, 18
-  \item \verb*+\sinh+, 18
-  \item \texttt{smallmatrix} environment, 11
-  \item \verb*+\smash+, 15, 27
-  \item \verb*+\sphat+, 12
-  \item \texttt{split} environment, 3, 5, 6, 9, 24, 27--30
-  \item \verb*+\sptilde+, 12
-  \item \verb*+\stackrel+, 13
-  \item \texttt{subarray} environment, 19
-  \item \texttt{subeqn.tex}, 3
-  \item \texttt{subequations} environment, 10
-  \item subscripts and superscripts, 13
-    \subitem multi-line, 19
-    \subitem on sums, 19
-    \subitem placement, 2
-  \item \verb*+\substack+, 19
-  \item \verb*+\sum+, 20, 22
-  \item \texttt{sumlimits} option, 2
-  \item \verb*+\sup+, 18
-  \item superscripts, \see{subscripts and superscripts}{19}
-
-  \indexspace
-
-  \item \texttt{tabular} environment, 26
-  \item \verb*+\tag+, 3
-  \item \verb*+\tag*+, 3
-  \item \verb*+\tan+, 18
-  \item \verb*+\tanh+, 18
-  \item \verb*+\tbinom+, 14
-  \item \texttt{tbtags} option, 2
-  \item \texttt{technote.tex}, 14, 28--30
-  \item \texttt{testmath.tex}, 3
-  \item \tex/ Users Group, 31
-  \item \verb*+\text+, 2, 7--9, 18
-  \item text fragments inside math, 9, 18
-  \item \verb*+\textstyle+, 14
-  \item \verb*+\tfrac+, 14
-  \item \verb*+\theequation+, 9, 10
-  \item \verb*+\thickspace+, 11
-  \item \verb*+\thinspace+, 11
-  \item \journalname{TUGboat}, 31
-
-  \indexspace
-
-  \item \verb*+\underleftarrow+, 13
-  \item \verb*+\underleftrightarrow+, 13
-  \item \verb*+\underrightarrow+, 13
-  \item \verb*+\underset+, 13
-  \item \verb*+\uproot+, 13
-  \item \verb*+\usepackage+, 2, 25
-
-  \indexspace
-
-  \item \verb*+\value+, 10
-  \item \verb*+\varDelta+, 23
-  \item \verb*+\varGamma+, 23
-  \item \verb*+\varinjlim+, 18
-  \item \verb*+\varLambda+, 23
-  \item \verb*+\varliminf+, 18
-  \item \verb*+\varlimsup+, 18
-  \item \verb*+\varOmega+, 23
-  \item \verb*+\varPhi+, 23
-  \item \verb*+\varPi+, 23
-  \item \verb*+\varprojlim+, 18
-  \item \verb*+\varPsi+, 23
-  \item \verb*+\varSigma+, 23
-  \item \verb*+\varTheta+, 23
-  \item \verb*+\varUpsilon+, 23
-  \item \verb*+\varXi+, 23
-  \item \texttt{Vmatrix} environment, 10
-  \item \texttt{vmatrix} environment, 10
-  \item \verb*+\vphantom+, 27
-
-  \indexspace
-
-  \item \verb*+\xleftarrow+, 13
-  \item \verb*+\xrightarrow+, 13
-
-\end{theindex}
+\printindex
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsmath.pdf b/Master/texmf-dist/doc/latex/amsmath/amsmath.pdf
index 452f47ca321..0c0d051a7a5 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsmath.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsmath.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsopn.pdf b/Master/texmf-dist/doc/latex/amsmath/amsopn.pdf
index 76b2c89bb72..c64b05b5787 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsopn.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsopn.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amstext.pdf b/Master/texmf-dist/doc/latex/amsmath/amstext.pdf
index c402d33c6de..8e4ca3d727b 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amstext.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amstext.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/amsxtra.pdf b/Master/texmf-dist/doc/latex/amsmath/amsxtra.pdf
index 2d34a0870a0..05914279342 100644
--- a/Master/texmf-dist/doc/latex/amsmath/amsxtra.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/amsxtra.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/diffs-m.txt b/Master/texmf-dist/doc/latex/amsmath/diffs-m.txt
index 0bfa0ff69d4..af3a273f526 100644
--- a/Master/texmf-dist/doc/latex/amsmath/diffs-m.txt
+++ b/Master/texmf-dist/doc/latex/amsmath/diffs-m.txt
@@ -543,8 +543,7 @@ documents, authors should use the amsmath package.
 
 Therefore, "\usepackage{amstex}" is incorrect usage---do not rely on the
 1994 edition of `The LaTeX Companion' in this respect (unless you obtain
-the errata for Chapter 8; see
-http://ctan.tug.org/info/compan-rev/ch8.pdf).
+the errata for Chapter 8).
 
 ---New documentclass amsproc
 
diff --git a/Master/texmf-dist/doc/latex/amsmath/subeqn.pdf b/Master/texmf-dist/doc/latex/amsmath/subeqn.pdf
index d2f123820a4..85f610d1885 100644
--- a/Master/texmf-dist/doc/latex/amsmath/subeqn.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/subeqn.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/subeqn.tex b/Master/texmf-dist/doc/latex/amsmath/subeqn.tex
index d0fa7d9b023..c34b3f6952a 100644
--- a/Master/texmf-dist/doc/latex/amsmath/subeqn.tex
+++ b/Master/texmf-dist/doc/latex/amsmath/subeqn.tex
@@ -65,7 +65,7 @@
 %    first pass \ref{check} is undefined and it is set to 0; on second
 %    pass \ref{check} is 0 and set to 1; on third pass it is 1).
 \def\checkref{\begingroup
-  \@ifundefined{r@check}{\def\@currentlabel{0}}{\def\@currentlabel{1}}%
+  \@ifundefined{r@check}{\let\r@check\relax\def\@currentlabel{0}}{\def\@currentlabel{1}}%
   \ifnum1=0\expandafter\@firstoftwo\r@check\relax
     \global\let\multipasswarning\relax
   \fi
diff --git a/Master/texmf-dist/doc/latex/amsmath/technote.pdf b/Master/texmf-dist/doc/latex/amsmath/technote.pdf
index 9c9f67047dc..a5b46be5b94 100644
--- a/Master/texmf-dist/doc/latex/amsmath/technote.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/technote.pdf
diff --git a/Master/texmf-dist/doc/latex/amsmath/testmath.pdf b/Master/texmf-dist/doc/latex/amsmath/testmath.pdf
index 34742b83df6..5a8a7b827a6 100644
--- a/Master/texmf-dist/doc/latex/amsmath/testmath.pdf
+++ b/Master/texmf-dist/doc/latex/amsmath/testmath.pdf