summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty147
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxtext.sty7
2 files changed, 81 insertions, 73 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 6253b6320ca..3956795c494 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
@@ -10,8 +10,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.437}
-\def\filedate{2015/05/01}
+\def\fileversion{1.44}
+\def\filedate{2015/07/01}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -50,7 +50,7 @@
\newif\iftx@altnu
\newif\iftx@largelibfigs \newif\iftx@frenchm % french math
\newif\iftx@minion \newif\iftx@libaltvw \newif\iftx@bv \newif\iftx@ut
-\newif\iftx@ch
+\newif\iftx@ch \newif\iftx@crimson
\DeclareOption{timesmathacc}{\tx@tmatrue}
\DeclareOption{bigdelims}{\tx@bigdelimstrue}
\DeclareOption{varbb}{\tx@varbbtrue}
@@ -59,6 +59,7 @@
\DeclareOption{nosymbolsc}{\tx@symbolsCfalse}
\DeclareOption{libertine}{\tx@libertinetrue}
\DeclareOption{minion}{\tx@miniontrue}
+\DeclareOption{crimson}{\tx@crimsontrue}
\DeclareOption{garamondx}{\tx@gmtrue}
\DeclareOption{baskervaldx}{\tx@bvtrue}
\DeclareOption{Baskervaldx}{\tx@bvtrue}
@@ -159,9 +160,15 @@ amssymbols,uprightGreek}
\SetSymbolFont{letters}{bold}{OML}{zchmi}{b}{it}
\DeclareFontSubstitution{OML}{zchmi}{m}{it}
\else
- \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
- \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+ \iftx@crimson
+ \DeclareSymbolFont{letters}{OML}{zcrimi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{zcrimi}{b}{it}
+ \DeclareFontSubstitution{OML}{zcrimi}{m}{it}
+ \else
+ \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
+ \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+ \fi
\fi
\fi
\fi
@@ -421,29 +428,29 @@ amssymbols,uprightGreek}
\fi
%
\iftx@slantedG
- \re@DeclareMathSymbol{\Gamma}{\mathord}{letters}{0}
- \re@DeclareMathSymbol{\Delta}{\mathord}{letters}{1}
- \re@DeclareMathSymbol{\Theta}{\mathord}{letters}{2}
- \re@DeclareMathSymbol{\Lambda}{\mathord}{letters}{3}
- \re@DeclareMathSymbol{\Xi}{\mathord}{letters}{4}
- \re@DeclareMathSymbol{\Pi}{\mathord}{letters}{5}
- \re@DeclareMathSymbol{\Sigma}{\mathord}{letters}{6}
- \re@DeclareMathSymbol{\Upsilon}{\mathord}{letters}{7}
- \re@DeclareMathSymbol{\Phi}{\mathord}{letters}{8}
- \re@DeclareMathSymbol{\Psi}{\mathord}{letters}{9}
- \re@DeclareMathSymbol{\Omega}{\mathord}{letters}{10}
+ \re@DeclareMathSymbol{\Gamma}{\mathalpha}{letters}{0}
+ \re@DeclareMathSymbol{\Delta}{\mathalpha}{letters}{1}
+ \re@DeclareMathSymbol{\Theta}{\mathalpha}{letters}{2}
+ \re@DeclareMathSymbol{\Lambda}{\mathalpha}{letters}{3}
+ \re@DeclareMathSymbol{\Xi}{\mathalpha}{letters}{4}
+ \re@DeclareMathSymbol{\Pi}{\mathalpha}{letters}{5}
+ \re@DeclareMathSymbol{\Sigma}{\mathalpha}{letters}{6}
+ \re@DeclareMathSymbol{\Upsilon}{\mathalpha}{letters}{7}
+ \re@DeclareMathSymbol{\Phi}{\mathalpha}{letters}{8}
+ \re@DeclareMathSymbol{\Psi}{\mathalpha}{letters}{9}
+ \re@DeclareMathSymbol{\Omega}{\mathalpha}{letters}{10}
\else
- \re@DeclareMathSymbol{\Gamma}{\mathord}{lettersA}{0}
- \re@DeclareMathSymbol{\Delta}{\mathord}{lettersA}{1}
- \re@DeclareMathSymbol{\Theta}{\mathord}{lettersA}{2}
- \re@DeclareMathSymbol{\Lambda}{\mathord}{lettersA}{3}
- \re@DeclareMathSymbol{\Xi}{\mathord}{lettersA}{4}
- \re@DeclareMathSymbol{\Pi}{\mathord}{lettersA}{5}
- \re@DeclareMathSymbol{\Sigma}{\mathord}{lettersA}{6}
- \re@DeclareMathSymbol{\Upsilon}{\mathord}{lettersA}{7}
- \re@DeclareMathSymbol{\Phi}{\mathord}{lettersA}{8}
- \re@DeclareMathSymbol{\Psi}{\mathord}{lettersA}{9}
- \re@DeclareMathSymbol{\Omega}{\mathord}{lettersA}{10}
+ \re@DeclareMathSymbol{\Gamma}{\mathalpha}{lettersA}{0}
+ \re@DeclareMathSymbol{\Delta}{\mathalpha}{lettersA}{1}
+ \re@DeclareMathSymbol{\Theta}{\mathalpha}{lettersA}{2}
+ \re@DeclareMathSymbol{\Lambda}{\mathalpha}{lettersA}{3}
+ \re@DeclareMathSymbol{\Xi}{\mathalpha}{lettersA}{4}
+ \re@DeclareMathSymbol{\Pi}{\mathalpha}{lettersA}{5}
+ \re@DeclareMathSymbol{\Sigma}{\mathalpha}{lettersA}{6}
+ \re@DeclareMathSymbol{\Upsilon}{\mathalpha}{lettersA}{7}
+ \re@DeclareMathSymbol{\Phi}{\mathalpha}{lettersA}{8}
+ \re@DeclareMathSymbol{\Psi}{\mathalpha}{lettersA}{9}
+ \re@DeclareMathSymbol{\Omega}{\mathalpha}{lettersA}{10}
\fi
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1183,49 +1190,49 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\re@DeclareMathSymbol{\varkappaup}{\mathord}{lettersA}{42}
%\fi
% upright Greek
-\re@DeclareMathSymbol{\Gammaup}{\mathord}{lettersA}{0}
-\re@DeclareMathSymbol{\Deltaup}{\mathord}{lettersA}{1}
-\re@DeclareMathSymbol{\Thetaup}{\mathord}{lettersA}{2}
-\re@DeclareMathSymbol{\Lambdaup}{\mathord}{lettersA}{3}
-\re@DeclareMathSymbol{\Xiup}{\mathord}{lettersA}{4}
-\re@DeclareMathSymbol{\Piup}{\mathord}{lettersA}{5}
-\re@DeclareMathSymbol{\Sigmaup}{\mathord}{lettersA}{6}
-\re@DeclareMathSymbol{\Upsilonup}{\mathord}{lettersA}{7}
-\re@DeclareMathSymbol{\Phiup}{\mathord}{lettersA}{8}
-\re@DeclareMathSymbol{\Psiup}{\mathord}{lettersA}{9}
-\re@DeclareMathSymbol{\Omegaup}{\mathord}{lettersA}{10}
-\re@DeclareMathSymbol{\alphaup}{\mathord}{lettersA}{11}
-\re@DeclareMathSymbol{\betaup}{\mathord}{lettersA}{12}
-\re@DeclareMathSymbol{\gammaup}{\mathord}{lettersA}{13}
-\re@DeclareMathSymbol{\deltaup}{\mathord}{lettersA}{14}
-\re@DeclareMathSymbol{\epsilonup}{\mathord}{lettersA}{15}
-\re@DeclareMathSymbol{\zetaup}{\mathord}{lettersA}{16}
-\re@DeclareMathSymbol{\etaup}{\mathord}{lettersA}{17}
-\re@DeclareMathSymbol{\thetaup}{\mathord}{lettersA}{18}
-\re@DeclareMathSymbol{\iotaup}{\mathord}{lettersA}{19}
-\re@DeclareMathSymbol{\kappaup}{\mathord}{lettersA}{20}
-\re@DeclareMathSymbol{\lambdaup}{\mathord}{lettersA}{21}
-\re@DeclareMathSymbol{\muup}{\mathord}{lettersA}{22}
-\re@DeclareMathSymbol{\nuup}{\mathord}{lettersA}{23}
+\re@DeclareMathSymbol{\Gammaup}{\mathalpha}{lettersA}{0}
+\re@DeclareMathSymbol{\Deltaup}{\mathalpha}{lettersA}{1}
+\re@DeclareMathSymbol{\Thetaup}{\mathalpha}{lettersA}{2}
+\re@DeclareMathSymbol{\Lambdaup}{\mathalpha}{lettersA}{3}
+\re@DeclareMathSymbol{\Xiup}{\mathalpha}{lettersA}{4}
+\re@DeclareMathSymbol{\Piup}{\mathalpha}{lettersA}{5}
+\re@DeclareMathSymbol{\Sigmaup}{\mathalpha}{lettersA}{6}
+\re@DeclareMathSymbol{\Upsilonup}{\mathalpha}{lettersA}{7}
+\re@DeclareMathSymbol{\Phiup}{\mathalpha}{lettersA}{8}
+\re@DeclareMathSymbol{\Psiup}{\mathalpha}{lettersA}{9}
+\re@DeclareMathSymbol{\Omegaup}{\mathalpha}{lettersA}{10}
+\re@DeclareMathSymbol{\alphaup}{\mathalpha}{lettersA}{11}
+\re@DeclareMathSymbol{\betaup}{\mathalpha}{lettersA}{12}
+\re@DeclareMathSymbol{\gammaup}{\mathalpha}{lettersA}{13}
+\re@DeclareMathSymbol{\deltaup}{\mathalpha}{lettersA}{14}
+\re@DeclareMathSymbol{\epsilonup}{\mathalpha}{lettersA}{15}
+\re@DeclareMathSymbol{\zetaup}{\mathalpha}{lettersA}{16}
+\re@DeclareMathSymbol{\etaup}{\mathalpha}{lettersA}{17}
+\re@DeclareMathSymbol{\thetaup}{\mathalpha}{lettersA}{18}
+\re@DeclareMathSymbol{\iotaup}{\mathalpha}{lettersA}{19}
+\re@DeclareMathSymbol{\kappaup}{\mathalpha}{lettersA}{20}
+\re@DeclareMathSymbol{\lambdaup}{\mathalpha}{lettersA}{21}
+\re@DeclareMathSymbol{\muup}{\mathalpha}{lettersA}{22}
+\re@DeclareMathSymbol{\nuup}{\mathalpha}{lettersA}{23}
\iftx@altnu
- \re@DeclareMathSymbol{\nuup}{\mathord}{lettersA}{40}
+ \re@DeclareMathSymbol{\nuup}{\mathalpha}{lettersA}{40}
\fi
-\re@DeclareMathSymbol{\xiup}{\mathord}{lettersA}{24}
-\re@DeclareMathSymbol{\piup}{\mathord}{lettersA}{25}
-\re@DeclareMathSymbol{\rhoup}{\mathord}{lettersA}{26}
-\re@DeclareMathSymbol{\sigmaup}{\mathord}{lettersA}{27}
-\re@DeclareMathSymbol{\tauup}{\mathord}{lettersA}{28}
-\re@DeclareMathSymbol{\upsilonup}{\mathord}{lettersA}{29}
-\re@DeclareMathSymbol{\phiup}{\mathord}{lettersA}{30}
-\re@DeclareMathSymbol{\chiup}{\mathord}{lettersA}{31}
-\re@DeclareMathSymbol{\psiup}{\mathord}{lettersA}{32}
-\re@DeclareMathSymbol{\omegaup}{\mathord}{lettersA}{33}
-\re@DeclareMathSymbol{\varepsilonup}{\mathord}{lettersA}{34}
-\re@DeclareMathSymbol{\varthetaup}{\mathord}{lettersA}{35}
-\re@DeclareMathSymbol{\varpiup}{\mathord}{lettersA}{36}
-\re@DeclareMathSymbol{\varrhoup}{\mathord}{lettersA}{37}
-\re@DeclareMathSymbol{\varsigmaup}{\mathord}{lettersA}{38}
-\re@DeclareMathSymbol{\varphiup}{\mathord}{lettersA}{39}
+\re@DeclareMathSymbol{\xiup}{\mathalpha}{lettersA}{24}
+\re@DeclareMathSymbol{\piup}{\mathalpha}{lettersA}{25}
+\re@DeclareMathSymbol{\rhoup}{\mathalpha}{lettersA}{26}
+\re@DeclareMathSymbol{\sigmaup}{\mathalpha}{lettersA}{27}
+\re@DeclareMathSymbol{\tauup}{\mathalpha}{lettersA}{28}
+\re@DeclareMathSymbol{\upsilonup}{\mathalpha}{lettersA}{29}
+\re@DeclareMathSymbol{\phiup}{\mathalpha}{lettersA}{30}
+\re@DeclareMathSymbol{\chiup}{\mathalpha}{lettersA}{31}
+\re@DeclareMathSymbol{\psiup}{\mathalpha}{lettersA}{32}
+\re@DeclareMathSymbol{\omegaup}{\mathalpha}{lettersA}{33}
+\re@DeclareMathSymbol{\varepsilonup}{\mathalpha}{lettersA}{34}
+\re@DeclareMathSymbol{\varthetaup}{\mathalpha}{lettersA}{35}
+\re@DeclareMathSymbol{\varpiup}{\mathalpha}{lettersA}{36}
+\re@DeclareMathSymbol{\varrhoup}{\mathalpha}{lettersA}{37}
+\re@DeclareMathSymbol{\varsigmaup}{\mathalpha}{lettersA}{38}
+\re@DeclareMathSymbol{\varphiup}{\mathalpha}{lettersA}{39}
% and, for compatibility with other packages (mtpro2, lucida, etc)
\let\upGamma\Gammaup
\let\upDelta\Deltaup
@@ -1373,7 +1380,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\DeclareMathSymbol{\m@thbbch@rY}{\mathord}{lettersA}{153}
\DeclareMathSymbol{\m@thbbch@rZ}{\mathord}{lettersA}{154}
-\DeclareMathSymbol{\m@thbbch@rk}{\mathord}{lettersA}{171}
+\DeclareMathSymbol{\m@thbbch@rk}{\mathord}{lettersA}{169}
% Original \varmathbb macro, slightly polished
\def\DoFutureLet{%
\def\@FutureLetDecide{%
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index 5668ca8aaac..0a3331f00c8 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
@@ -1,7 +1,7 @@
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.437}
-\def\filedate{2015/05/01}
+\def\fileversion{1.44}
+\def\filedate{2015/07/01}
\ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
\message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)}
@@ -138,7 +138,8 @@
{5pt plus 1pt minus 1pt} % HEADSPACE
{} % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section]
\fi%
-\fi%\DeclareTextFontCommand{\textsu}{\sustyle}
+\fi
+%\DeclareTextFontCommand{\textsu}{\sustyle}
%\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi}
\ifntx@defaultsups %
\else