summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/amsmath
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-02 22:19:48 +0000
committerKarl Berry <karl@freefriends.org>2016-04-02 22:19:48 +0000
commit54aa09d5d6925008eb25609ce953c1b99fd2d2c7 (patch)
treed8e052725306f427e156556aeb2bec689f8245cc /Master/texmf-dist/source/latex/amsmath
parent54e58adfc76118f03b1bd2f7dedfb2140dce7696 (diff)
latex2e (1apr16), now including amsmath
git-svn-id: svn://tug.org/texlive/trunk@40218 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/amsmath')
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amsmath.dtx11
-rw-r--r--Master/texmf-dist/source/latex/amsmath/amsopn.dtx21
2 files changed, 27 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
index ea9498f7a15..d40598054dc 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsmath.dtx
@@ -74,7 +74,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
[1994/12/01]% LaTeX date must be December 1994 or later
-\ProvidesPackage{amsmath}[2016/03/03 v2.15a AMS math features]
+\ProvidesPackage{amsmath}[2016/03/10 v2.15b AMS math features]
% \end{macrocode}
%
% \section{Catcode defenses}
@@ -1267,12 +1267,13 @@ Foreign command \@backslashchar#1;\MessageBreak
% position.
%
% \changes{v2.15}{2016/02/20}{Modify \cs{resetMathstrut@} for Unicode \TeX}
+% \changes{v2.15b}{2016/03/10}{Modify \cs{resetMathstrut@} for classic \TeX\ to preserve box 0}
% Original code assuming |\mathcode| is kept for 8bit \TeX. Unicode \TeX{}
% uses |\Umathcharnumdef| which works for xetex and luatex, which use
% different forms for |\mathchardef|. (New luatex always reports
% definitions using |\Umathchardef| syntax even if |\mathchardef| used.)
%
-% The unicode vesrion uses e-tex |\fontcharht| to avoid boxing which
+% The unicode version uses e-tex |\fontcharht| to avoid boxing which
% could also be done for pdftex, but not done here.
% \begin{macrocode}
\ifx\Umathcharnumdef\@undefined
@@ -1280,12 +1281,16 @@ Foreign command \@backslashchar#1;\MessageBreak
% Original code
% \begin{macrocode}
\def\resetMathstrut@{%
+ \begingroup
\setbox\z@\hbox{%
\mathchardef\@tempa\mathcode`\(\relax
\def\@tempb##1"##2##3{\the\textfont"##3\char"}%
\expandafter\@tempb\meaning\@tempa \relax
}%
- \ht\Mathstrutbox@\ht\z@ \dp\Mathstrutbox@\dp\z@
+ \edef\@tempa{%
+ \ht\Mathstrutbox@\the\ht\z@\relax
+ \dp\Mathstrutbox@\the\dp\z@\relax}%
+ \expandafter\endgroup\@tempa
}
\else
% \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/amsmath/amsopn.dtx b/Master/texmf-dist/source/latex/amsmath/amsopn.dtx
index 39c92f01bc8..7ab916387bd 100644
--- a/Master/texmf-dist/source/latex/amsmath/amsopn.dtx
+++ b/Master/texmf-dist/source/latex/amsmath/amsopn.dtx
@@ -58,7 +58,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
[1994/12/01]% LaTeX date must December 1994 or later
-\ProvidesPackage{amsopn}[1999/12/14 v2.01 operator names]
+\ProvidesPackage{amsopn}[2016/03/08 v2.02 operator names]
% \end{macrocode}
%
% What \cs{nolimits@} does is keep a \cn{limits} typed by the user
@@ -78,8 +78,12 @@ Bug reports can be opened (category \texttt{#1}) at\\%
%
% Where practical, we use decimal numbers to cut down main mem
% usage (\qc{\"} not needed).
+% use |\Umathcodedefnum| with xetex and LuaTeX to avoid problems
+% using |\mathcode| if |-| has already been defined using |\Umathcode|.
+% \changes{v2.02}{2016/03/08}{Unicode TeX version of \cs{newmcodes@}}
% \begin{macrocode}
\begingroup \catcode`\"=12
+\ifx\Umathcode\@undefined
\gdef\newmcodes@{\mathcode`\'39\mathcode`\*42\mathcode`\."613A%
% \end{macrocode}
% Define \cs{std@minus} for \cs{relbar} use; otherwise there are
@@ -89,6 +93,19 @@ Bug reports can be opened (category \texttt{#1}) at\\%
\mathchardef\std@minus\mathcode`\-\relax
\fi
\mathcode`\-45\mathcode`\/47\mathcode`\:"603A\relax}
+% \end{macrocode}
+% \begin{macrocode}
+\else
+% \end{macrocode}
+% \begin{macrocode}
+\gdef\newmcodes@{\mathcode`\'39\mathcode`\*42\mathcode`\."613A%
+ \ifnum\Umathcodenum`\-=45 \else
+ \Umathcharnumdef\std@minus\Umathcodenum`\-\relax
+ \fi
+ \mathcode`\-45\mathcode`\/47\mathcode`\:"603A\relax}
+% \end{macrocode}
+% \begin{macrocode}
+\fi
\endgroup
% \end{macrocode}
%
@@ -242,5 +259,5 @@ Bug reports can be opened (category \texttt{#1}) at\\%
%
% \changes{v1.2a}{1995/02/20}{Fixed operatorname
% (shouldn't have same limits behavior as operatorname*)}
-% \CheckSum{300}
+%
% \Finale