diff options
author | Karl Berry <karl@freefriends.org> | 2021-10-14 20:45:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-10-14 20:45:13 +0000 |
commit | 15994b5cdc96150a393b50de21a498bcf8a067c7 (patch) | |
tree | 4bc6d60312030c3750060f65ac3845b14728325e /Master/texmf-dist/tex/latex/newtx | |
parent | 7da55fa354dbee0479fddb06454249a0d12327ec (diff) |
newtx (14oct21)
git-svn-id: svn://tug.org/texlive/trunk@60762 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/lmsntxsy.fd | 16 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 38 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 4 |
3 files changed, 38 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/lmsntxsy.fd b/Master/texmf-dist/tex/latex/newtx/lmsntxsy.fd index e71419c8ec0..6a7dc1f30dc 100644 --- a/Master/texmf-dist/tex/latex/newtx/lmsntxsy.fd +++ b/Master/texmf-dist/tex/latex/newtx/lmsntxsy.fd @@ -11,8 +11,23 @@ \let\ntxmath@scaled\@empty% \fi +\def\tx@donoopt{\newif\iftx@noopt} +\expandafter\ifx\csname tx@nooptfalse\endcsname\relax + \tx@donoopt +\fi + \DeclareFontFamily{LMS}{ntxsy}{\providecommand {\setSYdimens}{}\setSYdimens\skewchar\font =120} +\iftx@noopt % no optical sizes +\DeclareFontShape{LMS}{ntxsy}{m}{n}{ + <-> \ntxmath@scaled ntxsy +}{} + +\DeclareFontShape{LMS}{ntxsy}{b}{n}{ + <-> \ntxmath@scaled ntxbsy +}{} + +\else % use optical sizes \DeclareFontShape{LMS}{ntxsy}{m}{n}{ <-6.3> \ntxmath@scaled ntxsy5 <6.3-8.6> \ntxmath@scaled ntxsy7 % from 6.3 up to, but not including, 8.6 @@ -24,6 +39,7 @@ <6.3-8.6> \ntxmath@scaled ntxbsy7 <8.6-> \ntxmath@scaled ntxbsy }{} +\fi \DeclareFontShape{LMS}{ntxsy}{bx}{n}{<->ssub * ntxsy/b/n}{} diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 991115460da..67846297b81 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.655} -\def\filedate{2021/06/01} +\def\fileversion{1.658} +\def\filedate{2021/10/13} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion ] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -176,6 +176,7 @@ %\def\tx@sb{\the\tx@tA \the\tx@tB}\enablesbcorrection} %\newcommand*{\loadsupfile}[1]{\readsufile{#1}%creates toks tx@tA. tx@tB %\def\tx@sp{\the\tx@tA \the\tx@tB}\enablespcorrection} +\def\tx@subs{newtx-subs.tex} \newread\tx@su \def\readsufile#1{% @@ -194,6 +195,8 @@ \tx@tA\expandafter{\the\tx@tA\next #1\mkern #2 mu\else} \tx@tB\expandafter{\the\tx@tB\fi}} +\newif\iftx@subsfile +\DeclareOption{subscriptcorrectionfile}{\def\tx@subs{#1}\tx@subsfiletrue} \DeclareOption{nosubscriptcorrection}{\tx@sbcfalse} \DeclareOption{subscriptcorrection}{\tx@sbctrue} %\DeclareOption{nosuperscriptcorrection}{\disablespcorrection} @@ -234,7 +237,6 @@ \DeclareOption{liby}{\tx@libytrue} \DeclareOption{frenchmath}{\tx@frenchmtrue} \DeclareOption{nonewtxmathopt}{\tx@noopttrue} -\DeclareOption{scale}{\tx@noopttrue} \DeclareOption{upint}{\tx@upinttrue} \DeclareOption{smallerops}{\tx@smopstrue} \DeclareOption{useBImacros}{\tx@BItrue} @@ -389,91 +391,91 @@ amssymbols,uprightGreek,nosubscriptcorrection} % Math Italic % %%%%%%%%%%%%%%% \iftx@libertine - \def\tx@subs{newtx-libertine-subs.tex} + \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 - \def\tx@subs{newtx-minion-subs.tex} + \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 - \def\tx@subs{newtx-garamond-subs.tex} + \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@bv - \def\tx@subs{newtx-baskervald-subs.tex} + \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 - \def\tx@subs{newtx-utopia-subs.tex} + \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@ch - \def\tx@subs{newtx-xcharter-subs.tex} + \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 - \def\tx@subs{newtx-cochineal-subs.tex} + \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@ba - \def\tx@subs{newtx-baskervillef-subs.tex} + \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 - \def\tx@subs{newtx-stickstoo-subs.tex} + \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 - \def\tx@subs{newtx-ebgaramond-subs.tex} + \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 - \def\tx@subs{newtx-ncf-subs.tex} + \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 - \def\tx@subs{newtx-nc-subs.tex} + \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 - \def\tx@subs{newtx-noto-subs.tex} + \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 - \def\tx@subs{newtx-notosans-subs.tex} + \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 - \def\tx@subs{newtx-subs.tex} + %\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} diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 25d3b63f899..f7aa8971c8b 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.656} -\def\filedate{2021/09/01} +\def\fileversion{1.658} +\def\filedate{2021/10/13} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)} |