summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-12-29 22:08:46 +0000
committerKarl Berry <karl@freefriends.org>2019-12-29 22:08:46 +0000
commitb8d97d3280e78c55170f0bfcd8cb83ed983d31e8 (patch)
treeffdb6a472e804e8311dcdb81c0b829c4561ffa46 /Master/texmf-dist/tex/latex/newtx
parent472f1aa97056361710825e4f3de18b0e89f0e985 (diff)
newtx (29dec19)
git-svn-id: svn://tug.org/texlive/trunk@53255 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty139
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxtext.sty1
-rw-r--r--Master/texmf-dist/tex/latex/newtx/untxmia.fd30
3 files changed, 108 insertions, 62 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 6676ec0b50b..576f3754fdf 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
+++ b/Master/texmf-dist/tex/latex/newtx/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.622}
+\def\filedate{2019/12/28}
\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,9 +83,10 @@
\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
+\newif\iftx@fourier
%\show\rmdefault
\edef\tx@rmdefault{\rmdefault}
\edef\tx@encdefault{\encodingdefault}
@@ -95,6 +96,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 +236,8 @@
\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{ncf}{\tx@nctrue\tx@ntxmathfalse\tx@fouriertrue} % added in 1.622
\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 +255,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 +405,24 @@ 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
+ \iftx@fourier
+ \def\tx@subs{newtx-ncf-subs.tex}
+ \DeclareSymbolFont{letters}{OML}{zncfmi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{zncfmi}{b}{it}
+ \DeclareFontSubstitution{OML}{zncfmi}{m}{it}
+ \else
+ \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}
+ \fi
+ \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
@@ -750,10 +775,10 @@ amssymbols,uprightGreek,nosubscriptcorrection}
%\DeclareMathDelimiter{(}{\mathopen}{operators}{40}{largesymbols}{0}
%\DeclareMathDelimiter{)}{\mathclose}{operators}{41}{largesymbols}{1}
%\iftx@bigdelims
- \DeclareMathDelimiter{\lgroup}{\mathopen}{largesymbols}{58}{largesymbols}{58}
- \DeclareMathDelimiter{\rgroup}{\mathclose}{largesymbols}{59}{largesymbols}{59}
- \DeclareMathDelimiter{\lmoustache}{\mathopen}{largesymbols}{64}{largesymbols}{64}
- \DeclareMathDelimiter{\rmoustache}{\mathclose}{largesymbols}{65}{largesymbols}{65}
+ \re@DeclareMathDelimiter{\lgroup}{\mathopen}{largesymbols}{58}{largesymbols}{58}
+ \re@DeclareMathDelimiter{\rgroup}{\mathclose}{largesymbols}{59}{largesymbols}{59}
+ \re@DeclareMathDelimiter{\lmoustache}{\mathopen}{largesymbols}{64}{largesymbols}{64}
+ \re@DeclareMathDelimiter{\rmoustache}{\mathclose}{largesymbols}{65}{largesymbols}{65}
\DeclareMathDelimiter{/}{\mathopen}{symbols}{157}{largesymbols}{14}
\DeclareMathDelimiter{(}{\mathopen}{symbols}{185}{largesymbols}{0}
\DeclareMathDelimiter{)}{\mathclose}{symbols}{186}{largesymbols}{1}
@@ -766,30 +791,30 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\DeclareMathDelimiter{\lbrace}{\mathopen}{symbols}{102}{largesymbols}{8}
\DeclareMathDelimiter{\rbrace}{\mathclose}{symbols}{103}{largesymbols}{9}
\DeclareMathDelimiter{\langle}{\mathopen}{symbols}{104}{largesymbols}{10}
- %\DeclareMathDelimiter{<}{\mathopen}{letters}{60}{largesymbols}{140}
+ %\re@DeclareMathDelimiter{<}{\mathopen}{letters}{60}{largesymbols}{140}
\DeclareMathDelimiter{\rangle}{\mathclose}{symbols}{105}{largesymbols}{11}
- %\DeclareMathDelimiter{>}{\mathclose}{letters}{62}{largesymbols}{141}
- \DeclareMathSymbol{\mid}{\mathrel}{symbols}{106}
+ %\re@DeclareMathDelimiter{>}{\mathclose}{letters}{62}{largesymbols}{141}
+ \re@DeclareMathSymbol{\mid}{\mathrel}{symbols}{106}
\DeclareMathDelimiter{|}{\mathord}{symbols}{106}{largesymbols}{12}
\DeclareMathDelimiter{\arrowvert}{\mathord}{symbols}{106}{largesymbols}{60}% 60
\DeclareMathDelimiter{\vert}{\mathord}{symbols}{106}{largesymbols}{12}
- \DeclareMathSymbol{\parallel}{\mathrel}{symbols}{107}
- \DeclareMathDelimiter{\Arrowvert}{\mathord}{symbols}{107}{largesymbols}{61}%61
- \DeclareMathDelimiter{\Vert}{\mathord}{symbols}{107}{largesymbols}{13}
+ \re@DeclareMathSymbol{\parallel}{\mathrel}{symbols}{107}
+ \re@DeclareMathDelimiter{\Arrowvert}{\mathord}{symbols}{107}{largesymbols}{61}%61
+ \re@DeclareMathDelimiter{\Vert}{\mathord}{symbols}{107}{largesymbols}{13}
\let\|=\Vert
- \DeclareMathDelimiter{\updownarrow}{\mathrel}{symbols}{108}{largesymbols}{63}
- \DeclareMathDelimiter{\Updownarrow}{\mathrel}{symbols}{109}{largesymbols}{119}
- \DeclareMathDelimiter{\llbracket}{\mathopen}{symbols}{201}{largesymbolsTXA}{18}
+ \re@DeclareMathDelimiter{\updownarrow}{\mathrel}{symbols}{108}{largesymbols}{63}
+ \re@DeclareMathDelimiter{\Updownarrow}{\mathrel}{symbols}{109}{largesymbols}{119}
+ \re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbols}{201}{largesymbolsTXA}{18}
\let\lBrack=\llbracket
- \DeclareMathDelimiter{\rrbracket}{\mathclose}{symbols}{202}{largesymbolsTXA}{19}
+ \re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbols}{202}{largesymbolsTXA}{19}
\let\rBrack=\rrbracket
-\DeclareMathDelimiter{\lvert} {\mathopen} {symbols}{106}{largesymbols}{12}
-\DeclareMathDelimiter{\rvert} {\mathclose} {symbols}{106}{largesymbols}{12}
-\DeclareMathDelimiter{\lVert} {\mathopen} {symbols}{107}{largesymbols}{13}
-\DeclareMathDelimiter{\rVert} {\mathclose} {symbols}{107}{largesymbols}{13}
+\re@DeclareMathDelimiter{\lvert} {\mathopen} {symbols}{106}{largesymbols}{12}
+\re@DeclareMathDelimiter{\rvert} {\mathclose} {symbols}{106}{largesymbols}{12}
+\re@DeclareMathDelimiter{\lVert} {\mathopen} {symbols}{107}{largesymbols}{13}
+\re@DeclareMathDelimiter{\rVert} {\mathclose} {symbols}{107}{largesymbols}{13}
-\DeclareMathDelimiter{\smlbrace}{\mathopen}{lettersA}{62}{largesymbols}{8}
-\DeclareMathDelimiter{\smrbrace}{\mathclose}{lettersA}{63}{largesymbols}{9}
+\re@DeclareMathDelimiter{\smlbrace}{\mathopen}{lettersA}{62}{largesymbols}{8}
+\re@DeclareMathDelimiter{\smrbrace}{\mathclose}{lettersA}{63}{largesymbols}{9}
\re@DeclareMathSymbol{\Perp}{\mathrel}{symbols}{205} % was symbolsC
\re@DeclareMathSymbol{\nPerp}{\mathrel}{symbols}{206} % was symbolsC
@@ -871,7 +896,7 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\else\ifx\encodingdefault\ly@one
\re@DeclareMathAccent{\bar}{\mathalpha}{operators}{175}
\re@DeclareMathAccent{\hat}{\mathalpha}{operators}{94}
- \DeclareMathAccent{\tilde}{\mathalpha}{operators}{152}
+ \re@DeclareMathAccent{\tilde}{\mathalpha}{operators}{152}
\fi\fi\fi
\fi
%
@@ -2061,32 +2086,32 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\let\varsigma\varsigmaup
\let\varphi\varphiup
\let\varkappa\varkappaup
- \DeclareMathSymbol{A}{\mathalpha}{operators}{65}
- \DeclareMathSymbol{B}{\mathalpha}{operators}{66}
- \DeclareMathSymbol{C}{\mathalpha}{operators}{67}
- \DeclareMathSymbol{D}{\mathalpha}{operators}{68}
- \DeclareMathSymbol{E}{\mathalpha}{operators}{69}
- \DeclareMathSymbol{F}{\mathalpha}{operators}{70}
- \DeclareMathSymbol{G}{\mathalpha}{operators}{71}
- \DeclareMathSymbol{H}{\mathalpha}{operators}{72}
- \DeclareMathSymbol{I}{\mathalpha}{operators}{73}
- \DeclareMathSymbol{J}{\mathalpha}{operators}{74}
- \DeclareMathSymbol{K}{\mathalpha}{operators}{75}
- \DeclareMathSymbol{L}{\mathalpha}{operators}{76}
- \DeclareMathSymbol{M}{\mathalpha}{operators}{77}
- \DeclareMathSymbol{N}{\mathalpha}{operators}{78}
- \DeclareMathSymbol{O}{\mathalpha}{operators}{79}
- \DeclareMathSymbol{P}{\mathalpha}{operators}{80}
- \DeclareMathSymbol{Q}{\mathalpha}{operators}{81}
- \DeclareMathSymbol{R}{\mathalpha}{operators}{82}
- \DeclareMathSymbol{S}{\mathalpha}{operators}{83}
- \DeclareMathSymbol{T}{\mathalpha}{operators}{84}
- \DeclareMathSymbol{U}{\mathalpha}{operators}{85}
- \DeclareMathSymbol{V}{\mathalpha}{operators}{86}
- \DeclareMathSymbol{W}{\mathalpha}{operators}{87}
- \DeclareMathSymbol{X}{\mathalpha}{operators}{88}
- \DeclareMathSymbol{Y}{\mathalpha}{operators}{89}
- \DeclareMathSymbol{Z}{\mathalpha}{operators}{90}
+ \re@DeclareMathSymbol{A}{\mathalpha}{operators}{65}
+ \re@DeclareMathSymbol{B}{\mathalpha}{operators}{66}
+ \re@DeclareMathSymbol{C}{\mathalpha}{operators}{67}
+ \re@DeclareMathSymbol{D}{\mathalpha}{operators}{68}
+ \re@DeclareMathSymbol{E}{\mathalpha}{operators}{69}
+ \re@DeclareMathSymbol{F}{\mathalpha}{operators}{70}
+ \re@DeclareMathSymbol{G}{\mathalpha}{operators}{71}
+ \re@DeclareMathSymbol{H}{\mathalpha}{operators}{72}
+ \re@DeclareMathSymbol{I}{\mathalpha}{operators}{73}
+ \re@DeclareMathSymbol{J}{\mathalpha}{operators}{74}
+ \re@DeclareMathSymbol{K}{\mathalpha}{operators}{75}
+ \re@DeclareMathSymbol{L}{\mathalpha}{operators}{76}
+ \re@DeclareMathSymbol{M}{\mathalpha}{operators}{77}
+ \re@DeclareMathSymbol{N}{\mathalpha}{operators}{78}
+ \re@DeclareMathSymbol{O}{\mathalpha}{operators}{79}
+ \re@DeclareMathSymbol{P}{\mathalpha}{operators}{80}
+ \re@DeclareMathSymbol{Q}{\mathalpha}{operators}{81}
+ \re@DeclareMathSymbol{R}{\mathalpha}{operators}{82}
+ \re@DeclareMathSymbol{S}{\mathalpha}{operators}{83}
+ \re@DeclareMathSymbol{T}{\mathalpha}{operators}{84}
+ \re@DeclareMathSymbol{U}{\mathalpha}{operators}{85}
+ \re@DeclareMathSymbol{V}{\mathalpha}{operators}{86}
+ \re@DeclareMathSymbol{W}{\mathalpha}{operators}{87}
+ \re@DeclareMathSymbol{X}{\mathalpha}{operators}{88}
+ \re@DeclareMathSymbol{Y}{\mathalpha}{operators}{89}
+ \re@DeclareMathSymbol{Z}{\mathalpha}{operators}{90}
\fi
\re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{181} % was 49
\re@DeclareMathSymbol{\vary}{\mathord}{lettersA}{182} % was 50
@@ -2413,9 +2438,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/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index ceebc8795cc..11e388118cc 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
+++ b/Master/texmf-dist/tex/latex/newtx/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}}
diff --git a/Master/texmf-dist/tex/latex/newtx/untxmia.fd b/Master/texmf-dist/tex/latex/newtx/untxmia.fd
index 680c0925683..b3f71b5ec6e 100644
--- a/Master/texmf-dist/tex/latex/newtx/untxmia.fd
+++ b/Master/texmf-dist/tex/latex/newtx/untxmia.fd
@@ -72,12 +72,30 @@
<-> \ntxmath@scaled zutbmia
}{}
\else
- \DeclareFontShape{U}{ntxmia}{m}{it}{
- <-> \ntxmath@scaled ntxmia
- }{}
- \DeclareFontShape{U}{ntxmia}{b}{it}{
- <-> \ntxmath@scaled ntxbmia
- }{}
+ \iftx@nc
+ \iftx@fourier
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled zncfmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled zncfbmia
+ }{}
+ \else
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled zncmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled zncbmia
+ }{}
+ \fi
+ \else
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled ntxmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled ntxbmia
+ }{}
+ \fi
\fi
\fi
\fi