diff options
author | Norbert Preining <norbert@preining.info> | 2023-07-28 03:01:08 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-07-28 03:01:08 +0000 |
commit | 1e45d661b659c3025746d3a41119300ab90d1dcd (patch) | |
tree | 9dfdc2d448c84ef1c1da6adef3145432703d179e /fonts/newtx/tex/newtxmath.sty | |
parent | 1ee18e17580e3a6c28aa966924ce0be160ef3577 (diff) |
CTAN sync 202307280301
Diffstat (limited to 'fonts/newtx/tex/newtxmath.sty')
-rw-r--r-- | fonts/newtx/tex/newtxmath.sty | 81 |
1 files changed, 49 insertions, 32 deletions
diff --git a/fonts/newtx/tex/newtxmath.sty b/fonts/newtx/tex/newtxmath.sty index 10058623ec..dac98a4b61 100644 --- a/fonts/newtx/tex/newtxmath.sty +++ b/fonts/newtx/tex/newtxmath.sty @@ -11,11 +11,13 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.71} -\def\filedate{2022/01/16} +\def\fileversion{1.72} +\def\filedate{2023/07/19} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ] \@ifundefined{newtxmathLoaded}{}{\endinput} +%\expandafter\show\csname opt@newtxmath.sty\endcsname + \message{`newtxmath' v\fileversion, \filedate\space Math macros based originally on txfonts (msharpe)} \csname newtxmathLoaded\endcsname @@ -29,15 +31,10 @@ % Replacement for \ifiscs is not comprehensive, but adequate to distinguish a letter like j from a macro like \rhox, not necessarily existent. \def\ifiscseq#1{\ifcat$\expandafter\@gobble\string#1$\expandafter\@secondoftwo\else\expandafter\@firstoftwo\fi} -\RequirePackage{ifxetex,ifluatex,xkeyval} +\RequirePackage{iftex} % should be in latex kernel now +\RequirePackage{xkeyval} \RequirePackage{centernot} % for proper handling of negated relations -\newif\ifxl@otf \xl@otffalse -\ifxetex - \xl@otftrue -\else\ifluatex - \xl@otftrue - \fi -\fi + \newif\iftx@noopt \newif\iftx@upscr \def\cmr@default{lmr} % changed from cmr 20170911 \def\ly@one{LY1} @@ -63,7 +60,8 @@ \newcount\tx@Isdigit \newcount\tx@IsAlNum \newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@braces -\newif\iftx@libertine \newif\iftx@varbb \newif\iftx@vvarbb \newif\iftx@symbolsC +\newif\iftx@libertine \newif\iftx@libertinus +\newif\iftx@vvarbb\newif\iftx@varbb \newif\iftx@symbolsC \newif\iftx@gm \newif\iftx@ebgm \newif\iftx@bigdelims @@ -196,6 +194,7 @@ \tx@tA\expandafter{\the\tx@tA\next #1\mkern #2 mu\else} \tx@tB\expandafter{\the\tx@tB\fi}} +%\newif\iftx@legacycolonsyms \newif\iftx@subsfile %\@ifpackageloaded{newtx}% %{\@for\ntx@x:=\ntx@textlst\do{\DeclareOption{\ntx@x}{}}}{} @@ -204,6 +203,7 @@ \DeclareOption{subscriptcorrection}{\tx@sbctrue} %\DeclareOption{nosuperscriptcorrection}{\disablespcorrection} %\DeclareOption{superscriptcorrection} {\enablespcorrection} +%\DeclareOption{legacycolonsyms}{\tx@legacycolonsymstrue} \DeclareOption{timesmathacc}{\tx@tmatrue} \DeclareOption{bigdelims}{\tx@bigdelimstrue} \DeclareOption{varbb}{\tx@varbbtrue} @@ -211,6 +211,7 @@ \DeclareOption{libaltvw}{\tx@libaltvwtrue} \DeclareOption{nosymbolsc}{\tx@symbolsCfalse} \DeclareOption{libertine}{\tx@libertinetrue\tx@ntxmathfalse} +\DeclareOption{libertinus}{\tx@libertinustrue\tx@ntxmathfalse} \DeclareOption{minion}{\tx@miniontrue\tx@ntxmathfalse\tx@otfalse} \DeclareOption{cochineal}{\tx@cochtrue\tx@ntxmathfalse} \DeclareOption{garamondx}{\tx@gmtrue\tx@ntxmathfalse\tx@otfalse} @@ -259,12 +260,17 @@ \DeclareOption{internaldigits}{\tx@digitstrue} \DeclareOption{noOT1}{\tx@nootonetrue} \DeclareOption{amsthm}{\ntx@amsthmtrue} - +\ntx@amsthmtrue \ExecuteOptions{% amssymbols,uprightGreek,nosubscriptcorrection} \ProcessOptions\relax + +\newif\iftx@lbtn +\iftx@libertine\tx@lbtntrue\else\iftx@libertinus% +\tx@lbtntrue\fi\fi + \let\ntxmath@scale\tx@scale \ifntx@amsthm @@ -297,7 +303,7 @@ amssymbols,uprightGreek,nosubscriptcorrection} % Check whether math face is enhanced \iftx@ntxmath\tx@isenhtrue\else - \iftx@libertine\tx@isenhtrue\else + \iftx@lbtn\tx@isenhtrue\else \iftx@ch\tx@isenhtrue\else \iftx@ebgm\tx@isenhtrue\else \iftx@stxtwo\tx@isenhtrue\else @@ -339,7 +345,7 @@ amssymbols,uprightGreek,nosubscriptcorrection} %bigdelims cancels cmbraces \iftx@bigdelims\tx@bracesfalse\fi % No varg or varvw with options other than newtx or newpx -\iftx@libertine\let\X@s@v@rg\@undefined\fi +\iftx@lbtn\let\X@s@v@rg\@undefined\fi \iftx@minion\let\X@s@v@rg\@undefined\fi \iftx@ut\let\X@s@v@rg\@undefined\fi \iftx@ch\let\X@s@v@rg\@undefined\fi @@ -349,11 +355,11 @@ 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 -% altnu, liby and largelibfigs valid only with libertine -\iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\tx@libyfalse\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 -\ifxl@otf - \iftx@libertine +\iftutex + \iftx@lbtn \ifx\tx@rmdefault\cmr@default %\message{Setting rmdefaultB to minlibertine} \renewcommand{\rmdefaultB}{minlibertine}% since can't load libertine twice @@ -361,10 +367,14 @@ amssymbols,uprightGreek,nosubscriptcorrection} \fi \else \iftx@libertine - \expandafter\ifx\csname iflibertine@otf\endcsname\undefined - \tx@otfalse - \fi\fi + \@ifundefined{iflibertinus@otf}{\tx@otfalse}{} + \else + \iftx@libertinus + \@ifundefined{iflibertinus@otf}{\tx@otfalse}{} + \fi + \fi \fi + \iftx@minion\edef\rmdefaultB{MinionPro-TLF}\fi \iftx@noto\edef\rmdefaultB{NotoSerif-TLF}\fi \iftx@notosans\edef\rmdefaultB{NotoSans-TLF}\fi @@ -402,7 +412,8 @@ amssymbols,uprightGreek,nosubscriptcorrection} %%%%%%%%%%%%%%% % Math Italic % %%%%%%%%%%%%%%% -\iftx@libertine + +\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} @@ -1297,6 +1308,7 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\iiiintupop} {\mathop}{largesymbolsTXA}{"21} \re@DeclareMathSymbol{\fintupop} {\mathop}{largesymbolsTXA}{"23} \re@DeclareMathSymbol{\sqintupop} {\mathop}{largesymbolsTXA}{"25} +\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsTXA}{32} \iftx@upint \let\smallint=\smallintup @@ -1786,14 +1798,14 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \re@DeclareMathSymbol{\nSupset}{\mathrel}{symbolsC}{63} \re@DeclareMathSymbol{\nsqsubseteq}{\mathrel}{symbolsC}{64} \re@DeclareMathSymbol{\nsqsupseteq}{\mathrel}{symbolsC}{65} -\re@DeclareMathSymbol{\coloneqq}{\mathrel}{symbolsC}{66} -\re@DeclareMathSymbol{\eqqcolon}{\mathrel}{symbolsC}{67} -%\re@DeclareMathSymbol{\coloneq}{\mathrel}{symbolsC}{68} -%\re@DeclareMathSymbol{\eqcolon}{\mathrel}{symbolsC}{69} -\re@DeclareMathSymbol{\Coloneqq}{\mathrel}{symbolsC}{70} -\re@DeclareMathSymbol{\Eqqcolon}{\mathrel}{symbolsC}{71} -\re@DeclareMathSymbol{\Coloneq}{\mathrel}{symbolsC}{72} -\re@DeclareMathSymbol{\Eqcolon}{\mathrel}{symbolsC}{73} +%\re@DeclareMathSymbol{\coloneq}{\mathrel}{symbolsC}{66} +%\re@DeclareMathSymbol{\eqcolon}{\mathrel}{symbolsC}{67} +\re@DeclareMathSymbol{\colondash}{\mathrel}{symbolsC}{68} +\re@DeclareMathSymbol{\dashcolon}{\mathrel}{symbolsC}{69} +\re@DeclareMathSymbol{\Coloneq}{\mathrel}{symbolsC}{70} +\re@DeclareMathSymbol{\Eqcolon}{\mathrel}{symbolsC}{71} +\re@DeclareMathSymbol{\Colondash}{\mathrel}{symbolsC}{72} +\re@DeclareMathSymbol{\Dashcolon}{\mathrel}{symbolsC}{73} \re@DeclareMathSymbol{\strictif}{\mathrel}{symbolsC}{74} \re@DeclareMathSymbol{\strictfi}{\mathrel}{symbolsC}{75} \re@DeclareMathSymbol{\strictiff}{\mathrel}{symbolsC}{76} @@ -2822,10 +2834,9 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsTXA}{2} %\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsTXA}{4} %\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsTXA}{6} -%\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsTXA}{16} +%\re@DeclareMathSymbol{\varprod}{\mathop}{gggg}{16} %\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsTXA}{18} %\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsTXA}{19} -\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsTXA}{32} \DeclareMathSymbol{\smallprod}{\mathop}{symbols}{"98} \DeclareMathSymbol{\smallsum}{\mathop}{symbols}{"99} \DeclareMathSymbol{\smallcoprod}{\mathop}{symbols}{113}% @@ -3207,4 +3218,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \fi \endgroup } +% For users of older newtxmath +\AtBeginDocument{% +\providecommand*\Coloneqq{\Coloneq} +\providecommand*\Eqqcolon{\Eqcolon} +\providecommand*\Coloneq{\Colondash} +\providecommand*\Eqcolon{\Dashcolon}} \endinput |