amsfonts 3.04 (29jan13)

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

4 files changed, 90 insertions, 70 deletions

diff --git a/Master/texmf-dist/source/latex/amsfonts/amsfonts.dtx b/Master/texmf-dist/source/latex/amsfonts/amsfonts.dtx
index 660eb054a9c..12e4ae10ba1 100644
--- a/Master/texmf-dist/source/latex/amsfonts/amsfonts.dtx
+++ b/Master/texmf-dist/source/latex/amsfonts/amsfonts.dtx
@@ -1,6 +1,6 @@
 % \def\filename{amsfonts.dtx}
-% \def\fileversion{3.00}
-% \def\filedate{2009/06/22}
+% \def\fileversion{3.01}
+% \def\filedate{2013/01/14}
 %
 % \iffalse meta-comment
 %
@@ -15,7 +15,7 @@
 % fax: (401) 331-3842
 % email: tech-support@ams.org
 %
-% Copyright 2001, 2009 American Mathematical Society.
+% Copyright 2001, 2009, 2013 American Mathematical Society.
 %
 % Unlimited copying and redistribution of this file are permitted as
 % long as this file is not modified.  Modifications, and distribution
@@ -166,13 +166,13 @@
 %
 %    Identify the file and version.
 %    \begin{macrocode}
-%<sty>\ProvidesPackage{amsfonts}[2009/06/22 v3.00 Basic AMSFonts support]
-%<eur>\ProvidesFile{ueur.fd}    [2009/06/22 v3.00 Euler Roman]
-%<eus>\ProvidesFile{ueus.fd}    [2009/06/22 v3.00 Euler Script]
-%<euf>\ProvidesFile{ueuf.fd}    [2009/06/22 v3.00 Euler Fraktur]
-%<euex>\ProvidesFile{ueuex.fd}  [2009/06/22 v3.00 Euler extra symbols]
-%<msa>\ProvidesFile{umsa.fd}    [2009/06/22 v3.00 AMS symbols A]
-%<msb>\ProvidesFile{umsb.fd}    [2009/06/22 v3.00 AMS symbols B]
+%<sty>\ProvidesPackage{amsfonts}[2013/01/14 v3.01 Basic AMSFonts support]
+%<eur>\ProvidesFile{ueur.fd}    [2013/01/14 v3.01 Euler Roman]
+%<eus>\ProvidesFile{ueus.fd}    [2013/01/14 v3.01 Euler Script]
+%<euf>\ProvidesFile{ueuf.fd}    [2013/01/14 v3.01 Euler Fraktur]
+%<euex>\ProvidesFile{ueuex.fd}  [2013/01/14 v3.01 Euler extra symbols]
+%<msa>\ProvidesFile{umsa.fd}    [2013/01/14 v3.01 AMS symbols A]
+%<msb>\ProvidesFile{umsb.fd}    [2013/01/14 v3.01 AMS symbols B]
 %    \end{macrocode}
 %
 % \section{Package options}
@@ -215,6 +215,28 @@
 %    \end{macrocode}
 %
 % \section{Miscellaneous}
+%
+%  \begin{macro}{\ams@newcommand}
+%    Where \pkg{stix} and \pkg{amsfonts} define the same control
+%    sequences, we want to avoid inadvertently overriding \pkg{stix}'s
+%    definitions.  If \pkg{stix} is loaded before \pkg{amsfonts}, the
+%    following conditional and a few more like it later in the code
+%    take care of the problem.  There is similar code in the
+%    \pkg{stix} package in case \pkg{amsfonts} is loaded first.
+%    \begin{macrocode}
+\@ifpackageloaded{stix}{%
+    \def\ams@DeclareMathDelimiter#1#2#3#4#5#6{}%
+    \def\ams@DeclareMathSymbol#1#2#3#4{}%
+}{%
+    \let\ams@DeclareMathDelimiter\DeclareMathDelimiter
+    \def\ams@DeclareMathSymbol#1#2#3#4{%
+        \global\let#1\undefined
+        \DeclareMathSymbol{#1}{#2}{#3}{#4}%
+    }%
+}
+%    \end{macrocode}
+%  \end{macro}
+%
 %    In case the \pkg{amsfonts} package is used apart from the
 %    \pkg{amsmath} package, we need to define the following functions.
 %    \begin{macrocode}
@@ -271,10 +293,10 @@
 %    like \fn{german.sty} was used).
 %    \begin{macrocode}
 \begingroup \catcode`\"=12
-\DeclareMathDelimiter{\ulcorner}{\mathopen} {AMSa}{"70}{AMSa}{"70}
-\DeclareMathDelimiter{\urcorner}{\mathclose}{AMSa}{"71}{AMSa}{"71}
-\DeclareMathDelimiter{\llcorner}{\mathopen} {AMSa}{"78}{AMSa}{"78}
-\DeclareMathDelimiter{\lrcorner}{\mathclose}{AMSa}{"79}{AMSa}{"79}
+\ams@DeclareMathDelimiter{\ulcorner}{\mathopen} {AMSa}{"70}{AMSa}{"70}
+\ams@DeclareMathDelimiter{\urcorner}{\mathclose}{AMSa}{"71}{AMSa}{"71}
+\ams@DeclareMathDelimiter{\llcorner}{\mathopen} {AMSa}{"78}{AMSa}{"78}
+\ams@DeclareMathDelimiter{\lrcorner}{\mathclose}{AMSa}{"79}{AMSa}{"79}
 %    \end{macrocode}
 %
 %    The next two definitions redefine the \cn{widehat} and
@@ -286,26 +308,28 @@
 %    or scriptscript math style. But making that part work properly is
 %    too much effort given the limitations of \TeX{} 3.x.
 %    \begin{macrocode}
-\xdef\widehat#1{\noexpand\@mathmeasure\z@\textstyle{#1}%
-  \noexpand\ifdim\noexpand\wd\z@>\tw@ em%
-  \mathaccent"0\hexnumber@\symAMSb 5B{#1}%
-  \noexpand\else\mathaccent"0362{#1}\noexpand\fi}
-%
-\xdef\widetilde#1{\noexpand\@mathmeasure\z@\textstyle{#1}%
-  \noexpand\ifdim\noexpand\wd\z@>\tw@ em%
-  \mathaccent"0\hexnumber@\symAMSb 5D{#1}%
-  \noexpand\else\mathaccent"0365{#1}\noexpand\fi}
+\@ifpackageloaded{stix}{}{%
+    \xdef\widehat#1{\noexpand\@mathmeasure\z@\textstyle{#1}%
+      \noexpand\ifdim\noexpand\wd\z@>\tw@ em%
+      \mathaccent"0\hexnumber@\symAMSb 5B{#1}%
+      \noexpand\else\mathaccent"0362{#1}\noexpand\fi}
+    \xdef\widetilde#1{\noexpand\@mathmeasure\z@\textstyle{#1}%
+      \noexpand\ifdim\noexpand\wd\z@>\tw@ em%
+      \mathaccent"0\hexnumber@\symAMSb 5D{#1}%
+      \noexpand\else\mathaccent"0365{#1}\noexpand\fi}
+}
 %    \end{macrocode}
 %    Now we define two special arrows which are built with special
 %    characters from the first symbol font.
 %    \begin{macrocode}
-\DeclareMathSymbol{\dabar@}{\mathord}{AMSa}{"39}
-\xdef\dashrightarrow{\mathrel{\dabar@\dabar@
+\@ifpackageloaded{stix}{}{%
+    \DeclareMathSymbol{\dabar@}{\mathord}{AMSa}{"39}
+    \xdef\dashrightarrow{\mathrel{\dabar@\dabar@
                               \mathchar"0\hexnumber@\symAMSa 4B}}%
-\xdef\dashleftarrow{\mathrel{\mathchar"0\hexnumber@\symAMSa 4C\dabar@
+    \xdef\dashleftarrow{\mathrel{\mathchar"0\hexnumber@\symAMSa 4C\dabar@
                               \dabar@}}%
-%
-\global\let\dasharrow\dashrightarrow
+    \global\let\dasharrow\dashrightarrow
+}
 %    \end{macrocode}
 %    To avoid using too many control sequence names by defining all
 %    new symbols provided with the two fonts, we defined so far only
@@ -321,24 +345,18 @@
 %    first, otherwise \cs{DeclareMathSymbol} will complain that they are
 %    already defined.
 %    \begin{macrocode}
-\global\let\rightleftharpoons\undefined
-\DeclareMathSymbol{\rightleftharpoons}{\mathrel}{AMSa}{"0A}
-\global\let\angle\undefined
-\DeclareMathSymbol{\angle}            {\mathord}{AMSa}{"5C}
-\global\let\hbar\undefined
-\DeclareMathSymbol{\hbar}             {\mathord}{AMSb}{"7E}
+\ams@DeclareMathSymbol{\rightleftharpoons}{\mathrel}{AMSa}{"0A}
+\ams@DeclareMathSymbol{\angle}            {\mathord}{AMSa}{"5C}
+\ams@DeclareMathSymbol{\hbar}             {\mathord}{AMSb}{"7E}
 %    \end{macrocode}
 %
 %    Include a few common symbols which are both in \fn{msam} or \fn{msbm}
 %    and also in \fn{lasy}, which might have been loaded already, so it
 %    is a good idea to make them undefined.
 %    \begin{macrocode}
-\global\let\sqsubset\undefined
-\DeclareMathSymbol{\sqsubset}         {\mathrel}{AMSa}{"40}
-\global\let\sqsupset\undefined
-\DeclareMathSymbol{\sqsupset}         {\mathrel}{AMSa}{"41}
-\global\let\mho\undefined
-\DeclareMathSymbol{\mho}              {\mathord}{AMSb}{"66}
+\ams@DeclareMathSymbol{\sqsubset}         {\mathrel}{AMSa}{"40}
+\ams@DeclareMathSymbol{\sqsupset}         {\mathrel}{AMSa}{"41}
+\ams@DeclareMathSymbol{\mho}              {\mathord}{AMSb}{"66}
 %    \end{macrocode}
 %
 %    Now we close the group so that |"| will get its old \cs{catcode}
@@ -353,8 +371,10 @@
 %    The Fraktur alphabet will be accessed by the command
 %    \cn{mathfrak} inside of math mode.
 %    \begin{macrocode}
-\DeclareMathAlphabet{\mathfrak}{U}{euf}{m}{n}
-\SetMathAlphabet{\mathfrak}{bold}{U}{euf}{b}{n}
+\@ifundefined{mathfrak}{%
+    \DeclareMathAlphabet{\mathfrak}{U}{euf}{m}{n}
+    \SetMathAlphabet{\mathfrak}{bold}{U}{euf}{b}{n}
+}{}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -363,7 +383,9 @@
 %      There is only a single weight of this alphabet so it is used in
 %      all math versions.
 %    \begin{macrocode}
-\DeclareSymbolFontAlphabet{\mathbb}{AMSb}
+\@ifundefined{mathbb}{%
+    \DeclareSymbolFontAlphabet{\mathbb}{AMSb}%
+}{}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -457,6 +479,9 @@
 %    \end{macrocode}
 %  \end{macro}
 %
+%    \begin{macrocode}
+\@ifpackageloaded{stix}{\endinput}{}
+%    \end{macrocode}
 %    First we load the symbols under the official AMS names and then
 %    define the \latex/ names via \cs{let} unless they are already
 %    defined (which probably means that the \fn{lasy} fonts are defined).
@@ -464,11 +489,11 @@
 \begingroup \catcode`\"=12
 \DeclareMathSymbol{\square}           {\mathord}{AMSa}{"03}
 \DeclareMathSymbol{\lozenge}          {\mathord}{AMSa}{"06}
-\DeclareMathSymbol{\vartriangleright} {\mathrel}{AMSa}{"42}
-\DeclareMathSymbol{\vartriangleleft}  {\mathrel}{AMSa}{"43}
-\DeclareMathSymbol{\trianglerighteq}  {\mathrel}{AMSa}{"44}
-\DeclareMathSymbol{\trianglelefteq}   {\mathrel}{AMSa}{"45}
-\DeclareMathSymbol{\rightsquigarrow}  {\mathrel}{AMSa}{"20}
+\ams@DeclareMathSymbol{\vartriangleright} {\mathrel}{AMSa}{"42}
+\ams@DeclareMathSymbol{\vartriangleleft}  {\mathrel}{AMSa}{"43}
+\ams@DeclareMathSymbol{\trianglerighteq}  {\mathrel}{AMSa}{"44}
+\ams@DeclareMathSymbol{\trianglelefteq}   {\mathrel}{AMSa}{"45}
+\ams@DeclareMathSymbol{\rightsquigarrow}  {\mathrel}{AMSa}{"20}
 %    \end{macrocode}
 %    Check if the \pkg{latexsym} package has already been loaded
 %    \begin{macrocode}
@@ -607,11 +632,4 @@
 \endinput
 %    \end{macrocode}
 %
-% \changes{v1.2beta}{1994/10/25}{Made every@math@size code explicitly global}
-% \changes{v1.2}{1994/12/08}{Exported non-font stuff elsewhere}
-% \changes{v2.2}{1995/01/05}{Moved square, Box, etc to compat-only section}
-% \changes{v2.2a}{1995/01/30}{Added missing def for @mathmeasure}
-% \changes{v2.2b}{1995/02/01}{Dealt with cmex font complications}
-%
-% \CheckSum{358}
 % \Finale
diff --git a/Master/texmf-dist/source/latex/amsfonts/amsfonts.ins b/Master/texmf-dist/source/latex/amsfonts/amsfonts.ins
index 36b9b6cc221..4bff0cd2bd3 100644
--- a/Master/texmf-dist/source/latex/amsfonts/amsfonts.ins
+++ b/Master/texmf-dist/source/latex/amsfonts/amsfonts.ins
@@ -1,6 +1,6 @@
 %% filename: amsfonts.ins
-%% version: 3.00
-%% date: 2009/02/22
+%% version: 3.01
+%% date: 2013/01/14
 %%
 %% American Mathematical Society
 %% Technical Support
@@ -13,7 +13,7 @@
 %% fax: (401) 331-3842
 %% email: tech-support@ams.org
 %% 
-%% Copyright 2001, 2009 American Mathematical Society.
+%% Copyright 2001, 2009, 2013 American Mathematical Society.
 %% 
 %% Unlimited copying and redistribution of this file are permitted as
 %% long as this file is not modified.  Modifications, and distribution
@@ -31,7 +31,7 @@
 
 This is a generated file.
 
-Copyright 2001, 2009 American Mathematical Society.
+Copyright 2001, 2009, 2013 American Mathematical Society.
 
 American Mathematical Society
 Technical Support
diff --git a/Master/texmf-dist/source/latex/amsfonts/amssymb.dtx b/Master/texmf-dist/source/latex/amsfonts/amssymb.dtx
index 5caf8f5667a..3f7d2c63e80 100644
--- a/Master/texmf-dist/source/latex/amsfonts/amssymb.dtx
+++ b/Master/texmf-dist/source/latex/amsfonts/amssymb.dtx
@@ -1,6 +1,6 @@
 % \def\filename{amssymb.dtx}
-% \def\fileversion{3.00}
-% \def\filedate{2009/06/22}
+% \def\fileversion{3.01}
+% \def\filedate{2013/01/14}
 %
 % \iffalse meta-comment
 %
@@ -15,7 +15,7 @@
 % fax: (401) 331-3842
 % email: tech-support@ams.org
 %
-% Copyright 2001, 2009 American Mathematical Society.
+% Copyright 2001, 2009, 2013 American Mathematical Society.
 %
 % Unlimited copying and redistribution of this file are permitted as
 % long as this file is not modified.  Modifications, and distribution
@@ -52,7 +52,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{amssymb}[2009/06/22 v3.00]
+\ProvidesPackage{amssymb}[2013/01/14 v3.01 AMS font symbols]
 %    \end{macrocode}
 %
 %    See the \pkg{amsfonts} package documentation for a discussion of
@@ -71,6 +71,14 @@
 \RequirePackage{amsfonts}[1995/01/01]
 %    \end{macrocode}
 %
+%    \begin{macrocode}
+\@ifpackageloaded{stix}{%
+    \PackageWarningNoLine{amssymb}{The 'amssymb' package is redundant when
+      you are using the 'stix' package, so I'm not going to load amssymb}
+    \endinput
+}{}
+%    \end{macrocode}
+%
 %    We undefine a few symbols that were perhaps defined by the
 %    \pkg{amsfonts} package (q.v.); otherwise \cn{DeclareMathSymbol} would
 %    issue some error messages.  (All these symbol names are \cn{let} to
@@ -329,10 +337,4 @@
 \endinput
 %    \end{macrocode}
 %
-% \changes{v2.2}{1995/01/05}{Changed diagup, diagdown to mathord}
-% \changes{v2.2}{1995/01/05}{Uncommented rightsquigarrow etc no longer
-%    defined in amsfonts.sty}
-% \changes{v2.2a}{1995/02/01}{Adding missing psamsfonts option}
-%
-% \CheckSum{687}
 % \Finale
diff --git a/Master/texmf-dist/source/latex/amsfonts/manifest.txt b/Master/texmf-dist/source/latex/amsfonts/manifest.txt
index 0de26a35062..ea621675425 100644
--- a/Master/texmf-dist/source/latex/amsfonts/manifest.txt
+++ b/Master/texmf-dist/source/latex/amsfonts/manifest.txt
@@ -5,9 +5,9 @@ doc/fonts:
 amsfonts
 
 doc/fonts/amsfonts:
-00README
 OFL-FAQ.txt
 OFL.txt
+README
 amsfndoc.pdf
 amsfonts.pdf
 amssymb.pdf