texlive[62369] Master/texmf-dist: newtx (3mar22)
commits+karl at tug.org
commits+karl at tug.org
Thu Mar 3 22:06:04 CET 2022
Revision: 62369
http://tug.org/svn/texlive?view=revision&revision=62369
Author: karl
Date: 2022-03-03 22:06:04 +0100 (Thu, 03 Mar 2022)
Log Message:
-----------
newtx (3mar22)
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/fonts/afm/public/newtx/ntxsups-Regular.afm
trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-Bold.otf
trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-BoldItalic.otf
trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-BoldSlanted.otf
trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-Italic.otf
trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-Regular.otf
trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-Slanted.otf
trunk/Master/texmf-dist/fonts/tfm/public/newtx/ntxsups-Regular-ly1.tfm
trunk/Master/texmf-dist/fonts/tfm/public/newtx/ntxsups-Regular-ot1.tfm
trunk/Master/texmf-dist/fonts/tfm/public/newtx/ntxsups-Regular-t1.tfm
trunk/Master/texmf-dist/fonts/type1/public/newtx/ntxsups-Regular.pfb
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/newtxtext.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/newtx/ly1minebgaramond.fd
trunk/Master/texmf-dist/tex/latex/newtx/ly1minntx.fd
trunk/Master/texmf-dist/tex/latex/newtx/ot1minebgaramond.fd
trunk/Master/texmf-dist/tex/latex/newtx/ot1minntx.fd
trunk/Master/texmf-dist/tex/latex/newtx/t1minebgaramond.fd
trunk/Master/texmf-dist/tex/latex/newtx/t1minntx.fd
Modified: trunk/Master/texmf-dist/doc/fonts/newtx/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/newtx/README 2022-03-03 16:29:55 UTC (rev 62368)
+++ trunk/Master/texmf-dist/doc/fonts/newtx/README 2022-03-03 21:06:04 UTC (rev 62369)
@@ -1,12 +1,20 @@
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.705 2022-01-11
+Current version: 1.71 2022-03-02
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.71
+1. Updated newtx.sty so that most packages for which newtxmath offers math
+support may be set up using options to newtx.
+2. Added code to newtx.sty setting up stacked fractions based on the
+denominator figures.
+3. Changes to newtxtext.sty, removing some redundent definitions and correcting some errors in 1.705.
+4. Changes to a number of options and macros. See the documentation for detailed descriptions.
+
Changes in version 1.705
-1. Corrected definition of \textth, while was not working in unicode latex.
+1. Corrected definition of \textth, which was not working in unicode latex.
2. Added some kerning entries affecting the theoremfonts.
Changes in version 1.704
@@ -14,7 +22,7 @@
2. Brought up to date a number of tfms and map file entries.
3. Corrected code in some fd files so that largesc option now works correctly in all cases.
4. Added option thmslshape to newtx and newtxtext changing theoremfont rendering from italic with upright figures, punctuation and delimiters, to slanted with the same upright features.
-5. Modified upright features to TeXGyreTermesX.otf and ztmrsl.pfb to permit item 4 to work.
+5. Modified upright features to TeXGyreTermesX-Slanted.otf and ztmrsl.pfb to permit item 4 to work.
Changes in version 1.703
Corrected a missing @ in line 40 of newtxmath.sty.
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 2022-03-03 16:29:55 UTC (rev 62368)
+++ trunk/Master/texmf-dist/doc/fonts/newtx/newtxdoc.tex 2022-03-03 21:06:04 UTC (rev 62369)
@@ -24,10 +24,11 @@
%\pdfmapfile{=newtx.map}
\usepackage[T1]{fontenc} % Active encoding for use in math text
-\renewcommand{\rmdefault}{ntxtlf}% Roman and Bold Termes for math
+%\renewcommand{\rmdefault}{minntx}% Roman and Bold Termes for math
\usepackage[type1,sfdefault,scale=1]{sourcesanspro}% used by \mathsf, optional
\usepackage[scaled=.98,varqu,varl]{zi4}
-\usepackage[no-math,nohelv,nott,amsthm,largesc,theoremfont,trueslanted,scosf]{newtx}% Use newtxmath, not a unicode math package
+%\usepackage[nohelv,nott,amsthm,largesc,theoremfont,trueslanted,scosf]{newtx}% Use newtxmath, not a unicode math package
+\usepackage[amsthm,largesc,theoremfont]{newtx}% Use newtxmath, not a unicode math package
%\setsansfont{sourcecodepro}[scale=MatchLowerCase]
\makeatletter
\@ifundefined{ver at amsthm.sty}{\typeout{amsthm NO}}{\typeout{amsthm YES}}
@@ -51,14 +52,17 @@
\DeclareMathSymbol{\Sumop}{\mathop}{largesymbols}{"50}
\usepackage{bm}
%\usepackage{hyperref}
-\ifntxotf
+\makeatletter
+\ifntx at otftext
\setmonofont{inconsolata}[Scale=MatchLowercase]
\fi
+\makeatother
\title{New TX font package}
\author{Michael Sharpe}
\date{\today} % Activate to display a given date or no date
\begin{document}
+%\show\textlf
\maketitle
%\char"2044{\addfontfeatures{RawFeature=+ss20;+dnom}\color{red}\char"2044}
%1\addfontfeatures{VerticalPosition=Inferior}23
@@ -83,9 +87,93 @@
\item the former behavior of \verb|\textsl| is now available through the new macro \verb|\textth|, \textsc{aka} \verb|\textthit|.
\item \verb|\pagestyle{headings}| now functions as intended with slanted rather than upright figures in the headers.
\end{itemize}
+\section{The new {\tt newtx.sty}}
+Versions 1.7--1.71 added the ability to process {\tt.tex} documents with all current LaTeX engines, adding {\tt fontspec} based macros as replacements for macros and options formerly defined for non-unicode {\tt latex} processing as needed for unicode latex processing. A new option, {\tt thmslshape}, instructs {\tt theoremfont} to use slanted rather than italic shape, with upright punctuation, of course. There are some new macros and options that work only under unicode LaTeX. The {\tt newtxtext} package is modified very substantially to work for all latex engines.
-Versions 1.7--1.704 add the ability to process {\tt.tex} documents with all current LaTeX engines, adding {\tt fontspec} based macros as replacements for macros and options formerly defined for {\tt pdflatex} processing as needed for unicode latex processing. A new option, {\tt thmslshape}, instructs {\tt theoremfont} to use slanted rather than italic shape, with upright punctuation, of course. There are some new macros and options that work only under unicode LaTeX. The {\tt newtxtext} package is modified very substantially to work for all latex engines. Also introduced in 1.7 is {\tt newtx.sty}, which to some extent reduces the (human) memory requirements for loading {\tt newtxtext} and {\tt newtxmath} in a way that works with all LaTeX engines. With {\tt newtx}, the simplest invocation could be just
+Also introduced in 1.7 is {\tt newtx.sty}, which to some extent reduces the (human) memory requirements for loading {\tt newtxtext} and/or {\tt newtxmath} in a way that works with all LaTeX engines.
+
+\textbf{Basic {\tt newtx} options:}
+
+\begin{itemize}
+\item
+{\tt type1text} (or {\tt type1} specifies that text processing should use a type1 package. (The default is to use an otf text package if processing with a unicode engine. With a non-unicode engine, a type1 text package is the default.)
+\item {\tt otfmath} specifies to use an otf math engine rather than the default type1 math package, {\tt newtxmath}.
+\item Option {\tt scale} or {\tt scaled} will pass the same {scale} option to both the text package and {\tt newtxmath}.
+\item For dealing with cases where the text package should be loaded with a different scale from {\tt newtxmath}, you specify separately the options {\tt textscale[d]} and {\tt mathscale[d]}. There is one useful special case to notice: the option {\tt textscale[d]=0} selects a text scale factor that matches to the math scale factor, the latter defaulting to 1 unless otherwise specified.
+\item You may specify as an option to {\tt newtx} any option valid for {\tt newtxmath}: those are mostly passed directly to {\tt newtxmath}. These will have no effect if you specify a unicode math package.
+\item Other options are passed along to the text package, with the exception of a few handled by {\tt newtx}.
+\end{itemize}
+
+The effect of loading the {\tt newtx} package is fundamentally one of four types, depending on the options you specify and the processing engine.
+
+\textsc{Otf text, otf math (requires unicode engine)}
\begin{verbatim}
+ \usepackage[]{newtxtext} %no other text package possible
+ \RequirePackage{fontspec} % just in case
+ \usepackage{unicode-math} %loads amsmath
+ %\setmathfont{}[] %expects your input here for math package
+\end{verbatim}
+\textsc{Notes:}
+\begin{itemize}
+\item Your option list to {\tt newtx} must include {\tt otfmath}.
+\item After loading {\tt newtx}, you must load your chosen unicode math package with \verb|\settmathfont{}[]|.
+\item
+You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
+\item Don't bother with setting math options to {\tt newtx}---they are sent only to {\tt newtxmath}.
+\item Babel, if used, must be specified before {\tt newtx[text]}, which loads {\tt fontspec}.
+\item Polyglossia, if used, must be specified after loading {\tt newtx[text]}.
+\end{itemize}
+
+\textsc{Otf text, type1 math (requires unicode engine)}
+\begin{verbatim}
+ \renewcommand*{\rmdefault}{\ntx at minfam} % loads minimal version of text font
+ \usepackage[]{newtxmath} % options will be as passed from newtx
+ \usepackage[no-math]{fontspec}
+ \usepackage{\ntx at TF} % the chosen text font
+
+
+\end{verbatim}
+\textsc{Notes:}
+\begin{itemize}
+\item No special option requirements---this is the default case.
+\item Babel, if used, must be specified before {\tt newtx[text]}, which loads {\tt fontspec}.
+\item Polyglossia, if used, must be specified after loading {\tt newtx[text]}.
+\end{itemize}
+
+
+\textsc{type1 text, otf math (requires unicode engine)}
+\begin{verbatim}
+ \usepackage[type1text]{newtxtext} %no other text package possible
+ \RequirePackage{fontspec} % just in case
+ \usepackage{unicode-math} %loads amsmath
+ %\setmathfont{}[] %expects your input here for math package
+\end{verbatim}
+\textsc{Notes:}
+
+\begin{itemize}
+%\item No special option requirements---this is the default case.
+\item Your option list to {\tt newtx} must include {\tt otfmath}.
+\item Don't bother with setting math options to {\tt newtx}---they are sent only to {\tt newtxmath}.
+\item Babel, if used, must be specified before {\tt newtx[text]}.
+\item Polyglossia, if used, must be specified after loading {\tt fontspec}.
+\end{itemize}
+
+\textsc{type1 text, type1 math}
+\begin{verbatim}
+ \renewcommand*{\rmdefault}{\ntx at minfam}% minimal text family, Roman and Bold for math
+ \usepackage{newtxmath} % options will be as passed from newtx
+ \usepackage{\ntx at TF} % the chosen text family
+ % should load tt and sans math before newtx
+\end{verbatim}
+\textsc{Notes:}
+
+\begin{itemize}
+\item If not processing with non-unicode latex, no special option requirements. If using unicode latex, your option list should include {\tt type1text} and you may include option {\tt nofontspec} if you will have no use for it.
+\item Babel, if used, must be specified before {\tt newtx[text]}.
+\end{itemize}
+
+ With {\tt newtx}, the simplest invocation could be just
+\begin{verbatim}
\documentclass{article}
\usepackage{newtx}
\begin{document}
@@ -93,20 +181,31 @@
which would work under all LaTeX engines:
\begin{itemize}
\item
-Under {\tt pdflatex}, the effect is the same as
+Under {\tt [pdf]latex}, the effect is the same as
\begin{verbatim}
\usepackage{newtxtext, newtxmath}
\end{verbatim}
-\item Under unicode LaTeX, this calls
+though it is implemented equivalently as
\begin{verbatim}
% specify newtxtext with tabular lining figures for math operators
-\renewcommand{\rmdefault}{ntxtlf} % for math use only
+\renewcommand{\rmdefault}{minntx} % for math use only
\usepackage{newtxmath}
-\usepackage[no-math]{newtxtext}% pass no-math option to fontspec
+\usepackage{newtxtext}% type1 text by default
\end{verbatim}
-and the effect is to run unicode latex on the {\tt TeXGyreTermesX} font family for text and use {\tt newtxmath} as the math font in {\tt type1} mode.
+
+\item Under unicode LaTeX, in the absence of other options, the implementation is
+\begin{verbatim}
+% specify newtxtext with tabular lining figures for math operators
+\renewcommand{\rmdefault}{minntx} % minimal newtxtext for math use only
+\usepackage{newtxmath}
+\usepackage{newtxtext}% otf text by default, loads [no-math]fontspec
+\end{verbatim}
+and the effect is to run unicode latex on the {\tt TeXGyreTermesX} font family for text and use {\tt newtxmath} as the math font.
\end{itemize}
-The {\tt newtx} package has only one option: {\tt otfmath} changes the call above to
+
+\begin{itemize}
+\item
+{\tt otfmath} changes the code above to
\begin{verbatim}
\usepackage{newtxtext}
\RequirePackage{fontspec}
@@ -117,18 +216,68 @@
\setmathfont{}[]
\end{verbatim}
line to set up a unicode math font as the partner to text from {\tt TeXGyreTermesX}.
+\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 March, 2022, are:
+\begin{verbatim}
+libertine
+libertinus
+etbb --> ETbb
+ebgaramond
+MinionPro
+minion --> MinionPro
+cochineal
+garamondx
+baskervillef
+baskerville --> baskervillef
+Baskerville --> baskervillef
+BaskervilleF --> baskervillef
+baskervaldx
+Baskervaldx --> baskervaldx
+erewhon
+Erewhon --> erewhon
+XCharter
+xcharter --> XCharter
+stickstoo --> stickstootext
+Stickstoo --> stickstootext
+stix2 --> stickstootext
+scholax
+nc --> scholax
+scholaxf
+ncf --> scholaxf
+\end{verbatim}
+\end{itemize}
+The sty file {\tt newtx.sty} stores a good deal of information about each of the supported text packages and uses some of this to translate its macros into forms understood by the text package.
-You may specify any option to {\tt newtxtext} or {\tt newtxmath} as an option to {\tt newtx}: it will simply pass them along to those packages for processing.
+For example, how the following line in your preamble is interpreted depends on the LaTeX engine and the options you set.
+\begin{verbatim}
+\usepackage[libertine,vvarbb]{newtx}
+\end{verbatim}
+With non-unicode engines such as {\tt latex+dvips} or {\tt pdflatex}, the result will be the same as would be produced by
+\begin{verbatim}
+ \renewcommand*{\rmdefault}{minlibertine}% Roman and Bold for math
+ \usepackage[vvarbb]{newtxmath} % vvarbb was passed from newtx
+ \usepackage{libertine} % should load tt and sans math before newtx
+\end{verbatim}
+The first line, setting the \verb|\rmdefault| temporarily to {\tt minlibertine}, refers to one of three {\tt fd} files included with the distribution: {\tt t1minlibertine.fd}, {\tt ot1minlibertine.fd}, {\tt ly1minlibertine.fd}, and the one used depends on the last encoding specified before {\tt newtx} with a line like
+\begin{verbatim}
+\usepackage[T1]{fontenc}
+\end{verbatim}
+If you look at, say, {\tt t1minlibertine.fd} (the ``min'' part of the name is supposed to denote ``minimal''), you will see that if leads to {\tt libertine} text fonts with TLF (Tabular Lining Figures). When {\tt newtxmath} is loaded it is sets its {\tt operators} fonts to the corresponding {\tt libertine} text font so that mathematical operator names, numerals, punctuation and accents are chosen from this font. Indeed, this is the only way it will be used.
-A more realistic preamble would follow the general pattern:
+Finally, the actual text font package, {\tt libertine}, is loaded with whatever is selected by the text options you specified. For example, if your options specified to {\tt newtx} included {\tt p, osf}, then all figures in text (but not in math) would be in proportional oldstyle shape.
+
+There is a ``min'' fd family for each possible text font family, each pointing to TLF figured tfm files, but using a family name that will not conflict in any way with the final text font family. Examples are {\tt minntx} (for {\tt newtxtext}), {\tt minetbb} and so on.
+
+\subsection{A more general layout using {\tt newtx}}
+
+A more realistic preamble than those detailed above would follow the general pattern:
\begin{verbatim}
% !TEX TS-program = xelatex
\documentclass[11pt,<amsmath options to pass>]{article}
-<General packages, babel (optional) and those necessary for pdflatex>
-<Pdflatex encoding info, sf and tt fonts needed by newtxmath>
+<General packages, babel (optional) and those necessary for latex>
+<latex encoding, sf and tt fonts to be used by newtxmath>
\usepackage[]{newtx} % include all desired options to newtxtext and newtxmath
% options nohelv, nott to newtxtext will prevent it from overwriting sf and tt choices
-% a new option amsthm will correctly load that option, if specified
+% option amsthm will correctly load that option, if specified
<fontspec is loaded, add \setmainfont, \setmonofont etc>
% Uncomment example lines below to use polyglossia, which must be loaded after fontspec
%\usepackage{polyglossia}
@@ -151,7 +300,7 @@
\usepackage[scaled=.98,varqu,varl]{zi4} % mathtt
\usepackage[nohelv,nott,amsthm,largesc,theoremfont,trueslanted,scosf]{newtx} % this line loads fontspec
% nohelv and nott stop overwriting initial mathsf and mathtt choices
-%\setmonofont and \setmonofont could be set here if necessary
+%\setmonofont and \setsansfont could be set here if necessary for use in text
% polyglossia, if used, must be loaded after fontspec
\usepackage{polyglossia}
\setdefaultlanguage[variant=american]{english}
@@ -158,18 +307,160 @@
\setotherlanguages{french,russian}
\usepackage[]{hyperref}
\end{verbatim}
-Version 1.7 of {\tt newtxtext} is a major reworking of the previous versions, functioning with all current \LaTeX\ engines, loading {\tt fontspec} if necessary. The {\tt newtx} package passes the options you specify to {\tt newtxmath} and {\tt newtxtext} and the loads the three lines
-\begin{verbatim}
-\renewcommand{\rmdefault}{ntxtlf}% Roman and Bold TermesX for math
-\usepackage{newtxmath} % options will be as passed from newtx
-\usepackage{newtxtext} % options will be as passed from newtx
-\end{verbatim}
-If you process with XeLaTeX or LuaLaTeX, {\tt fontspec} will be loaded by {\tt newtxtext} unless instructed not to by one of the options {\tt type1}, {\tt nofontspec} to {\tt newtx}. (The macro \verb|\ifntxotf| is defined and set in {\tt newtxtext}: it is set to {\tt true} in case the engine is a unicode engine, and neither of the options {\tt type1, nofontspec} was selected.) Other possible options are described in detail later in this documentation.
+If you process with a unicode engine, {\tt fontspec} will be loaded by {\tt newtxtext} unless instructed not to by option {\tt nofontspec} to {\tt newtx}. (For example, you may wish to process with LuaLaTeX in order to use {\tt lua} while using type1 text and math packages and are concerned about processing speed.
+\subsection{Notes}
+%\section{Usage with Lua\LaTeX\ and Xe\LaTeX}
+%As far as I can tell, \textsf{newtxmath} works with both, but requires a very specific loading order and choice of options. Briefly, the math options must all be loaded prior to loading and using {\tt fontspec}. As of version 1.5, {\tt newtxtext} will load fontspec when processing with XeLaTeX or LuaLaTeX unless one or more of the options {\tt nofontspec}, {\tt type1} is specified. (If you specify the option {\tt no-otfmath} to {\tt newtxtext}, it will pass the option {\tt no-math}to the {\tt fontspec} call. This should be done if {\tt fontspec} will not be expected to load an Opentype package or install math support using {\tt mathspec}.)
+%
+%\textsc{Example I: TeXGyreTermesX Opentype + STIX (Opentype).}
+%\begin{verbatim}
+%% general setup packages
+%%\usepackage[greek.polutonico,english]{babel} % if using babel
+%% next line calls fontspec and loads TeXGyreTermesX otf
+%\usepackage[theoremfont,trueslanted,largesc,p,osf]{newtxtext} % or newtx
+%% set mono and sans opentype fonts
+%\usepackage{unicode-math} % can omit if using newtx instead of newtxtext
+%% can't load type1 math fonts after this point
+%\setmathfont{STIX}
+%%\usepackage{polyglossia} % must load after fontspec, if using polyglossia
+%% polyglossia setup commands
+%%\usepackage{hyperref} % if using
+%\end{verbatim}
+%\textsc{Notes:}
+%\begin{itemize}
+%\item
+%You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
+%\item Babel, if used, must be specified before {\tt newtxtext}, which loads {\tt fontspec}.
+%\item Polyglossia, if used, must be specified after loading {\tt newtxtext}.
+%\end{itemize}
+%%\textsc{Example II: newtxtext type1 + STIX (Opentype).}
+%%\begin{verbatim}
+%%%\usepackage[greek.polutonico,english]{babel} % if using babel
+%%% next line does not call fontspec, loads newtxtext type1
+%%\usepackage[type1,theoremfont,trueslanted,largesc,p,osf]{newtxtext}
+%%\usepackage{fontspec}
+%%\usepackage{unicode-math}% can't load type1 math fonts after this
+%%\setmathfont{STIX}
+%%%\usepackage{polyglossia} % must load after fontspec, if using polyglossia
+%%% polyglossia setup commands
+%%\end{verbatim}
+%%\textsc{Notes:}
+%%
+%%\begin{itemize}
+%%\item The {\tt type1} option to {\tt newtxtext} prevents the package loading {\tt fontspec} so you must load it before loading {\tt unicode-math} and any opentype fonts.
+%%\item
+%%You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
+%%\item Babel, if used, must be specified before {\tt newtxtext}.
+%%\item Polyglossia, if used, must be specified after loading {\tt fontspec}.
+%%\end{itemize}
+%
+%\textsc{Example II: TeXGyreTermesX Opentype + newtxmath (type1) + polyglossia + other Opentype.}
+%\begin{verbatim}
+%\renewcommand{\rmdefault}{ntxtlf}% Roman and Bold Termes for math mode
+%\usepackage[T1]{fontenc} % T1 is active encoding for use in math text
+%\usepackage[type1]{cabin}% used only by \mathsf, optional
+%\usepackage{amsmath} % must be loaded before amsthm if using amsthm
+%\usepackage{amsthm}% load before newtxmath
+%\usepackage[vvarbb]{newtxmath}
+%\usepackage[no-math,largesc]{newtxtext}% pass no-math option to fontspec
+%% Fontspec will be loaded so that Opentype text fonts may be loaded
+%\setmainfont{TeXGyreTermesX}
+%%\setmonofont{...}[]
+%%\setsansfont{...}[]
+%%\usepackage{polyglossia} % must load after fontspec
+%%\setdefaultlanguage[variant=american]{english}
+%%\setotherlanguages{french,russian}
+%%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal}
+%\end{verbatim}
+%With the new {\tt newtx.sty}, the above example may be written as:
+%\begin{verbatim}
+%\usepackage[T1]{fontenc} % T1 is active encoding for use in math text
+%\usepackage[type1]{cabin}% used only by \mathsf, optional
+%\usepackage[nohelv,amsthm,vvarbb,no-math,largesc]{newtx}
+%%\setmonofont{...}[]
+%%\setsansfont{...}[]
+%%\usepackage{polyglossia} % must load after fontspec
+%%\setdefaultlanguage[variant=american]{english}
+%%\setotherlanguages{french,russian}
+%%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal}
+%\end{verbatim}
+%
+%\textsc{Notes:}
+%
+%\begin{itemize}
+%\item The {\tt no-math} option to {\tt newtxtext} causes {\tt fontspec} to load with option {\tt no-math}, preventing the package from loading any unicode math font. This option is automatically set internally by {\tt newtxtext} if it detects that {\tt newtxmath} has already been loaded.
+%\item
+%You do not need to load {\tt amsmath}: it is loaded by {\tt newtxmath} However, if you wish to load {\tt amsthm}, load {\tt amsmath}, then {\tt amsthm} before {\tt newtxmath}. As of version 1.7. it is simpler to just make use of the option {\tt amsthm} to {\tt newtx} or to {\tt newtxmath}.
+%\item Babel, if used, must be specified before {\tt newtxtext}.
+%\item Polyglossia, if used, must be specified after loading {\tt newtxtext}.
+%\item The {\tt type1} option to {\tt cabin} is important, preventing it from loading {\tt fontspec}, which would lead to an {\tt option clash} error. The same is true for a number of similar packages, like, e.g., {\tt sourcesanspro}.
+%\end{itemize}
+%
+%%\textsc{Example IV: newtxtext type1 + newtxmath (type1) + polyglossia + other Opentype.}
+%%\begin{verbatim}
+%%\renewcommand{\rmdefault}{ntxtlf}% Roman and Bold Termes for math mode
+%%\usepackage[T1]{fontenc} % T1 is active encoding for use in math text
+%%\usepackage[type1]{cabin}% used only by \mathsf, optional
+%%\usepackage{amsmath} % must be loaded before amsthm if using amsthm
+%%\usepackage{amsthm}% load before newtxmath
+%%\usepackage[vvarbb]{newtxmath}
+%%\usepackage[no-math]{newtxtext}% pass no-math option to fontspec
+%%% Fontspec will be loaded so that Opentype text fonts may be loaded
+%%\usepackage{polyglossia} % must load after fontspec
+%%\setdefaultlanguage[variant=american]{english}
+%%\setotherlanguages{french,russian}
+%%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal}
+%%\end{verbatim}
+%%\textsc{Notes:}
+%%\begin{itemize}
+%%\item The {\tt type1} option to {\tt newtxtext} prevents the package loading {\tt fontspec} so you must load it before loading {\tt unicode-math} and any opentype fonts.
+%%\item
+%%You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
+%%\item Babel, if used, must be specified before {\tt newtxtext}.
+%%\item Polyglossia, if used, must be specified after loading {\tt fontspec}.
+%%\item The first seven lines of this example preamble could be taken as a basis for a preamble that will compile under all LaTeX engines.
+%%\end{itemize}
+%%
+%
+%%Be aware that some text packages (e.g., {\tt cabin}) may contain a line like
+%%\begin{verbatim}
+%%\RequirePackage{fontspec}
+%%\end{verbatim}
+%%which would prevent (``option clash'' error) a subsequent
+%%\begin{verbatim}
+%%\usepackage[no-math]{fontspec}
+%%\end{verbatim}
+%%unless suppressed by an appropriate option. E.g.,
+%%\begin{verbatim}
+%%\usepackage[type1]{cabin}
+%%\end{verbatim}
+%%prevents the problem with the {\tt cabin} package.
-It is not necessary to use {\tt newtx} in version 1.7 and higher. The original loading via {\tt newtxtext} and {\tt newtxmath} should still work.
+\subsection{The stacked fraction macro}
+Having collected a lot of data about the text fonts it supports, it seemed worth-while to construct a macro that would work for most of those fonts: \verb|\textsfrac[1]{17}{32}| renders in {\tt newtxtext} as \textsfrac[1]{17}{32} and \verb|\textsfrac{9}{64}| as \textsfrac{9}{64}. Compare these with output from the diagonal fraction macro \verb|\textfrac|: \textfrac[1]{17}{32}, \textfrac{9}{64}.
-The math package {\tt newtxmath} works, after possibly replacing its math Roman and Greek letters, with fonts other than Times that are intermediate in weight between Computer Modern and Times. The free font Linux Libertine is one particular target---it is of nearly the same x-height as Computer Modern, but, not being a \emph{modern} font, does not have a high contrast ratio, and so appears denser than Computer Modern but not as much so as Times. It is meant as a replacement for Times, but differs from it in many characteristics, more similar to MinionPro than Times, and provides a better range of variants than Times---three weights (regular, semi-bold and bold) rather than just two, and has expert features in all weights: old-style figures, more extensive and more interesting ligatures, and small caps. In my opinion, material typeset in Linux Libertine looks better than the corresponding material typeset in Times. This seems especially true on the screen. As of version 1.0, the package also offers support for MinionPro as a math font, but with limitations described in detail below. More recently, an option to provide math support for the \textsf{garamondx} text font package was added. Version 1.55 adds support for the {SticksToo} text fonts, a reworking of the {\tt STIX2} text fonts.
+There are four options with which you may control the layout of the fractional part.
+\begin{itemize}
+\item
+{\tt sfracvcenter} controls the vertical center of the fraction bar.
+\item{\tt sfracbarthick} controls its thickness.
+\item{\tt sfracvspacing} controls the vertical space about and below the fraction bar.
+\item{\tt sfracscaling} controls the size of the figures in the fraction.
+\end{itemize}
+The last of these is just a number like .85 by which to scale the denominator figures used in the construction. The first three items may be specified in either {\tt em} units or in {\tt ex} units. If you use a number greater than 6, it is interpreted as a multiple of an {\tt em} (recall that for most fonts, and certainly for those supported by {\tt newtx}, 100{\tt em} is equal to 1{\tt pt} if you are processing at 10pt. On the other hand, 1{\tt ex} is the height of the letter x in the current text font. If you specify a number less than 6, it is interpreted in {\tt ex} units.
+\subsection{Limitations of {\tt newtx}}
+
+1. When using {\tt newtx} with a unicode engine and specify the option {\tt otfmath}, the only text font you will have available is {\tt newtxtext}. You may specify another package, but {\tt newtx} will change it back to {\tt newtxtext} and issue a message to the console and the {\tt log} file.
+
+2. You can't use an arbitrary text font with {\tt newtx}. It needs considerable information to be available including how to pair it to a variant of {\tt newtxmath}.
+
+3. Aside from the minor addition of the stacked fraction macro \verb|\textsfrac|, {\tt newtx} is simply a convenience: it loads packages and sets option so that you don't have to remember as many details.
+The original loading via {\tt newtxtext} and {\tt newtxmath} should still work as long as you remember all the loading rules.
+
+\section{Newtxmath}
+The math package {\tt newtxmath} works, after possibly replacing its math Roman and Greek letters, with fonts other than Times that are intermediate in weight between Computer Modern and Times. The free font Linux Libertine is one particular target---it is of nearly the same x-height as Computer Modern, but, not being a \emph{modern} font, does not have a high contrast ratio, and so appears denser than Computer Modern but not as much so as Times. It is meant as a replacement for Times, but differs from it in many characteristics, more similar to MinionPro than Times, and provides a better range of variants than Times---three weights (regular, semi-bold and bold) rather than just two, and has expert features in all weights: old-style figures, more extensive and more interesting ligatures, and small caps. In my opinion, the venerable {\tt libertine} package should at this point be substituted by the newer {\tt libertinus} package. As of version 1.0, {\tt newtx} also offers support for MinionPro as a math font, but with limitations described in detail below. More recently, an option to provide math support for the \textsf{garamondx} text font package was added. Version 1.55 adds support for the {SticksToo} text fonts, a reworking of the {\tt STIX2} text fonts.
+
The {\tt newtx} package differs from {\tt txfonts} in the following ways:
\begin{itemize}
\item
@@ -189,7 +480,7 @@
\item \verb|\varkappa| $\varkappa$ has been moved from {\tt AMSb} to {\tt lettersA}, and is now accompanied by an upright form \verb|\upvarkappa| $\upvarkappa$ which behaves as it should when using the {\tt frenchmath} option.
\end{itemize}
\section{Text mode options}
-Beginning with version 1.4, the text font component of \textsf{newtx} is no longer dependent on the {\tt txfonts}, and is constructed entirely from \textsf{TeXGyre Termes} and some modifications thereof
+Beginning with version 1.4, the text font component of \textsf{newtx} is no longer dependent on the {\tt txfonts}, and is constructed entirely from \textsf{TeXGyre Termes} and some modifications thereof.
The text mode environment invoked by
\begin{verbatim}
@@ -290,6 +581,7 @@
%%\end{document}
%\traceon
+
\begin{thm}
This is Theorem Italic:
%\traceoff
@@ -326,94 +618,52 @@
Fontspec offers the {\tt WordSpace=} option for individual control of the space, stretch and shrink, with the value being either an ordered triple like \verb|{1.1,1,.8}| or a single number like {\tt .9}, the latter having the same effect as the triple \verb|{.9,.9,.9}|. These three numbers act as multipliers of {\tt space}, {\tt stretch} and {\tt shrink}. The option that you can set is {\tt spcfactor=}, entering either a number or a triple---e.g., {\tt spcfactor=1.1} or \verb|{1.1,1,.8}|. Note however that {\tt tighter} and {\tt looser} will have an effect if {\tt spcfactor} is not set, amounting to \verb|\spcfactor={1,.625,1}| and \verb|\spcfactor={1.2,1,1}| respectively.
-\section{Usage with Lua\LaTeX\ and Xe\LaTeX}
-As far as I can tell, \textsf{newtxmath} works with both, but requires a very specific loading order and choice of options. Briefly, the math options must all be loaded prior to loading and using {\tt fontspec}. As of version 1.5, {\tt newtxtext} will load fontspec when processing with XeLaTeX or LuaLaTeX unless one or more of the options {\tt nofontspec}, {\tt type1} is specified. (If you specify the option {\tt no-math} to {\tt newtxtext}, it will pass that option to the {\tt fontspec} call. This should be done if {\tt fontspec} will not be expected to load an Opentype package or install math support using {\tt mathspec}.)
-
-\textsc{Example I: TeXGyreTermesX Opentype + STIX (Opentype).}
-\begin{verbatim}
-% general setup packages
-%\usepackage[greek.polutonico,english]{babel} % if using babel
-% next line calls fontspec and loads TeXGyreTermesX otf
-\usepackage[theoremfont,trueslanted,largesc,p,osf]{newtxtext} % or newtx
-% set mono and sans opentype fonts
-\usepackage{unicode-math} % can omit if using newtx instead of newtxtext
-% can't load type1 math fonts after this point
-\setmathfont{STIX}
-%\usepackage{polyglossia} % must load after fontspec, if using polyglossia
-% polyglossia setup commands
-%\usepackage{hyperref} % if using
-\end{verbatim}
-\textsc{Notes:}
-\begin{itemize}
-\item
-You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
-\item Babel, if used, must be specified before {\tt newtxtext}, which loads {\tt fontspec}.
-\item Polyglossia, if used, must be specified after loading {\tt newtxtext}.
-\end{itemize}
-%\textsc{Example II: newtxtext type1 + STIX (Opentype).}
+%\section{Usage with Lua\LaTeX\ and Xe\LaTeX}
+%As far as I can tell, \textsf{newtxmath} works with both, but requires a very specific loading order and choice of options. Briefly, the math options must all be loaded prior to loading and using {\tt fontspec}. As of version 1.5, {\tt newtxtext} will load fontspec when processing with XeLaTeX or LuaLaTeX unless one or more of the options {\tt nofontspec}, {\tt type1} is specified. (If you specify the option {\tt no-otfmath} to {\tt newtxtext}, it will pass the option {\tt no-math}to the {\tt fontspec} call. This should be done if {\tt fontspec} will not be expected to load an Opentype package or install math support using {\tt mathspec}.)
+%
+%\textsc{Example I: TeXGyreTermesX Opentype + STIX (Opentype).}
%\begin{verbatim}
+%% general setup packages
%%\usepackage[greek.polutonico,english]{babel} % if using babel
-%% next line does not call fontspec, loads newtxtext type1
-%\usepackage[type1,theoremfont,trueslanted,largesc,p,osf]{newtxtext}
-%\usepackage{fontspec}
-%\usepackage{unicode-math}% can't load type1 math fonts after this
+%% next line calls fontspec and loads TeXGyreTermesX otf
+%\usepackage[theoremfont,trueslanted,largesc,p,osf]{newtxtext} % or newtx
+%% set mono and sans opentype fonts
+%\usepackage{unicode-math} % can omit if using newtx instead of newtxtext
+%% can't load type1 math fonts after this point
%\setmathfont{STIX}
%%\usepackage{polyglossia} % must load after fontspec, if using polyglossia
%% polyglossia setup commands
+%%\usepackage{hyperref} % if using
%\end{verbatim}
%\textsc{Notes:}
-%
%\begin{itemize}
-%\item The {\tt type1} option to {\tt newtxtext} prevents the package loading {\tt fontspec} so you must load it before loading {\tt unicode-math} and any opentype fonts.
%\item
%You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
-%\item Babel, if used, must be specified before {\tt newtxtext}.
-%\item Polyglossia, if used, must be specified after loading {\tt fontspec}.
+%\item Babel, if used, must be specified before {\tt newtxtext}, which loads {\tt fontspec}.
+%\item Polyglossia, if used, must be specified after loading {\tt newtxtext}.
%\end{itemize}
-
-\textsc{Example II: TeXGyreTermesX Opentype + newtxmath (type1) + polyglossia + other Opentype.}
-\begin{verbatim}
-\renewcommand{\rmdefault}{ntxtlf}% Roman and Bold Termes for math mode
-\usepackage[T1]{fontenc} % T1 is active encoding for use in math text
-\usepackage[type1]{cabin}% used only by \mathsf, optional
-\usepackage{amsmath} % must be loaded before amsthm if using amsthm
-\usepackage{amsthm}% load before newtxmath
-\usepackage[vvarbb]{newtxmath}
-\usepackage[no-math,largesc]{newtxtext}% pass no-math option to fontspec
-% Fontspec will be loaded so that Opentype text fonts may be loaded
-\setmainfont{TeXGyreTermesX}
-%\setmonofont{...}[]
-%\setsansfont{...}[]
-%\usepackage{polyglossia} % must load after fontspec
-%\setdefaultlanguage[variant=american]{english}
-%\setotherlanguages{french,russian}
-%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal}
-\end{verbatim}
-With the new {\tt newtx.sty}, the above example may be written as:
-\begin{verbatim}
-\usepackage[T1]{fontenc} % T1 is active encoding for use in math text
-\usepackage[type1]{cabin}% used only by \mathsf, optional
-\usepackage[nohelv,amsthm,vvarbb,no-math,largesc]{newtx}
-%\setmonofont{...}[]
-%\setsansfont{...}[]
-%\usepackage{polyglossia} % must load after fontspec
-%\setdefaultlanguage[variant=american]{english}
-%\setotherlanguages{french,russian}
-%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal}
-\end{verbatim}
-
-\textsc{Notes:}
-
-\begin{itemize}
-\item The {\tt no-math} option to {\tt newtxtext} causes {\tt fontspec} to load with option {\tt no-math}, preventing the package from loading any unicode math font. This option is automatically set internally by {\tt newtxtext} if it detects that {\tt newtxmath} has already been loaded.
-\item
-You do not need to load {\tt amsmath}: it is loaded by {\tt newtxmath} However, if you wish to load {\tt amsthm}, load {\tt amsmath}, then {\tt amsthm} before {\tt newtxmath}. As of version 1.7. it is simpler to just make use of the option {\tt amsthm} to {\tt newtx} or to {\tt newtxmath}.
-\item Babel, if used, must be specified before {\tt newtxtext}.
-\item Polyglossia, if used, must be specified after loading {\tt newtxtext}.
-\item The {\tt type1} option to {\tt cabin} is important, preventing it from loading {\tt fontspec}, which would lead to an {\tt option clash} error. The same is true for a number of similar packages, like, e.g., {\tt sourcesanspro}.
-\end{itemize}
-
-%\textsc{Example IV: newtxtext type1 + newtxmath (type1) + polyglossia + other Opentype.}
+%%\textsc{Example II: newtxtext type1 + STIX (Opentype).}
+%%\begin{verbatim}
+%%%\usepackage[greek.polutonico,english]{babel} % if using babel
+%%% next line does not call fontspec, loads newtxtext type1
+%%\usepackage[type1,theoremfont,trueslanted,largesc,p,osf]{newtxtext}
+%%\usepackage{fontspec}
+%%\usepackage{unicode-math}% can't load type1 math fonts after this
+%%\setmathfont{STIX}
+%%%\usepackage{polyglossia} % must load after fontspec, if using polyglossia
+%%% polyglossia setup commands
+%%\end{verbatim}
+%%\textsc{Notes:}
+%%
+%%\begin{itemize}
+%%\item The {\tt type1} option to {\tt newtxtext} prevents the package loading {\tt fontspec} so you must load it before loading {\tt unicode-math} and any opentype fonts.
+%%\item
+%%You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
+%%\item Babel, if used, must be specified before {\tt newtxtext}.
+%%\item Polyglossia, if used, must be specified after loading {\tt fontspec}.
+%%\end{itemize}
+%
+%\textsc{Example II: TeXGyreTermesX Opentype + newtxmath (type1) + polyglossia + other Opentype.}
%\begin{verbatim}
%\renewcommand{\rmdefault}{ntxtlf}% Roman and Bold Termes for math mode
%\usepackage[T1]{fontenc} % T1 is active encoding for use in math text
@@ -421,38 +671,80 @@
%\usepackage{amsmath} % must be loaded before amsthm if using amsthm
%\usepackage{amsthm}% load before newtxmath
%\usepackage[vvarbb]{newtxmath}
-%\usepackage[no-math]{newtxtext}% pass no-math option to fontspec
+%\usepackage[no-math,largesc]{newtxtext}% pass no-math option to fontspec
%% Fontspec will be loaded so that Opentype text fonts may be loaded
-%\usepackage{polyglossia} % must load after fontspec
-%\setdefaultlanguage[variant=american]{english}
-%\setotherlanguages{french,russian}
-%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal}
+%\setmainfont{TeXGyreTermesX}
+%%\setmonofont{...}[]
+%%\setsansfont{...}[]
+%%\usepackage{polyglossia} % must load after fontspec
+%%\setdefaultlanguage[variant=american]{english}
+%%\setotherlanguages{french,russian}
+%%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal}
%\end{verbatim}
+%With the new {\tt newtx.sty}, the above example may be written as:
+%\begin{verbatim}
+%\usepackage[T1]{fontenc} % T1 is active encoding for use in math text
+%\usepackage[type1]{cabin}% used only by \mathsf, optional
+%\usepackage[nohelv,amsthm,vvarbb,no-math,largesc]{newtx}
+%%\setmonofont{...}[]
+%%\setsansfont{...}[]
+%%\usepackage{polyglossia} % must load after fontspec
+%%\setdefaultlanguage[variant=american]{english}
+%%\setotherlanguages{french,russian}
+%%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal}
+%\end{verbatim}
+%
%\textsc{Notes:}
+%
%\begin{itemize}
-%\item The {\tt type1} option to {\tt newtxtext} prevents the package loading {\tt fontspec} so you must load it before loading {\tt unicode-math} and any opentype fonts.
+%\item The {\tt no-math} option to {\tt newtxtext} causes {\tt fontspec} to load with option {\tt no-math}, preventing the package from loading any unicode math font. This option is automatically set internally by {\tt newtxtext} if it detects that {\tt newtxmath} has already been loaded.
%\item
-%You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
+%You do not need to load {\tt amsmath}: it is loaded by {\tt newtxmath} However, if you wish to load {\tt amsthm}, load {\tt amsmath}, then {\tt amsthm} before {\tt newtxmath}. As of version 1.7. it is simpler to just make use of the option {\tt amsthm} to {\tt newtx} or to {\tt newtxmath}.
%\item Babel, if used, must be specified before {\tt newtxtext}.
-%\item Polyglossia, if used, must be specified after loading {\tt fontspec}.
-%\item The first seven lines of this example preamble could be taken as a basis for a preamble that will compile under all LaTeX engines.
+%\item Polyglossia, if used, must be specified after loading {\tt newtxtext}.
+%\item The {\tt type1} option to {\tt cabin} is important, preventing it from loading {\tt fontspec}, which would lead to an {\tt option clash} error. The same is true for a number of similar packages, like, e.g., {\tt sourcesanspro}.
%\end{itemize}
%
+%%\textsc{Example IV: newtxtext type1 + newtxmath (type1) + polyglossia + other Opentype.}
+%%\begin{verbatim}
+%%\renewcommand{\rmdefault}{ntxtlf}% Roman and Bold Termes for math mode
+%%\usepackage[T1]{fontenc} % T1 is active encoding for use in math text
+%%\usepackage[type1]{cabin}% used only by \mathsf, optional
+%%\usepackage{amsmath} % must be loaded before amsthm if using amsthm
+%%\usepackage{amsthm}% load before newtxmath
+%%\usepackage[vvarbb]{newtxmath}
+%%\usepackage[no-math]{newtxtext}% pass no-math option to fontspec
+%%% Fontspec will be loaded so that Opentype text fonts may be loaded
+%%\usepackage{polyglossia} % must load after fontspec
+%%\setdefaultlanguage[variant=american]{english}
+%%\setotherlanguages{french,russian}
+%%\newfontfamily{\cyrillicfont}[Scale=MatchLowercase]{cochineal}
+%%\end{verbatim}
+%%\textsc{Notes:}
+%%\begin{itemize}
+%%\item The {\tt type1} option to {\tt newtxtext} prevents the package loading {\tt fontspec} so you must load it before loading {\tt unicode-math} and any opentype fonts.
+%%\item
+%%You do not need to load {\tt amsmath}: it is loaded by {\tt unicode-math}.
+%%\item Babel, if used, must be specified before {\tt newtxtext}.
+%%\item Polyglossia, if used, must be specified after loading {\tt fontspec}.
+%%\item The first seven lines of this example preamble could be taken as a basis for a preamble that will compile under all LaTeX engines.
+%%\end{itemize}
+%%
+%
+%%Be aware that some text packages (e.g., {\tt cabin}) may contain a line like
+%%\begin{verbatim}
+%%\RequirePackage{fontspec}
+%%\end{verbatim}
+%%which would prevent (``option clash'' error) a subsequent
+%%\begin{verbatim}
+%%\usepackage[no-math]{fontspec}
+%%\end{verbatim}
+%%unless suppressed by an appropriate option. E.g.,
+%%\begin{verbatim}
+%%\usepackage[type1]{cabin}
+%%\end{verbatim}
+%%prevents the problem with the {\tt cabin} package.
-%Be aware that some text packages (e.g., {\tt cabin}) may contain a line like
-%\begin{verbatim}
-%\RequirePackage{fontspec}
-%\end{verbatim}
-%which would prevent (``option clash'' error) a subsequent
-%\begin{verbatim}
-%\usepackage[no-math]{fontspec}
-%\end{verbatim}
-%unless suppressed by an appropriate option. E.g.,
-%\begin{verbatim}
-%\usepackage[type1]{cabin}
-%\end{verbatim}
-%prevents the problem with the {\tt cabin} package.
-
\textsc{Macros and Options Modified in Version 1.7:}
\begin{itemize}
\item
@@ -470,7 +762,8 @@
\item {\tt foresolidus, aftsolidus} are not used in unicode tex.
\item {\tt scosf} operates more effectively than in [pdf]latex---in the latter, it seems now very difficult to modify the definition of \verb|\scshape|, and this option works only for \verb|\textsc|.
\item {\tt oldSS} (opentype only) controls whether the new German capital sharp S is used or whether the old SS is retained. The former is the default but the option {\tt oldSS} forces the latter by setting {\tt StylisticSet=6}. The effects are summarized in the following tables.
-\ifntxotf
+\makeatletter
+\ifntx at otftext
\begin{center}
\begin{tabular}{@{} lcl @{}}
@@ -484,10 +777,12 @@
\hline
\end{tabular}
\end{center}
-\fi % \ifntxotf
+\fi % \ifntx at otftext
+\makeatother
\noindent Effect of choice of {\tt StylisticSet}:
-\ifntxotf
+\makeatletter
+\ifntx at otftext
\begin{center}
\begin{tabular}{@{} ccccc @{}}
@@ -502,6 +797,7 @@
\end{center}
\fi % \ifntxotf
\end{itemize}
+\makeatother
\section{Math mode options}
The package invoked by
@@ -508,7 +804,7 @@
\begin{verbatim}
\usepackage{newtxmath}
\end{verbatim}
-loads the math part of the {\tt txfonts} (with revised metrics and additional glyphs) and should be loaded \emph{after} the text font and its encoding have been specified, as it uses the text font settings to define how operators, numbers, math accents, \verb|\mathrm|, \verb|\mathbf| etc.\ are rendered. You should also load a Typewriter font so as not to generate mysterious error messages about \textsf{metafont} trying to generate \texttt{ectt10}. The package offers a number of options.
+loads the math part of the {\tt txfonts} (with revised metrics and additional glyphs) and should be loaded \emph{after} the text font and its encoding have been specified, as it uses the text font settings to define how operators, numbers, math accents, \verb|\mathrm|, \verb|\mathbf| etc.\ are rendered. You should also load a typewriter font so as not to generate mysterious error messages about \textsf{metafont} trying to generate \texttt{ectt10}. The package offers a number of options.
\begin{itemize}
\item {\tt upint} (new as of version 1.5) selects upright integrals---the default shape is slanted. Each shape/size of integral takes one of twelve form, illustrated below in the case of display size slanted integrals.
\[\int\quad\oint\quad\iint\quad\iiint\quad\iiiint\quad\oiint\quad\oiiint\quad\varointclockwise\quad\ointctrclockwise\quad\fint\quad\sumint\quad\sqint\]
@@ -592,7 +888,13 @@
\item Option {\tt nonewtxmathopt} (or {\tt scale}, a mistake I cannot now erase) causes newtxmath to not make use of the optical math sizes (7{\tt pt}, 5{\tt pt}), as preferred by some.
\item Option {\tt subscriptcorrection} enables the special spacing of some subscripts. (The default setting is {\tt nosubscriptcorrection}.)
\item The \textsf{newtxmath} package contains three different Blackboard Bold alphabets, where the original \textsf{txfonts} contained two. The default, triggered by \verb|\mathbb{}|, takes its glyphs from the font which replaces {\tt msbm} and has the same overall appearance of a hollowed-out text font, which I find neither bold nor blackboard-like. The second option, taken from \textsf{txfonts}, is triggered by \verb|\varmathbb{}|, is more geometric and, in my opinion, preferable but not optimal. The option {\tt varbb} makes \verb|\mathbb{}| synonymous with \verb|\varmathbb{}|. The third option is the double-struck glyphs from the STIX collection. See the expanded discussion below.
-\item {\tt noOT1} affects only those text-math combinations where {\tt operators} is defined by default to OT1 with Greek uppercase letters. It causes {\tt operators} to keep the same encoding as in tex, allowing operatornames to use accented characters, but possibly losing some calls for Greek uppercase.
+\item {\tt noOT1} affects only those text-math combinations where {\tt operators} is defined by default to OT1 with Greek uppercase letters. It causes {\tt operators} to keep the same encoding as in tex, allowing operator names to use accented characters, but possibly losing some calls for Greek uppercase.
+You may avoid the loss of One solution could be to define the affected operator names individually with commands like
+\begin{verbatim}
+\DeclareMathOperator{\mIn}{\text{{\fontencoding{\encodingdefault}\selectfont m\'in}}}
+\end{verbatim}
+making use of the {\tt amsmath} \verb|\text| macro, which gives you proper scaling in scriptstyle and scriptscriptstyle as well.
+
\item {\tt nosymbolsc} causes the package to not load the {\tt symbolsC} fonts, saving a math family. (This font contains mostly exotic symbols, along with some very useful, commonly used symbols like \verb|\coloneq| $\coloneq$, \verb|\eqcolon| $\eqcolon$, \verb|\notin| $\notin$, \verb|\notni| $\notni$, \verb|\neq| $\neq$, \verb|\nsubset| $\nsubset$ and \verb|\nsupset| $\nsupset$, but these have been moved (virtually) to {\tt lettersA} so they may continue to be used even if you use the option {\tt nosymbolsc}.) If this option is selected, then, as of version 1.53, new definitions are made for the missing negated symbols. The package {\tt centernot} is now required.
%\item {\tt amssymbols} (the default) and {\tt noamssymbols} determine whether the {\tt txfonts} versions of the \textsc{ams} symbols ({\tt AMSm}) are loaded---if so, they override previous settings in {\tt amsmath}. If you use the option {\tt noamssymbols}, then \verb|\mathbb{}| is set to mean the same as \verb|\varmathbb{}|. (One advantage of {\tt noamssymbols} is that you save two of your precious math families for other purposes, such as setting a couple of external math alphabets by means of the \textsf{mathalfa} package.) \textbf{Important note:} if you load an AMS class, like {\tt amsart}, then some trickery will be involved. From 2018 onward, the AMS classes {\tt noamsfonts} prevents the loading of {\tt AMSa} and {\tt AMSb}, which waste two slots.
%The following workaround seems like a reasonable stopgap until then.
@@ -627,7 +929,7 @@
\[\widearc{BC}\quad\widearc{ABC}\quad\widearc{ABCD}\quad
\wideOarc{BC}\quad\wideOarc{ABC}\quad\wideOarc{ABCD}\]
%\item {largelibfigs} has effect only if the libertine option is selected---with this option, full-sized figures are substituted in math mode for the default Libertine figures, which are about 8\% below Libertine's Capheight.
-\item The option {\tt timesmathacc} changes the default selection of math accents from the Roman text font, forcing the use of the heavier Times accents. (Libertine has much lighter accents which can seem to almost disappear under some conditions.) If your language uses accented operator names, do not use this option.
+\item The option {\tt timesmathacc} changes the default selection of math accents from the Roman text font, forcing the use of the heavier Times accents. (Libertine has much lighter accents which can seem to almost disappear under some conditions.)
\end{itemize}
\bigskip
@@ -796,7 +1098,7 @@
\item If using one of the AMS classes (e.g., {\tt amsart}, {\tt amsbook}), you can save two or more math families by adding the option {\tt noamsfonts} in your \verb|\documentclass| call. As of early 2018, This works only with the most recent versions the AMS classes available in both TexLive and MiKTeX.
\item
The {\tt operators} font is essentially the Roman text font, used for names of operators and as the target for \verb|\mathrm|---its bold version is used as the target for \verb|\mathbf|;
-\item {\tt operators} is defined to be the OT$1$ encoded version of the text font in cases where that version is known to contain upright uppercase Greek letters in its forst eleven slots---eg, newtxtext, libertine.
+\item {\tt operators} is defined to be the OT$1$ encoded version of the text font in cases where that version is known to contain upright uppercase Greek letters in its first eleven slots---eg, newtxtext, libertine.
\item if you typeset an expression that, say, calls for a single bold glyph from {\tt symbolsC}, that costs you an entire new slot, leaving only two remaining;
\item same with, eg, \verb|\mathit|;
\item same with an external Fraktur, Blackboard Bold or Script glyphs;
@@ -1172,20 +1474,19 @@
Here is a sample preamble showing the elements you will need to specify to generate a pdf satisfying the PDF/A-1b standards, as verified by Adobe Acrobat Pro. (Other verification processes may yield different outcomes.)
\begin{verbatim}
\documentclass[noamsfonts]{amsart} % save 2 math families
-\pdfcompresslevel=0
-\pdfgentounicode=1
-\input glyphtounicode.tex
+%\pdfcompresslevel=0 %Set this only if are going to debug the pdf
+%\pdfgentounicode=1 %These to lines no longer needed--LaTeX does it.
+%\input glyphtounicode.tex
\usepackage{pdfx} % v 1.6.4 or higher
\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
\usepackage{newtxtext} %T1 is default encoding
\usepackage[scaled=0.95]{inconsolata} % typewriter
-%\usepackage[leqno]{amsmath}
+\usepackage[leqno]{amsmath}
\usepackage{amsthm}
\usepackage[vvarbb]{newtxmath} % vvarbb gives STIX Bbb
-\end{verbatim}
+\end{verbatim}
-Version 1.6.3 of {\tt pdfx} from February 2019 mishandles math accents. A fix is now available and will become part of the upcoming {\tt pdfx} v1.6.4.
\subsection{Glyph spacing changes} \textbf{(For enhanced packages only)}I reworked the math italics to improve the rendering of some superscripts. This affects (a) parentheses, brackets and braces to inhibit clashes; (b) glyphs like j, f, p, y, \verb|\rho|, \verb|\beta| and \verb|\mu| where a long tail could pose problems intersecting with other glyphs; (c) glyphs like such as D, Q and \verb|\Phi| that are round on the right, where interference is most likely to occur with a superscript. Increasing the left side-bearing of j, etc., helps with superscripts but creates an ugly gap when used as subscripts.
@@ -1297,19 +1598,30 @@
\end{filecontents*}
\end{verbatim}
\subsection*{The {\tt ebgaramond} option to newtxmath}
-As {\tt ebgaramond} has an x-height considerably smaller than {\tt newtx}, some amount of scaling is useful to bridge the gap. In making the replacement letters, I increased the size of the EBGaramond letters by 5\%, so make some scaling combination that compensates for this. The weights of {\tt ebgaramond} used in the substitutions were regular and semibold. This dictates one of the options used for {\tt ebgaramond}.
+As {\tt ebgaramond} has an x-height considerably smaller than {\tt newtx}, some amount of scaling is useful to bridge the gap. In making the replacement letters, I increased the size of the EBGaramond letters in math by 5\%, so make some scaling combination for text that compensates for this. The weights of {\tt ebgaramond} used in the substitutions were regular and semibold. This dictates one of the options used for {\tt ebgaramond}.
-\textsc{Example preamble:}\\
+\textsc{Example preamble not using newtx:}
\begin{verbatim}
\usepackage[lining,semibold,scaled=1.05]{ebgaramond}
% Latex BOLD renders with ebgaramond semibold
\usepackage[T1]{fontenc} % best for Western European languages
-\usepackage{textcomp} % required to get special symbols
-\usepackage[varqu,varl]{inconsolata}% a typewriter font must be defined
+\usepackage[varqu,varl]{inconsolata}% a typewriter font for \mathtt
\usepackage{amsmath}% must be loaded before amsthm, if using
\usepackage{amsthm}% must be loaded before newtxmath
\usepackage[ebgaramond,vvarbb,subscriptcorrection]{newtxmath} % STIX Bbb
\usepackage{bm}% load after all math to give access to bold math
\end{verbatim}
-
+\textsc{Same preamble using newtx:}
+\begin{verbatim}
+\usepackage[T1]{fontenc} % best for Western European languages
+\usepackage[varqu,varl]{inconsolata}% a typewriter font for \mathtt
+\usepackage[ebgaramond,semibold,textscale=0,vvarbb,subscriptcorrection,amsthm]{newtx}
+\usepackage{bm}% load after all math to give access to bold math
+\end{verbatim}
+%\subsection{Operatorname issues}
+%For some of the text fonts supported by {\tt newtx}, an {\tt OT1} version of the text fonts has been constructed with Greek capital letters in the first eleven slots, just as in Computer Modern, and some older TeX constructs depend on that. In those cases, even if you set {\tt T1} as your text font encoding before loading {\tt newtxmath} or {\tt newtx}, the operator font will be set to the {\tt OT1} version, not the {\tt T1} version. (You may prevent this by specifying option {\tt noOT1} to {\tt newtxmath} or {\tt newtx}.) Using the {\tt OT1} encoded operators font should not be a problem unless you wish to use accented characters in some operator names. This is the case in Spanish and Portuguese, and possible other languages. One solution could be to define the affected operators individually with commands like
+%\begin{verbatim}
+%\DeclareMathOperator{\mIn}{\text{{\fontencoding{T1}\selectfont m\'in}}}
+%\end{verbatim}
+%making use of the {\tt amsmath} \verb|\text| macro, which gives you proper scaling in scriptstyle and scriptscriptstyle as well.
\end{document}
\ No newline at end of file
Modified: trunk/Master/texmf-dist/fonts/afm/public/newtx/ntxsups-Regular.afm
===================================================================
--- trunk/Master/texmf-dist/fonts/afm/public/newtx/ntxsups-Regular.afm 2022-03-03 16:29:55 UTC (rev 62368)
+++ trunk/Master/texmf-dist/fonts/afm/public/newtx/ntxsups-Regular.afm 2022-03-03 21:06:04 UTC (rev 62369)
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20190801
-Comment Creation Date: Sun Mar 1 11:10:02 2020
+Comment Generated by FontForge 20201107
+Comment Creation Date: Sun Jan 30 13:34:05 2022
FontName ntxsups-Regular
FullName ntxsups Regular
FamilyName ntxsups
@@ -37,14 +37,14 @@
C 45 ; WX 258 ; N hyphen.sup ; B 25 378 227 430 ;
C 46 ; WX 181 ; N period.sup ; B 46 263 136 354 ;
C 47 ; WX 200 ; N slash.sup ; B -6 262 206 676 ;
-C 48 ; WX 358 ; N zero.sup ; B 16 262 343 676 ;
-C 49 ; WX 340 ; N one.sup ; B 72 270 271 676 ;
-C 50 ; WX 360 ; N two.sup ; B 20 270 344 676 ;
-C 51 ; WX 351 ; N three.sup ; B 28 262 307 676 ;
+C 48 ; WX 369 ; N zero.sup ; B 21 262 348 676 ;
+C 49 ; WX 300 ; N one.sup ; B 57 270 248 676 ;
+C 50 ; WX 336 ; N two.sup ; B 21 270 316 676 ;
+C 51 ; WX 323 ; N three.sup ; B 21 262 298 676 ;
C 52 ; WX 358 ; N four.sup ; B 8 270 340 676 ;
-C 53 ; WX 329 ; N five.sup ; B 21 262 289 684 ;
+C 53 ; WX 321 ; N five.sup ; B 21 262 289 684 ;
C 54 ; WX 355 ; N six.sup ; B 22 262 335 680 ;
-C 55 ; WX 336 ; N seven.sup ; B 13 265 303 667 ;
+C 55 ; WX 326 ; N seven.sup ; B 17 265 324 667 ;
C 56 ; WX 353 ; N eight.sup ; B 36 262 317 676 ;
C 57 ; WX 357 ; N nine.sup ; B 20 252 330 681 ;
C 58 ; WX 199 ; N colon.sup ; B 53 263 144 545 ;
Modified: trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-Bold.otf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-BoldItalic.otf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-BoldSlanted.otf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-Italic.otf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-Regular.otf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/opentype/public/newtx/TeXGyreTermesX-Slanted.otf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/newtx/ntxsups-Regular-ly1.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/newtx/ntxsups-Regular-ot1.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/tfm/public/newtx/ntxsups-Regular-t1.tfm
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/fonts/type1/public/newtx/ntxsups-Regular.pfb
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/tex/latex/newtx/ly1minebgaramond.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/ly1minebgaramond.fd (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/newtx/ly1minebgaramond.fd 2022-03-03 21:06:04 UTC (rev 62369)
@@ -0,0 +1,366 @@
+%% Generated by msharpe on 2022/01/20
+%%
+\ProvidesFile{ly1minebgaramond.fd}
+ [2022/01/20 (msharpe) Font definitions for LY1/minebgaramond.]
+
+\def\@textscalefactor{1.05}
+%ebgaramond must be reduced by factor .93 to match xheight of newtxmath
+
+\@ifundefined{ntxmath at scale}{\let\ntxmath at scaled\@empty}
+{\@tempdima\@textscalefactor\p@
+\@tempdima\ntxmath at scale\@tempdima
+\edef\ntxmath at scaled{s*[\strip at pt\@tempdima]}}% locally, not globally
+
+\DeclareFontFamily{LY1}{minebgaramond}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{minebgaramond}{regular}{sc}{
+ <-> \ntxmath at scaled EBGaramond-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{regular}{n}{
+ <-> \ntxmath at scaled EBGaramond-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{regular}{it}{
+ <-> \ntxmath at scaled EBGaramond-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{regular}{scit}{
+ <-> \ntxmath at scaled EBGaramond-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{regular}{sw}{
+ <-> \ntxmath at scaled EBGaramond-Italic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{regular}{nw}{
+ <-> \ntxmath at scaled EBGaramond-Regular-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{regular}{scsl}{
+ <-> ssub * minebgaramond/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{regular}{sl}{
+ <-> ssub * minebgaramond/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{LY1}{minebgaramond}{semibold}{sc}{
+ <-> \ntxmath at scaled EBGaramond-SemiBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{semibold}{n}{
+ <-> \ntxmath at scaled EBGaramond-SemiBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{semibold}{it}{
+ <-> \ntxmath at scaled EBGaramond-SemiBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{semibold}{scit}{
+ <-> \ntxmath at scaled EBGaramond-SemiBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{semibold}{sw}{
+ <-> \ntxmath at scaled EBGaramond-SemiBoldItalic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{semibold}{nw}{
+ <-> \ntxmath at scaled EBGaramond-SemiBold-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{semibold}{scsl}{
+ <-> ssub * minebgaramond/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{semibold}{sl}{
+ <-> ssub * minebgaramond/semibold/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{minebgaramond}{bold}{sc}{
+ <-> \ntxmath at scaled EBGaramond-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bold}{n}{
+ <-> \ntxmath at scaled EBGaramond-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bold}{it}{
+ <-> \ntxmath at scaled EBGaramond-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bold}{scit}{
+ <-> \ntxmath at scaled EBGaramond-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bold}{sw}{
+ <-> \ntxmath at scaled EBGaramond-BoldItalic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bold}{nw}{
+ <-> \ntxmath at scaled EBGaramond-Bold-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bold}{scsl}{
+ <-> ssub * minebgaramond/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bold}{sl}{
+ <-> ssub * minebgaramond/bold/it
+}{}
+
+
+% ---- medium ----
+
+\DeclareFontShape{LY1}{minebgaramond}{medium}{sc}{
+ <-> \ntxmath at scaled EBGaramond-Medium-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{medium}{n}{
+ <-> \ntxmath at scaled EBGaramond-Medium-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{medium}{it}{
+ <-> \ntxmath at scaled EBGaramond-MediumItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{medium}{scit}{
+ <-> \ntxmath at scaled EBGaramond-MediumItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{medium}{sw}{
+ <-> \ntxmath at scaled EBGaramond-MediumItalic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{medium}{nw}{
+ <-> \ntxmath at scaled EBGaramond-Medium-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{medium}{scsl}{
+ <-> ssub * minebgaramond/medium/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{medium}{sl}{
+ <-> ssub * minebgaramond/medium/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{LY1}{minebgaramond}{extrabold}{sc}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{extrabold}{n}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{extrabold}{it}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{extrabold}{scit}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{extrabold}{sw}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBoldItalic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{extrabold}{nw}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBold-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{extrabold}{scsl}{
+ <-> ssub * minebgaramond/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{extrabold}{sl}{
+ <-> ssub * minebgaramond/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{LY1}{minebgaramond}{m}{scsl}{
+ <-> ssub * minebgaramond/regular/scsl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{m}{sc}{
+ <-> ssub * minebgaramond/regular/sc
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{m}{n}{
+ <-> ssub * minebgaramond/regular/n
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{m}{it}{
+ <-> ssub * minebgaramond/regular/it
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{m}{sw}{
+ <-> ssub * minebgaramond/regular/sw
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{m}{sl}{
+ <-> ssub * minebgaramond/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{m}{scit}{
+ <-> ssub * minebgaramond/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{m}{nw}{
+ <-> ssub * minebgaramond/regular/nw
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{LY1}{minebgaramond}{sb}{scsl}{
+ <-> ssub * minebgaramond/semibold/scsl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{sb}{sc}{
+ <-> ssub * minebgaramond/semibold/sc
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{sb}{n}{
+ <-> ssub * minebgaramond/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{sb}{it}{
+ <-> ssub * minebgaramond/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{sb}{sw}{
+ <-> ssub * minebgaramond/semibold/sw
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{sb}{sl}{
+ <-> ssub * minebgaramond/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{sb}{scit}{
+ <-> ssub * minebgaramond/semibold/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{sb}{nw}{
+ <-> ssub * minebgaramond/semibold/nw
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{minebgaramond}{b}{scsl}{
+ <-> ssub * minebgaramond/bold/scsl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{b}{sc}{
+ <-> ssub * minebgaramond/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{b}{n}{
+ <-> ssub * minebgaramond/bold/n
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{b}{it}{
+ <-> ssub * minebgaramond/bold/it
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{b}{sw}{
+ <-> ssub * minebgaramond/bold/sw
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{b}{sl}{
+ <-> ssub * minebgaramond/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{b}{scit}{
+ <-> ssub * minebgaramond/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{b}{nw}{
+ <-> ssub * minebgaramond/bold/nw
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{LY1}{minebgaramond}{eb}{scsl}{
+ <-> ssub * minebgaramond/extrabold/scsl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{eb}{sc}{
+ <-> ssub * minebgaramond/extrabold/sc
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{eb}{n}{
+ <-> ssub * minebgaramond/extrabold/n
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{eb}{it}{
+ <-> ssub * minebgaramond/extrabold/it
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{eb}{sw}{
+ <-> ssub * minebgaramond/extrabold/sw
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{eb}{sl}{
+ <-> ssub * minebgaramond/extrabold/sl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{eb}{scit}{
+ <-> ssub * minebgaramond/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{eb}{nw}{
+ <-> ssub * minebgaramond/extrabold/nw
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bx}{n}{
+ <-> ssub * minebgaramond/b/n
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bx}{sc}{
+ <-> ssub * minebgaramond/b/sc
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bx}{scsl}{
+ <-> ssub * minebgaramond/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bx}{it}{
+ <-> ssub * minebgaramond/b/it
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bx}{sw}{
+ <-> ssub * minebgaramond/b/sw
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bx}{sl}{
+ <-> ssub * minebgaramond/b/sl
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bx}{scit}{
+ <-> ssub * minebgaramond/b/scit
+}{}
+
+\DeclareFontShape{LY1}{minebgaramond}{bx}{nw}{
+ <-> ssub * minebgaramond/b/nw
+}{}
+
+\endinput
Property changes on: trunk/Master/texmf-dist/tex/latex/newtx/ly1minebgaramond.fd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/newtx/ly1minntx.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/ly1minntx.fd (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/newtx/ly1minntx.fd 2022-03-03 21:06:04 UTC (rev 62369)
@@ -0,0 +1,42 @@
+\ProvidesFile{ly1minntx.fd}[2022/01/20 v1.0 font definition file for LY1/minntx]
+
+\@ifundefined{ifntx at sl}{\let\ifntx at sl\iftrue}{}
+\@ifundefined{ifntx at largesc}{\let\ifntx at largesc\iftrue}{}
+
+\expandafter\ifx\csname ntxmath at scaled\endcsname\relax
+ \let\ntxmath at scaled\@empty%
+\fi
+\def\ntx at asfx{}
+\def\ntx at lsfx{}
+\def\ntx at makelsfx{\ifntx at largesc\def\ntx at lsfx{l}\fi}
+\def\ntx at makeadobesc{\ifntx at adobesc\def\ntx at lsfx{l}\def\ntx at adobesc{a}\else\ntx at makelsfx\fi}
+\ntx at makelsfx
+\ifdefined\ntx at adobescfalse\ntx at makeadobesc\fi
+\ifdefined\ntx at spacing \else\global\let\ntx at spacing\@empty\fi
+
+\DeclareFontFamily{LY1}{minntx}{\ntx at spacing}
+\DeclareFontShape{LY1}{minntx}{b}{sc}{<-> \ntxmath at scaled ntx-Bold-tlf-sc\ntx at lsfx-ly1}{}
+\DeclareFontShape{LY1}{minntx}{b}{n}{<-> \ntxmath at scaled ntx-Bold-tlf-ly1}{}
+\DeclareFontShape{LY1}{minntx}{b}{scit}{<-> \ntxmath at scaled ntx-BoldItalic-tlf-sc\ntx at lsfx-ly1}{}
+\DeclareFontShape{LY1}{minntx}{b}{it}{<-> \ntxmath at scaled ntx-BoldItalic-tlf-ly1}{}
+\DeclareFontShape{LY1}{minntx}{m}{sc}{<-> \ntxmath at scaled ntx-Regular-tlf-sc\ntx at lsfx-ly1}{}
+\DeclareFontShape{LY1}{minntx}{m}{n}{<-> \ntxmath at scaled ntx-Regular-tlf-ly1}{}
+\DeclareFontShape{LY1}{minntx}{m}{scit}{<-> \ntxmath at scaled ntx-Italic-tlf-sc\ntx at lsfx-ly1}{}
+\DeclareFontShape{LY1}{minntx}{m}{it}{<-> \ntxmath at scaled ntx-Italic-tlf-ly1}{}
+\DeclareFontShape{LY1}{minntx}{bx}{sc}{<->ssub * minntx/b/sc}{}
+\DeclareFontShape{LY1}{minntx}{bx}{n}{<->ssub * minntx/b/n}{}
+\DeclareFontShape{LY1}{minntx}{bx}{scit}{<->ssub * minntx/b/scit}{}
+\DeclareFontShape{LY1}{minntx}{bx}{it}{<->ssub * minntx/b/it}{}
+\ifntx at sl % point to real slanted fonts
+ \DeclareFontShape{LY1}{minntx}{m}{sl}{<-> \ntxmath at scaled tyxsl}{}
+ \DeclareFontShape{LY1}{minntx}{b}{sl}{<-> \ntxmath at scaled ztmbsl-tlf-ly1}{}
+ \DeclareFontShape{LY1}{minntx}{bx}{sl}{<->ssub * minntx/b/sl}{}
+\else %point to theorem font
+ \DeclareFontShape{LY1}{minntx}{m}{sl}{<-> \ntxmath at scaled ntxth-Italic-tlf-ot1}{}
+ \DeclareFontShape{LY1}{minntx}{b}{sl}{<->ssub * minntx/m/sl}{}
+ \DeclareFontShape{LY1}{minntx}{bx}{sl}{<->ssub * minntx/m/sl}{}
+\fi
+\DeclareFontShape{LY1}{minntx}{b}{scsl}{<->ssub * minntx/b/scit}{}
+\DeclareFontShape{LY1}{minntx}{bx}{scsl}{<->ssub * minntx/b/scit}{}
+\DeclareFontShape{LY1}{minntx}{m}{scsl}{<->ssub * minntx/m/scit}{}
+\endinput
Property changes on: trunk/Master/texmf-dist/tex/latex/newtx/ly1minntx.fd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/newtx/newtx.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/newtx.sty 2022-03-03 16:29:55 UTC (rev 62368)
+++ trunk/Master/texmf-dist/tex/latex/newtx/newtx.sty 2022-03-03 21:06:04 UTC (rev 62369)
@@ -1,113 +1,539 @@
\NeedsTeXFormat{LaTeX2e}
+%:
-%Package to simplify loading of newtxtext with newtxmath for all latex engines
-\def\fileversion{1.704}
-\def\filedate{2022/01/09}
+%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.71}
+\def\filedate{2022/02/11}
\ProvidesPackage{newtx}[%
-\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for newtxtext with newtxmath]
+\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]
-\message{`newtx'v\fileversion,\filedate\space Integrated\space loading\space of\space newtxtext\space and\space newtxmath
+\message{`newtx'v\fileversion,\space\filedate\space Integrated\space loading\space of\space newtxmath\space and\space a\space text\space font
\space for\space all\space latex\space engines\space (msharpe)}
-\RequirePackage{ifthen,ifxetex,ifluatex}
-\def\ntx at mathlst{vecsep,amsthm,nosubscriptcorrection,subscriptcorrection,subscriptcorrectionfile,timesmathacc,varbb,vvarbb,nosymbolsc,noamssymbols,amssymbols,uprightscript,uprightGreek,slantedGreek,frenchmath,nonewtxmathopt,upint,smallerops,useBImacros,varg,varvw,noOT1}
-\def\ntx at textlst{type1,nofontspec,no-math,defaultfeatures,lining,lf,oldstyle,osf,tabular,t,proportional,p,defaultsups,largesc,nott,nohelv,helvratio,spcfactor,spacing,stretch,shrink,defaultfeatures,oldSS,slashedzero,theoremfont,thmlining,thmslshape,trueslanted,scosf,tighter,looser}
+\RequirePackage{fontenc,fontaxes}
+\RequirePackage{ifthen,iftex,etoolbox,scalefnt}
-%\newif\ifntx at inmath\newif\ifntx at intext
-%% #2
-%\def\ntx at inmath#1{\ntx at inmathfalse%
-% \@for\ntx at opt:=\ntx at mathlst\do{%
-% \ifthenelse{\equal}{#1}{\ntx at opt}{\ntx at inmathtrue\typeout{#1 in mathlst}}{}}%
-% }
-%\def\ntx at intext#1{\ntx at intextfalse%
-% \@for\ntx at opt:=\ntx at textlst\do{%
-% \ifthenelse{\equal}{#1}{\ntx at opt}{\ntx at intexttrue}{}}%
-% }
+% options for newtxmath as etoolbox internal list allowing \ifinlist
+\def\ntx at mathlstr{vecsep,amsthm,nosubscriptcorrection,subscriptcorrection,timesmathacc,varbb,vvarbb,nosymbolsc,noamssymbols,amssymbols,uprightscript,uprightGreek,slantedGreek,frenchmath,nonewtxmathopt,upint,smallerops,useBImacros,varg,varvw,noOT1}
+% Note that subscriptcorrectionfile is not on the list---we process it in this sty file
+\def\ntx at mathlst{}
+\@for\ntx at opt:=\ntx at mathlstr\do{%
+\listeadd{\ntx at mathlst}{\ntx at opt}}%
+%\ifinlist{amsthm}{\ntx at mathlst}{\typeout{YES}}{ \typeout{NO}}
+
%Enginecheck
-\newif\ifntxotf
-\newif\ifntx at origotf
-\ifxetex
- \ntxotftrue
-\else
- \ifluatex
- \ntxotftrue
- \else %[pdf]LaTeX
- \ntxotffalse
- \fi
-\fi
-\ifntxotf\ntx at origotftrue\fi
+%iftex's \iftutex is true for LuaTeX and XeTeX
+\newif\ifntx at otftext
+\iftutex\ntx at otftexttrue\fi
%%%%%%%%%%%%%%%%%%
-\IfFileExists{xkeyval.sty}{\RequirePackage{xkeyval}}%
-{\let\DeclareOptionX\DeclareOption
-\let\ExecuteOptionsX\ExecuteOptions
-\let\ProcessOptionsX\ProcessOptions}
+\RequirePackage{xkeyval}%
+
%%%%StartOptions
-\newif\ifntxotfmath\ntxotfmathfalse %default is type1 math
-%\newif\ifntxotftext\ntxotftexttrue %default is otftext using newtxtext
-%\newcommand{\ntx at optlist}{}
-\newif\ifntx at babel\newif\ifntx@
-%\DeclareOptionX{babel}{}
-%\DeclareOptionX{type1text}[true]{%
-%\@nameuse{if#1}\ntxotftextfalse\fi
-%}
-%\DeclareOptionX{nofontspec}[true]{%
-%\@nameuse{if#1}\ntxotffalse\fi
-%}
-%\DeclareOptionX{type1}[true]{%
-%\@nameuse{if#1}\ntxotffalse\fi
-%}
+\newif\ifntx at nofontspec % default is to load fontspec if unicode engine
+\newif\ifntx at otfmath %\ntx at otfmathfalse % default is type1 math
+
+\def\tx at divide#1#2{\strip at pt\dimexpr 1pt * (\dimexpr #1pt) / \dimexpr #2pt\relax\relax}
+
+\newcommand*{\ntxtext at scale}{1}
+\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}}
+\DeclareOptionX{textscale}[1]{\renewcommand*{\ntxtext at scale}{#1}}
+\DeclareOptionX{textscaled}[1]{\renewcommand*{\ntxtext at scale}{#1}}
+\DeclareOptionX{mathscale}[1]{\renewcommand*{\ntxmath at scale}{#1}}
+\DeclareOptionX{mathscaled}[1]{\renewcommand*{\ntxmath at scale}{#1}}
+
+\DeclareOptionX{type1}[true]{%
+\@nameuse{if#1}\ntx at otftextfalse\fi}
+\DeclareOptionX{type1text}[true]{% same as type1--use type1 for text
+\@nameuse{if#1}\ntx at otftextfalse\fi}
+
+\DeclareOptionX{nofontspec}[true]{% use type1 for text and math
+\@nameuse{if#1}\ntx at nofontspectrue\fi}
+
\DeclareOptionX{otfmath}[true]{%
-\@nameuse{if#1}\ntxotfmathtrue\typeout{Got otfmath}\fi
+\@nameuse{if#1}\iftutex\ntx at otfmathtrue\fi\fi}
+
+%\DeclareOptionX{no-math}[true]{%
+%\@nameuse{if#1}\ntx at nomathtrue\fi}
+%\DeclareOptionX{no-otfmath}[true]{% forces use of newtxmath
+%\@nameuse{if#1}\ntx at nomathtrue\fi}
+
+\DeclareOptionX{subscriptcorrectionfile}{\def\tx at subs{#1}\tx at subsfiletrue}
+
+%\newif\ifntx at fourier
+\def\ntx at dfltTF{newtxtext} % the default text font package name
+\def\ntx at text{\let\ntx at TF=\ntx at dfltTF % the text font package name
+\def\ntx at MF{} % option name for flavor of newtxmath
+\def\ntx at id{0} % identifier for font properties
+\def\ntx at sc{ntx at scale} % macro name for scale factor in font package
+\def\ntx at minfam{minntx} %roman font, tabular lining fd, used in math
}
-
+\ntx at text % set the default
+\DeclareOptionX{libertine}[true]{%
+ \@nameuse{if#1}\def\ntx at sc{LinuxLibertineT at scale}%
+ \def\ntx at TF{libertinus}\def\ntx at MF{libertine}
+ \def\ntx at id{10}\def\ntx at minfam{minlibertine}\def\textlf##1{{\liningnums##1}}\def\nustyle{\sufigures}\def\destyle{}\def\infigures{}\def\textinf{}\fi}
+\DeclareOptionX{libertinus}[true]{%
+ \@nameuse{if#1}\def\ntx at sc{LibertinusSerif at scale}%
+ \def\ntx at TF{libertinus}\def\ntx at MF{libertine}
+ \def\ntx at id{10}\def\ntx at minfam{minlibertine}%
+}
+\DeclareOptionX{etbb}[true]{%
+ \@nameuse{if#1}\def\ntx at TF{ETbb}\def\ntx at MF{libertine}
+ \def\ntx at id{2}\def\ntx at minfam{minlibertine}\fi}
+\DeclareOptionX{ebgaramond}[true]{\@nameuse{if#1}
+ \def\ntx at sc{EBGaramond at scale}\def\ntx at TF{ebgaramond}
+ \let\ntx at MF\ntx at TF\def\ntx at id{3}\def\ntx at minfam{minebgaramond}\fi}
+\DeclareOptionX{MinionPro}[true]{\@nameuse{if#1}
+ \def\ntx at sc{}\def\ntx at TF{MinionPro}\def\ntx at MF{minion}
+ \def\ntx at id{4}\def\ntx at minfam{mincochineal}\def\ntx at TF{MinionPro}\fi}
+\DeclareOptionX{minion}[true]{\@nameuse{if#1}
+ \def\ntx at sc{}\def\ntx at TF{MinionPro}\def\ntx at MF{minion}
+ \def\ntx at id{4}\def\ntx at minfam{mincochineal}\def\ntx at TF{MinionPro}\fi}
+\DeclareOptionX{cochineal}[true]{\@nameuse{if#1}
+ \def\ntx at sc{Cochineal at scale}\def\ntx at TF{cochineal}
+ \let\ntx at MF\ntx at TF\def\ntx at id{5}\def\ntx at minfam{mincochineal}\fi}
+\DeclareOptionX{garamondx}[true]{\@nameuse{if#1}
+ \def\ntx at sc{zgm at Scale}\def\ntx at TF{garamondx}
+ \let\ntx at MF\ntx at TF
+ \def\ntx at id{6}\def\ntx at minfam{minzgm}\fi}
+\DeclareOptionX{baskerville}[true]{\@nameuse{if#1}
+ \def\ntx at sc{BaskervilleF at scale}\def\ntx at TF{baskervillef}
+ \let\ntx at MF\ntx at TF\def\ntx at id{7}\def\ntx at minfam{minbaskervillef}\fi}
+\DeclareOptionX{Baskerville}[true]{\@nameuse{if#1}
+ \def\ntx at sc{BaskervilleF at scale}\def\ntx at TF{baskervillef}
+ \let\ntx at MF\ntx at TF\def\ntx at id{7}\def\ntx at minfam{minbaskervillef}\fi}
+\DeclareOptionX{baskervillef}[true]{\@nameuse{if#1}
+ \def\ntx at sc{BaskervilleF at scale}\def\ntx at TF{baskervillef}
+ \let\ntx at MF\ntx at TF\def\ntx at id{7}\def\ntx at minfam{minbaskervillef}\fi}
+\DeclareOptionX{BaskervilleF}[true]{\@nameuse{if#1}
+ \def\ntx at sc{BaskervilleF at scale}\def\ntx at TF{baskervillef}
+ \let\ntx at MF\ntx at TF\def\ntx at id{7}\def\ntx at minfam{minbaskervillef}\fi}
+\DeclareOptionX{baskervaldx}[true]{\@nameuse{if#1}
+ \def\ntx at sc{Baskervaldx at scale}\def\ntx at TF{baskervaldx}
+ \let\ntx at MF\ntx at TF\def\ntx at id{8}\def\ntx at minfam{minbaskervaldx}\fi}
+\DeclareOptionX{Baskervaldx}[true]{\@nameuse{if#1}
+ \def\ntx at sc{Baskervaldx at scale}\def\ntx at TF{baskervaldx}
+ \let\ntx at MF\ntx at TF\def\ntx at id{8}\def\ntx at minfam{minbaskervaldx}\fi}
+%\DeclareOptionX{utopia}[true]{%
+% \@nameuse{if#1}\def\ntx at TF{utopia}\let\ntx at MF\ntx at TF\def\ntx at id{0}\def\ntx at minfam{}\fi}
+\DeclareOptionX{heuristica}[true]{\@nameuse{if#1}
+ \def\ntx at sc{Heuristica at scale}%
+ \def\ntx at TF{heuristica}\def\ntx at MF{utopia}
+ \def\ntx at id{9}\def\ntx at minfam{minheuristica}\fi}
+\DeclareOptionX{Heuristica}[true]{\@nameuse{if#1}
+ \def\ntx at sc{Heuristica at scale}%
+ \def\ntx at TF{heuristica}\def\ntx at MF{utopia}
+ \def\ntx at id{9}\def\ntx at minfam{minheuristica}\fi}
+\DeclareOptionX{erewhon}[true]{\@nameuse{if#1}
+ \def\ntx at sc{erewhon at scale}\def\ntx at TF{erewhon}\def\ntx at MF{utopia}
+ \def\ntx at id{11}\def\ntx at minfam{minerewhon}\fi}
+\DeclareOptionX{Erewhon}[true]{\@nameuse{if#1}
+ \def\ntx at sc{erewhon at scale}\def\ntx at TF{erewhon}\def\ntx at MF{utopia}
+ \def\ntx at id{11}\def\ntx at minfam{minerewhon}\fi}
+\DeclareOptionX{XCharter}[true]{\@nameuse{if#1}
+ \def\ntx at sc{XCharter at scale}\def\ntx at TF{XCharter}
+ \def\ntx at MF{xcharter}\def\ntx at id{12}\def\ntx at minfam{minxcharter}\fi}
+\DeclareOptionX{xcharter}[true]{\@nameuse{if#1}
+ \def\ntx at sc{XCharter at scale}\def\ntx at TF{XCharter}
+ \def\ntx at MF{xcharter}\def\ntx at id{12}\def\ntx at minfam{minxcharter}\fi}
+\DeclareOptionX{Stickstoo}[true]{\@nameuse{if#1}
+ \def\ntx at sc{SticksTooText at scale}%
+ \def\ntx at TF{stickstootext}\def\ntx at MF{stickstoo}
+ \def\ntx at id{13}\def\ntx at minfam{minstickstootext}\fi}
+\DeclareOptionX{stickstoo}[true]{\@nameuse{if#1}
+ \def\ntx at sc{SticksTooText at scale}%
+ \def\ntx at TF{stickstootext}\def\ntx at MF{stickstoo}
+ \def\ntx at id{13}\def\ntx at minfam{minstickstootext}\fi}
+\DeclareOptionX{stix2}[true]{\@nameuse{if#1}
+ \def\ntx at sc{SticksTooText at scale}%
+ \def\ntx at TF{stickstootext}\def\ntx at MF{stickstoo}
+ \def\ntx at id{13}\def\ntx at minfam{minstickstootext}\fi}
+\DeclareOptionX{scholax}[true]{\@nameuse{if#1}
+ \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{nc}[true]{\@nameuse{if#1}
+ \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{scholaxf}[true]{\@nameuse{if#1}
+ \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{ncf}[true]{\@nameuse{if#1}
+ \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}
+% for stacked fractions
+\DeclareOptionX{sfracvcenter}{%
+\def\tx at sfrVC{#1}}
+\DeclareOptionX{sfracvspacing}{%
+\def\tx at sfrVS{#1}}
+\DeclareOptionX{sfracbarthick}{%
+\def\tx at sfrTH{#1}}
+\DeclareOptionX{sfracscaling}{%
+\def\tx at sfrSC{#1}}
+\def\ntx at textopt{}
\DeclareOptionX*{% what to do with unknown options
-%\ntx at intext{\CurrentOption}\ifntx at intext%
-\PassOptionsToPackage{\CurrentOption}{newtxtext}
-%\ntx at inmath{\CurrentOption}\ifntx at inmath%
-\PassOptionsToPackage{\CurrentOption}{newtxmath}
+\xifinlist{\CurrentOption}{\ntx at mathlst}%
+{\PassOptionsToPackage{\CurrentOption}{newtxmath}}{%
+\xdef\ntx at textopt{\ntx at textopt \CurrentOption,}
+}}
+% \ntx at textopt contains all unknown options that are not math options. It contains no scale options.
+\ProcessOptionsX\relax
+%\traceon
+% Check for conflict between nofontspec and others
+\ifntx at nofontspec
+ \iftutex
+ \ntx at otfmathfalse
+ \ntx at otftextfalse
+ \fi
+\fi
+\ifntx at otfmath
+ \ifnum\ntx at id>0
+ \PackageWarning{newtx.sty}{Reverting to newtxtext: newtx is useless when specifying otfmath with any other text package.}
+ \ntx at text % revert to newtxtext
+\fi\fi
+%\ifntx at badnof\PackageError{newtx.sty}{Incompatible options, nofontspec and otfmath}{Incompatible options, nofontspec and otfmath}\fi
+% Set the text scale macros appropriately
+%\show\ntx at TF
+\PassOptionsToPackage{scaled=\ntxmath at scale}{newtxmath}
+%\PassOptionsToPackage{scaled=\ntxtext at scale}{\ntx at TF}
+\edef\ntxmath at scaled{s*[\ntxmath at scale]}
+% For the min text fd files, need to use actual scale macro passed to fd?
+%\@namedef{\ntx at sc}{\ntxtext at scale}
+
+\newif\ifntx at iszero
+\@tempdima\@ne\p@\@tempdima\ntxtext at scale\@tempdima
+\expandafter\ifnum\number\@tempdima=0\relax\ntx at iszerotrue\fi
+%
+\newcommand{\PassMathScale}{\ifntx at iszero\gdef\ntxtext at scale{\ntxmath at scale}\gdef\ntxtext at scaled{s*[\ntxtext at scale]}\fi
+\ifnum\ntx at id=4 % MinionPro
+ \PassOptionsToPackage{scale=\ntxtext at scale}{\ntx at TF}
+\else
+ \ifnum\ntx at id=10 %libertinus
+ \PassOptionsToPackage{ScaleRM=\ntxtext at scale}{\ntx at TF}
+ \else
+ \PassOptionsToPackage{scaled=\ntxtext at scale}{\ntx at TF}
+ \fi
+\fi
}
+%
+\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]}
+\fi
+\PassOptionsToPackage{scaled=\ntxtext at scale}{\ntx at TF}%
+}
-\ProcessOptionsX\relax
+\ifcase\ntx at id % 0, newtxtext
+\PassMathScale
+% info for sfrac (stacked fractions) involving newtxtext
+\@ifundefined{tx at xht}{\def\tx at xht{450}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{406}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{270}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{0}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{331}}{}% 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{54}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.8}}{} % scale defigures by this
+\or %1, libertine
+\PassMathScale
+ \PassOptionsToPackage{ttscaled=\ntxtext at scale,
+ llscaled=\ntxtext at scale}{\ntx at TF} % for tt and serifed in Libertine
+\@ifundefined{tx at xht}{\def\tx at xht{431}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{328}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{365}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{365}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{305}}{}% vertical center of sfrac
+\@ifundefined{tx at sfrVS}{\def\tx at sfrVS{100}}{} % space above/below bar
+\@ifundefined{tx at sfrTH}{\def\tx at sfrTH{46}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.9}}{} % scale defigures by this
+\def\destyle{\sufigures} \def\nustyle{\sufigures}
+%\iflibertine at otf%
+%\providecommand{\textfrac}[3][]{{%
+%\mbox{%
+% \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+% {\textlf{#1}\kern.02em}{}%
+%{\addfontfeature{RawFeature=+frac}#2/#3}}%
+%}}
+\or % 2, etbb
+\PassMathScale
+\@ifundefined{tx at xht}{\def\tx at xht{431}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{357}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{295}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{0}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{331}}{}% 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{64}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.8}}{} % scale defigures by this
+\or % 3, ebgaramond
+\PassMatchingScale{1.05}
+\@ifundefined{tx at xht}{\def\tx at xht{431}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{341}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{443}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{-143}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{318}}{}% vertical center of sfrac
+\@ifundefined{tx at sfrVS}{\def\tx at sfrVS{90}}{} % space above/below bar
+\@ifundefined{tx at sfrTH}{\def\tx at sfrTH{46}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.9}}{} % scale defigures by this
+\def\destyle{\infigures} \def\nustyle{\sufigures}
+\def\textlf#1{{\liningnums#1}}
+%\iflibertine at otf%
+%\providecommand{\textfrac}[3][]{{%
+%{{%
+% \mbox{%
+% \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+% {\textlf{#1}\kern.02em}{}%
+%{\addfontfeature{RawFeature=+frac}#2/#3}}%
+%}}}}
+\or % 4, MinionPro
+\PassMathScale
+%\@ifundefined{tx at xht}{\def\tx at xht{437}}{} % lowercase letters
+%\@ifundefined{tx at deht}{\def\tx at deht{359}}{} % denominator figures ht
+%\@ifundefined{tx at nubase}{\def\tx at nubase{277}}{} % baseline of numerators
+%\@ifundefined{tx at debase}{\def\tx at debase{0}}{} % baseline of denoms
+%\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{317}}{}% 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{54}}{} % bar thickness
+%\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.9}}{} % scale defigures by this
+\or % 5, cochineal
+\PassMathScale
+\@ifundefined{tx at xht}{\def\tx at xht{430}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{378}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{248}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{0}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{313}}{}% 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{54}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.9}}{} % scale defigures by this amount
+\or % 6, garamondx
+\PassMatchingScale{.94}
+\or % 7, BaskervilleF
+\PassMathScale
+\or % 8, baskervaldx
+\PassMathScale
+\or % 9, heuristica
+\PassMatchingScale{.94}
+\or % 10, libertinus
+\PassMathScale
+ \PassOptionsToPackage{ScaleTT=\ntxtext at scale, ScaleSF=\ntxtext at scale,
+ ScaleRM=\ntxtext at scale}{\ntx at TF} % for tt and serifed in Libertinus
+\@ifundefined{tx at xht}{\def\tx at xht{431}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{324}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{364}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{-112}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{305}}{}% vertical center of sfrac
+\@ifundefined{tx at sfrVS}{\def\tx at sfrVS{90}}{} % space above/below bar
+\@ifundefined{tx at sfrTH}{\def\tx at sfrTH{46}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.9}}{} % scale defigures by this
+%\def\destyle{\sufigures} \def\nustyle{\sufigures}
+%\providecommand{\textfrac}[3][]{\textlf{#1}\kern.01em{\addfontfeature{RawFeature=+frac}#2/#3}}
+%\iflibertine at otf%
+%\providecommand{\textfrac}[3][]{{%
+%{{%
+% \mbox{%
+% \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+% {\textlf{#1}\kern.02em}{}%
+%{\addfontfeature{RawFeature=+frac}#2/#3}}%
+%}}}}
+\or % 11, erewhon
+\PassMathScale
+\@ifundefined{tx at xht}{\def\tx at xht{461}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{384}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{256}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{0}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{320}}{}% 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{58}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.8}}{} % scale defigures by this
+\or % 12, XCharter
+\PassMatchingScale{.98}
+\@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
+\@ifundefined{tx at debase}{\def\tx at debase{0}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{341}}{}% 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{54}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.8}}{} % scale defigures by this
+\or % 13, stickstoo
+\PassMathScale
+\@ifundefined{tx at xht}{\def\tx at xht{473}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{411}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{252}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{0}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{320}}{}% 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{56}}{} % bar thickness
+\@ifundefined{tx at sfrSC}{\def\tx at sfrSC{.75}}{} % scale defigures by this
+\or % 14, scholax
+\PassMatchingScale{.93}
+\@ifundefined{tx at xht}{\def\tx at xht{466}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{423}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{289}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{-111}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{352}}{}% 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{.8}}{} % scale defigures by this
+\or % 15, scholax/fourier
+\PassMatchingScale{.93}
+\@ifundefined{tx at xht}{\def\tx at xht{466}}{} % lowercase letters
+\@ifundefined{tx at deht}{\def\tx at deht{423}}{} % denominator figures ht
+\@ifundefined{tx at nubase}{\def\tx at nubase{289}}{} % baseline of numerators
+\@ifundefined{tx at debase}{\def\tx at debase{-111}}{} % baseline of denoms
+\@ifundefined{tx at sfrVC}{\def\tx at sfrVC{352}}{}% 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{.8}}{} % scale defigures by this
+\fi
-\ifntxotf\typeout{otf^^J}\else\typeout{type1^^J}\fi
-\ifntxotfmath\typeout{otfmath^^J}\else\typeout{type1math^^J}\fi
-%\ifntxotftext\typeout{otftext^^J}\else\typeout{type1text^^J}\fi
+\PassOptionsToPackage{\ntx at MF}{newtxmath}
-\ifntxotf
-% \ifntxotftext
- \ifntxotfmath %I
+\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
+
+% 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}
+
+\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
+\newcommand*{\textsfrac}[3][]{% like \textsfrac[1]{23}{34}
+\mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {\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}%
+\egroup}}
+}
+
+\ifntx at otfmath\typeout{otf math}\else\typeout{type1 math}\fi
+\ifntx at otftext\typeout{otf text}\else\typeout{type1 text}\fi
+
+\ifntx at otftext
+ \ifntx at otfmath %I
+ %\show\xyzI
\usepackage[]{newtxtext} %may not load fontspec
\RequirePackage{fontspec} % just in case
\usepackage{unicode-math} %loads amsmath
%\setmathfont{}
\else %II: type1 math, otftext
- \renewcommand{\rmdefault}{ntxtlf} % Roman and BoldTermes for math
+ %\show\xyzII
+ \renewcommand*{\rmdefault}{\ntx at minfam} % Roman and Bold Termes for math
\usepackage[]{newtxmath} % options will be as passed from newtx
- \usepackage[no-math]{newtxtext}
- \RequirePackage[no-math]{fontspec} % just in case
+ %\show\xyz
+ \usepackage[no-math]{fontspec}
+ %\show\textlf
+ \ifnum\ntx at id=10\relax % libertinus
+ \usepackage[nomath]{\ntx at TF}% was \usepackage[no-math]{\ntx at TF}
+ \else
+ \usepackage{\ntx at TF}
+ \fi
\fi
-% \else % type1 text
-% \ifntxotfmath %II: type1text, otfmath
-% \usepackage[]{newtxtext}
-% \usepackage{fontspec}
-% \usepackage{unicode-math} % loadsamsmath
-% %\setmathfont{}
-% \else %IV: type1math,type1text
-% \renewcommand{\rmdefault}{ntxtlf}% Roman and Bold Termes for math
-% \usepackage[]{newtxmath}% options will be as passed from newtx
-% \usepackage[nofontspec]{newtxtext}
-% \ifntx at origotf\usepackage[no-math]{fontspec}\fi % we are
-% \fi
-% \fi
-\else % pdflatex
- \renewcommand{\rmdefault}{ntxtlf}% Roman and Bold Termes for math
- \usepackage{newtxmath} % options will be as passed from newtx
- \usepackage{newtxtext} % should load tt and sans math before newtx
+\else % III, pdflatex
+ %\show\ntx at minfam
+ \ifntx at otfmath % type1 text, otf math
+ \usepackage[type1text]{newtxtext} %may not load fontspec
+ \RequirePackage{fontspec} % just in case
+ \usepackage{unicode-math} %loads amsmath
+ %\setmathfont{}
+
+ \else % IV, type1 tex and math
+ \renewcommand*{\rmdefault}{\ntx at minfam}% Roman and Bold for math
+ \usepackage{newtxmath} % options will be as passed from newtx
+ \usepackage{\ntx at TF} % should load tt and sans math before newtx
+ \fi
\fi
-%\usepackage[\ntx at optlist]{newtxtext}%optionswillalsobeaspassedfromnewtx
-%\ifntxotfmath
-%\usepackage{unicode-math}
-%\fi
+%%%%%%% End of preamble items
+\AtEndPreamble{%
+\providecommand{\textfrac}[3][]{{%
+\mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {\textlf{#1}\kern.02em}{}%
+{\ifntx at otftext\addfontfeature{RawFeature=+frac}#2/#3}
+\else\textnu{#2}{\normalfont\fontencoding{TS1}\selectfont\char"2F}%
+\textde{#3}\fi}
+}}}
+
+% Finally, add code to extend text packages after they load.
+% This will depend on the particular package and the state
+% of \ntx at otftext
+\ifcase\ntx at id % 0, newtxtext
+\or % 1, was libertine % switch to libertinus
+\or % 2, etbb
+\or % 3, ebgaramond
+ \def\destyle{\infigures} \def\nustyle{\sufigures}
+ \def\textnu#1{{\sufigures#1}}
+ \def\textde#1{{\infigures#1}}
+ \ifntx at otftext
+ \def\pliningnums{\addfontfeature{RawFeature=-tnum;-onum;+pnum;+lnum}}
+ \else % type1
+ \DeclareTextFontCommand{\pliningnums}{\fontfamily{EBGaramond-LF}\selectfont}
+ \fi
+ \def\textlf#1{{\pliningnums#1}}
+\or % 4, MinionPro
+\or % 5, cochineal
+\or % 6, garamondx
+\or % 7, BaskervilleF
+\or % 8, baskervaldx
+\or % 9, heuristica
+\or % 10, libertinus
+ \def\nustyle{\textsup}\let\textnu\textsup
+ \ifntx at otftext%
+ \def\textlf#1{{\addfontfeature{RawFeature=+lnum,RawFeature=+pnum}#1}}
+ \def\destyle{\addfontfeature{RawFeature=+subs}}
+ \else % type1
+ \fa at naming@exception{figures}{{inferior}{proportional}}{Inf}
+ \fa at naming@exception{figures}{{inferior}{tabular}}{Inf}
+ \def\infigures{\@nomath\infigures\fontfigurestyle{inferior}\selectfont}
+ \DeclareTextFontCommand{\textinf}{\infigures}
+ \let\destyle\infigures
+ \def\textlf#1{{\LibertinusSerifLF#1}}
+ \fi
+ \def\textde#1{{\destyle#1}}
+\or % 11, erewhon
+\or % 12, XCharter
+\or % 13, stickstoo
+\or % 14, scholax
+\or % 15, scholax/fourier
+\fi
+
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/newtxmath.sty 2022-03-03 16:29:55 UTC (rev 62368)
+++ trunk/Master/texmf-dist/tex/latex/newtx/newtxmath.sty 2022-03-03 21:06:04 UTC (rev 62369)
@@ -11,8 +11,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.7}
-\def\filedate{2021/12/18}
+\def\fileversion{1.71}
+\def\filedate{2022/01/16}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -51,6 +51,7 @@
\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}}
+%:
%\define at key{ntxmath}{scalesubdrop}[1.0]{\DeclareRobustCommand{\ntx at scalesub}{%
%\fontdimen16\font=#1\fontdimen16\font\fontdimen17\font=#1\fontdimen17\font}}
\DeclareOption*{%
@@ -94,15 +95,15 @@
\newif\iftx at fourier
\edef\tx at rmdefault{\rmdefault}
\edef\tx at encdefault{\encodingdefault}
-\tx at ottrue % default is true
+\tx at ottrue % default is to use OT1 operators
\let\rmdefaultB\rmdefault
\newif\iftx at hastm
\ifx\tx at rmdefault\@tx at ptm \tx at hastmtrue\fi
\@ifundefined{ver at newtxtext.sty}{}{\tx at hastmtrue}
\@ifundefined{ver at tgtermes.sty}{}{\tx at hastmtrue}
-\iftx at hastm\def\rmdefaultB{ntxtlf}\fi
+\iftx at hastm\def\rmdefaultB{minntx}\fi
% test if tm is loaded minimally as with XeLaTeX newtxmath
-\ifthenelse{\equal{\rmdefault}{ntxtlf}}{\tx at hastmtrue\def\rmdefaultB{ntxtlf}}{}
+\ifthenelse{\equal{\rmdefault}{minntx}}{\tx at hastmtrue\def\rmdefaultB{minntx}}{}
%\expandafter\ifx\csname qnc at scale\endcsname\relax
%\else
% \let\znc at scale=\qnc at scale % scale set by tgschola.sty
@@ -135,8 +136,8 @@
\if\next N\mkern-0.5mu\else
\if\next P\mkern-\@ne mu\else
\if\next X\mkern-\@ne mu\else
- \ifx\next \rho\mkern-1.5mu\else
- \ifx\next \mu\mkern-1 mu\else
+ \if\next \rho\mkern-1.5mu\else
+ \if\next \mu\mkern-1 mu\else
\fi
\fi
\fi%
@@ -191,14 +192,14 @@
\repeat
}
\def\tx at addrec#1#2{%
-\ifiscseq{#1}{\tx at tA\expandafter{\the\tx at tA\ifx}}{\tx at tA\expandafter{\the\tx at tA\if}}
+\ifiscseq{#1}{\tx at tA\expandafter{\the\tx at tA\if}}{\tx at tA\expandafter{\the\tx at tA\if}}
\tx at tA\expandafter{\the\tx at tA\next #1\mkern #2 mu\else}
\tx at tB\expandafter{\the\tx at tB\fi}}
\newif\iftx at subsfile
-\@ifpackageloaded{newtx}%
-{\@for\ntx at x:=\ntx at textlst\do{\DeclareOption{\ntx at x}{}}}{}
-\DeclareOption{subscriptcorrectionfile}{\def\tx at subs{##1}\tx at subsfiletrue}
+%\@ifpackageloaded{newtx}%
+%{\@for\ntx at x:=\ntx at textlst\do{\DeclareOption{\ntx at x}{}}}{}
+\DeclareOption{subscriptcorrectionfile}{\def\tx at subs{#1}\tx at subsfiletrue}
\DeclareOption{nosubscriptcorrection}{\tx at sbcfalse}
\DeclareOption{subscriptcorrection}{\tx at sbctrue}
%\DeclareOption{nosuperscriptcorrection}{\disablespcorrection}
@@ -264,6 +265,8 @@
amssymbols,uprightGreek,nosubscriptcorrection}
\ProcessOptions\relax
+\let\ntxmath at scale\tx at scale
+
\ifntx at amsthm
\RequirePackage{amsthm}
\typeout{amsthm loaded}
Modified: trunk/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/newtxtext.sty 2022-03-03 16:29:55 UTC (rev 62368)
+++ trunk/Master/texmf-dist/tex/latex/newtx/newtxtext.sty 2022-03-03 21:06:04 UTC (rev 62369)
@@ -6,26 +6,21 @@
% Text and math versions now separate.
% Added scaled keyword and osf option;
% Text is now directed to an extension of TeXGyreTermes rather than tx.
-% 2.0 is first version of newtxtext to support both [pdf]latex and unicode latex.
+% 1.7 is first version of newtxtext to support both [pdf]latex and unicode latex.
-\def\fileversion{1.705}
-\def\filedate{2022/01/11}
+\def\fileversion{1.71}
+\def\filedate{2022/02/28}
\ProvidesPackage{newtxtext}[%
\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyreTermesX]
\message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Termes and its extensions (msharpe)}
-\RequirePackage[T1]{fontenc}
-\renewcommand*{\rmdefault}{ntxtlf} % the default until end of preamble
-\renewcommand*{\familydefault}{\rmdefault}
-\RequirePackage{ifxetex,ifluatex,xkeyval,etoolbox,textcomp}
+\RequirePackage{iftex,xkeyval,etoolbox,textcomp}
\RequirePackage{xstring,ifthen,scalefnt} % for \textfrac
-\@ifpackageloaded{mweights}{}{%
- \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}%
-}
-
+\RequirePackage{mweights} % should be in latex kernel
\DeclareEncodingSubset{TS1}{ntx*}{0}
\input{binhex}
+
\newcount\ntx at tmpcnta
\newcount\ntx at cnt \ntx at cnt=0
@@ -34,61 +29,59 @@
\@ifundefined{KOMAClassName}{}{\ntx at KOMAtrue}
\@ifundefined{ver at scrextend.sty}{}{\ntx at KOMAtrue}
+
% Engine check
\newif\ifntx at newtx
-\@ifundefined{ntxotftrue}{\newif\ifntxotf%
-\newif\ifntx at origotf% true iff either xelatex or lualatex
- % might have been defined in newtx.sty
-\ifxetex
- \ntxotftrue
-\else\ifluatex
- \ntxotftrue
-\else % [pdf]LaTeX
- \ntxotffalse
-\fi\fi
-\ifntxotf\ntx at origotftrue\fi
-}{\ntx at newtxtrue%
-%\ifntxotf\typeout{ntxotftrue.^^J}\else\typeout{ntxotffalse.^^J}\fi
+\@ifundefined{ntx at otftexttrue}{% not run from newtx.sty
+ \newif\ifntx at otftext%
+ \newif\ifntx at otfmath % default is type1 math
+ %iftex's \iftutex returns true for LuaTeX and XeTeX, not [pdf]latex
+ \iftutex\ntx at otftexttrue\fi % default is otf text for unicode latex
+ \newif\ifntx at nofontspec % default is to load fontspec iftutex
+ % might have been defined in newtx.sty
+ \def\ntx at id{0} % make it appear that newtxtext was chosen in newtx
+}{% run from newtx.sty
+ \ntx at newtxtrue%
+ %\ifntx at otftext\typeout{ntx at otftexttrue.}\else\typeout{ntx at otftextfalse.}\fi
}
%%%%%%%%%%%%%%%%%%
-\IfFileExists{xkeyval.sty}{
- \RequirePackage{xkeyval}
- }{
- \let\DeclareOptionX\DeclareOption
- \let\ExecuteOptionsX\ExecuteOptions
- \let\ProcessOptionsX\ProcessOptions
-}
-%%%%Start Options
-\@ifpackageloaded{newtx}%
-{\ntx at newtxtrue%
-\@for\ntx at x:=\ntx at mathlst\do{\expandafter\DeclareOptionX\expandafter{\ntx at x}{}}}{}
+%
-\newif\ifntx at nomath\ntx at nomathfalse
+%\newif\ifntx at nomath\ntx at nomathfalse % ?????
\newif\ifntx at lining\ntx at liningtrue
\newif\ifntx at tabular\ntx at tabulartrue % default is tabular lining figures
-\@ifundefined{ver at newtxmath.sty}{}{\ntx at nomathtrue}
+\@ifundefined{ver at newtxmath.sty}{\iftutex\ntx at otfmathtrue\fi}{}
\DeclareOptionX{type1}[true]{%
-\def\ntx at tmpx{\@nameuse{if#1}\ntxotffalse\fi}
+\def\ntx at tmpx{\@nameuse{if#1}\ntx at otftextfalse\fi}
\ifntx at newtx
\else\ntx at tmpx\fi}
+\DeclareOptionX{type1text}[true]{%
+\def\ntx at tmpx{\@nameuse{if#1}\ntx at otftextfalse\fi}
+\ifntx at newtx
+\else\ntx at tmpx\fi}
-\DeclareOptionX{nofontspec}[true]{%
-\def\ntx at tmpx{\@nameuse{if#1}\ntxotffalse\fi}
+\DeclareOptionX{otfmath}[true]{%
+\def\ntx at tmpx{\@nameuse{if#1}\iftutex\ntx at otfmathtrue\fi\fi}
\ifntx at newtx
\else\ntx at tmpx\fi}
-\DeclareOptionX{no-math}[true]{%
-\def\ntx at tmpx{\@nameuse{if#1}\ntx at nomathtrue\fi}
+\DeclareOptionX{nofontspec}[true]{%
+\def\ntx at tmpx{\@nameuse{if#1}\ntx at nofontspectrue\fi}
\ifntx at newtx
\else\ntx at tmpx\fi}
+%\DeclareOptionX{no-math}[true]{%
+%\def\ntx at tmpx{\@nameuse{if#1}\ntx at nomathtrue\fi}
+%\ifntx at newtx
+%\else\ntx at tmpx\fi}
+
\def\ntx at defaultfeatures{}
\DeclareOptionX{defaultfeatures}{\def\ntx at defaultfeatures{#1}}
%Figure style options
-\edef\ntx at dfltfigurestyle{lf}
-\edef\ntx at dfltfigurealign{t}
+\def\ntx at dfltfigurestyle{lf}
+\def\ntx at dfltfigurealign{t}
\DeclareOptionX{lining}[true]{%
\@nameuse{ntx at lining#1}
@@ -202,20 +195,45 @@
\DeclareOptionX{looser}{%
\gdef\ntx at spc{.3em}\gdef\ntx at stretch{.2em}%
\gdef\ntx at shrink{.1em}\def\ntx at nolo{F}}
-
+%\traceon
\ProcessOptionsX\relax
-%\ifntxotf \typeout{ntxotftrue^^J}\else\typeout{ntxotffalse^^J}\fi
+% Check for conflict between nofontspec and others
+\ifntx at nofontspec
+ \iftutex
+ \ntx at otfmathfalse
+ \ntx at otftextfalse
+ \fi
+\fi
+\ifntx at otftext \typeout{ntx at otftexttrue}\else\typeout{ntx at otftextfalse}\fi
+\ifntx at newtx\let\ntx at scale=\ntxtext at scale\fi
+% following lines required by newtxmath
+% They must follow the definition of \ntx at scaled
+\@tempdima=\ntx at scale\p@\@tempdima=\ntx at helvratio\@tempdima%
+\edef\qhv at scale{\strip at pt\@tempdima}
+\edef\ntx at scaled{s*[\ntx at scale]}% used in fd files
+\providecommand*{\ntx at minfam}{minntx} % won't override value from newtx
+
+%\RequirePackage[T1]{fontenc} % do we need this?
+\renewcommand*{\rmdefault}{\ntx at minfam} % the default until end of preamble
+\renewcommand*{\familydefault}{\rmdefault} % Cause the fd files to load
+
\def\re at DeclareTextSymbol#1#2#3{%
\let#1=\undefined
\DeclareTextSymbol{#1}{#2}{#3}}
-\ifntxotf
- \ifntx at nomath
- \RequirePackage[no-math]{fontspec}
- \else
- \RequirePackage{fontspec}
+
+\iftutex
+ \ifntx at nofontspec % do nothing
+ \else
+ \ifntx at otfmath
+ \RequirePackage{fontspec}
+ \else
+ \RequirePackage[no-math]{fontspec}
+ \fi
\fi
+\fi
+\ifntx at otftext
\ifxetex\XeTeXtracingfonts=1\fi
\ifluatex % avoid possibly uncorrected "system" fonts
\directlua{fonts.names.set_location_precedence{
@@ -226,7 +244,7 @@
\newcommand{\textfrac}[3][]{{%\normalfont%
\mbox{%
\ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
- {{\lfstyle#1}\kern.1em}{}%
+ {{\lfstyle#1}\kern.04em}{}%
\addfontfeatures{RawFeature=+sups}#2\char"2044% numerator
\addfontfeatures{RawFeature=-sups;+dnom;+ss20}\char"2044{}#3%
}}}
@@ -324,12 +342,13 @@
\let\orig at makefnmark=\@makefnmark
\def\bfseries at rm{b}
\def\mdseries at rm{m}
+
\def\useosf{\ntx at liningfalse}
\@onlypreamble\useosf
\def\useproportional{\ntx at tabularfalse}
\@onlypreamble\useproportional
-\ifntxotf
+\ifntx at otftext
\def\ntx at dflt{}
\ifntx at zeroslash\edef\ntx at dflt{Numbers = SlashedZero ,
}\fi
@@ -375,10 +394,7 @@
\fontdimen2\font=\ntx at spc
\fontdimen3\font=\ntx at stretch
\fontdimen4\font=\ntx at shrink}
- \@tempdima=\ntx at scale\p@\@tempdima=\ntx at helvratio\@tempdima%
- \edef\qhv at scale{\strip at pt\@tempdima}
- \def\ntx at scaled{s*[\ntx at scale]}% used in fd files
-
+ %\show\ntx at scaled
%\def\oldstylenums#1{{\fontencoding{TS1}\selectfont #1}}
%\expandafter\patchcmd\expandafter{\csname scshape \endcsname}{\fontshape}{\fontfamily{ntx\ntx at figurealign osf}\fontshape}{\message{Replaced figure style by osf in sc.}}{\message{Unable to replace figure style by osf in sc.}}
@@ -441,18 +457,41 @@
\fi%
\fi%}
-\ifntxotf
+\ifntx at otftext
% \def\ntx at nft{\if t\ntx at thmtab Monospaced%
% \else Proportional\fi}
- \DeclareTextFontCommand{\textsl}{\slshape}
- \DeclareTextFontCommand{%
- \osfstyle}{\addfontfeatures{Numbers={Proportional,OldStyle}}}
- \DeclareTextFontCommand{%
- \tosfstyle}{\addfontfeatures{Numbers={Tabular,OldStyle}}}
- \DeclareTextFontCommand{%
- \tlfstyle}{\addfontfeatures{Numbers={Tabular,Lining}}}
- \DeclareTextFontCommand{%
- \lfstyle}{\addfontfeatures{Numbers={Proportional,Lining}}}
+ \DeclareRobustCommand{\lfstyle}{%
+ \not at math@alphabet\lfstyle\relax
+ \addfontfeatures{Numbers={Proportional,Lining}}%
+ }
+ \DeclareRobustCommand{\tlfstyle}{%
+ \not at math@alphabet\tlfstyle\relax
+ \addfontfeatures{Numbers={Monospaced,Lining}}%
+ }
+ \DeclareRobustCommand{\osfstyle}{%
+ \not at math@alphabet\osfstyle\relax
+ \addfontfeatures{Numbers={Proportional,OldStyle}}%
+ }
+ \DeclareRobustCommand{\tosfstyle}{%
+ \not at math@alphabet\tosfstyle\relax
+ \addfontfeatures{Numbers={Monospaced,OldStyle}}%
+ }
+ \DeclareRobustCommand{\oldstylenums}{%
+ \not at math@alphabet\oldstylenums\relax
+ \addfontfeatures{Numbers=OldStyle}%
+ }
+ \DeclareRobustCommand{\liningnums}{%
+ \not at math@alphabet\liningnums\relax
+ \addfontfeatures{Numbers=Lining}%
+ }
+ \DeclareRobustCommand{\tabularnums}{%
+ \not at math@alphabet\tabularnums\relax
+ \addfontfeatures{Numbers=Monospaced}%
+ }
+ \DeclareRobustCommand{\proportionalnums}{%
+ \not at math@alphabet\proportionalnums\relax
+ \addfontfeatures{Numbers=Proportional}%
+ }
\providecommand\sufigures{%
\addfontfeatures{VerticalPosition=Superior}}
@@ -463,7 +502,7 @@
\providecommand\defigures{%
\addfontfeatures{VerticalPosition=Denominator}}
\let\sustyle=\sufigures
-% \let\nustyle=\nufigures
+ \let\nustyle=\sufigures
\let\instyle=\infigures
\let\destyle=\defigures
\ifntx at defaultsups %
@@ -514,6 +553,7 @@
% \hfil \crcr \symbol{"25EF}}%
% \egroup}
\else % type1
+
\renewcommand*{\textcircled}[1]{\hmode at bgroup\ooalign{%
\hfil \raise .3ex\hbox{{%
\normalfont
@@ -523,21 +563,11 @@
\fi
% applies to both
-\DeclareRobustCommand{\textlf}[1]{%
- {\lfstyle #1}%
-}
-\DeclareRobustCommand{\texttlf}[1]{%
- {\tlfstyle #1}%
-}
-\DeclareRobustCommand{\textosf}[1]{%
- {\osfstyle #1}%
-}
-\DeclareRobustCommand{\texttosf}[1]{%
- {\tosfstyle #1}%
-}
-\DeclareRobustCommand{\textsu}[1]{%
- {\sustyle #1}%
-}
+\DeclareTextFontCommand{\textosf}{\osfstyle}
+\DeclareTextFontCommand{\texttosf}{\tosfstyle}
+\DeclareTextFontCommand{\texttlf}{\tlfstyle}
+\DeclareTextFontCommand{\textlf}{\lfstyle}
+
\DeclareTextFontCommand{\textsu}{\sustyle}
\let\textsuperior\textsu
\DeclareTextFontCommand{\textnu}{\nustyle}
@@ -548,7 +578,7 @@
\let\textinferior\textinf
\AtEndPreamble{%
-\ifntxotf
+\ifntx at otftext
\ifntx at lining
\def\ntx at figurestyle{Lining}
\else
@@ -607,25 +637,21 @@
\fi
}
%both
+
\ifntx at thrm
+ \@ifundefined{theoremstyle}{}{%
\theoremstyle{plain}
\patchcmd{\th at plain}{\itshape}{\thfamily}{\message{Replaced itshape by thfamily in theorem style plain.}}{\message{Unable to replace itshape by thfamily in theorem style plain.}}
+ }
\fi
-\DeclareRobustCommand{\textth}[1]{%
- {\thfamily #1}%
-}
+%\DeclareRobustCommand{\textth}[1]{%
+% {\thfamily #1}%
+%}
+\DeclareTextFontCommand{\textth}{\thfamily}
\let\textthit\textth
% Define \oldstylenums, \liningnums ,\tabularnums and \proportionalnums
-\ifntxotf
- \DeclareTextFontCommand{%
- \oldstylenums}{\addfontfeatures{Numbers=OldStyle}}
- \DeclareTextFontCommand{%
- \liningnums}{\addfontfeatures{Numbers=Lining}}
- \DeclareTextFontCommand{%
- \tabularnums}{\addfontfeatures{Numbers=Tabular}}
- \DeclareTextFontCommand{%
- \proportionalnums}{\addfontfeatures{Numbers=Proportional}}
+\ifntx at otftext
\else % type1
\DeclareTextFontCommand{%
\oldstylenums}{\fontfamily{ntx\ntx at figurealign osf}\selectfont }
Added: trunk/Master/texmf-dist/tex/latex/newtx/ot1minebgaramond.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/ot1minebgaramond.fd (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/newtx/ot1minebgaramond.fd 2022-03-03 21:06:04 UTC (rev 62369)
@@ -0,0 +1,366 @@
+%% Generated by msharpe on 2022/01/20
+%%
+\ProvidesFile{ot1minebgaramond.fd}
+ [2022/01/20 (msharpe) Font definitions for OT1/minebgaramond.]
+
+\def\@textscalefactor{1.05}
+%ebgaramond must be reduced by factor .93 to match xheight of newtxmath
+
+\@ifundefined{ntxmath at scale}{\let\ntxmath at scaled\@empty}
+{\@tempdima\@textscalefactor\p@
+\@tempdima\ntxmath at scale\@tempdima
+\edef\ntxmath at scaled{s*[\strip at pt\@tempdima]}}% locally, not globally
+
+\DeclareFontFamily{OT1}{minebgaramond}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{minebgaramond}{regular}{sc}{
+ <-> \ntxmath at scaled EBGaramond-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{regular}{n}{
+ <-> \ntxmath at scaled EBGaramond-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{regular}{it}{
+ <-> \ntxmath at scaled EBGaramond-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{regular}{scit}{
+ <-> \ntxmath at scaled EBGaramond-Italic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{regular}{sw}{
+ <-> \ntxmath at scaled EBGaramond-Italic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{regular}{nw}{
+ <-> \ntxmath at scaled EBGaramond-Regular-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{regular}{scsl}{
+ <-> ssub * minebgaramond/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{regular}{sl}{
+ <-> ssub * minebgaramond/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{OT1}{minebgaramond}{semibold}{sc}{
+ <-> \ntxmath at scaled EBGaramond-SemiBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{semibold}{n}{
+ <-> \ntxmath at scaled EBGaramond-SemiBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{semibold}{it}{
+ <-> \ntxmath at scaled EBGaramond-SemiBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{semibold}{scit}{
+ <-> \ntxmath at scaled EBGaramond-SemiBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{semibold}{sw}{
+ <-> \ntxmath at scaled EBGaramond-SemiBoldItalic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{semibold}{nw}{
+ <-> \ntxmath at scaled EBGaramond-SemiBold-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{semibold}{scsl}{
+ <-> ssub * minebgaramond/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{semibold}{sl}{
+ <-> ssub * minebgaramond/semibold/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{minebgaramond}{bold}{sc}{
+ <-> \ntxmath at scaled EBGaramond-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bold}{n}{
+ <-> \ntxmath at scaled EBGaramond-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bold}{it}{
+ <-> \ntxmath at scaled EBGaramond-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bold}{scit}{
+ <-> \ntxmath at scaled EBGaramond-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bold}{sw}{
+ <-> \ntxmath at scaled EBGaramond-BoldItalic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bold}{nw}{
+ <-> \ntxmath at scaled EBGaramond-Bold-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bold}{scsl}{
+ <-> ssub * minebgaramond/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bold}{sl}{
+ <-> ssub * minebgaramond/bold/it
+}{}
+
+
+% ---- medium ----
+
+\DeclareFontShape{OT1}{minebgaramond}{medium}{sc}{
+ <-> \ntxmath at scaled EBGaramond-Medium-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{medium}{n}{
+ <-> \ntxmath at scaled EBGaramond-Medium-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{medium}{it}{
+ <-> \ntxmath at scaled EBGaramond-MediumItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{medium}{scit}{
+ <-> \ntxmath at scaled EBGaramond-MediumItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{medium}{sw}{
+ <-> \ntxmath at scaled EBGaramond-MediumItalic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{medium}{nw}{
+ <-> \ntxmath at scaled EBGaramond-Medium-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{medium}{scsl}{
+ <-> ssub * minebgaramond/medium/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{medium}{sl}{
+ <-> ssub * minebgaramond/medium/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{OT1}{minebgaramond}{extrabold}{sc}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{extrabold}{n}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{extrabold}{it}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{extrabold}{scit}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{extrabold}{sw}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBoldItalic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{extrabold}{nw}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBold-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{extrabold}{scsl}{
+ <-> ssub * minebgaramond/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{extrabold}{sl}{
+ <-> ssub * minebgaramond/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{OT1}{minebgaramond}{m}{scsl}{
+ <-> ssub * minebgaramond/regular/scsl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{m}{sc}{
+ <-> ssub * minebgaramond/regular/sc
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{m}{n}{
+ <-> ssub * minebgaramond/regular/n
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{m}{it}{
+ <-> ssub * minebgaramond/regular/it
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{m}{sw}{
+ <-> ssub * minebgaramond/regular/sw
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{m}{sl}{
+ <-> ssub * minebgaramond/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{m}{scit}{
+ <-> ssub * minebgaramond/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{m}{nw}{
+ <-> ssub * minebgaramond/regular/nw
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{OT1}{minebgaramond}{sb}{scsl}{
+ <-> ssub * minebgaramond/semibold/scsl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{sb}{sc}{
+ <-> ssub * minebgaramond/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{sb}{n}{
+ <-> ssub * minebgaramond/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{sb}{it}{
+ <-> ssub * minebgaramond/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{sb}{sw}{
+ <-> ssub * minebgaramond/semibold/sw
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{sb}{sl}{
+ <-> ssub * minebgaramond/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{sb}{scit}{
+ <-> ssub * minebgaramond/semibold/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{sb}{nw}{
+ <-> ssub * minebgaramond/semibold/nw
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{minebgaramond}{b}{scsl}{
+ <-> ssub * minebgaramond/bold/scsl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{b}{sc}{
+ <-> ssub * minebgaramond/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{b}{n}{
+ <-> ssub * minebgaramond/bold/n
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{b}{it}{
+ <-> ssub * minebgaramond/bold/it
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{b}{sw}{
+ <-> ssub * minebgaramond/bold/sw
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{b}{sl}{
+ <-> ssub * minebgaramond/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{b}{scit}{
+ <-> ssub * minebgaramond/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{b}{nw}{
+ <-> ssub * minebgaramond/bold/nw
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{OT1}{minebgaramond}{eb}{scsl}{
+ <-> ssub * minebgaramond/extrabold/scsl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{eb}{sc}{
+ <-> ssub * minebgaramond/extrabold/sc
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{eb}{n}{
+ <-> ssub * minebgaramond/extrabold/n
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{eb}{it}{
+ <-> ssub * minebgaramond/extrabold/it
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{eb}{sw}{
+ <-> ssub * minebgaramond/extrabold/sw
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{eb}{sl}{
+ <-> ssub * minebgaramond/extrabold/sl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{eb}{scit}{
+ <-> ssub * minebgaramond/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{eb}{nw}{
+ <-> ssub * minebgaramond/extrabold/nw
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bx}{n}{
+ <-> ssub * minebgaramond/b/n
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bx}{sc}{
+ <-> ssub * minebgaramond/b/sc
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bx}{scsl}{
+ <-> ssub * minebgaramond/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bx}{it}{
+ <-> ssub * minebgaramond/b/it
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bx}{sw}{
+ <-> ssub * minebgaramond/b/sw
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bx}{sl}{
+ <-> ssub * minebgaramond/b/sl
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bx}{scit}{
+ <-> ssub * minebgaramond/b/scit
+}{}
+
+\DeclareFontShape{OT1}{minebgaramond}{bx}{nw}{
+ <-> ssub * minebgaramond/b/nw
+}{}
+
+\endinput
Property changes on: trunk/Master/texmf-dist/tex/latex/newtx/ot1minebgaramond.fd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/newtx/ot1minntx.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/ot1minntx.fd (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/newtx/ot1minntx.fd 2022-03-03 21:06:04 UTC (rev 62369)
@@ -0,0 +1,42 @@
+\ProvidesFile{ot1minntx.fd}[2022/01/20 v1.0 font definition file for OT1/minntx]
+
+\@ifundefined{ifntx at sl}{\let\ifntx at sl\iftrue}{}
+\@ifundefined{ifntx at largesc}{\let\ifntx at largesc\iftrue}{}
+
+\expandafter\ifx\csname ntxmath at scaled\endcsname\relax
+ \let\ntxmath at scaled\@empty%
+\fi
+\def\ntx at asfx{}
+\def\ntx at lsfx{}
+\def\ntx at makelsfx{\ifntx at largesc\def\ntx at lsfx{l}\fi}
+\def\ntx at makeadobesc{\ifntx at adobesc\def\ntx at lsfx{l}\def\ntx at adobesc{a}\else\ntx at makelsfx\fi}
+\ntx at makelsfx
+\ifdefined\ntx at adobescfalse\ntx at makeadobesc\fi
+\ifdefined\ntx at spacing \else\global\let\ntx at spacing\@empty\fi
+
+\DeclareFontFamily{OT1}{minntx}{\ntx at spacing}
+\DeclareFontShape{OT1}{minntx}{b}{sc}{<-> \ntxmath at scaled ntx-Bold-tlf-sc\ntx at lsfx-ot1}{}
+\DeclareFontShape{OT1}{minntx}{b}{n}{<-> \ntxmath at scaled ntx-Bold-tlf-ot1}{}
+\DeclareFontShape{OT1}{minntx}{b}{scit}{<-> \ntxmath at scaled ntx-BoldItalic-tlf-sc\ntx at lsfx-ot1}{}
+\DeclareFontShape{OT1}{minntx}{b}{it}{<-> \ntxmath at scaled ntx-BoldItalic-tlf-ot1}{}
+\DeclareFontShape{OT1}{minntx}{m}{sc}{<-> \ntxmath at scaled ntx-Regular-tlf-sc\ntx at lsfx-ot1}{}
+\DeclareFontShape{OT1}{minntx}{m}{n}{<-> \ntxmath at scaled ntx-Regular-tlf-ot1}{}
+\DeclareFontShape{OT1}{minntx}{m}{scit}{<-> \ntxmath at scaled ntx-Italic-tlf-sc\ntx at lsfx-ot1}{}
+\DeclareFontShape{OT1}{minntx}{m}{it}{<-> \ntxmath at scaled ntx-Italic-tlf-ot1}{}
+\DeclareFontShape{OT1}{minntx}{bx}{sc}{<->ssub * minntx/b/sc}{}
+\DeclareFontShape{OT1}{minntx}{bx}{n}{<->ssub * minntx/b/n}{}
+\DeclareFontShape{OT1}{minntx}{bx}{scit}{<->ssub * minntx/b/scit}{}
+\DeclareFontShape{OT1}{minntx}{bx}{it}{<->ssub * minntx/b/it}{}
+\ifntx at sl % point to real slanted fonts
+ \DeclareFontShape{OT1}{minntx}{m}{sl}{<-> \ntxmath at scaled txsl}{}
+ \DeclareFontShape{OT1}{minntx}{b}{sl}{<-> \ntxmath at scaled ztmbsl-tlf-ot1}{}
+ \DeclareFontShape{OT1}{minntx}{bx}{sl}{<->ssub * minntx/b/sl}{}
+\else %point to theorem font
+ \DeclareFontShape{OT1}{minntx}{m}{sl}{<-> \ntxmath at scaled ntxth-Italic-tlf-ot1}{}
+ \DeclareFontShape{OT1}{minntx}{b}{sl}{<->ssub * minntx/m/sl}{}
+ \DeclareFontShape{OT1}{minntx}{bx}{sl}{<->ssub * minntx/m/sl}{}
+\fi
+\DeclareFontShape{OT1}{minntx}{b}{scsl}{<->ssub * minntx/b/scit}{}
+\DeclareFontShape{OT1}{minntx}{bx}{scsl}{<->ssub * minntx/b/scit}{}
+\DeclareFontShape{OT1}{minntx}{m}{scsl}{<->ssub * minntx/m/scit}{}
+\endinput
Property changes on: trunk/Master/texmf-dist/tex/latex/newtx/ot1minntx.fd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/newtx/t1minebgaramond.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/t1minebgaramond.fd (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/newtx/t1minebgaramond.fd 2022-03-03 21:06:04 UTC (rev 62369)
@@ -0,0 +1,366 @@
+%% Generated by msharpe on 2022/01/20
+%%
+\ProvidesFile{t1minebgaramond.fd}
+ [2022/01/20 (msharpe) Font definitions for T1/minebgaramond.]
+
+\def\@textscalefactor{1.05}
+%ebgaramond must be reduced by factor .93 to match xheight of newtxmath
+
+\@ifundefined{ntxmath at scale}{\let\ntxmath at scaled\@empty}
+{\@tempdima\@textscalefactor\p@
+\@tempdima\ntxmath at scale\@tempdima
+\edef\ntxmath at scaled{s*[\strip at pt\@tempdima]}}% locally, not globally
+
+\DeclareFontFamily{T1}{minebgaramond}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{minebgaramond}{regular}{sc}{
+ <-> \ntxmath at scaled EBGaramond-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{regular}{n}{
+ <-> \ntxmath at scaled EBGaramond-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{regular}{it}{
+ <-> \ntxmath at scaled EBGaramond-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{regular}{scit}{
+ <-> \ntxmath at scaled EBGaramond-Italic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{regular}{sw}{
+ <-> \ntxmath at scaled EBGaramond-Italic-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{regular}{nw}{
+ <-> \ntxmath at scaled EBGaramond-Regular-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{regular}{scsl}{
+ <-> ssub * minebgaramond/regular/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{regular}{sl}{
+ <-> ssub * minebgaramond/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{T1}{minebgaramond}{semibold}{sc}{
+ <-> \ntxmath at scaled EBGaramond-SemiBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{semibold}{n}{
+ <-> \ntxmath at scaled EBGaramond-SemiBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{semibold}{it}{
+ <-> \ntxmath at scaled EBGaramond-SemiBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{semibold}{scit}{
+ <-> \ntxmath at scaled EBGaramond-SemiBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{semibold}{sw}{
+ <-> \ntxmath at scaled EBGaramond-SemiBoldItalic-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{semibold}{nw}{
+ <-> \ntxmath at scaled EBGaramond-SemiBold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{semibold}{scsl}{
+ <-> ssub * minebgaramond/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{semibold}{sl}{
+ <-> ssub * minebgaramond/semibold/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{minebgaramond}{bold}{sc}{
+ <-> \ntxmath at scaled EBGaramond-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bold}{n}{
+ <-> \ntxmath at scaled EBGaramond-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bold}{it}{
+ <-> \ntxmath at scaled EBGaramond-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bold}{scit}{
+ <-> \ntxmath at scaled EBGaramond-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bold}{sw}{
+ <-> \ntxmath at scaled EBGaramond-BoldItalic-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bold}{nw}{
+ <-> \ntxmath at scaled EBGaramond-Bold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bold}{scsl}{
+ <-> ssub * minebgaramond/bold/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bold}{sl}{
+ <-> ssub * minebgaramond/bold/it
+}{}
+
+
+% ---- medium ----
+
+\DeclareFontShape{T1}{minebgaramond}{medium}{sc}{
+ <-> \ntxmath at scaled EBGaramond-Medium-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{medium}{n}{
+ <-> \ntxmath at scaled EBGaramond-Medium-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{medium}{it}{
+ <-> \ntxmath at scaled EBGaramond-MediumItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{medium}{scit}{
+ <-> \ntxmath at scaled EBGaramond-MediumItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{medium}{sw}{
+ <-> \ntxmath at scaled EBGaramond-MediumItalic-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{medium}{nw}{
+ <-> \ntxmath at scaled EBGaramond-Medium-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{medium}{scsl}{
+ <-> ssub * minebgaramond/medium/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{medium}{sl}{
+ <-> ssub * minebgaramond/medium/it
+}{}
+
+
+% ---- extrabold ----
+
+\DeclareFontShape{T1}{minebgaramond}{extrabold}{sc}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{extrabold}{n}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{extrabold}{it}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{extrabold}{scit}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{extrabold}{sw}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBoldItalic-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{extrabold}{nw}{
+ <-> \ntxmath at scaled EBGaramond-ExtraBold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{extrabold}{scsl}{
+ <-> ssub * minebgaramond/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{extrabold}{sl}{
+ <-> ssub * minebgaramond/extrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
+\DeclareFontShape{T1}{minebgaramond}{m}{scsl}{
+ <-> ssub * minebgaramond/regular/scsl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{m}{sc}{
+ <-> ssub * minebgaramond/regular/sc
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{m}{n}{
+ <-> ssub * minebgaramond/regular/n
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{m}{it}{
+ <-> ssub * minebgaramond/regular/it
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{m}{sw}{
+ <-> ssub * minebgaramond/regular/sw
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{m}{sl}{
+ <-> ssub * minebgaramond/regular/sl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{m}{scit}{
+ <-> ssub * minebgaramond/regular/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{m}{nw}{
+ <-> ssub * minebgaramond/regular/nw
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{T1}{minebgaramond}{sb}{scsl}{
+ <-> ssub * minebgaramond/semibold/scsl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{sb}{sc}{
+ <-> ssub * minebgaramond/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{sb}{n}{
+ <-> ssub * minebgaramond/semibold/n
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{sb}{it}{
+ <-> ssub * minebgaramond/semibold/it
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{sb}{sw}{
+ <-> ssub * minebgaramond/semibold/sw
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{sb}{sl}{
+ <-> ssub * minebgaramond/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{sb}{scit}{
+ <-> ssub * minebgaramond/semibold/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{sb}{nw}{
+ <-> ssub * minebgaramond/semibold/nw
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{minebgaramond}{b}{scsl}{
+ <-> ssub * minebgaramond/bold/scsl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{b}{sc}{
+ <-> ssub * minebgaramond/bold/sc
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{b}{n}{
+ <-> ssub * minebgaramond/bold/n
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{b}{it}{
+ <-> ssub * minebgaramond/bold/it
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{b}{sw}{
+ <-> ssub * minebgaramond/bold/sw
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{b}{sl}{
+ <-> ssub * minebgaramond/bold/sl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{b}{scit}{
+ <-> ssub * minebgaramond/bold/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{b}{nw}{
+ <-> ssub * minebgaramond/bold/nw
+}{}
+
+
+% eb --> extrabold
+
+\DeclareFontShape{T1}{minebgaramond}{eb}{scsl}{
+ <-> ssub * minebgaramond/extrabold/scsl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{eb}{sc}{
+ <-> ssub * minebgaramond/extrabold/sc
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{eb}{n}{
+ <-> ssub * minebgaramond/extrabold/n
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{eb}{it}{
+ <-> ssub * minebgaramond/extrabold/it
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{eb}{sw}{
+ <-> ssub * minebgaramond/extrabold/sw
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{eb}{sl}{
+ <-> ssub * minebgaramond/extrabold/sl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{eb}{scit}{
+ <-> ssub * minebgaramond/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{eb}{nw}{
+ <-> ssub * minebgaramond/extrabold/nw
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bx}{n}{
+ <-> ssub * minebgaramond/b/n
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bx}{sc}{
+ <-> ssub * minebgaramond/b/sc
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bx}{scsl}{
+ <-> ssub * minebgaramond/b/scsl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bx}{it}{
+ <-> ssub * minebgaramond/b/it
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bx}{sw}{
+ <-> ssub * minebgaramond/b/sw
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bx}{sl}{
+ <-> ssub * minebgaramond/b/sl
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bx}{scit}{
+ <-> ssub * minebgaramond/b/scit
+}{}
+
+\DeclareFontShape{T1}{minebgaramond}{bx}{nw}{
+ <-> ssub * minebgaramond/b/nw
+}{}
+
+\endinput
Property changes on: trunk/Master/texmf-dist/tex/latex/newtx/t1minebgaramond.fd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/newtx/t1minntx.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/newtx/t1minntx.fd (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/newtx/t1minntx.fd 2022-03-03 21:06:04 UTC (rev 62369)
@@ -0,0 +1,45 @@
+\ProvidesFile{t1minntx.fd}[2022/01/20 v1.1 font definition file for T1/minntx]
+%\show\ntxmath at scaled
+\@ifundefined{ifntx at sl}{\let\ifntx at sl\iftrue}{}
+\@ifundefined{ifntx at largesc}{\let\ifntx at largesc\iftrue}{}
+
+\expandafter\ifx\csname ntxmath at scaled\endcsname\relax
+ \let\ntxmath at scaled\@empty%
+\fi
+\def\ntx at asfx{}
+\def\ntx at lsfx{}
+\def\ntx at makelsfx{\ifntx at largesc\def\ntx at lsfx{l}\fi}
+\def\ntx at makeadobesc{\ifntx at adobesc\def\ntx at lsfx{l}\def\ntx at adobesc{a}\else\ntx at makelsfx\fi}
+\ntx at makelsfx
+\ifdefined\ntx at adobescfalse\ntx at makeadobesc\fi
+\ifdefined\ntx at spacing \else\global\let\ntx at spacing\@empty\fi
+
+\DeclareFontFamily{T1}{minntx}{\ntx at spacing}
+\DeclareFontShape{T1}{minntx}{b}{sc}{<-> \ntxmath at scaled ntx-Bold-tlf-sc\ntx at lsfx-t1}{}
+\DeclareFontShape{T1}{minntx}{b}{n}{<-> \ntxmath at scaled ntx-Bold-tlf-t1}{}
+\DeclareFontShape{T1}{minntx}{b}{scit}{<-> \ntxmath at scaled ntx-BoldItalic-tlf-sc\ntx at lsfx-t1}{}
+\DeclareFontShape{T1}{minntx}{b}{it}{<-> \ntxmath at scaled ntx-BoldItalic-tlf-t1}{}
+\DeclareFontShape{T1}{minntx}{m}{sc}{<-> \ntxmath at scaled ntx-Regular-tlf-sc\ntx at lsfx-t1}{}
+\DeclareFontShape{T1}{minntx}{m}{n}{<-> \ntxmath at scaled ntx-Regular-tlf-t1}{}
+\DeclareFontShape{T1}{minntx}{m}{scit}{<-> \ntxmath at scaled ntx-Italic-tlf-sc\ntx at lsfx-t1}{}
+\DeclareFontShape{T1}{minntx}{m}{it}{<-> \ntxmath at scaled ntx-Italic-tlf-t1}{}
+\DeclareFontShape{T1}{minntx}{bx}{sc}{<->ssub * minntx/b/sc}{}
+\DeclareFontShape{T1}{minntx}{bx}{n}{<->ssub * minntx/b/n}{}
+\DeclareFontShape{T1}{minntx}{bx}{scit}{<->ssub * minntx/b/scit}{}
+\DeclareFontShape{T1}{minntx}{bx}{it}{<->ssub * minntx/b/it}{}
+\ifntx at sl % point to real slanted fonts
+ \DeclareFontShape{T1}{minntx}{m}{sl}{<-> \ntxmath at scaled t1xsl}{}
+ \DeclareFontShape{T1}{minntx}{b}{sl}{<-> \ntxmath at scaled ztmbsl-tlf-t1}{}
+ \DeclareFontShape{T1}{minntx}{bx}{sl}{<->ssub * minntx/b/sl}{}
+
+\else %point to theorem font
+ \DeclareFontShape{T1}{minntx}{m}{sl}{<-> \ntxmath at scaled ntxth-Italic-tlf-t1}{}
+ \DeclareFontShape{T1}{minntx}{b}{sl}{<->ssub * minntx/m/sl}{}
+ \DeclareFontShape{T1}{minntx}{bx}{sl}{<->ssub * minntx/m/sl}{}
+
+\fi
+
+\DeclareFontShape{T1}{minntx}{b}{scsl}{<->ssub * minntx/b/scit}{}
+\DeclareFontShape{T1}{minntx}{bx}{scsl}{<->ssub * minntx/b/scit}{}
+\DeclareFontShape{T1}{minntx}{m}{scsl}{<->ssub * minntx/m/scit}{}
+\endinput
Property changes on: trunk/Master/texmf-dist/tex/latex/newtx/t1minntx.fd
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
More information about the tex-live-commits
mailing list.