1 files changed, 51 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/latex/amsfonts/amsfonts.sty b/Master/texmf-dist/tex/latex/amsfonts/amsfonts.sty
index 95fd876f803..a59797ffe02 100644
--- a/Master/texmf-dist/tex/latex/amsfonts/amsfonts.sty
+++ b/Master/texmf-dist/tex/latex/amsfonts/amsfonts.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 2001, 2009 American Mathematical Society.
+%% Copyright 2001, 2009, 2013 American Mathematical Society.
 %% 
 %% American Mathematical Society
 %% Technical Support
@@ -27,7 +27,7 @@
 %% is renamed.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{amsfonts}[2009/06/22 v3.00 Basic AMSFonts support]
+\ProvidesPackage{amsfonts}[2013/01/14 v3.01 Basic AMSFonts support]
 \DeclareOption{psamsfonts}{%
     \PackageWarningNoLine{amsfonts}{The 'psamsfonts' option is
       obsolete in AMSFonts v3}
@@ -43,6 +43,16 @@
 \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
 
 \def\cmex@opt{10}
+\@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}%
+    }%
+}
 \providecommand*{\@mathmeasure}[3]{%
   \setbox#1\hbox{\frozen@everymath\@emptytoks\m@th$#2#3$}}
 \@ifundefined{@emptytoks}{\csname newtoks\endcsname\@emptytoks}{}
@@ -61,40 +71,42 @@
   \edef\maltese{\noexpand\mathhexbox{\hexnumber@\symAMSa}7A}
 }{}
 \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}
-\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}
-\DeclareMathSymbol{\dabar@}{\mathord}{AMSa}{"39}
-\xdef\dashrightarrow{\mathrel{\dabar@\dabar@
+\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}
+\@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}
+}
+\@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\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}
-\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}
+    \global\let\dasharrow\dashrightarrow
+}
+\ams@DeclareMathSymbol{\rightleftharpoons}{\mathrel}{AMSa}{"0A}
+\ams@DeclareMathSymbol{\angle}            {\mathord}{AMSa}{"5C}
+\ams@DeclareMathSymbol{\hbar}             {\mathord}{AMSb}{"7E}
+\ams@DeclareMathSymbol{\sqsubset}         {\mathrel}{AMSa}{"40}
+\ams@DeclareMathSymbol{\sqsupset}         {\mathrel}{AMSa}{"41}
+\ams@DeclareMathSymbol{\mho}              {\mathord}{AMSb}{"66}
 \endgroup
-\DeclareMathAlphabet{\mathfrak}{U}{euf}{m}{n}
-\SetMathAlphabet{\mathfrak}{bold}{U}{euf}{b}{n}
-\DeclareSymbolFontAlphabet{\mathbb}{AMSb}
+\@ifundefined{mathfrak}{%
+    \DeclareMathAlphabet{\mathfrak}{U}{euf}{m}{n}
+    \SetMathAlphabet{\mathfrak}{bold}{U}{euf}{b}{n}
+}{}
+\@ifundefined{mathbb}{%
+    \DeclareSymbolFontAlphabet{\mathbb}{AMSb}%
+}{}
 \DeclareFontEncodingDefaults{\relax}{\def\accentclass@{7}}
 \DeclareRobustCommand{\frak}[1]{%
   {\@subst@obsolete{amsfonts}\frak\mathfrak{#1}}}
@@ -124,14 +136,15 @@
     Obsolete command \protect#2; \protect#3 should be used instead}}%
 \fi
 \def\@subst@obsolete#1#2#3{\@obsolete{#1}#2#3\gdef#2{#3}#2}
+\@ifpackageloaded{stix}{\endinput}{}
 \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}
 \@ifpackageloaded{latexsym}{\@tempswafalse}{\@tempswatrue}
 \if@tempswa
   \global\let\Box\square