diff options
author | Karl Berry <karl@freefriends.org> | 2023-08-21 20:19:40 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-08-21 20:19:40 +0000 |
commit | 4566c4f4174f48227e4567d7c74e877f58b32c47 (patch) | |
tree | 5706ad5a11c247e0dcf26ac44e7c0255932cc2ef /Master/texmf-dist/tex/latex/newtx | |
parent | 634f841463dde73f13dcdc9f686dde9603fd0c61 (diff) |
newtx (21aug23)
git-svn-id: svn://tug.org/texlive/trunk@68000 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtx.sty | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 74 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/ts1ntxlf.fd | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/ts1ntxosf.fd | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/ts1ntxsups.fd | 62 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/untxsym.fd | 4 |
6 files changed, 135 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtx.sty b/Master/texmf-dist/tex/latex/newtx/newtx.sty index 21a0d4565f2..67d7d540aef 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtx.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtx.sty @@ -2,8 +2,8 @@ %Package to simplify loading of newtxmath with a text font family such as newtxtext for all latex engines, or for newtxtext and an otf math package. -\def\fileversion{1.723} -\def\filedate{2023/07/30} +\def\fileversion{1.724} +\def\filedate{2023/08/20} \ProvidesPackage{newtx}[% \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for newtxmath and a supported text font family, or for newtxtext and an otf math package] @@ -96,7 +96,7 @@ % must load fontspec if unicode engine \newif\ifntx@otfmath %\ntx@otfmathfalse % default is type1 math -\def\tx@divide#1#2{\strip@pt\dimexpr 1pt * (\dimexpr #1pt) / \dimexpr #2pt\relax\relax} +\def\tx@divide#1#2{\strip@pt\dimexpr 1pt * (\dimexpr #1pt\relax) / \dimexpr #2pt\relax\relax} \newcommand*{\ntxtext@RM}{1} \newcommand*{\ntxtext@SF}{1} \newcommand*{\ntxtext@TT}{.88} @@ -338,7 +338,7 @@ \@ifundefined{tx@sfrVC}{\def\tx@sfrVC{331}}{}% vertical center of sfrac \@ifundefined{tx@sfrVS}{\def\tx@sfrVS{106}}{} % space above/below bar \@ifundefined{tx@sfrTH}{\def\tx@sfrTH{54}}{} % bar thickness -\@ifundefined{tx@sfrSC}{\def\tx@sfrSC{.8}}{} % scale defigures by this +\@ifundefined{tx@sfrSC}{\def\tx@sfrSC{.9}}{} % scale defigures by this \or %1, libertine \PassMathScale % \PassOptionsToPackage{ttscaled=\ntxtext@scale, diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 4d47dcdc25d..ac157b31e49 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -8,8 +8,8 @@ % Text is now directed to an extension of TeXGyreTermes rather than tx. % 1.7 is first version of newtxtext to support both [pdf]latex and unicode latex. -\def\fileversion{1.723} -\def\filedate{2023/07/30} +\def\fileversion{1.724} +\def\filedate{2023/08/20} \ProvidesPackage{newtxtext}[% \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyreTermesX] @@ -309,7 +309,7 @@ \or%\kern.02em% 4 \or%\kern.01em% 5 \or\kern.01em% 6 - \or\kern-.11em% 7 + \or\kern-.06em% 7 \or%\kern-.11em% 8 \or\kern-.02em% 9 \fi% @@ -501,14 +501,14 @@ \let\nustyle=\sufigures \let\instyle=\infigures \let\destyle=\defigures + \ifntx@KOMA + \setkomafont{footnotereference}{\normalfont} + \else + \renewcommand{\footnotemark}{\normalfont} + \fi \ifntx@defaultsups % \else - \usepackage{realscripts} - \ifntx@KOMA - \setkomafont{footnotelabel}{\normalfont} - \else - \renewcommand\footnotemarkfont{\normalfont} - \fi + \RequirePackage{realscripts} \fi % \ifntx@scosf % \edef\ntx@fnt{\expandafter\csname ntx\ifntx@tabular T\fi OsF\endcsname} @@ -634,6 +634,62 @@ \fi } %both +\@ifundefined{tx@xht}{\def\tx@xht{450}}{} % lowercase letters +\@ifundefined{tx@deht}{\def\tx@deht{406}}{} % denominator figures ht +\@ifundefined{tx@nubase}{\def\tx@nubase{270}}{} % baseline of numerators +\@ifundefined{tx@debase}{\def\tx@debase{0}}{} % baseline of denoms +\@ifundefined{tx@sfrVC}{\def\tx@sfrVC{331}}{}% vertical center of sfrac +\@ifundefined{tx@sfrVS}{\def\tx@sfrVS{106}}{} % space above/below bar +\@ifundefined{tx@sfrTH}{\def\tx@sfrTH{54}}{} % bar thickness +\@ifundefined{tx@sfrSC}{\def\tx@sfrSC{.9}}{} % scale + +\@ifundefined{textsfrac}{ +\newdimen\tx@sixem\tx@sixem6pt % for checking if a number refers to ex +\newdimen\tx@y \newdimen\tx@x + +% convert numerical entry that may be multiple of ex (<6) or em value +\def\tx@toex#1{\tx@x#1pt \ifdim\tx@x<\z@\tx@y-\tx@x\else\tx@y\tx@x\fi \ifdim\tx@y>\tx@sixem \tx@x\dimexpr 1pt * (\dimexpr #1pt\relax) / \dimexpr \tx@xht pt\relax\relax\fi} + +\newdimen\tx@tmpdima \newdimen\tx@tmpdimb \newdimen\tx@tmpdimc +\newdimen\tx@tmpdimd \newdimen\tx@tmpdime \newdimen\tx@tmpdimf +\newdimen\tx@dimA +\newdimen\tx@dimAA \newdimen\tx@dimB \newdimen\tx@dimBB +\newdimen\tx@dimC % vertical center +% double cap letters for below bar, single cap for above +\tx@toex\tx@sfrVC\tx@dimC\tx@x %Vertical center of fraction +\tx@toex\tx@sfrTH\tx@tmpdimb\tx@x % bar thickness +\tx@tmpdime.5\tx@tmpdimb % half bar thickness +\tx@toex\tx@sfrVS\tx@tmpdimc\tx@x% vertical space +\tx@toex\tx@deht\tx@tmpdimd\tx@x % height of unscaled figures +\tx@tmpdimd\tx@sfrSC\tx@tmpdimd % height of scaled figures +\tx@toex\tx@debase\tx@tmpdimf\tx@x % unscaled baseline of de figures +\tx@toex\tx@nubase\tx@tmpdima\tx@x % unscaled baseline of nu figures +\tx@tmpdima\tx@sfrSC\tx@tmpdima % scaled nu baseline +\tx@tmpdimf\tx@sfrSC\tx@tmpdimf % scaled de baseline +\tx@dimA\tx@dimC +\advance\tx@dimA by \tx@tmpdime % top of bar +\tx@dimAA\tx@dimC +\advance\tx@dimAA by -\tx@tmpdime % bottom of bar +\tx@dimB\tx@dimA +\advance\tx@dimB by \tx@tmpdimc % top figure baseline +\advance\tx@dimB by -\tx@tmpdima +\tx@dimBB\tx@dimAA +\advance\tx@dimBB by -\tx@tmpdimc % +\advance\tx@dimBB by -\tx@tmpdimd % bottom figure baseline +\advance\tx@dimBB by -\tx@tmpdimf +\newcommand*{\textsfrac}[3][]{% like \textsfrac[1]{23}{34} +\mbox{% + \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1] + {\textlf{#1}\kern.04em}{}% + {\hmode@bgroup% +\ooalign{% + \setbox0=\hbox{\scalefont{\tx@sfrSC}\nustyle#2}% + \hfil \raise\strip@pt\tx@dimB ex\box0\hfil \crcr% + \leaders\hrule height \strip@pt\tx@dimA ex depth -\strip@pt\tx@dimAA ex\hfill \crcr% + \setbox1=\hbox{\scalefont{\tx@sfrSC}\destyle#3}% + \hfil\raise\strip@pt\tx@dimBB ex\box1\hfil}% +\egroup}}} +}{} % end of \@ifundefined{textsfrac}{ \ifntx@thrm \@ifundefined{theoremstyle}{}{% diff --git a/Master/texmf-dist/tex/latex/newtx/ts1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/ts1ntxlf.fd index ed83ccac875..5954050d0a0 100644 --- a/Master/texmf-dist/tex/latex/newtx/ts1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ts1ntxlf.fd @@ -1,7 +1,7 @@ \ProvidesFile{ts1ntxlf.fd}[2015/01/18 v1.0 fd file for TS1/ntxlf] \expandafter\ifx\csname ntx@scaled\endcsname\relax - \let\ntx@scaled\@empty% + \global\let\ntx@scaled\@empty% \fi \DeclareFontFamily{TS1}{ntxlf}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ts1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/ts1ntxosf.fd index 8fd5182bfc9..58315ea96d8 100644 --- a/Master/texmf-dist/tex/latex/newtx/ts1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ts1ntxosf.fd @@ -1,7 +1,7 @@ \ProvidesFile{ts1ntxosf.fd}[2015/01/18 v1.0 fd file for TS1/ntxosf] \expandafter\ifx\csname ntx@scaled\endcsname\relax - \let\ntx@scaled\@empty% + \global\let\ntx@scaled\@empty% \fi \DeclareFontFamily{TS1}{ntxosf}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ts1ntxsups.fd b/Master/texmf-dist/tex/latex/newtx/ts1ntxsups.fd new file mode 100644 index 00000000000..f51ce2d66af --- /dev/null +++ b/Master/texmf-dist/tex/latex/newtx/ts1ntxsups.fd @@ -0,0 +1,62 @@ +\ProvidesFile{ts1ntxsups.fd}[2023/08/19 v1.0] +\expandafter\ifx\csname ntx@scaled\endcsname\relax + \global\let\ntx@scaled\@empty% +\fi + +\DeclareFontFamily{TS1}{ntxsups}{} +\DeclareFontShape{TS1}{ntxsups}{m}{n}{ %medium + <-> \ntx@scaled ntxsups-Regular-ts1% +}{} +\DeclareFontShape{TS1}{ntxsups}{m}{it}{ %italic + <-> \ntx@scaled ntxsups-Italic-ts1% +}{} +\DeclareFontShape{TS1}{ntxsups}{b}{n}{ %bold + <-> \ntx@scaled ntxsups-Bold-ts1% +}{} +\DeclareFontShape{TS1}{ntxsups}{b}{it}{ %bold italic + <-> \ntx@scaled ntxsups-BoldItalic-ts1% +}{} +\DeclareFontShape{TS1}{ntxsups}{m}{sl}{ %medium + <-> \ntx@scaled ntxsups-Italic-ts1% +}{} +\DeclareFontShape{TS1}{ntxsups}{b}{sl}{ %medium + <-> \ntx@scaled ntxsups-BoldItalic-ts1% +}{} + +\DeclareFontShape{TS1}{ntxsups}{m}{sc}{ %cap & small cap + <-> ssub * ntxsups/m/n% +}{} +\DeclareFontShape{TS1}{ntxsups}{m}{scit}{ %italic + <-> ssub * ntxsups/m/it% +}{} +\DeclareFontShape{TS1}{ntxsups}{m}{ui}{ %unslanted italic + <-> ssub * ntxsups/m/n% +}{} +\DeclareFontShape{TS1}{ntxsups}{bx}{sc}{ %bold extended cap & small cap + <-> ssub * ntxsups/b/n% +}{} +\DeclareFontShape{TS1}{ntxsups}{bx}{sl}{ %bold extended slanted + <-> ssub * ntxsups/b/sl% +}{} +\DeclareFontShape{TS1}{ntxsups}{bx}{it}{ %bold extended italic + <-> ssub * ntxsups/b/it% +}{} +\DeclareFontShape{TS1}{ntxsups}{bx}{scit}{ %bold extended italic + <-> ssub * ntxsups/b/it% +}{} +\DeclareFontShape{TS1}{ntxsups}{bx}{ui}{ %bold extended unslanted italic + <-> ssub * ntxsups/b/n% +}{} +\DeclareFontShape{TS1}{ntxsups}{bx}{n}{ %bold extended + <-> ssub * ntxsups/b/n% +}{} +\DeclareFontShape{TS1}{ntxsups}{b}{sc}{ %bold cap & small cap + <-> ssub * ntxsups/b/n% +}{} +\DeclareFontShape{TS1}{ntxsups}{b}{ui}{ %bold unslanted italic + <-> ssub * ntxsups/b/n% +}{} +\DeclareFontShape{TS1}{ntxsups}{b}{scit}{ %bold italic + <-> ssub * ntxsups/b/it% +}{} +\endinput diff --git a/Master/texmf-dist/tex/latex/newtx/untxsym.fd b/Master/texmf-dist/tex/latex/newtx/untxsym.fd index 967984b0cd0..a648b90339c 100644 --- a/Master/texmf-dist/tex/latex/newtx/untxsym.fd +++ b/Master/texmf-dist/tex/latex/newtx/untxsym.fd @@ -5,10 +5,10 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{untxsym.fd} - [2015/03/20 Fontinst v1.933 font definitions for U/ntxsym.] + [2023/08/16 Fontinst v1.933 font definitions for U/ntxsym.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax - \let\ntxmath@scaled\@empty% + \global\let\ntxmath@scaled\@empty% \fi \DeclareFontFamily{U}{ntxsym}{} |