summaryrefslogtreecommitdiff
path: root/fonts/newtx/tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-08-06 03:02:06 +0000
committerNorbert Preining <norbert@preining.info>2020-08-06 03:02:06 +0000
commitd99fea72e367e8d4d2809b43b3b0206b1bb526b8 (patch)
tree4ff41aa9059b698160184e26c89a845c859c8ef7 /fonts/newtx/tex
parent7731c3718462625785ef5c34fd2a38d6ea4f60a7 (diff)
CTAN sync 202008060302
Diffstat (limited to 'fonts/newtx/tex')
-rw-r--r--fonts/newtx/tex/newtxmath.sty63
-rw-r--r--fonts/newtx/tex/untxmia.fd30
2 files changed, 79 insertions, 14 deletions
diff --git a/fonts/newtx/tex/newtxmath.sty b/fonts/newtx/tex/newtxmath.sty
index 500ae8e321..c81e330939 100644
--- a/fonts/newtx/tex/newtxmath.sty
+++ b/fonts/newtx/tex/newtxmath.sty
@@ -11,8 +11,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.628}
-\def\filedate{2020/07/22}
+\def\fileversion{1.629}
+\def\filedate{2020/08/04}
\ProvidesPackage{newtxmath}[\filedate\space v\fileversion ]
\@ifundefined{newtxmathLoaded}{}{\endinput}
@@ -46,8 +46,9 @@
\newcount\tx@cntz
\input{binhex}
-\let\ntxmath@scaled\@empty
-\define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}}
+\let\ntxmath@scaled\@empty\def\tx@scale{1}
+\define@key{ntxmath}{scaled}[1.0]{\def\tx@scale{#1}\def\ntxmath@scaled{s*[#1]}}
+\define@key{ntxmath}{scale}[1.0]{\def\tx@scale{#1}\def\ntxmath@scaled{s*[#1]}}
\def\ntxmath@vecsep{.25ex}
\define@key{ntxmath}{vecsep}[.25ex]{\def\ntxmath@vecsep{#1}}
%\define@key{ntxmath}{scalesubdrop}[1.0]{\DeclareRobustCommand{\ntx@scalesub}{%
@@ -82,6 +83,7 @@
\newif\iftx@nozchvw
\newif\iftx@stxtwo
\newif\iftx@sbc
+\newif\iftx@noto \newif\iftx@notosans
%\newif\iftx@spc
\newif\iftx@nootone % do not switch to OT1 for operators
\newif\iftx@digits % use digits from letters
@@ -242,6 +244,8 @@
\DeclareOption{stickstoo}{\tx@stxtwotrue\tx@ntxmathfalse} % added in 1.55
\DeclareOption{nc}{\tx@nctrue\tx@ntxmathfalse} % added in 1.62
\DeclareOption{ncf}{\tx@nctrue\tx@ntxmathfalse\tx@fouriertrue} % added in 1.622
+\DeclareOption{noto}{\tx@nototrue\tx@notosansfalse\tx@ntxmathfalse} % added in 1.629
+\DeclareOption{notosans}{\tx@notosanstrue\tx@notofalse\tx@ntxmathfalse} % added in 1.629
\DeclareOption{cochf}{\tx@cochftrue} % added in 1.604
\DeclareOption{cochrho}{\tx@cochrhotrue} % added in 1.604
\DeclareOption{alty}{\tx@XChaltytrue} % only in XCharter, added im 1.611
@@ -253,6 +257,28 @@
\ExecuteOptions{%
amssymbols,uprightGreek,nosubscriptcorrection}
\ProcessOptions*
+
+% noto option requires special handling because of scaling issues---
+% The noto package does not have an option that controls the scale
+% factor for serifed text.
+%\newdimen\tx@dima
+%\newif\iftx@somenoto
+%\iftx@noto
+% \tx@somenototrue
+%\else
+% \iftx@notosans
+% \tx@somenototrue
+% \fi
+%\fi
+%\iftx@somenoto
+% % use the scale from newtxmath to reset scale factors for noto
+% \tx@dima=\tx@scale\p@
+% \tx@dima=.9\tx@dima
+% \edef\NotoSerif@scale{\strip@pt\tx@dima}
+% \let\NotoSans@scale\NotoSerif@scale
+% \let\NotoSansMono@scale\NotoSerif@scale
+%\fi
+
% Check whether math face is enhanced
\iftx@ntxmath\tx@isenhtrue\else
\iftx@libertine\tx@isenhtrue\else
@@ -263,6 +289,10 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\iftx@ut\tx@isenhtrue\else
\iftx@nc\tx@isenhtrue\else
\iftx@minion\tx@isenhtrue\else
+ \iftx@noto\tx@isenhtrue\else
+ \iftx@notosans\tx@isenhtrue\else
+ \fi
+ \fi
\fi
\fi
\fi
@@ -320,6 +350,8 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\fi\fi
\fi
\iftx@minion\edef\rmdefaultB{MinionPro-TLF}\fi
+\iftx@noto\edef\rmdefaultB{NotoSerif-TLF}\fi
+\iftx@notosans\edef\rmdefaultB{NotoSans-TLF}\fi
\edef\bold@wt{\ifx\iflibertine@otf\undefined b\else sb\fi}
\let\tx@enc\encodingdefault
%:
@@ -429,10 +461,24 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\DeclareFontSubstitution{OML}{zncmi}{m}{it}
\fi
\else
- \def\tx@subs{newtx-subs.tex}
- \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
- \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
- \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+ \iftx@noto
+ \def\tx@subs{newtx-noto-subs.tex}
+ \DeclareSymbolFont{letters}{OML}{notomi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{notomi}{b}{it}
+ \DeclareFontSubstitution{OML}{notomi}{m}{it}
+ \else
+ \iftx@notosans
+ \def\tx@subs{newtx-notosans-subs.tex}
+ \DeclareSymbolFont{letters}{OML}{notosansmi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{notosansmi}{b}{it}
+ \DeclareFontSubstitution{OML}{notosansmi}{m}{it}
+ \else
+ \def\tx@subs{newtx-subs.tex}
+ \DeclareSymbolFont{letters}{OML}{ntxmi}{m}{it}
+ \SetSymbolFont{letters}{bold}{OML}{ntxmi}{b}{it}
+ \DeclareFontSubstitution{OML}{ntxmi}{m}{it}
+ \fi
+ \fi
\fi
\fi
\fi
@@ -444,6 +490,7 @@ amssymbols,uprightGreek,nosubscriptcorrection}
\fi
\fi
\fi
+
%\show\tx@subs
\iftx@isenh
diff --git a/fonts/newtx/tex/untxmia.fd b/fonts/newtx/tex/untxmia.fd
index b3f71b5ec6..4e77bfc7e3 100644
--- a/fonts/newtx/tex/untxmia.fd
+++ b/fonts/newtx/tex/untxmia.fd
@@ -89,12 +89,30 @@
}{}
\fi
\else
- \DeclareFontShape{U}{ntxmia}{m}{it}{
- <-> \ntxmath@scaled ntxmia
- }{}
- \DeclareFontShape{U}{ntxmia}{b}{it}{
- <-> \ntxmath@scaled ntxbmia
- }{}
+ \iftx@noto
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled notomia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled notobmia
+ }{}
+ \else
+ \iftx@notosans
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled notosansmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled notosansbmia
+ }{}
+ \else
+ \DeclareFontShape{U}{ntxmia}{m}{it}{
+ <-> \ntxmath@scaled ntxmia
+ }{}
+ \DeclareFontShape{U}{ntxmia}{b}{it}{
+ <-> \ntxmath@scaled ntxbmia
+ }{}
+ \fi
+ \fi
\fi
\fi
\fi