diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx/newtxmath.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 225 |
1 files changed, 117 insertions, 108 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 86fa898e14c..5fbcf14b08c 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty @@ -1,5 +1,5 @@ \NeedsTeXFormat{LaTeX2e}[1997/06/01] -% +% %:ams % Based on Young Ryu's txfonts.sty, v.3.2.1 % Text and math are now loaded in separate sty files---the text @@ -11,8 +11,8 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.742} -\def\filedate{2024/03/06} +\def\fileversion{1.754} +\def\filedate{2024/09/22} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -43,9 +43,13 @@ \newcount\tx@cntz \input{binhex} -\let\ntxmath@scaled\@empty\def\tx@scale{1} +\let\ntxmath@scaled\@empty +\@ifundefined{ntxmathscale}{\def\ntxmathscale{1}}{} +\def\tx@scale{\ntxmathscale} +\def\ntxmath@scaled{s*[\tx@scale]} \define@key{ntxmath}{scaled}[1.0]{\def\tx@scale{#1}\def\ntxmath@scaled{s*[#1]}} \define@key{ntxmath}{scale}[1.0]{\def\tx@scale{#1}\def\ntxmath@scaled{s*[#1]}} + \def\ntxmath@vecsep{.25ex} \define@key{ntxmath}{vecsep}[.25ex]{\def\ntxmath@vecsep{#1}} %: @@ -72,6 +76,7 @@ \newif\iftx@largelibfigs \newif\iftx@frenchm % french math \newif\iftx@minion \newif\iftx@libaltvw \newif\iftx@bv \newif\iftx@ut \newif\iftx@ba % new BaskervilleF fonts +\newif\iftx@gel % GelasioMath \newif\iftx@ch \newif\iftx@coch \newif\iftx@nc % NewCenturySchoolbook \newif\iftx@ot % use OT1 for operators \newif\iftx@ntxmath \tx@ntxmathtrue % default is Times operators and math italic @@ -88,7 +93,7 @@ \newif\iftx@nootone % do not switch to OT1 for operators \newif\iftx@digits % use digits from letters \newif\iftx@isenh % the math style is enhanced and can make use of new macros -% Currently (2019-12-11) only txmath, libertine, XCharter, ebgaramond, stickstoo, utopia, nc, minion and cochineal have been enhanced. +% Currently (2019-12-11) only txmath, libertine, XCharter, aramond, stickstoo, utopia, nc, minion and cochineal have been enhanced. \newif\iftx@ebgalth \newif\iftx@cochf % switch to long f \newif\iftx@cochrho % switch to long rho @@ -229,6 +234,7 @@ \DeclareOption{Heuristica}{\tx@uttrue\tx@ntxmathfalse} \DeclareOption{Erewhon}{\tx@uttrue\tx@ntxmathfalse} \DeclareOption{erewhon}{\tx@uttrue\tx@ntxmathfalse} +\DeclareOption{gelasio}{\tx@geltrue\tx@ntxmathfalse} \DeclareOption{charter}{\tx@chtrue\tx@ntxmathfalse} \DeclareOption{xcharter}{\tx@chtrue\tx@ntxmathfalse} \DeclareOption{cmintegrals}{\tx@cminttrue} @@ -303,7 +309,6 @@ amssymbols,uprightGreek,nosubscriptcorrection} % \let\NotoSans@scale\NotoSerif@scale % \let\NotoSansMono@scale\NotoSerif@scale %\fi - % Check whether math face is enhanced \iftx@ntxmath\tx@isenhtrue\else \iftx@lbtn\tx@isenhtrue\else @@ -316,6 +321,8 @@ amssymbols,uprightGreek,nosubscriptcorrection} \iftx@minion\tx@isenhtrue\else \iftx@noto\tx@isenhtrue\else \iftx@notosans\tx@isenhtrue\else + \iftx@gel\tx@isenhtrue\else + \fi \fi \fi \fi @@ -327,6 +334,7 @@ amssymbols,uprightGreek,nosubscriptcorrection} \fi \fi \fi + \AtEndPreamble{% %\traceon \iftx@sbc @@ -358,6 +366,7 @@ amssymbols,uprightGreek,nosubscriptcorrection} \iftx@bv\let\X@s@v@rg\@undefined\fi \iftx@ba\let\X@s@v@rg\@undefined\fi \iftx@stxtwo\let\X@s@v@rg\@undefined\fi +\iftx@gel\let\X@s@v@rg\@undefined\fi % altnu, liby and largelibfigs valid only with libertin[e,us] \iftx@lbtn\else\tx@altnufalse\tx@largelibfigsfalse\tx@libyfalse\fi % Use existing text fonts for operators, mathrm, etc @@ -381,7 +390,7 @@ amssymbols,uprightGreek,nosubscriptcorrection} \fi \fi \fi - +\iftx@gel\edef\rmdefaultB{mingelasio}\fi \iftx@minion\edef\rmdefaultB{MinionPro-TLF}\fi \iftx@noto\edef\rmdefaultB{NotoSerif-TLF}\fi \iftx@notosans\edef\rmdefaultB{NotoSans-TLF}\fi @@ -431,108 +440,116 @@ amssymbols,uprightGreek,nosubscriptcorrection} %%%%%%%%%%%%%%% \iftx@lbtn - \iftx@subsfile\else\def\tx@subs{newtx-libertine-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{nxlmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{nxlmi}{b}{it} - \DeclareFontSubstitution{OML}{nxlmi}{m}{it} + \iftx@subsfile\else\def\tx@subs{newtx-libertine-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{nxlmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{nxlmi}{b}{it} + \DeclareFontSubstitution{OML}{nxlmi}{m}{it} \else - \iftx@minion - \iftx@subsfile\else\def\tx@subs{newtx-minion-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{zmnmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{zmnmi}{b}{it} - \DeclareFontSubstitution{OML}{zmnmi}{m}{it} + \iftx@minion + \iftx@subsfile\else\def\tx@subs{newtx-minion-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zmnmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zmnmi}{b}{it} + \DeclareFontSubstitution{OML}{zmnmi}{m}{it} + \else + \iftx@gm + \iftx@subsfile\else\def\tx@subs{newtx-garamond-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zgmmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zgmmi}{b}{it} + \DeclareFontSubstitution{OML}{zgmmi}{m}{it} \else - \iftx@gm - \iftx@subsfile\else\def\tx@subs{newtx-garamond-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{zgmmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{zgmmi}{b}{it} - \DeclareFontSubstitution{OML}{zgmmi}{m}{it} + \iftx@bv + \iftx@subsfile\else\def\tx@subs{newtx-baskervald-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zbvmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zbvmi}{b}{it} + \DeclareFontSubstitution{OML}{zbvmi}{m}{it} + \else + \iftx@ut + \iftx@subsfile\else\def\tx@subs{newtx-utopia-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zutmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zutmi}{b}{it} + \DeclareFontSubstitution{OML}{zutmi}{m}{it} \else - \iftx@bv - \iftx@subsfile\else\def\tx@subs{newtx-baskervald-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{zbvmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{zbvmi}{b}{it} - \DeclareFontSubstitution{OML}{zbvmi}{m}{it} + \iftx@ch + \iftx@subsfile\else\def\tx@subs{newtx-xcharter-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zchmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zchmi}{b}{it} + \DeclareFontSubstitution{OML}{zchmi}{m}{it} + \else + \iftx@coch + \iftx@subsfile\else\def\tx@subs{newtx-cochineal-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zcochmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zcochmi}{b}{it} + \DeclareFontSubstitution{OML}{zcochmi}{m}{it} \else - \iftx@ut - \iftx@subsfile\else\def\tx@subs{newtx-utopia-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{zutmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{zutmi}{b}{it} - \DeclareFontSubstitution{OML}{zutmi}{m}{it} + \iftx@ba + \iftx@subsfile\else\def\tx@subs{newtx-baskervillef-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zbami}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zbami}{b}{it} + \DeclareFontSubstitution{OML}{zbami}{m}{it} + \else + \iftx@stxtwo + \iftx@subsfile\else\def\tx@subs{newtx-stickstoo-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{ntxstx2mi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{ntxstx2mi}{b}{it} + \DeclareFontSubstitution{OML}{ntxstx2mi}{m}{it} \else - \iftx@ch - \iftx@subsfile\else\def\tx@subs{newtx-xcharter-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{zchmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{zchmi}{b}{it} - \DeclareFontSubstitution{OML}{zchmi}{m}{it} - \else - \iftx@coch - \iftx@subsfile\else\def\tx@subs{newtx-cochineal-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{zcochmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{zcochmi}{b}{it} - \DeclareFontSubstitution{OML}{zcochmi}{m}{it} + \iftx@ebgm + \iftx@subsfile\else\def\tx@subs{newtx-ebgaramond-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{ntxebgmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{ntxebgmi}{b}{it} + \DeclareFontSubstitution{OML}{ntxebgmi}{m}{it} + \else + \iftx@nc + \iftx@fourier + \iftx@subsfile\else\def\tx@subs{newtx-ncf-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zncfmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zncfmi}{b}{it} + \DeclareFontSubstitution{OML}{zncfmi}{m}{it} + \else + \iftx@subsfile\else\def\tx@subs{newtx-nc-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zncmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zncmi}{b}{it} + \DeclareFontSubstitution{OML}{zncmi}{m}{it} + \fi + \else + \iftx@noto + \iftx@subsfile\else\def\tx@subs{newtx-noto-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{notomi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{notomi}{b}{it} + \DeclareFontSubstitution{OML}{notomi}{m}{it} + \else + \iftx@notosans + \iftx@subsfile\else\def\tx@subs{newtx-notosans-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{notosansmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{notosansmi}{b}{it} + \DeclareFontSubstitution{OML}{notosansmi}{m}{it} \else - \iftx@ba - \iftx@subsfile\else\def\tx@subs{newtx-baskervillef-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{zbami}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{zbami}{b}{it} - \DeclareFontSubstitution{OML}{zbami}{m}{it} - \else - \iftx@stxtwo - \iftx@subsfile\else\def\tx@subs{newtx-stickstoo-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{ntxstx2mi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{ntxstx2mi}{b}{it} - \DeclareFontSubstitution{OML}{ntxstx2mi}{m}{it} - \else - \iftx@ebgm - \iftx@subsfile\else\def\tx@subs{newtx-ebgaramond-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{ntxebgmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{ntxebgmi}{b}{it} - \DeclareFontSubstitution{OML}{ntxebgmi}{m}{it} - \else - \iftx@nc - \iftx@fourier - \iftx@subsfile\else\def\tx@subs{newtx-ncf-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{zncfmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{zncfmi}{b}{it} - \DeclareFontSubstitution{OML}{zncfmi}{m}{it} - \else - \iftx@subsfile\else\def\tx@subs{newtx-nc-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{zncmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{zncmi}{b}{it} - \DeclareFontSubstitution{OML}{zncmi}{m}{it} - \fi - \else - \iftx@noto - \iftx@subsfile\else\def\tx@subs{newtx-noto-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{notomi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{notomi}{b}{it} - \DeclareFontSubstitution{OML}{notomi}{m}{it} - \else - \iftx@notosans - \iftx@subsfile\else\def\tx@subs{newtx-notosans-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{notosansmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{notosansmi}{b}{it} - \DeclareFontSubstitution{OML}{notosansmi}{m}{it} - \else - %\iftx@subsfile\else\def\tx@subs{newtx-subs.tex}\fi - \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it} - \DeclareFontSubstitution{OML}{ntxmi}{m}{it} - \fi - \fi - \fi - \fi - \fi - \fi + \iftx@gel + \iftx@subsfile\else\def\tx@subs{newtx-gel-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{zgelmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zgelmi}{b}{it} + \DeclareFontSubstitution{OML}{zgelmi}{m}{it} + \else + %\iftx@subsfile\else\def\tx@subs{newtx-subs.tex}\fi + \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it} + \DeclareFontSubstitution{OML}{ntxmi}{m}{it} + \fi \fi - \fi - \fi + \fi + \fi + \fi + \fi + \fi \fi - \fi + \fi + \fi + \fi \fi + \fi \fi + \iftx@isenh \iftx@digits \DeclareMathSymbol{0}{\mathord}{letters}{132} @@ -976,14 +993,6 @@ amssymbols,uprightGreek,nosubscriptcorrection} \re@DeclareMathAccent{\dddot}{\mathord}{symbols}{168} \re@DeclareMathAccent{\ddddot}{\mathord}{symbols}{200} \iftx@tma - \re@DeclareMathAccent{\grave}{\mathord}{symbols}{158} - \re@DeclareMathAccent{\acute}{\mathord}{symbols}{159} - \re@DeclareMathAccent{\hat}{\mathord}{symbols}{160} - \re@DeclareMathAccent{\tilde}{\mathord}{symbols}{161} - \re@DeclareMathAccent{\bar}{\mathord}{symbols}{162} - \re@DeclareMathAccent{\breve}{\mathord}{symbols}{163} - \re@DeclareMathAccent{\mathring}{\mathord}{symbols}{166} - \re@DeclareMathAccent{\check}{\mathord}{symbols}{167} \else \iftx@ot %no change needed if using OT1 for operators \else @@ -3097,8 +3106,8 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \DeclareMathSizes{5} {5.5} {5.5} {5.5} \DeclareMathSizes{6} {6.5} {5.5} {5.5} \DeclareMathSizes{7} {7.3} {5.5} {5.5} -\DeclareMathSizes{8} {8} {6.2} {5.5} -\DeclareMathSizes{9} {9} {7.3} {5.5} +\DeclareMathSizes{8} {8} {6} {5.5} +\DeclareMathSizes{9} {9} {6.6} {5.5} \DeclareMathSizes{10} {10} {7.3} {5.5} \DeclareMathSizes{10.95}{10.95}{8} {6.1} \DeclareMathSizes{11} {10.95}{8} {6.1} |