From 1d29cc334a5a588ee0a0678be215be65df74d6aa Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 28 Dec 2019 03:00:29 +0000 Subject: CTAN sync 201912280300 --- fonts/newtx/tex/newtxmath.sty | 36 +++++++++++++++++++++++++++--------- fonts/newtx/tex/newtxtext.sty | 1 + 2 files changed, 28 insertions(+), 9 deletions(-) (limited to 'fonts/newtx/tex') diff --git a/fonts/newtx/tex/newtxmath.sty b/fonts/newtx/tex/newtxmath.sty index 6676ec0b50..4e0d9868ed 100644 --- a/fonts/newtx/tex/newtxmath.sty +++ b/fonts/newtx/tex/newtxmath.sty @@ -11,8 +11,8 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.611} -\def\filedate{2019/11/21} +\def\fileversion{1.62} +\def\filedate{2019/12/25} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -70,7 +70,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@ch \newif\iftx@coch +\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 \newif\iftx@upint %default is sloped @@ -83,7 +83,7 @@ \newif\iftx@sbc %\newif\iftx@spc \newif\iftx@isenh % the math style is enhanced and can make use of new macros -% Currently (2019-10-15) only txmath, libertine, XCharter, ebgaramond, stickstoo and cochineal have been enhanced. +% Currently (2019-12-11) only txmath, libertine, XCharter, ebgaramond, stickstoo, utopia, nc and cochineal have been enhanced. \newif\iftx@cochf % switch to long f \newif\iftx@cochrho % switch to long rho %\show\rmdefault @@ -95,6 +95,12 @@ \ifx\tx@rmdefault\@tx@ptm \tx@hastmtrue\fi\@ifundefined{ver@newtxtext.sty}{}{\tx@hastmtrue} \@ifundefined{ver@tgtermes.sty}{}{\tx@hastmtrue} \iftx@hastm\def\rmdefaultB{ntxtlf}\fi + +%\expandafter\ifx\csname qnc@scale\endcsname\relax +%\else +% \let\znc@scale=\qnc@scale % scale set by tgschola.sty +%\fi + % %\newcommand\enablesbcorrection{\tx@sbctrue\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}} %\newcommand\disablesbcorrection{\tx@sbcfalse\catcode`\_=8\relax} @@ -229,6 +235,7 @@ \DeclareOption{noXchvw}{\tx@nozchvwtrue} \DeclareOption{stix2}{\tx@stxtwotrue\tx@ntxmathfalse} % added in 1.55 \DeclareOption{stickstoo}{\tx@stxtwotrue\tx@ntxmathfalse} % added in 1.55 +\DeclareOption{nc}{\tx@nctrue\tx@ntxmathfalse} % added in 1.62 \DeclareOption{cochf}{\tx@cochftrue} % added in 1.604 \DeclareOption{cochrho}{\tx@cochrhotrue} % added in 1.604 \DeclareOption{alty}{\tx@XChaltytrue} % only in XCharter, added im 1.611 @@ -246,6 +253,8 @@ amssymbols,uprightGreek,nosubscriptcorrection} \iftx@stxtwo\tx@isenhtrue\else \iftx@coch\tx@isenhtrue\else \iftx@ut\tx@isenhtrue\else + \iftx@nc\tx@isenhtrue\else + \fi \fi \fi \fi @@ -394,10 +403,17 @@ amssymbols,uprightGreek,nosubscriptcorrection} \SetSymbolFont{letters}{bold}{OML}{ntxebgmi}{b}{it} \DeclareFontSubstitution{OML}{ntxebgmi}{m}{it} \else - \def\tx@subs{newtx-subs.tex} - \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it} - \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it} - \DeclareFontSubstitution{OML}{ntxmi}{m}{it} + \iftx@nc + \def\tx@subs{newtx-nc-subs.tex} + \DeclareSymbolFont{letters}{OML}{zncmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{zncmi}{b}{it} + \DeclareFontSubstitution{OML}{zncmi}{m}{it} + \else + \def\tx@subs{newtx-subs.tex} + \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it} + \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it} + \DeclareFontSubstitution{OML}{ntxmi}{m}{it} + \fi \fi \fi \fi @@ -2413,9 +2429,11 @@ $\hfil\displaystyle{#1}\hfil$\crcr% \iftx@varbb \let\mathbb\vmathbb %\DeclareRobustCommand*{\mathbb}{\varmathbb} \else - \iftx@ams\else\let\mathbb\vmathbb\fi + \iftx@ams\else\let\mathbb\vmathbb \let\Bbbk=\vmathbb{k}\fi \fi \fi +\DeclareRobustCommand{\Bbbk}{\mathbb{k}} + %\show\mathbb %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Extension (ntxex) Definition % largesymbols diff --git a/fonts/newtx/tex/newtxtext.sty b/fonts/newtx/tex/newtxtext.sty index ceebc8795c..11e388118c 100644 --- a/fonts/newtx/tex/newtxtext.sty +++ b/fonts/newtx/tex/newtxtext.sty @@ -11,6 +11,7 @@ \let\orig@makefnmark=\@makefnmark \newdimen\ntx@fs \RequirePackage{xkeyval,etoolbox} +\RequirePackage{mweights} \renewcommand*{\rmdefault}{ntxtlf} % always TLF for math \renewcommand*{\familydefault}{\rmdefault} \def\useosf{\edef\ntx@figurestyle{osf}} -- cgit v1.2.3