texlive[71571] Master/texmf-dist: newtx (20jun24)
commits+karl at tug.org
commits+karl at tug.org
Thu Jun 20 22:12:11 CEST 2024
Revision: 71571
https://tug.org/svn/texlive?view=revision&revision=71571
Author: karl
Date: 2024-06-20 22:12:10 +0200 (Thu, 20 Jun 2024)
Log Message:
-----------
newtx (20jun24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/fonts/newtx/README
trunk/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf
trunk/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex
trunk/Master/texmf-dist/tex/latex/newtx/newtx.sty
trunk/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
trunk/Master/texmf-dist/tex/latex/newtx/untxmia.fd
Modified: trunk/Master/texmf-dist/doc/fonts/newtx/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/newtx/README 2024-06-20 20:11:35 UTC (rev 71570)
+++ trunk/Master/texmf-dist/doc/fonts/newtx/README 2024-06-20 20:12:10 UTC (rev 71571)
@@ -1,12 +1,18 @@
This package, initially based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen.
-Current version: 1.744 2024-04-01
+Current version: 1.75 2024-06-20
This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in version 1.75
+Added code to newtx.sty and newtxmath.sty to support gelasio small caps, additional
+figure in pdflatex and math. (Best to use gelasiomath.sty as the interface as it adds
+supporting code and calls newtx and thereby newtxmath in the proper order
+and with matching scales.)
+
Changes in version 1.744
-Added code to newtxtext.sty that had been remove in error from an earlier version, preventing Helvetica sans from scaling properly. (Thanks Dana Nau.)
+Added code to newtxtext.sty that had been removed in error from an earlier version, preventing Helvetica sans from scaling properly. (Thanks Dana Nau.)
Changes in version 1.743
Updated the zut[b]mi[a].{tfm,vf} needed for the erewhon option to newtxmath.
Modified: trunk/Master/texmf-dist/doc/fonts/newtx/newtxdoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex 2024-06-20 20:11:35 UTC (rev 71570)
+++ trunk/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex 2024-06-20 20:12:10 UTC (rev 71571)
@@ -275,7 +275,7 @@
You may set the scale for both text and math by setting {\tt scale} or, equivalently, {\tt scaled}. Alternatively, you may scale text and math separately by means of the options {\tt textscale[d]}, {\tt mathscale[d]}.
\item Option {\tt otfmath} is acted upon only under a unicode engine, and specifies unicode math rather than the default---type1 math using {\tt newtxmath}. The effect is the exact opposite to {\tt no-math}, which would specify math not controlled by {\tt fontspec}.
\item Option {\tt subscriptcorrectionfile} allows you to set your own file specifying subscript corrections.
-\item You may specify as an option to {\tt newtx} the name of any supported text package and any options other than scale[d] that are understood by that package. The default text package is {\tt newtxtext}, which need not be specified explicitly. Other valid options as of early May, 2022, are:
+\item You may specify as an option to {\tt newtx} the name of any supported text package and any options other than scale[d] that are understood by that package. The default text package is {\tt newtxtext}, which need not be specified explicitly. Other valid options as of early June, 2024, are:
\begin{verbatim}
libertine
libertinus
@@ -285,6 +285,7 @@
minion --> MinionPro
cochineal
garamondx
+gelasio
baskervillef
baskerville --> baskervillef
Baskerville --> baskervillef
@@ -935,6 +936,7 @@
\item (new in version 1.55) {\tt stix2} loads different versions of math italic and bold math italic based on \textsf{StixTwoMath} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the documentation to the {\tt SticksToo} package, which contains more details and some math samples.
\item (new in version 1.60) {\tt ebgaramond} loads different versions of math italic and bold math italic based on \textsf{EBGaramond} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the end of Appendix 2 for an example of a preamble. You may in addition specify option {\tt alth} which changes the shape of math h from {\ebgmi h} to {\ebgmi\char250}. (The renderings of \verb|\hslash| and \verb|\hbar| are also changed.)
\item (new as of version 1.629) {\tt noto, notosans} load different versions of math italic and bold math italic based on \textsf{NotoSerif}, \textsf{NotoSans} rather than \textsf{Times}. There are some intricacies involved, for which there is a separate package, {\tt notomath}, that tries to offer as simple an interface as it was possible for me to devise.
+\item (new in version 1.75) {\tt gelasio} loads math italic and math bold italic based on the {\tt gelasio} text fooonts, with Greek math letters taken from an enlarged version of those letters from {\tt XCharter}. It is best to use the separate package {\tt gelasiomath}, which adds several features specific to {\tt gelasio}.
\item (new in version 1.62) {\tt nc, ncf} load different versions of math italic and bold math italic based on \textsf{ScholaX} (\textsf{New Century Schoolbook}) rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. The difference is that option {\tt nc} loads math Greek letters from {\tt newtxmath}, while option {\tt ncf} loads math greek from an adaptation of {\tt fourier} Greek.
\item {\tt minion} loads different versions of math italic and bold math italic based on \textsf{MinionPro} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default---see the extended discussion below;
\item {\tt garamondx} loads different versions of math italic and bold math italic based on \textsf{garamondx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default.
Modified: trunk/Master/texmf-dist/tex/latex/newtx/newtx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/newtx.sty 2024-06-20 20:11:35 UTC (rev 71570)
+++ trunk/Master/texmf-dist/tex/latex/newtx/newtx.sty 2024-06-20 20:12:10 UTC (rev 71571)
@@ -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.739}
-\def\filedate{2024/02/24}
+\def\fileversion{1.75}
+\def\filedate{2024/06/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]
@@ -95,8 +95,10 @@
%\newif\ifntx at nofontspec
% must load fontspec if unicode engine
\newif\ifntx at otfmath %\ntx at otfmathfalse % default is type1 math
+%\newdimen\ntx at dima
+%\def\tx at divide#1#2{\ntx at dima=\dimexpr 1pt * (\dimexpr #1pt\relax) / \dimexpr #2pt\relax\relax}
+%\tx at divide{300}{400}\showthe\ntx at dima
-\def\tx at divide#1#2{\strip at pt\dimexpr 1pt * (\dimexpr #1pt\relax) / \dimexpr #2pt\relax\relax}
\newcommand*{\ntxtext at RM}{1}
\newcommand*{\ntxtext at SF}{1}
\newcommand*{\ntxtext at TT}{.88}
@@ -105,10 +107,11 @@
\newcommand*{\ntxtext at rm}{} % not understood by libertinus-otf
\newcommand*{\ntxtext at sf}{}% not understood by libertinus-otf
-\newcommand*{\ntxtext at scale}{1}
+\newcommand*{\ntxtext at scale}{0}
\newcommand*{\ntxmath at scale}{1}
-\DeclareOptionX{scaled}[1]{\renewcommand*{\ntxtext at scale}{#1}\renewcommand*{\ntxmath at scale}{#1}}
-\DeclareOptionX{scale}[1]{\renewcommand*{\ntxtext at scale}{#1}\renewcommand*{\ntxmath at scale}{#1}}
+%\traceon
+\DeclareOptionX{scaled}[1]{\renewcommand*{\ntxmath at scale}{#1}}
+\DeclareOptionX{scale}[1]{\renewcommand*{\ntxmath at scale}{#1}}
\DeclareOptionX{textscale}[1]{\renewcommand*{\ntxtext at scale}{#1}}
\DeclareOptionX{textscaled}[1]{\renewcommand*{\ntxtext at scale}{#1}}
\DeclareOptionX{mathscale}[1]{\renewcommand*{\ntxmath at scale}{#1}}
@@ -258,6 +261,12 @@
\def\ntx at sc{TeXGyreScholaX at scale}%
\def\ntx at TF{scholax}\def\ntx at MF{nc}
\def\ntx at id{14}\def\ntx at minfam{minscholax}\fi}
+\DeclareOptionX{Gelasio}[true]{\@nameuse{if#1}
+ \def\ntx at sc{Gelasio at scale}\def\ntx at TF{gelasio}\def\ntx at MF{gelasio}
+ \def\ntx at id{16}\def\ntx at minfam{mingelasio}\fi}
+\DeclareOptionX{gelasio}[true]{\@nameuse{if#1}
+ \def\ntx at sc{Gelasio at scale}\def\ntx at TF{gelasio}\def\ntx at MF{gelasio}
+ \def\ntx at id{16}\def\ntx at minfam{mingelasio}\fi}
% for stacked fractions
\DeclareOptionX{sfracvcenter}{%
\def\tx at sfrVC{#1}}
@@ -354,10 +363,14 @@
%
\newcommand{\PassMatchingScale}[1]{%
\ifntx at iszero%
- \@tempdima #1\p@ \@tempdima\ntxmath at scale\@tempdima \xdef\ntxtext at scale{\strip at pt\@tempdima}
- \gdef\ntxtext at scaled{s*[\ntxtext at scale]}
+ \@tempdima #1\p@ \@tempdima\ntxmath at scale\@tempdima \xdef\ntxtext at scale{\strip at pt\@tempdima}
\fi
- \PassOptionsToPackage{scaled=\ntxtext at scale}{\ntx at TF}%
+ \xdef\ntxtext at scaled{s*[\ntxtext at scale]}
+ \ifnum\ntx at id=16 % gelasio
+ \PassOptionsToPackage{scale=\ntxtext at scale}{\ntx at TF}%
+ \else
+ \PassOptionsToPackage{scaled=\ntxtext at scale}{\ntx at TF}%
+ \fi
}
%\fi
@@ -480,7 +493,7 @@
\@ifundefined{tx at sfrTH}{\def\tx at sfrTH{58}}{} % bar thickness
\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.8}}{} % scale defigures by this
\or % 12, XCharter
-\PassMatchingScale{.98}
+\PassMatchingScale{.935}
\@ifundefined{tx at xht}{\def\tx at xht{481}}{} % lowercase letters
\@ifundefined{tx at deht}{\def\tx at deht{382}}{} % denominator figures ht
\@ifundefined{tx at nubase}{\def\tx at nubase{295}}{} % baseline of numerators
@@ -519,6 +532,16 @@
\@ifundefined{tx at sfrVS}{\def\tx at sfrVS{106}}{} % space above/below bar
\@ifundefined{tx at sfrTH}{\def\tx at sfrTH{70}}{} % bar thickness
\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.8}}{} % scale defigures by this
+\or % 16, gelasio
+\PassMatchingScale{.92}
+\@ifundefined{tx at xht}{\def\tx at xht{485}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{473}}{} % denominator figures
+\@ifundefined{tx at nubase}{\def\tx at nubase{246}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{0}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{360}}{}% vertical center of sfrac
+\@ifundefined{tx at sfrVS}{\def\tx at sfrVS{106}}{} % space above/below bar
+\@ifundefined{tx at sfrTH}{\def\tx at sfrTH{70}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.75}}{} % scale defigures by this
\fi
\PassOptionsToPackage{\ntx at MF}{newtxmath}
@@ -526,39 +549,39 @@
%\ifblank{\ntx at textopt}{}%
%{\PassOptionsToPackage{\ntx at textopt}{\ntx at TF}}
-\newdimen\tx at sixem\tx at sixem6pt % for checking if a number refers to ex
-\newdimen\tx at y \newdimen\tx at x
+%\newdimen\tx at sixem\tx at sixem6pt % for checking if a number refers to ex
+\newdimen\tx at x \newdimen\tx at y
-% convert numerical entry that may be multiple of ex (<6) or em value
-\def\tx at toex#1{\tx at x#1pt \ifdim\tx at x<\z@\tx at y-\tx at x\else\tx at y\tx at x\fi \ifdim\tx at y>\tx at sixem \tx at x\dimexpr 1pt * (\dimexpr #1pt\relax) / \dimexpr \tx at xht pt\relax\relax\fi}
+% convert numerical entry that may be multiple of ex or em value
+%\def\tx at toex#1{\tx at x#1pt \ifdim\tx at x<\z@\tx at y=-\tx at x\else\tx at y=\tx at x\fi \ifdim\tx at y>\tx at sixem \tx at x=\dimexpr 1pt * (\dimexpr #1pt\relax) / \dimexpr \tx at xht pt\relax\relax\fi}
+%\def\tx at chkex#1{\@tx at chkex#1ex\@nil}
+%\def\@tx at chkex#1ex#2\@nil{\ifthenelse{\equal{#2}{}}{\tx at toex #1}{\tx at x=#1ex}} # defines dimen \tx at x
+\def\tx at toex#1{\tx at x=\dimexpr 1pt * (\dimexpr #1pt\relax) / \dimexpr \tx at xht pt\relax\relax}
+%\def\tx at divide#1#2{\ntx at dima=\dimexpr 1pt * (\dimexpr #1 pt\relax) / \dimexpr #2pt\relax\relax}
-\newdimen\tx at tmpdima \newdimen\tx at tmpdimb \newdimen\tx at tmpdimc
-\newdimen\tx at tmpdimd \newdimen\tx at tmpdime \newdimen\tx at tmpdimf
-\newdimen\tx at dimA
-\newdimen\tx at dimAA \newdimen\tx at dimB \newdimen\tx at dimBB
-\newdimen\tx at dimC % vertical center
-% double cap letters for below bar, single cap for above
-\tx at toex\tx at sfrVC\tx at dimC\tx at x %Vertical center of fraction
-\tx at toex\tx at sfrTH\tx at tmpdimb\tx at x % bar thickness
-\tx at tmpdime.5\tx at tmpdimb % half bar thickness
-\tx at toex\tx at sfrVS\tx at tmpdimc\tx at x% vertical space
-\tx at toex\tx at deht\tx at tmpdimd\tx at x % height of unscaled figures
-\tx at tmpdimd\tx at sfrSC\tx at tmpdimd % height of scaled figures
-\tx at toex\tx at debase\tx at tmpdimf\tx at x % unscaled baseline of de figures
-\tx at toex\tx at nubase\tx at tmpdima\tx at x % unscaled baseline of nu figures
-\tx at tmpdima\tx at sfrSC\tx at tmpdima % scaled nu baseline
-\tx at tmpdimf\tx at sfrSC\tx at tmpdimf % scaled de baseline
-\tx at dimA\tx at dimC
-\advance\tx at dimA by \tx at tmpdime % top of bar
-\tx at dimAA\tx at dimC
-\advance\tx at dimAA by -\tx at tmpdime % bottom of bar
-\tx at dimB\tx at dimA
-\advance\tx at dimB by \tx at tmpdimc % top figure baseline
-\advance\tx at dimB by -\tx at tmpdima
-\tx at dimBB\tx at dimAA
-\advance\tx at dimBB by -\tx at tmpdimc %
-\advance\tx at dimBB by -\tx at tmpdimd % bottom figure baseline
-\advance\tx at dimBB by -\tx at tmpdimf
+\newdimen\tx at tmpdima \newdimen\tx at tmpdimb \newdimen\tx at tmpdimC
+\newdimen\tx at dimX \newdimen\tx at dimY \newdimen\tx at dimZ
+\newdimen\tx at numrbase \newdimen\tx at dnombase
+\newdimen\tx at bartop \newdimen\tx at barbot
+\newdimen\tx at bartopex \newdimen\tx at barbotex
+\setlength\tx at tmpdimb{\tx at sfrTH pt} % bar thickness
+\setlength\tx at tmpdima{\tx at deht pt} % de figure ht
+\setlength\tx at tmpdimC{\tx at sfrVC pt} % bar center height
+\tx at bartop=\tx at tmpdimC
+\advance\tx at bartop by .5\tx at tmpdimb % top of bar
+\tx at toex{\strip at pt\tx at bartop}\tx at bartopex=\tx at x % same, in ex units
+\tx at barbot=\tx at bartop
+\advance\tx at barbot by -\tx at tmpdimb % bottom of bar
+\tx at toex{\strip at pt\tx at barbot}\tx at barbotex=\tx at x % same, in ex units
+\tx at dimX=\tx at bartop
+\advance\tx at dimX by \tx at sfrVS pt % bottom of numr
+\tx at dimY=\tx at barbot
+\advance\tx at dimY by -\tx at sfrVS pt % top of dnom
+\advance\tx at dimY by -\tx at sfrSC\tx at tmpdima % baseline of dnom
+
+\tx at toex{\strip at pt\tx at dimX}\tx at numrbase=\tx at x % num baseline in ex units
+\tx at toex{\strip at pt\tx at dimY}\tx at dnombase=\tx at x % dnom baseline in ex units
+
\newcommand*{\textsfrac}[3][]{% like \textsfrac[1]{23}{34}
\mbox{%
\ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
@@ -565,11 +588,16 @@
{\textlf{#1}\kern.04em}{}%
{\hmode at bgroup%
\ooalign{%
- \setbox0=\hbox{\scalefont{\tx at sfrSC}\nustyle#2}%
- \hfil \raise\strip at pt\tx at dimB ex\box0\hfil \crcr%
- \leaders\hrule height \strip at pt\tx at dimA ex depth -\strip at pt\tx at dimAA ex\hfill \crcr%
- \setbox1=\hbox{\scalefont{\tx at sfrSC}\destyle#3}%
- \hfil\raise\strip at pt\tx at dimBB ex\box1\hfil}%
+% \ifnum\ntx at id=16\relax
+ \setbox0=\hbox{\textsmde{#2}}% scaled down denom, baseline 0
+ \tx at dimZ=\strip at pt\tx at numrbase ex%
+ \hfil \raise \tx at dimZ \box0\hfil \crcr%
+ \tx at dimX=\strip at pt\tx at bartopex ex%
+ \tx at dimY=-\strip at pt\tx at barbotex ex%
+ \leaders\hrule height \tx at dimX depth \tx at dimY \hfill \crcr%
+ \setbox1=\hbox{\textsmde{#3}}%
+ \tx at dimZ=\strip at pt\tx at dnombase ex
+ \hfil\raise \tx at dimZ \box1\hfil}%
\egroup}}
}
@@ -611,7 +639,7 @@
\mbox{%
\ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
{\textlf{#1}\kern.02em}{}%
-{\ifntx at otftext\addfontfeature{RawFeature=+frac}#2/#3}
+\ifntx at otftext\addfontfeature{RawFeature=+frac}#2/#3
\else\textnu{#2}{\normalfont\fontencoding{TS1}\selectfont\char"2F}%
\textde{#3}\fi}
}}}
@@ -699,6 +727,60 @@
\or % 13, stickstoo
\or % 14, scholax
\or % 15, scholax/fourier
+\or % 16, gelasio
\fi
-
+% galasio.sty does not offer macros for numerators, denominators or inferiors
+%\ifgelasio at otf
+% \providecommand\nufigures{%
+% \addfontfeatures{VerticalPosition=Numerator}}
+% \providecommand\defigures{%
+% \addfontfeatures{VerticalPosition=Denominator}}
+% \providecommand\infigures{%
+% \addfontfeatures{VerticalPosition=Inferior}}
+%
+% \DeclareTextFontCommand{\textnum}{\nufigures}
+% \DeclareTextFontCommand{\textde}{\defigures}
+% \DeclareTextFontCommand{\textinf}{\infigures}
+% \@ifundefined{tx at sfrSC}{}{%
+% \newcommand*{\textsmde}[1]{%
+% \setbox0=\hbox{\scalebox\tx at sfrSC{\textde{#1}}}\box0}}
+%
+%\else % type1 --we define \text.. by lowering \textsu
+% \newbox\tx at box
+% \newcommand*{\textde}[1]{{\setbox0=\hbox{\textsu{#1}}\setbox1=\hbox{\raise -.763ex \box0}\dp1=0pt\ht1=.977ex\box1\relax}}
+%
+% \providecommand*\textnum[1]{\raisebox{.507ex}{\textde{#1}}}
+% \let\textnu\textnum
+%% \providecommand*\textde[1]{{\setbox0=\hbox{\textsu{#1}}%
+%% \setbox1=\hbox{\lower.763ex\box0}\dp0=0pt\relax\box1\relax}}
+% %\raisebox{-.763ex}{\textsu{#1}}}
+% % the following will be used only by \textsfrac
+% \@ifundefined{tx at sfrSC}{}{%
+% \newcommand*{\textsmde}[1]{%
+% \setbox0=\hbox{\scalebox\tx at sfrSC{\textde{#1}}}\box0}%
+% }
+%\fi
+%\DeclareTextFontCommand{\textlf}{\liningnums}
+%\fi % end ifcase
+\ifnum\ntx at id=16\relax
+\else % create \textsmsmde for other than minion and gelasio
+% We move the small font to the text baseline and scale it by \tx at sfrSC, for use only in the \textsfrac macro.
+\ifnum\ntx at id=4\relax
+\else
+ \ifnum\tx at debase=0
+ \newcommand*{\textsmde}[1]{%
+ \setbox0=\hbox{\scalebox\tx at sfrSC{\textde{#1}}}\box0}
+ \else
+ \newdimen\tx at u \newdimen\tx at v
+ \tx at u=-\tx at debase pt
+ \tx at toex{\strip at pt\tx at u}\tx at y=\tx at x
+ %\showthe\tx at y
+ \tx at v=\strip at pt\tx at y ex
+ \newcommand*{\textsmde}[1]{%
+ \setbox2=\hbox{\textde{#1}}%
+ \setbox1=\hbox{\raise \tx at v \box2}%
+ \setbox0=\hbox{\scalebox{\tx at sfrSC}{\box1}}\box0}
+ \fi %\ifnum\tx at debase=0
+\fi %\ifnum\ntx at id=4
+\fi %\ifnum\ntx at id=16
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/newtxmath.sty 2024-06-20 20:11:35 UTC (rev 71570)
+++ trunk/Master/texmf-dist/tex/latex/newtx/newtxmath.sty 2024-06-20 20:12:10 UTC (rev 71571)
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}[1997/06/01]
-%
+%
%:ams
% Based on Young Ryu's txfonts.sty, v.3.2.1
% Text and math are now loaded in separate sty files---the text
@@ -11,8 +11,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.742}
-\def\filedate{2024/03/06}
+\def\fileversion{1.75}
+\def\filedate{2024/06/18}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -43,9 +43,13 @@
\newcount\tx at cntz
\input{binhex}
-\let\ntxmath at scaled\@empty\def\tx at scale{1}
+\let\ntxmath at scaled\@empty
+\@ifundefined{ntxmathscale}{\def\ntxmathscale{1}}{}
+\def\tx at scale{\ntxmathscale}
+\def\ntxmath at scaled{s*[\tx at scale]}
\define at key{ntxmath}{scaled}[1.0]{\def\tx at scale{#1}\def\ntxmath at scaled{s*[#1]}}
\define at key{ntxmath}{scale}[1.0]{\def\tx at scale{#1}\def\ntxmath at scaled{s*[#1]}}
+
\def\ntxmath at vecsep{.25ex}
\define at key{ntxmath}{vecsep}[.25ex]{\def\ntxmath at vecsep{#1}}
%:
@@ -72,6 +76,7 @@
\newif\iftx at largelibfigs \newif\iftx at frenchm % french math
\newif\iftx at minion \newif\iftx at libaltvw \newif\iftx at bv \newif\iftx at ut
\newif\iftx at ba % new BaskervilleF fonts
+\newif\iftx at gel % GelasioMath
\newif\iftx at ch \newif\iftx at coch \newif\iftx at nc % NewCenturySchoolbook
\newif\iftx at ot % use OT1 for operators
\newif\iftx at ntxmath \tx at ntxmathtrue % default is Times operators and math italic
@@ -88,7 +93,7 @@
\newif\iftx at nootone % do not switch to OT1 for operators
\newif\iftx at digits % use digits from letters
\newif\iftx at isenh % the math style is enhanced and can make use of new macros
-% Currently (2019-12-11) only txmath, libertine, XCharter, ebgaramond, stickstoo, utopia, nc, minion and cochineal have been enhanced.
+% Currently (2019-12-11) only txmath, libertine, XCharter, aramond, stickstoo, utopia, nc, minion and cochineal have been enhanced.
\newif\iftx at ebgalth
\newif\iftx at cochf % switch to long f
\newif\iftx at cochrho % switch to long rho
@@ -229,6 +234,7 @@
\DeclareOption{Heuristica}{\tx at uttrue\tx at ntxmathfalse}
\DeclareOption{Erewhon}{\tx at uttrue\tx at ntxmathfalse}
\DeclareOption{erewhon}{\tx at uttrue\tx at ntxmathfalse}
+\DeclareOption{gelasio}{\tx at geltrue\tx at ntxmathfalse}
\DeclareOption{charter}{\tx at chtrue\tx at ntxmathfalse}
\DeclareOption{xcharter}{\tx at chtrue\tx at ntxmathfalse}
\DeclareOption{cmintegrals}{\tx at cminttrue}
@@ -303,7 +309,6 @@
% \let\NotoSans at scale\NotoSerif at scale
% \let\NotoSansMono at scale\NotoSerif at scale
%\fi
-
% Check whether math face is enhanced
\iftx at ntxmath\tx at isenhtrue\else
\iftx at lbtn\tx at isenhtrue\else
@@ -316,6 +321,8 @@
\iftx at minion\tx at isenhtrue\else
\iftx at noto\tx at isenhtrue\else
\iftx at notosans\tx at isenhtrue\else
+ \iftx at gel\tx at isenhtrue\else
+ \fi
\fi
\fi
\fi
@@ -327,6 +334,7 @@
\fi
\fi
\fi
+
\AtEndPreamble{%
%\traceon
\iftx at sbc
@@ -358,6 +366,7 @@
\iftx at bv\let\X at s@v at rg\@undefined\fi
\iftx at ba\let\X at s@v at rg\@undefined\fi
\iftx at stxtwo\let\X at s@v at rg\@undefined\fi
+\iftx at gel\let\X at s@v at rg\@undefined\fi
% altnu, liby and largelibfigs valid only with libertin[e,us]
\iftx at lbtn\else\tx at altnufalse\tx at largelibfigsfalse\tx at libyfalse\fi
% Use existing text fonts for operators, mathrm, etc
@@ -431,108 +440,116 @@
%%%%%%%%%%%%%%%
\iftx at lbtn
- \iftx at subsfile\else\def\tx at subs{newtx-libertine-subs.tex}\fi
- \DeclareSymbolFont{letters}{OML}{nxlmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{nxlmi}{b}{it}
- \DeclareFontSubstitution{OML}{nxlmi}{m}{it}
+ \iftx at subsfile\else\def\tx at 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 at minion
- \iftx at subsfile\else\def\tx at subs{newtx-minion-subs.tex}\fi
- \DeclareSymbolFont{letters}{OML}{zmnmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{zmnmi}{b}{it}
- \DeclareFontSubstitution{OML}{zmnmi}{m}{it}
+ \iftx at minion
+ \iftx at subsfile\else\def\tx at 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 at gm
+ \iftx at subsfile\else\def\tx at 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 at gm
- \iftx at subsfile\else\def\tx at subs{newtx-garamond-subs.tex}\fi
- \DeclareSymbolFont{letters}{OML}{zgmmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{zgmmi}{b}{it}
- \DeclareFontSubstitution{OML}{zgmmi}{m}{it}
+ \iftx at bv
+ \iftx at subsfile\else\def\tx at 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 at ut
+ \iftx at subsfile\else\def\tx at 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 at bv
- \iftx at subsfile\else\def\tx at subs{newtx-baskervald-subs.tex}\fi
- \DeclareSymbolFont{letters}{OML}{zbvmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{zbvmi}{b}{it}
- \DeclareFontSubstitution{OML}{zbvmi}{m}{it}
+ \iftx at ch
+ \iftx at subsfile\else\def\tx at 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 at coch
+ \iftx at subsfile\else\def\tx at 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 at ut
- \iftx at subsfile\else\def\tx at subs{newtx-utopia-subs.tex}\fi
- \DeclareSymbolFont{letters}{OML}{zutmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{zutmi}{b}{it}
- \DeclareFontSubstitution{OML}{zutmi}{m}{it}
+ \iftx at ba
+ \iftx at subsfile\else\def\tx at 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 at stxtwo
+ \iftx at subsfile\else\def\tx at 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 at ch
- \iftx at subsfile\else\def\tx at 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 at coch
- \iftx at subsfile\else\def\tx at subs{newtx-cochineal-subs.tex}\fi
- \DeclareSymbolFont{letters}{OML}{zcochmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{zcochmi}{b}{it}
- \DeclareFontSubstitution{OML}{zcochmi}{m}{it}
+ \iftx at ebgm
+ \iftx at subsfile\else\def\tx at 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 at nc
+ \iftx at fourier
+ \iftx at subsfile\else\def\tx at 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
+ \iftx at subsfile\else\def\tx at 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 at noto
+ \iftx at subsfile\else\def\tx at 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 at notosans
+ \iftx at subsfile\else\def\tx at 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
- \iftx at ba
- \iftx at subsfile\else\def\tx at 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 at stxtwo
- \iftx at subsfile\else\def\tx at 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 at ebgm
- \iftx at subsfile\else\def\tx at 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 at nc
- \iftx at fourier
- \iftx at subsfile\else\def\tx at 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
- \iftx at subsfile\else\def\tx at 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 at noto
- \iftx at subsfile\else\def\tx at 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 at notosans
- \iftx at subsfile\else\def\tx at 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
- %\iftx at subsfile\else\def\tx at subs{newtx-subs.tex}\fi
- \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
- \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
+ \iftx at gel
+ \iftx at subsfile\else\def\tx at subs{newtx-gel-subs.tex}\fi
+ \DeclareSymbolFont{letters}{OML}{zgelmi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{zgelmi}{b}{it}
+ \DeclareFontSubstitution{OML}{zgelmi}{m}{it}
+ \else
+ %\iftx at subsfile\else\def\tx at subs{newtx-subs.tex}\fi
+ \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
+ \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+ \fi
\fi
- \fi
- \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
\fi
- \fi
+ \fi
+ \fi
+ \fi
\fi
+ \fi
\fi
+
\iftx at isenh
\iftx at digits
\DeclareMathSymbol{0}{\mathord}{letters}{132}
@@ -976,14 +993,6 @@
\re at DeclareMathAccent{\dddot}{\mathord}{symbols}{168}
\re at DeclareMathAccent{\ddddot}{\mathord}{symbols}{200}
\iftx at tma
- \re at DeclareMathAccent{\grave}{\mathord}{symbols}{158}
- \re at DeclareMathAccent{\acute}{\mathord}{symbols}{159}
- \re at DeclareMathAccent{\hat}{\mathord}{symbols}{160}
- \re at DeclareMathAccent{\tilde}{\mathord}{symbols}{161}
- \re at DeclareMathAccent{\bar}{\mathord}{symbols}{162}
- \re at DeclareMathAccent{\breve}{\mathord}{symbols}{163}
- \re at DeclareMathAccent{\mathring}{\mathord}{symbols}{166}
- \re at DeclareMathAccent{\check}{\mathord}{symbols}{167}
\else
\iftx at ot %no change needed if using OT1 for operators
\else
Modified: trunk/Master/texmf-dist/tex/latex/newtx/untxmia.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/untxmia.fd 2024-06-20 20:11:35 UTC (rev 71570)
+++ trunk/Master/texmf-dist/tex/latex/newtx/untxmia.fd 2024-06-20 20:12:10 UTC (rev 71571)
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{untxmia.fd}
- [2018/04/14 Fontinst v1.933 font definitions for U/ntxmia.]
+ [2024/04/09 Fontinst v1.933 font definitions for U/ntxmia.]
\expandafter\ifx\csname ntxmath at scaled\endcsname\relax
\let\ntxmath at scaled\@empty%
@@ -105,12 +105,22 @@
<-> \ntxmath at scaled notosansbmia
}{}
\else
- \DeclareFontShape{U}{ntxmia}{m}{it}{
+ \iftx at gel
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath at scaled zgelmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath at scaled zgelbmia
+ }{}
+ \else
+
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
<-> \ntxmath at scaled ntxmia
}{}
- \DeclareFontShape{U}{ntxmia}{b}{it}{
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
<-> \ntxmath at scaled ntxbmia
}{}
+ \fi
\fi
\fi
\fi
More information about the tex-live-commits
mailing list.