summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-07-31 20:10:29 +0000
committerKarl Berry <karl@freefriends.org>2023-07-31 20:10:29 +0000
commit7b61686573a1fb9e8b3f8fadb80f0f0535bb860c (patch)
treef2e4dc4201f83d1a1df88bd3fce2d0e647ae2d4b /Master/texmf-dist/tex/latex/newtx
parenta9e18b3417648f0f4766cd86239caa51602d8d78 (diff)
newtx (31jul23)
git-svn-id: svn://tug.org/texlive/trunk@67778 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtx.sty14
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty26
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxtext.sty7
3 files changed, 26 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtx.sty b/Master/texmf-dist/tex/latex/newtx/newtx.sty
index 9cbc2469206..21a0d4565f2 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.72}
-\def\filedate{2023/07/20}
+\def\fileversion{1.723}
+\def\filedate{2023/07/30}
\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]
@@ -155,7 +155,6 @@
\@nameuse{if#1}\def\ntx@sc{LinuxLibertineT@scale}%
\def\ntx@TF{libertine}\def\ntx@MF{libertine}
\def\ntx@id{1}\def\ntx@minfam{MinLibertinus}\def\textlf##1{{\liningnums##1}}
-\def\infigures{}\def\textinf{}
\def\nustyle{\sufigures}\def\destyle{}\fi}
\DeclareOptionX{libertinus}[true]{%
\@nameuse{if#1}\def\ntx@sc{LibertinusSerif@scale}%
@@ -380,8 +379,7 @@
\@ifundefined{tx@sfrVS}{\def\tx@sfrVS{90}}{} % space above/below bar
\@ifundefined{tx@sfrTH}{\def\tx@sfrTH{46}}{} % bar thickness
\@ifundefined{tx@sfrSC}{\def\tx@sfrSC{.9}}{} % scale defigures by this
-\def\destyle{\infigures} \def\nustyle{\sufigures}
-\def\textlf#1{{\liningnums#1}}
+
%\iflibertine@otf%
%\providecommand{\textfrac}[3][]{{%
%{{%
@@ -628,9 +626,9 @@
\let\sustyle\sufigures
\let\nustyle\sufigures
\DeclareTextFontCommand{\textsup}{\sufigures}\def\destyle{\addfontfeature{RawFeature=+subs}}
- \def\infstyle\destyle
- \let\infigures\infstyle
- \DeclareTextFontCommand{\textinf}{\infigures}
+ \let\infstyle\destyle
+ \let\infigures\destyle
+ \DeclareTextFontCommand{\textinf}{\destyle}
\newcommand{\textfrac}[3][]{%
\mbox{%
\ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 46a604cba57..aca652f5725 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.722}
-\def\filedate{2023/07/28}
+\def\fileversion{1.723}
+\def\filedate{2023/07/30}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -212,7 +212,7 @@
\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{minion}{\tx@miniontrue\tx@ntxmathfalse}
\DeclareOption{cochineal}{\tx@cochtrue\tx@ntxmathfalse}
\DeclareOption{garamondx}{\tx@gmtrue\tx@ntxmathfalse\tx@otfalse}
\DeclareOption{ebgaramond}{\tx@ebgmtrue\tx@ntxmathfalse\tx@otfalse}
@@ -220,13 +220,13 @@
\DeclareOption{Baskerville}{\tx@batrue\tx@ntxmathfalse}
\DeclareOption{baskervillef}{\tx@batrue\tx@ntxmathfalse}
\DeclareOption{BaskervilleF}{\tx@batrue\tx@ntxmathfalse}
-\DeclareOption{baskervaldx}{\tx@bvtrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{Baskervaldx}{\tx@bvtrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{utopia}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{heuristica}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{Heuristica}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{Erewhon}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
-\DeclareOption{erewhon}{\tx@uttrue\tx@ntxmathfalse\tx@otfalse}
+\DeclareOption{baskervaldx}{\tx@bvtrue\tx@ntxmathfalse}
+\DeclareOption{Baskervaldx}{\tx@bvtrue\tx@ntxmathfalse}
+\DeclareOption{utopia}{\tx@uttrue\tx@ntxmathfalse}
+\DeclareOption{heuristica}{\tx@uttrue\tx@ntxmathfalse}
+\DeclareOption{Heuristica}{\tx@uttrue\tx@ntxmathfalse}
+\DeclareOption{Erewhon}{\tx@uttrue\tx@ntxmathfalse}
+\DeclareOption{erewhon}{\tx@uttrue\tx@ntxmathfalse}
\DeclareOption{charter}{\tx@chtrue\tx@ntxmathfalse}
\DeclareOption{xcharter}{\tx@chtrue\tx@ntxmathfalse}
\DeclareOption{cmintegrals}{\tx@cminttrue}
@@ -3223,4 +3223,10 @@ $\hfil\displaystyle{#1}\hfil$\crcr%
\providecommand*\Eqqcolon{\Eqcolon}
\providecommand*\Coloneq{\Colondash}
\providecommand*\Eqcolon{\Dashcolon}}
+
+% Fix for garamondx with siunitx
+\iftx@gm%
+ \AtEndPreamble{%
+ \@ifpackageloaded{siunitx} {\DeclareSIUnit\ohm{\text{\ensuremath\upOmega}}}{}}
+\fi
\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index b1b3ba6fae8..4d47dcdc25d 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.72}
-\def\filedate{2023/07/20}
+\def\fileversion{1.723}
+\def\filedate{2023/07/30}
\ProvidesPackage{newtxtext}[%
\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyreTermesX]
@@ -566,13 +566,14 @@
%\show\textlf
\DeclareTextFontCommand{\textsu}{\sustyle}
\let\textsuperior\textsu
+ \let\textsup\textsu
\DeclareTextFontCommand{\textnum}{\nustyle}
\let\textnumerator\textnum
\DeclareTextFontCommand{\textde}{\destyle}
\let\textdenominator\textde
\DeclareTextFontCommand{\textinf}{\instyle}
\let\textinferior\textinf
-
+ \let\infigures\instyle
\AtEndPreamble{%
\ifntx@otftext
\ifntx@lining