newtx (19dec23)

git-svn-id: svn://tug.org/texlive/trunk@69168 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 32 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/newtx/newtx.sty b/Master/texmf-dist/tex/latex/newtx/newtx.sty
index c0809399121..753b259ef2d 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.732}
-\def\filedate{2023/11/05}
+\def\fileversion{1.735}
+\def\filedate{2023/12/18}
 \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]
 
@@ -163,7 +163,8 @@
 }
 \DeclareOptionX{etbb}[true]{%
 	\@nameuse{if#1}\def\ntx@TF{ETbb}\def\ntx@MF{libertine}
-	\def\ntx@id{2}\def\ntx@minfam{minlibertine}\fi}
+	\def\ntx@id{2}\def\ntx@minfam{minlibertine}%
+	\def\ntx@sc{ETbb@scale}\fi}
 \DeclareOptionX{ebgaramond}[true]{\@nameuse{if#1}
 	\def\ntx@sc{EBGaramond@scale}\def\ntx@TF{ebgaramond}
 	\let\ntx@MF\ntx@TF\def\ntx@id{3}\def\ntx@minfam{minebgaramond}\fi}
@@ -554,7 +555,8 @@
   \typeout{II}
     \renewcommand*{\rmdefault}{\ntx@minfam} % Roman and Bold text for math
     \usepackage[]{newtxmath} % options will be as passed from newtx
-    \usepackage[no-math]{fontspec}
+    \@ifpackageloaded{fontspec}{}{%
+      \usepackage[no-math]{fontspec}}
     \ifnum\ntx@id=10\relax % libertinus
       \usepackage[nomath]{\ntx@TF}
     \else
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index b624d0c7aaf..0a52052a8d7 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
@@ -177,8 +177,7 @@
 %\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
-
+\newread\tx@s
 \def\readsufile#1{%
   \tx@tA={}
   \tx@tB={}
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index 1b694330c0a..b487cbc6dea 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
@@ -11,8 +11,8 @@
 %\def\ntx@state{0} % 0 for both, 1 for tutex only, 2 for legacy only
 \def\setstate#1{\if 1\ntx@showstate\typeout{State=#1}\fi}
 
-\def\fileversion{1.734}
-\def\filedate{2023/11/14}
+\def\fileversion{1.735}
+\def\filedate{2023/12/18}
 \ProvidesPackage{newtxtext}[%
 \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyreTermesX]
 
@@ -43,11 +43,13 @@
 
 % Engine check
 \newif\ifntx@newtx
+\@ifundefined{ntx@otfmathtrue}{\newif\ifntx@otfmath}{}
+ % default is type1 math
+%
 \@ifundefined{ntx@otftexttrue}{% not run from newtx.sty
-  \newif\ifntx@otftext%
-  \newif\ifntx@otfmath % default is type1 math
-  %iftex's \iftutex returns true for LuaTeX and XeTeX, not [pdf]latex
-  \iftutex\ntx@otftexttrue\fi %  otf text for unicode latex
+   \newif\ifntx@otftext
+   \iftutex\ntx@otftexttrue\fi %  otf text for unicode 
+%iftex's \iftutex returns true for LuaTeX and XeTeX, not [pdf]latex
   %\newif\ifntx@nofontspec 
   % default is to load fontspec iftutex  
   % might have been defined in newtx.sty
@@ -58,7 +60,8 @@
 }
 %%%%%%%%%%%%%%%%%%
 %
-%\newif\ifntx@nomath\ntx@nomathfalse % ?????
+\newif\ifntx@nomath\ntx@nomathfalse % load fontspec with no-math
+
 \newif\ifntx@lining\ntx@liningtrue
 \newif\ifntx@tabular\ntx@tabulartrue % default is tabular lining figures
 %\@ifundefined{ver@newtxmath.sty}{\iftutex\ntx@otfmathtrue\fi}{}
@@ -69,6 +72,12 @@
 
 \DeclareOptionX{nofontspec}[true]{}
 
+\DeclareOptionX{no-math}[true]{%
+\@nameuse{if#1}\ntx@nomathtrue\fi
+}
+\DeclareOptionX{otfmath}[true]{%
+\@nameuse{if#1}\ntx@otfmathtrue\fi
+}
 \def\ntx@defaultfeatures{}
 \DeclareOptionX{defaultfeatures}{\def\ntx@defaultfeatures{#1}}
 
@@ -215,6 +224,8 @@
 %\def\ntx@sfrSC{#1}}
 \ProcessOptionsX\relax
 
+% otfmath beats no-math
+\ifntx@otfmath\ntx@nomathfalse\fi
 \setlength{\ntxsups@raise}{\ntxsups@raised}
 \setlength{\ntxsups@scale}{\ntxsups@scaledval\p@}
 \ntxsups@scale=\ntx@scale\ntxsups@scale %
@@ -240,7 +251,13 @@
 
 \iftutex
 \setstate1
-  \RequirePackage[no-math]{fontspec}
+ \@ifpackageloaded{fontspec}{}{%
+  \ifntx@nomath
+    \RequirePackage[no-math]{fontspec}
+  \else
+    \RequirePackage{fontspec}
+  \fi%
+ } 
   %\ifxetex\XeTeXtracingfonts=1\fi % causing unwanted warnings in Tectonic system
   \ifluatex  % avoid possibly uncorrected "system" fonts
     \directlua{fonts.names.set_location_precedence{