summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-02-01 21:51:19 +0000
committerKarl Berry <karl@freefriends.org>2015-02-01 21:51:19 +0000
commitcd285ac1d0661956809666ac560c257b531a0bd4 (patch)
treeea37c48c3358aa51e3e09c29ca73bf0649a2e2d9 /Master/texmf-dist/tex/latex/newtx
parentb8545db1347b09f7ebd9c6394232cbd065c6f084 (diff)
newtx (1feb15)
git-svn-id: svn://tug.org/texlive/trunk@36182 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ly1ntxr.fd53
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ly1ntxr1.fd53
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ly1ntxrj.fd71
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ly1ntxrx.fd75
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxmath.sty4
-rw-r--r--Master/texmf-dist/tex/latex/newtx/newtxtext.sty109
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ot1ntxr.fd53
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ot1ntxr1.fd62
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ot1ntxrj.fd75
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ot1ntxrx.fd72
-rw-r--r--Master/texmf-dist/tex/latex/newtx/t1ntxr.fd52
-rw-r--r--Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd61
-rw-r--r--Master/texmf-dist/tex/latex/newtx/t1ntxrj.fd74
-rw-r--r--Master/texmf-dist/tex/latex/newtx/t1ntxrx.fd74
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ts1ntxr.fd53
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ts1ntxr1.fd53
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ts1ntxrj.fd53
-rw-r--r--Master/texmf-dist/tex/latex/newtx/ts1ntxrx.fd53
18 files changed, 79 insertions, 1021 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxr.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxr.fd
deleted file mode 100644
index 8ac03b622f4..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ly1ntxr.fd
+++ /dev/null
@@ -1,53 +0,0 @@
-\ProvidesFile{ly1ntxr.fd}[2012/04/15 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{LY1}{ntxr}{}
-\DeclareFontShape{LY1}{ntxr}{m}{n}{ %medium
- <-> \ntx@scaled tyxr%
-}{}
-\DeclareFontShape{LY1}{ntxr}{m}{sc}{ %cap & small cap
- <-> \ntx@scaled tyxsc%
-}{}
-\DeclareFontShape{LY1}{ntxr}{m}{sl}{ %slanted
- <-> \ntx@scaled tyxsl%
-}{}
-\DeclareFontShape{LY1}{ntxr}{m}{it}{ %italic
- <-> \ntx@scaled tyxi%
-}{}
-\DeclareFontShape{LY1}{ntxr}{m}{ui}{ %unslanted italic
- <->ssub * ntxr/m/it%
-}{}
-\DeclareFontShape{LY1}{ntxr}{bx}{n}{ %bold extended
- <-> \ntx@scaled tyxb%
-}{}
-\DeclareFontShape{LY1}{ntxr}{bx}{sc}{ %bold extended cap & small cap
- <-> \ntx@scaled tyxbsc%
-}{}
-\DeclareFontShape{LY1}{ntxr}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled tyxbsl%
-}{}
-\DeclareFontShape{LY1}{ntxr}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled tyxbi%
-}{}
-\DeclareFontShape{LY1}{ntxr}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxr/bx/it%
-}{}
-\DeclareFontShape{LY1}{ntxr}{b}{n}{ %bold
- <->ssub * ntxr/bx/n%
-}{}
-\DeclareFontShape{LY1}{ntxr}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxr/bx/sc%
-}{}
-\DeclareFontShape{LY1}{ntxr}{b}{sl}{ %bold slanted
- <->ssub * ntxr/bx/sl%
-}{}
-\DeclareFontShape{LY1}{ntxr}{b}{it}{ %bold italic
- <->ssub * ntxr/bx/it%
-}{}
-\DeclareFontShape{LY1}{ntxr}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxr/bx/ui%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxr1.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxr1.fd
deleted file mode 100644
index d20117abe9f..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ly1ntxr1.fd
+++ /dev/null
@@ -1,53 +0,0 @@
-\ProvidesFile{ly1ntxr1.fd}[2012/04/15 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{LY1}{ntxr1}{}
-\DeclareFontShape{LY1}{ntxr1}{m}{n}{ %medium
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{m}{sc}{ %cap & small cap
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{m}{sl}{ %slanted
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{m}{it}{ %italic
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{m}{ui}{ %unslanted italic
- <->ssub * ntxr1/m/it%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{bx}{n}{ %bold extended
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{bx}{sc}{ %bold extended cap & small cap
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxr1/bx/it%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{b}{n}{ %bold
- <->ssub * ntxr1/bx/n%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxr1/bx/sc%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{b}{sl}{ %bold slanted
- <->ssub * ntxr1/bx/sl%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{b}{it}{ %bold italic
- <->ssub * ntxr1/bx/it%
-}{}
-\DeclareFontShape{LY1}{ntxr1}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxr1/bx/ui%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxrj.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxrj.fd
deleted file mode 100644
index 62fa6e2a5cd..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ly1ntxrj.fd
+++ /dev/null
@@ -1,71 +0,0 @@
-\ProvidesFile{ly1ntxrj.fd}[2014/08/14 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-\def\ntx@asfx{}
-\ifdefined\ntx@adobescfalse %
- \ifntx@adobesc \def\ntx@asfx{-a}\fi
-\fi
-
-\DeclareFontFamily{LY1}{ntxrj}{}
-\DeclareFontShape{LY1}{ntxrj}{m}{n}{ %medium
-<-> \ntx@scaled tyxrj%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{m}{sc}{ %cap & small cap
-<-> \ntx@scaled ly1-ntxrc-osf\ntx@asfx%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{m}{sl}{ %slanted
-<-> \ntx@scaled tyxslj%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{m}{scit}{ %italic small cap
-<-> \ntx@scaled ly1-ntxric-osf%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{m}{si}{ %italic small cap
-<-> ssub * ntxrj/m/scit%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{m}{it}{ %italic
-<-> \ntx@scaled tyxij%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{m}{ui}{ %unslanted italic
-<->ssub * ntxrj/m/it%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{bx}{n}{ %bold extended
-<-> \ntx@scaled tyxbj%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{bx}{sc}{ %bold extended cap & small cap
-<-> \ntx@scaled ly1-ntxbc-osf\ntx@asfx%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{bx}{sl}{ %bold extended slanted
-<-> \ntx@scaled tyxbslj%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{bx}{it}{ %bold extended italic
-<-> \ntx@scaled tyxbij%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{bx}{scit}{ %italic
-<-> \ntx@scaled ly1-ntxbic-osf%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{bx}{ui}{ %bold extended unslanted italic
-<->ssub * ntxrj/bx/it%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{b}{n}{ %bold
-<->ssub * ntxrj/bx/n%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{b}{sc}{ %bold cap & small cap
-<->ssub * ntxrj/bx/sc%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{b}{sl}{ %bold slanted
-<->ssub * ntxrj/bx/sl%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{b}{it}{ %bold italic
-<->ssub * ntxrj/bx/it%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{b}{scit}{ %italic
-<->ssub * ntxrj/bx/scit%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{b}{si}{ %italic
-<->ssub * ntxrj/bx/scit%
-}{}
-\DeclareFontShape{LY1}{ntxrj}{b}{ui}{ %bold unslanted italic
-<->ssub * ntxrj/bx/ui%
-}{}
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxrx.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxrx.fd
deleted file mode 100644
index c0acc26c409..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ly1ntxrx.fd
+++ /dev/null
@@ -1,75 +0,0 @@
-\ProvidesFile{ly1ntxrx.fd}[2014/08/14 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-\def\ntx@asfx{}
-\ifdefined\ntx@adobescfalse %
- \ifntx@adobesc \def\ntx@asfx{-a}\fi
-\fi
-
-\DeclareFontFamily{LY1}{ntxrx}{}
-\DeclareFontShape{LY1}{ntxrx}{m}{n}{ %medium
- <-> \ntx@scaled tyxr%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{m}{sc}{ %cap & small cap
- <-> \ntx@scaled tyxsc\ntx@asfx%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{m}{sl}{ %slanted
- <-> \ntx@scaled tyxsl%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{m}{it}{ %italic
- <-> \ntx@scaled tyxi%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{m}{scit}{ %italic smallcap
- <-> \ntx@scaled ly1-ntxric%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{m}{si}{ %italic smallcap
- <-> ssub * ntxrx/m/scit%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{m}{ui}{ %unslanted italic
- <->ssub * ntxrx/m/it%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{bx}{n}{ %bold extended
- <-> \ntx@scaled tyxb%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{bx}{sc}{ %bold extended cap & small cap
- <-> \ntx@scaled tyxbsc\ntx@asfx%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled tyxbsl%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled tyxbi%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{bx}{scit}{ %bold extended smallcap italic
- <-> \ntx@scaled ly1-ntxbic%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{bx}{si}{ %bold extended smallcap italic
- <-> ssub * ntxrx/bx/scit%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxrx/bx/it%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{b}{n}{ %bold
- <->ssub * ntxrx/bx/n%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxrx/bx/sc%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{b}{sl}{ %bold slanted
- <->ssub * ntxrx/bx/sl%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{b}{it}{ %bold italic
- <->ssub * ntxrx/bx/it%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{b}{scit}{ %bold italic smallcap
- <->ssub * ntxrx/bx/scit%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{b}{si}{ %bold italic smallcap
- <->ssub * ntxrx/bx/scit%
-}{}
-\DeclareFontShape{LY1}{ntxrx}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxrx/bx/ui%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
index 5ecce453d26..4842255a1f4 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty
@@ -10,8 +10,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.322}
-\def\filedate{2015/01/06}
+\def\fileversion{1.4}
+\def\filedate{2015/01/31}
\ProvidesPackage{newtxmath}
[\filedate\space v\fileversion]
\@ifundefined{newtxmathLoaded}{}{\endinput}
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
index a9f40bb27b6..b8dc42eb5d8 100644
--- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
+++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty
@@ -1,82 +1,123 @@
\NeedsTeXFormat{LaTeX2e}
-% Based on Young Ryu's txfonts.sty, v.3.2.1
-% Changes to original txfonts.sty:
-% Change by Thomas Esser, June 2002:
-% Replaced hex numbers by octal to avoid trouble with active "
-% as in german.sty.
-% Approved for release by Young Ryu (the author) in January 2005.
-%
-% Changes from original txfonts.sty by Michael Sharpe, msharpe at ucsd dot edu;
-% Text and math versions now separate.
-% Math version doesn't require newtxtext.sty;
-% Added scaled keyword and osf option;
-% Modified the definition of \k to bypass problem with grouping;
-
-\def\fileversion{1.322}
-\def\filedate{2015/01/06}
+\def\fileversion{1.4}
+\def\filedate{2015/01/31}
\ProvidesPackage{newtxtext}[\filedate\space v\fileversion]
-\message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)}
+\message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)}
\RequirePackage{fontaxes}% so we can have [bold] italic small caps
\let\orig@footnote=\thefootnote
\let\orig@makefnmark=\@makefnmark
-
+\newdimen\ntx@fs
\RequirePackage{xkeyval,etoolbox}
-\renewcommand*{\rmdefault}{ntxrx}
-\def\useosf{\AtEndPreamble{\renewcommand*{\rmdefault}{ntxrj}}}
+\renewcommand*{\rmdefault}{ntxtlf} % always TLF for math
+\renewcommand*{\familydefault}{\rmdefault}
+\def\useosf{\edef\ntx@figurestyle{osf}}
\@onlypreamble\useosf
+\def\ntx@figurestyle{lf}% default is lining figure style
+\def\ntx@figurealign{t}% default is tabular figure alignment
\newif\ifntx@defaultsups
\newif\ifntx@adobesc
\newif\ifntx@scosf
+\newif\ifntx@largesc
\define@boolkey{ntx}{defaultsups}[true]{%
\csname ntx@defaultsups#1\endcsname}
+\define@boolkey{ntx}{largesc}[true]{%
+\csname ntx@largesc#1\endcsname}
+\define@boolkey{ntx}{proportional}[true]{%
+\csname ntx@prop#1\endcsname}
\define@boolkey{ntx}{adobesc}[true]{%
\csname ntx@adobesc#1\endcsname}
\define@key{ntx}{helvratio}[0.9]{\def\ntx@helvratio{#1}}
\define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}%
\def\ntx@scale{#1}}
+\setkeys{ntx}{helvratio} % set this first, at least to default 0.9
+\setkeys{ntx}{scaled} % get at least default
+\DeclareOption{lining}{\edef\ntx@figurestyle{lf}}
+\DeclareOption{lf}{\edef\ntx@figurestyle{lf}}
+\DeclareOption{oldstyle}{\useosf}
+\DeclareOption{osf}{\useosf}
+\DeclareOption{tabular}{\edef\ntx@figurealign{t}}
+\DeclareOption{p}{\edef\ntx@figurealign{}}
+\DeclareOption{proportional}{\edef\ntx@figurealign{}}
+%\DeclareOption{sups}{\ntx@defaultsupsfalse}
+\DeclareOption{scosf}{\ntx@scosftrue}
+\ExecuteOptions{lining,tabular}
+
\DeclareOption*{%
\begingroup
\edef\x{\endgroup
\noexpand\setkeys{ntx}{\CurrentOption}}%
\x}
-\def\ntx@style{x}% default is lining figures
-\DeclareOption{osf}{\useosf}
-%\DeclareOption{osf}{\def\ntx@style{j}}
-\DeclareOption{oldstyle}{\useosf}
-\DeclareOption{scosf}{\ntx@scosftrue}
-\setkeys{ntx}{helvratio} % set this first, at least to default 0.9
-\setkeys{ntx}{scaled} % get at least default
+
\ProcessOptions*
+%Each tosf fd file should contain:
+%\def\ntx@asfx{}
+%\ifdefined\ntx@adobescfalse %
+% \ifntx@adobesc \def\ntx@asfx{a}\def\ntx@lsfx{l}
+%\else
+%\ifntx@largesc\def\ntx@asfx{l}\fi
+%\fi\fi
\@tempdima=\ntx@scale\p@\@tempdima=\ntx@helvratio\@tempdima%
\edef\qhv@scale{\strip@pt\@tempdima}
\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
+\RequirePackage[full]{textcomp}
\ifntx@scosf %
\DeclareRobustCommand{\textsc}[1]{%
-{\fontfamily{ntxrj}\scshape\selectfont #1}%
+{\fontfamily{ntx\ntx@figurealign osf}\scshape\selectfont #1}%
}\fi% use OsF in small caps
+\DeclareRobustCommand{\lfstyle}{%
+ \not@math@alphabet\lfstyle\relax
+ \fontfamily{ntxlf}\selectfont %
+}% to get lf
+\DeclareRobustCommand{\tlfstyle}{%
+ \not@math@alphabet\tlfstyle\relax
+ \fontfamily{ntxtlf}\selectfont %
+}% to get tlf
+\DeclareRobustCommand{\osfstyle}{%
+ \not@math@alphabet\osfstyle\relax
+ \fontfamily{ntxosf}\selectfont %
+}% to get osf
+\DeclareRobustCommand{\tosfstyle}[1]{%
+ \not@math@alphabet\tosfstyle\relax
+ \fontfamily{ntxtosf}\selectfont %
+}% to get tosf
+\DeclareRobustCommand{\textlf}[1]{%
+ {\lfstyle #1}%
+}% to get lf
+\DeclareRobustCommand{\texttlf}[1]{%
+ {\tlfstyle #1}%
+}% to get tlf
+\DeclareRobustCommand{\textosf}[1]{%
+ {\osfstyle #1}%
+}% to get osf
+\DeclareRobustCommand{\texttosf}[1]{%
+ {\tosfstyle #1}%
+}% to get tosf
+
\DeclareRobustCommand{\sustyle}{%
\not@math@alphabet\sustyle\relax
- \fontfamily{ntxr1}\selectfont}
+ \fontfamily{ntxsups}\selectfont}
\DeclareTextFontCommand{\textsu}{\sustyle}
%\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi}
\ifntx@defaultsups %
\else
\def\f@@tn@te{footnote}
\def\@makefnmark{%
- \ifx\@mpfn\f@@tn@te%
+ \ifx\@mpfn\f@@tn@te% footnote not in a minipage
\ifx\thefootnote\orig@footnote%
\hbox{\sustyle\hspace*{.04em}\@thefnmark\hspace*{.03em}}%
\else%
\orig@makefnmark%
\fi
- \else%
+ \else% footnote in a minipage
+% \ntx@fs=\f@size\p@
+% \ntx@fs=1.05\ntx@fs
+%\hbox{{\itshape\sustyle\fontsize{\strip@pt\ntx@fs}{12}\selectfont \@thefnmark\hspace*{.1em}}}%
\orig@makefnmark%
\fi}
\fi
@@ -163,5 +204,9 @@
\ifx\encodingdefault\LY@n@@nc@d@ng\LY@n@@nc@d@ngM@cr@M@d\fi%
}
-\endinput
+\AtEndPreamble{%
+\renewcommand*{\rmdefault}{ntx\ntx@figurealign%
+\ntx@figurestyle}
+\normalfont}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxr.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxr.fd
deleted file mode 100644
index 79eb7498400..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ot1ntxr.fd
+++ /dev/null
@@ -1,53 +0,0 @@
-\ProvidesFile{ot1ntxr.fd}[2012/04/15 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{OT1}{ntxr}{\hyphenchar\font45 }
-\DeclareFontShape{OT1}{ntxr}{m}{n}{ %medium
- <-> \ntx@scaled txr%
-}{}
-\DeclareFontShape{OT1}{ntxr}{m}{sc}{ %cap & small cap
- <-> \ntx@scaled txsc%
-}{}
-\DeclareFontShape{OT1}{ntxr}{m}{sl}{ %slanted
- <-> \ntx@scaled txsl%
-}{}
-\DeclareFontShape{OT1}{ntxr}{m}{it}{ %italic
- <-> \ntx@scaled txi%
-}{}
-\DeclareFontShape{OT1}{ntxr}{m}{ui}{ %unslanted italic
- <->ssub * ntxr/m/it%
-}{}
-\DeclareFontShape{OT1}{ntxr}{bx}{n}{ %bold extended
- <-> \ntx@scaled txb%
-}{}
-\DeclareFontShape{OT1}{ntxr}{bx}{sc}{ %bold extended cap & small cap
- <-> \ntx@scaled txbsc%
-}{}
-\DeclareFontShape{OT1}{ntxr}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled txbsl%
-}{}
-\DeclareFontShape{OT1}{ntxr}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled txbi%
-}{}
-\DeclareFontShape{OT1}{ntxr}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxr/bx/it%
-}{}
-\DeclareFontShape{OT1}{ntxr}{b}{n}{ %bold
- <->ssub * ntxr/bx/n%
-}{}
-\DeclareFontShape{OT1}{ntxr}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxr/bx/sc%
-}{}
-\DeclareFontShape{OT1}{ntxr}{b}{sl}{ %bold slanted
- <->ssub * ntxr/bx/sl%
-}{}
-\DeclareFontShape{OT1}{ntxr}{b}{it}{ %bold italic
- <->ssub * ntxr/bx/it%
-}{}
-\DeclareFontShape{OT1}{ntxr}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxr/bx/ui%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxr1.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxr1.fd
deleted file mode 100644
index be6cb216642..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ot1ntxr1.fd
+++ /dev/null
@@ -1,62 +0,0 @@
-\ProvidesFile{ot1ntxr1.fd}[2012/04/15 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{OT1}{ntxr1}{\hyphenchar\font45 }
-\DeclareFontShape{OT1}{ntxr1}{m}{n}{ %medium
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{m}{sc}{ %cap & small cap
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{m}{sl}{ %slanted
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{m}{it}{ %italic
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{m}{scit}{ %italic
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{m}{ui}{ %unslanted italic
- <->ssub * ntxr1/m/it%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{bx}{n}{ %bold extended
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{bx}{sc}{ %bold extended cap & small cap
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{bx}{scit}{ %bold extended italic
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxr1/bx/it%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{b}{n}{ %bold
- <->ssub * ntxr1/bx/n%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxr1/bx/sc%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{b}{sl}{ %bold slanted
- <->ssub * ntxr1/bx/sl%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{b}{it}{ %bold italic
- <->ssub * ntxr1/bx/it%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{b}{scit}{ %bold italic
- <->ssub * ntxr1/bx/scit%
-}{}
-\DeclareFontShape{OT1}{ntxr1}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxr1/bx/ui%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxrj.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxrj.fd
deleted file mode 100644
index f8ddf206345..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ot1ntxrj.fd
+++ /dev/null
@@ -1,75 +0,0 @@
-\ProvidesFile{ot1ntxrj.fd}[2014/08/14 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-\def\ntx@asfx{}
-\ifdefined\ntx@adobescfalse %
- \ifntx@adobesc \def\ntx@asfx{-a}\fi
-\fi
-
-\DeclareFontFamily{OT1}{ntxrj}{\hyphenchar\font45 }
-\DeclareFontShape{OT1}{ntxrj}{m}{n}{ %medium
-<-> \ntx@scaled txrj%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{m}{sc}{ %cap & small cap
-<-> \ntx@scaled ot1-ntxrc-osf\ntx@asfx%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{m}{sl}{ %slanted
-<-> \ntx@scaled txslj%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{m}{it}{ %italic
-<-> \ntx@scaled txij%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{m}{scit}{% smallcap italic
-<-> \ntx@scaled ot1-ntxric-osf%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{m}{si}{% smallcap italic
-<-> ssub * ntxrj/m/scit%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{m}{ui}{ %unslanted italic
-<->ssub * ntxrj/m/it%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{bx}{n}{ %bold extended
-<-> \ntx@scaled txbj%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{bx}{sc}{ %bold extended cap & small cap
-<-> \ntx@scaled ot1-ntxbc-osf\ntx@asfx%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{bx}{sl}{ %bold extended slanted
-<-> \ntx@scaled txbslj%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{bx}{it}{ %bold extended italic
-<-> \ntx@scaled txbij%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{bx}{scit}{% bold extended smallcap italic
-<-> \ntx@scaled ot1-ntxbic-osf%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{bx}{si}{% bold extended smallcap italic
-<-> ssub * ntxrj/bx/scit%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{bx}{ui}{ %bold extended unslanted italic
-<->ssub * ntxrj/bx/it%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{b}{n}{ %bold
-<->ssub * ntxrj/bx/n%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{b}{sc}{ %bold cap & small cap
-<->ssub * ntxrj/bx/sc%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{b}{sl}{ %bold slanted
-<->ssub * ntxrj/bx/sl%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{b}{it}{ %bold italic
-<->ssub * ntxrj/bx/it%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{b}{ui}{ %bold unslanted italic
-<->ssub * ntxrj/bx/ui%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{b}{scit}{%
-<->ssub * ntxrj/bx/scit%
-}{}
-\DeclareFontShape{OT1}{ntxrj}{b}{si}{%
-<->ssub * ntxrj/bx/scit%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxrx.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxrx.fd
deleted file mode 100644
index ebb2045a422..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ot1ntxrx.fd
+++ /dev/null
@@ -1,72 +0,0 @@
-\ProvidesFile{ot1ntxrx.fd}[2014/08/14 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-\def\ntx@asfx{}
-\ifdefined\ntx@adobescfalse %
- \ifntx@adobesc \def\ntx@asfx{-a}\fi
-\fi
-
-\DeclareFontFamily{OT1}{ntxrx}{\hyphenchar\font45 }
-\DeclareFontShape{OT1}{ntxrx}{m}{n}{ %medium
- <-> \ntx@scaled txr%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{m}{sc}{ %cap & small cap
- <-> \ntx@scaled txsc\ntx@asfx%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{m}{sl}{ %slanted
- <-> \ntx@scaled txsl%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{m}{it}{ %italic
- <-> \ntx@scaled txi%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{m}{scit}{% smallcap italic
-<-> \ntx@scaled ot1-ntxric%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{m}{si}{ %italic smallcap
- <-> ssub * ntxrx/m/scit%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{m}{ui}{ %unslanted italic
- <->ssub * ntxrx/m/it%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{bx}{n}{ %bold extended
- <-> \ntx@scaled txb%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{bx}{sc}{ %bold extended cap & small cap
- <-> \ntx@scaled txbsc\ntx@asfx%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled txbsl%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled txbi%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{bx}{scit}{% bold extended smallcap italic
-<-> \ntx@scaled ot1-ntxbic%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{bx}{si}{% smallcap italic
-<-> ssub * ntxrx/bx/scit%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxrx/bx/it%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{b}{n}{ %bold
- <->ssub * ntxrx/bx/n%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxrx/bx/sc%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{b}{sl}{ %bold slanted
- <->ssub * ntxrx/bx/sl%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{b}{it}{ %bold italic
- <->ssub * ntxrx/bx/it%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxrx/bx/ui%
-}{}
-\DeclareFontShape{OT1}{ntxrx}{b}{scit}{%
-<->ssub * ntxrx/bx/scit%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxr.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxr.fd
deleted file mode 100644
index 3beda20fb07..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/t1ntxr.fd
+++ /dev/null
@@ -1,52 +0,0 @@
-\ProvidesFile{t1ntxr.fd}[2012/04/17 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{T1}{ntxr}{}
-\DeclareFontShape{T1}{ntxr}{m}{n}{ %medium
- <-> \ntx@scaled t1xr%
-}{}
-\DeclareFontShape{T1}{ntxr}{m}{sc}{ %cap & small cap
- <-> \ntx@scaled t1xsc%
-}{}
-\DeclareFontShape{T1}{ntxr}{m}{sl}{ %slanted
- <-> \ntx@scaled t1xsl%
-}{}
-\DeclareFontShape{T1}{ntxr}{m}{it}{ %italic
- <-> \ntx@scaled t1xi%
-}{}
-\DeclareFontShape{T1}{ntxr}{m}{ui}{ %unslanted italic
- <->ssub * ntxr/m/it%
-}{}
-\DeclareFontShape{T1}{ntxr}{bx}{n}{ %bold extended
- <-> \ntx@scaled t1xb%
-}{}
-\DeclareFontShape{T1}{ntxr}{bx}{sc}{ %bold extended cap & small cap
- <-> \ntx@scaled t1xbsc%
-}{}
-\DeclareFontShape{T1}{ntxr}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled t1xbsl%
-}{}
-\DeclareFontShape{T1}{ntxr}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled t1xbi%
-}{}
-\DeclareFontShape{T1}{ntxr}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxr/bx/it%
-}{}
-\DeclareFontShape{T1}{ntxr}{b}{n}{ %bold
- <->ssub * ntxr/bx/n%
-}{}
-\DeclareFontShape{T1}{ntxr}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxr/bx/sc%
-}{}
-\DeclareFontShape{T1}{ntxr}{b}{sl}{ %bold slanted
- <->ssub * ntxr/bx/sl%
-}{}
-\DeclareFontShape{T1}{ntxr}{b}{it}{ %bold italic
- <->ssub * ntxr/bx/it%
-}{}
-\DeclareFontShape{T1}{ntxr}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxr/bx/ui%
-}{}
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd
deleted file mode 100644
index 75ce6274339..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/t1ntxr1.fd
+++ /dev/null
@@ -1,61 +0,0 @@
-\ProvidesFile{t1ntxr1.fd}[2012/07/29 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{T1}{ntxr1}{}
-\DeclareFontShape{T1}{ntxr1}{m}{n}{ %medium
- <-> \ntx@scaled ntxsups%
-}{}
-\DeclareFontShape{T1}{ntxr1}{m}{sc}{ %cap & small cap
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{m}{sl}{ %slanted
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{m}{it}{ %italic
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{m}{scit}{ %italic
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{m}{ui}{ %unslanted italic
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{bx}{n}{ %bold extended
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{bx}{sc}{ %bold extended cap & small cap
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{bx}{sl}{ %bold extended slanted
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{bx}{it}{ %bold extended italic
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{bx}{scit}{ %bold extended italic
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{bx}{ui}{ %bold extended unslanted italic
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{b}{n}{ %bold
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{b}{sc}{ %bold cap & small cap
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{b}{sl}{ %bold slanted
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{b}{it}{ %bold italic
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{b}{ui}{ %bold unslanted italic
- <-> ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{T1}{ntxr1}{b}{scit}{ %bold italic
- <-> ssub * ntxr1/m/n%
-}{}
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxrj.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxrj.fd
deleted file mode 100644
index a02b2cbb65b..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/t1ntxrj.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-\ProvidesFile{t1ntxrj.fd}[2014/08/14 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-\def\ntx@asfx{}
-\ifdefined\ntx@adobescfalse %
- \ifntx@adobesc \def\ntx@asfx{-a}\fi
-\fi
-
-\DeclareFontFamily{T1}{ntxrj}{}
-\DeclareFontShape{T1}{ntxrj}{m}{n}{ %medium
-<-> \ntx@scaled t1xrj%
-}{}
-\DeclareFontShape{T1}{ntxrj}{m}{sc}{ %cap & small cap
-<-> \ntx@scaled t1-ntxrc-osf\ntx@asfx%
-}{}
-\DeclareFontShape{T1}{ntxrj}{m}{sl}{ %slanted
-<-> \ntx@scaled t1xslj%
-}{}
-\DeclareFontShape{T1}{ntxrj}{m}{it}{ %italic
-<-> \ntx@scaled t1xij%
-}{}
-\DeclareFontShape{T1}{ntxrj}{m}{scit}{% smallcap italic
-<-> \ntx@scaled t1-ntxric-osf%
-}{}
-\DeclareFontShape{T1}{ntxrj}{m}{si}{% smallcap italic
-<-> ssub * ntxrj/m/scit%
-}{}
-\DeclareFontShape{T1}{ntxrj}{m}{ui}{ %unslanted italic
-<->ssub * ntxrj/m/it%
-}{}
-\DeclareFontShape{T1}{ntxrj}{bx}{n}{ %bold extended
-<-> \ntx@scaled t1xbj%
-}{}
-\DeclareFontShape{T1}{ntxrj}{bx}{sc}{ %bold extended cap & small cap
-<-> \ntx@scaled t1-ntxbc-osf\ntx@asfx%
-}{}
-\DeclareFontShape{T1}{ntxrj}{bx}{sl}{ %bold extended slanted
-<-> \ntx@scaled t1xbslj%
-}{}
-\DeclareFontShape{T1}{ntxrj}{bx}{it}{ %bold extended italic
-<-> \ntx@scaled t1xbij%
-}{}
-\DeclareFontShape{T1}{ntxrj}{bx}{scit}{% bold extended smallcap italic
-<-> \ntx@scaled t1-ntxbic-osf%
-}{}
-\DeclareFontShape{T1}{ntxrj}{bx}{si}{% bold extended smallcap italic
-<-> ssub * ntxrj/bx/scit%
-}{}
-\DeclareFontShape{T1}{ntxrj}{bx}{ui}{ %bold extended unslanted italic
-<->ssub * ntxrj/bx/it%
-}{}
-\DeclareFontShape{T1}{ntxrj}{b}{n}{ %bold
-<->ssub * ntxrj/bx/n%
-}{}
-\DeclareFontShape{T1}{ntxrj}{b}{sc}{ %bold cap & small cap
-<->ssub * ntxrj/bx/sc%
-}{}
-\DeclareFontShape{T1}{ntxrj}{b}{sl}{ %bold slanted
-<->ssub * ntxrj/bx/sl%
-}{}
-\DeclareFontShape{T1}{ntxrj}{b}{it}{ %bold italic
-<->ssub * ntxrj/bx/it%
-}{}
-\DeclareFontShape{T1}{ntxrj}{b}{ui}{ %bold unslanted italic
-<->ssub * ntxrj/bx/ui%
-}{}
-\DeclareFontShape{T1}{ntxrj}{b}{scit}{%
-<->ssub * ntxrj/bx/scit%
-}{}
-\DeclareFontShape{T1}{ntxrj}{b}{si}{%
-<->ssub * ntxrj/bx/scit%
-}{}
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxrx.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxrx.fd
deleted file mode 100644
index c77fb84bb66..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/t1ntxrx.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-\ProvidesFile{t1ntxrx.fd}[2014/08/14 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-\def\ntx@asfx{}
-\ifdefined\ntx@adobescfalse %
- \ifntx@adobesc \def\ntx@asfx{-a}\fi
-\fi
-
-\DeclareFontFamily{T1}{ntxrx}{}
-\DeclareFontShape{T1}{ntxrx}{m}{n}{ %medium
- <-> \ntx@scaled t1xr%
-}{}
-\DeclareFontShape{T1}{ntxrx}{m}{sc}{ %cap & small cap
- <-> \ntx@scaled t1xsc\ntx@asfx%
-}{}
-\DeclareFontShape{T1}{ntxrx}{m}{sl}{ %slanted
- <-> \ntx@scaled t1xsl%
-}{}
-\DeclareFontShape{T1}{ntxrx}{m}{it}{ %italic
- <-> \ntx@scaled t1xi%
-}{}
-\DeclareFontShape{T1}{ntxrx}{m}{scit}{ %italic smallcap
- <-> \ntx@scaled t1-ntxric%
-}{}
-\DeclareFontShape{T1}{ntxrx}{m}{si}{ %italic smallcap
- <-> ssub * ntxrx/m/scit%
-}{}
-\DeclareFontShape{T1}{ntxrx}{m}{ui}{ %unslanted italic
- <->ssub * ntxrx/m/it%
-}{}
-\DeclareFontShape{T1}{ntxrx}{bx}{n}{ %bold extended
- <-> \ntx@scaled t1xb%
-}{}
-\DeclareFontShape{T1}{ntxrx}{bx}{sc}{ %bold extended cap & small cap
- <-> \ntx@scaled t1xbsc\ntx@asfx%
-}{}
-\DeclareFontShape{T1}{ntxrx}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled t1xbsl%
-}{}
-\DeclareFontShape{T1}{ntxrx}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled t1xbi%
-}{}
-\DeclareFontShape{T1}{ntxrx}{bx}{scit}{ %bold extended smallcap italic
- <-> \ntx@scaled t1-ntxbic%
-}{}
-\DeclareFontShape{T1}{ntxrx}{bx}{si}{ %bold extended smallcap italic
- <-> ssub * ntxrx/bx/scit%
-}{}
-\DeclareFontShape{T1}{ntxrx}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxrx/bx/it%
-}{}
-\DeclareFontShape{T1}{ntxrx}{b}{n}{ %bold
- <->ssub * ntxrx/bx/n%
-}{}
-\DeclareFontShape{T1}{ntxrx}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxrx/bx/sc%
-}{}
-\DeclareFontShape{T1}{ntxrx}{b}{sl}{ %bold slanted
- <->ssub * ntxrx/bx/sl%
-}{}
-\DeclareFontShape{T1}{ntxrx}{b}{it}{ %bold italic
- <->ssub * ntxrx/bx/it%
-}{}
-\DeclareFontShape{T1}{ntxrx}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxrx/bx/ui%
-}{}
-\DeclareFontShape{T1}{ntxrx}{b}{scit}{ %bold italic smallcap
- <->ssub * ntxrx/bx/scit%
-}{}
-\DeclareFontShape{T1}{ntxrx}{b}{si}{ %bold italic smallcap
- <->ssub * ntxrx/bx/scit%
-}{}
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ts1ntxr.fd b/Master/texmf-dist/tex/latex/newtx/ts1ntxr.fd
deleted file mode 100644
index db423c73ead..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ts1ntxr.fd
+++ /dev/null
@@ -1,53 +0,0 @@
-\ProvidesFile{ts1ntxr.fd}[2012/04/15 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{TS1}{ntxr}{}
-\DeclareFontShape{TS1}{ntxr}{m}{n}{ %medium
- <-> \ntx@scaled tcxr%
-}{}
-\DeclareFontShape{TS1}{ntxr}{m}{sc}{ %cap & small cap
- <->ssub * ntxr/m/n%
-}{}
-\DeclareFontShape{TS1}{ntxr}{m}{sl}{ %slanted
- <-> \ntx@scaled tcxsl%
-}{}
-\DeclareFontShape{TS1}{ntxr}{m}{it}{ %italic
- <-> \ntx@scaled tcxi%
-}{}
-\DeclareFontShape{TS1}{ntxr}{m}{ui}{ %unslanted italic
- <->ssub * ntxr/m/it%
-}{}
-\DeclareFontShape{TS1}{ntxr}{bx}{n}{ %bold extended
- <-> \ntx@scaled tcxb%
-}{}
-\DeclareFontShape{TS1}{ntxr}{bx}{sc}{ %bold extended cap & small cap
- <->ssub * ntxr/bx/n%
-}{}
-\DeclareFontShape{TS1}{ntxr}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled tcxbsl%
-}{}
-\DeclareFontShape{TS1}{ntxr}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled tcxbi%
-}{}
-\DeclareFontShape{TS1}{ntxr}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxr/bx/it%
-}{}
-\DeclareFontShape{TS1}{ntxr}{b}{n}{ %bold
- <->ssub * ntxr/bx/n%
-}{}
-\DeclareFontShape{TS1}{ntxr}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxr/bx/sc%
-}{}
-\DeclareFontShape{TS1}{ntxr}{b}{sl}{ %bold slanted
- <->ssub * ntxr/bx/sl%
-}{}
-\DeclareFontShape{TS1}{ntxr}{b}{it}{ %bold italic
- <->ssub * ntxr/bx/it%
-}{}
-\DeclareFontShape{TS1}{ntxr}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxr/bx/ui%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ts1ntxr1.fd b/Master/texmf-dist/tex/latex/newtx/ts1ntxr1.fd
deleted file mode 100644
index ace6fad5cc8..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ts1ntxr1.fd
+++ /dev/null
@@ -1,53 +0,0 @@
-\ProvidesFile{ts1ntxr1.fd}[2012/07/29 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{TS1}{ntxr1}{}
-\DeclareFontShape{TS1}{ntxr1}{m}{n}{ %medium
- <-> \ntx@scaled tcxr%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{m}{sc}{ %cap & small cap
- <->ssub * ntxr1/m/n%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{m}{sl}{ %slanted
- <-> \ntx@scaled tcxsl%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{m}{it}{ %italic
- <-> \ntx@scaled tcxi%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{m}{ui}{ %unslanted italic
- <->ssub * ntxr1/m/it%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{bx}{n}{ %bold extended
- <-> \ntx@scaled tcxb%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{bx}{sc}{ %bold extended cap & small cap
- <->ssub * ntxr1/bx/n%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled tcxbsl%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled tcxbi%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxr1/bx/it%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{b}{n}{ %bold
- <->ssub * ntxr1/bx/n%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxr1/bx/sc%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{b}{sl}{ %bold slanted
- <->ssub * ntxr1/bx/sl%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{b}{it}{ %bold italic
- <->ssub * ntxr1/bx/it%
-}{}
-\DeclareFontShape{TS1}{ntxr1}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxr1/bx/ui%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ts1ntxrj.fd b/Master/texmf-dist/tex/latex/newtx/ts1ntxrj.fd
deleted file mode 100644
index 69b97d3e95d..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ts1ntxrj.fd
+++ /dev/null
@@ -1,53 +0,0 @@
-\ProvidesFile{ts1ntxrj.fd}[2012/04/15 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{TS1}{ntxrj}{}
-\DeclareFontShape{TS1}{ntxrj}{m}{n}{ %medium
- <-> \ntx@scaled tcxr%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{m}{sc}{ %cap & small cap
- <->ssub * ntxrj/m/n%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{m}{sl}{ %slanted
- <-> \ntx@scaled tcxsl%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{m}{it}{ %italic
- <-> \ntx@scaled tcxi%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{m}{ui}{ %unslanted italic
- <->ssub * ntxrj/m/it%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{bx}{n}{ %bold extended
- <-> \ntx@scaled tcxb%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{bx}{sc}{ %bold extended cap & small cap
- <->ssub * ntxrj/bx/n%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled tcxbsl%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled tcxbi%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxrj/bx/it%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{b}{n}{ %bold
- <->ssub * ntxrj/bx/n%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxrj/bx/sc%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{b}{sl}{ %bold slanted
- <->ssub * ntxrj/bx/sl%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{b}{it}{ %bold italic
- <->ssub * ntxrj/bx/it%
-}{}
-\DeclareFontShape{TS1}{ntxrj}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxrj/bx/ui%
-}{}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/newtx/ts1ntxrx.fd b/Master/texmf-dist/tex/latex/newtx/ts1ntxrx.fd
deleted file mode 100644
index 4201aa1c3aa..00000000000
--- a/Master/texmf-dist/tex/latex/newtx/ts1ntxrx.fd
+++ /dev/null
@@ -1,53 +0,0 @@
-\ProvidesFile{ts1ntxrx.fd}[2012/04/15 v1.0]
-\expandafter\ifx\csname ntx@scaled\endcsname\relax
- \let\ntx@scaled\@empty%
-\fi
-
-\DeclareFontFamily{TS1}{ntxrx}{}
-\DeclareFontShape{TS1}{ntxrx}{m}{n}{ %medium
- <-> \ntx@scaled tcxr%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{m}{sc}{ %cap & small cap
- <->ssub * ntxrx/m/n%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{m}{sl}{ %slanted
- <-> \ntx@scaled tcxsl%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{m}{it}{ %italic
- <-> \ntx@scaled tcxi%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{m}{ui}{ %unslanted italic
- <->ssub * ntxrx/m/it%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{bx}{n}{ %bold extended
- <-> \ntx@scaled tcxb%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{bx}{sc}{ %bold extended cap & small cap
- <->ssub * ntxrx/bx/n%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{bx}{sl}{ %bold extended slanted
- <-> \ntx@scaled tcxbsl%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{bx}{it}{ %bold extended italic
- <-> \ntx@scaled tcxbi%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{bx}{ui}{ %bold extended unslanted italic
- <->ssub * ntxrx/bx/it%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{b}{n}{ %bold
- <->ssub * ntxrx/bx/n%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{b}{sc}{ %bold cap & small cap
- <->ssub * ntxrx/bx/sc%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{b}{sl}{ %bold slanted
- <->ssub * ntxrx/bx/sl%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{b}{it}{ %bold italic
- <->ssub * ntxrx/bx/it%
-}{}
-\DeclareFontShape{TS1}{ntxrx}{b}{ui}{ %bold unslanted italic
- <->ssub * ntxrx/bx/ui%
-}{}
-
-\endinput