summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-03-10 22:26:19 +0000
committerKarl Berry <karl@freefriends.org>2013-03-10 22:26:19 +0000
commitce491a1586dcdd7e3389230d2c83044fcec07b4b (patch)
tree0ae40840f058d2095ba68d3abdeb0afc41ded5b0 /Master/texmf-dist/source/latex/amsmath/amsmath.dtx
parentff3c93e9ce39119d004e551043abd8c3f49c6104 (diff)
amsmath (10mar13)
git-svn-id: svn://tug.org/texlive/trunk@29327 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/amsmath/amsmath.dtx')
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amsmath.dtx141
1 files changed, 73 insertions, 68 deletions
diff --git a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
index 9810bc283f0..ee7fe578b1f 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
@@ -1,41 +1,36 @@
-%%% ====================================================================
-%%% @LaTeX-file{
-%%% filename = "amsmath.dtx",
-%%% version = "2.13",
-%%% date = "2000/07/18",
-%%% time = "08:16:41 EDT",
-%%% author = "American Mathematical Society",
-%%% copyright = "Copyright 1995, 2000 American Mathematical Society,
-%%% all rights reserved. Copying of this file is
-%%% authorized only if either:
-%%% (1) you make absolutely no changes to your copy,
-%%% including name; OR
-%%% (2) if you do make changes, you first rename it
-%%% to some other name.",
-%%% address = "American Mathematical Society,
-%%% Technical Support,
-%%% Publications Technical Group,
-%%% P. O. Box 6248,
-%%% Providence, RI 02940,
-%%% USA",
-%%% telephone = "401-455-4080 or (in the USA and Canada)
-%%% 800-321-4AMS (321-4267)",
-%%% FAX = "401-331-3842",
-%%% checksum = "38084 5829 21569 202795",
-%%% email = "tech-support@ams.org (Internet)",
-%%% codetable = "ISO/ASCII",
-%%% keywords = "latex, amslatex, math, amsmath",
-%%% supported = "yes",
-%%% abstract = "This is a \LaTeX{} package that provides a variety of
-%%% extra mathematical features, largely derived from
-%%% AMS-\TeX{}.",
-%%% docstring = "The checksum field above contains a CRC-16 checksum
-%%% as the first value, followed by the equivalent of
-%%% the standard UNIX wc (word count) utility output of
-%%% lines, words, and characters. This is produced by
-%%% Robert Solovay's checksum utility.",
-%%% }
-%%% ====================================================================
+% \def\filename{amsmath.dtx}
+% \def\fileversion{2.14}
+% \def\filedate{2013/01/14}
+%
+% \iffalse meta-comment
+%
+% American Mathematical Society
+% Technical Support
+% Publications Technical Group
+% 201 Charles Street
+% Providence, RI 02904
+% USA
+% tel: (401) 455-4080
+% (800) 321-4267 (USA and Canada only)
+% fax: (401) 331-3842
+% email: tech-support@ams.org
+%
+% Copyright 1995, 2000, 2013 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 American Mathematical
+% Society.
+%
+% \fi
%
%\iffalse
%<*driver>
@@ -52,7 +47,7 @@
}{%
\endtrivlist
}
-\hDocInput{amsmath.dtx}
+\DocInput{amsmath.dtx}
\end{document}
%</driver>
%\fi
@@ -82,7 +77,7 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
[1994/12/01]% LaTeX date must be December 1994 or later
-\ProvidesPackage{amsmath}[2000/07/18 v2.13 AMS math features]
+\ProvidesPackage{amsmath}[2013/01/14 v2.14 AMS math features]
% \end{macrocode}
%
% \section{Catcode defenses}
@@ -309,6 +304,28 @@ For additional information on amsmath, use the \lq ?\rq\space option.%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \section{Miscellaneous}
%
+% \begin{macro}{\ams@newcommand}
+% Where \pkg{stix} and \pkg{amsmath} define the same control
+% sequences, we want to avoid inadvertently overriding \pkg{stix}'s
+% definitions. If \pkg{stix} is loaded before \pkg{amsmath}, the
+% following conditional takes care of the problem. There is
+% similar code in the \pkg{stix} package in case \pkg{amsmath} is
+% loaded first.
+% \begin{macrocode}
+\@ifpackageloaded{stix}{%
+ \let\ams@newcommand\providecommand
+ \let\ams@renewcommand\providecommand
+ \let\ams@def\providecommand
+ \let\ams@DeclareRobustCommand\providecommand
+}{%
+ \let\ams@newcommand\newcommand
+ \let\ams@renewcommand\renewcommand
+ \let\ams@def\def
+ \let\ams@DeclareRobustCommand\DeclareRobustCommand
+}
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@amsmath@err}
% Defining this error function saves main mem.
% \begin{macrocode}
@@ -830,7 +847,7 @@ Foreign command \@backslashchar#1;\MessageBreak
% The definition of \cs{@cdots} is merely the \fn{plain.tex}
% definition of \cs{cdots}.
% \begin{macrocode}
-\def\@cdots{\mathinner{\cdotp\cdotp\cdotp}}
+\ams@def\@cdots{\mathinner{\cdotp\cdotp\cdotp}}
\newcommand{\dotsi}{\!\@cdots}
\let\dotsb@\@cdots
% \end{macrocode}
@@ -888,7 +905,7 @@ Foreign command \@backslashchar#1;\MessageBreak
%
% The \cn{cdots} command.
% \begin{macrocode}
-\DeclareRobustCommand{\cdots}{\DN@{\extrap@\@cdots}\FN@\next@}
+\ams@DeclareRobustCommand{\cdots}{\DN@{\extrap@\@cdots}\FN@\next@}
\let\dotsb\cdots
\let\dotsm\cdots
\DeclareRobustCommand{\dotso}{\relax
@@ -954,9 +971,9 @@ Foreign command \@backslashchar#1;\MessageBreak
{{\cdotp}\mkern1mu{\cdotp}\mkern1mu{\cdotp}}%
{{\cdotp}\mkern1mu{\cdotp}\mkern1mu{\cdotp}}}
%
-\newcommand{\iint}{\DOTSI\protect\MultiIntegral{2}}
-\newcommand{\iiint}{\DOTSI\protect\MultiIntegral{3}}
-\newcommand{\iiiint}{\DOTSI\protect\MultiIntegral{4}}
+\ams@newcommand{\iint}{\DOTSI\protect\MultiIntegral{2}}
+\ams@newcommand{\iiint}{\DOTSI\protect\MultiIntegral{3}}
+\ams@newcommand{\iiiint}{\DOTSI\protect\MultiIntegral{4}}
\newcommand{\idotsint}{\DOTSI\protect\MultiIntegral{0}}
% \end{macrocode}
%
@@ -1171,10 +1188,10 @@ Foreign command \@backslashchar#1;\MessageBreak
%
% Triple and quadruple dot accents.
% \begin{macrocode}
-\newcommand{\dddot}[1]{%
+\ams@newcommand{\dddot}[1]{%
{\mathop{#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@
\hbox{\normalfont ...}\vss}}}}
-\newcommand{\ddddot}[1]{%
+\ams@newcommand{\ddddot}[1]{%
{\mathop{#1}\limits^{\vbox to-1.4\ex@{\kern-\tw@\ex@
\hbox{\normalfont....}\vss}}}}
% \end{macrocode}
@@ -1246,7 +1263,7 @@ Foreign command \@backslashchar#1;\MessageBreak
% internal syntax of the \cs{mathaccent} primitive. With
% \cs{mathaccentV}, it will yield an error message. We therefore do a
% special check for such syntax problems in order to make the error
-% message more informative.
+% message more informative. (dmj: ??????)
% \begin{macrocode}
\newcommand{\acc@check}{}
\newcommand{\acc@error}{}
@@ -1621,8 +1638,8 @@ Foreign command \@backslashchar#1;\MessageBreak
% \end{macrocode}
%
% \begin{macrocode}
-\def\relbar{\mathrel{\mathpalette\mathsm@sh\std@minus}}
-\def\Relbar{\mathrel\std@equal}
+\ams@def\relbar{\mathrel{\mathpalette\mathsm@sh\std@minus}}
+\ams@def\Relbar{\mathrel\std@equal}
% \end{macrocode}
%
% \begin{macrocode}
@@ -1643,11 +1660,11 @@ Foreign command \@backslashchar#1;\MessageBreak
% \begin{macrocode}
\def\overarrow@#1#2#3{\vbox{\ialign{##\crcr#1#2\crcr
\noalign{\nointerlineskip}$\m@th\hfil#2#3\hfil$\crcr}}}
-\renewcommand{\overrightarrow}{%
+\ams@renewcommand{\overrightarrow}{%
\mathpalette{\overarrow@\rightarrowfill@}}
-\renewcommand{\overleftarrow}{%
+\ams@renewcommand{\overleftarrow}{%
\mathpalette{\overarrow@\leftarrowfill@}}
-\newcommand{\overleftrightarrow}{%
+\ams@newcommand{\overleftrightarrow}{%
\mathpalette{\overarrow@\leftrightarrowfill@}}
% \end{macrocode}
%
@@ -1655,11 +1672,11 @@ Foreign command \@backslashchar#1;\MessageBreak
\def\underarrow@#1#2#3{%
\vtop{\ialign{##\crcr$\m@th\hfil#2#3\hfil$\crcr
\noalign{\nointerlineskip\kern1.3\ex@}#1#2\crcr}}}
-\newcommand{\underrightarrow}{%
+\ams@newcommand{\underrightarrow}{%
\mathpalette{\underarrow@\rightarrowfill@}}
-\newcommand{\underleftarrow}{%
+\ams@newcommand{\underleftarrow}{%
\mathpalette{\underarrow@\leftarrowfill@}}
-\newcommand{\underleftrightarrow}{%
+\ams@newcommand{\underleftrightarrow}{%
\mathpalette{\underarrow@\leftrightarrowfill@}}
% \end{macrocode}
%
@@ -5814,16 +5831,4 @@ Cannot use `split' here;\MessageBreak trying to recover with `aligned'}%
% changed in 1994 to make it user-oriented rather than
% history-oriented.
%
-% \changes{v1.2b}{1995/02/15}{Added kern -alignsep@ to math@cr@@@align}
-% \changes{v1.2b}{1995/02/15}{Modified one piece of measure@}
-% \changes{v1.2b}{1995/02/15}{Cleaned out some obsolete commentary}
-% \changes{v1.2b}{1995/02/15}{Changed kern tagshift@ to kern -tagshift@
-% in the reqno case of place@tag}
-%
-% \changes{v1.2c}{1996/11/01}{Changed `over etc from error to warning}
-%
-% \changes{v1.2d}{1997/03/20}{%
-% Removed dependency on mixed-case fd file names}
-%
-% \CheckSum{6699}
% \Finale