From 89c9c6dc3195b0fa6a9672b7fc3bd4466f3d9089 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 31 Aug 2015 22:42:25 +0000 Subject: newtx (31aug15) git-svn-id: svn://tug.org/texlive/trunk@38255 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 48 ++++++++++++++++++++++--- Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 4 +-- Master/texmf-dist/tex/latex/newtx/omlntxmi.fd | 29 +++++++++++++-- 3 files changed, 73 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index e136dacdb58..3ea9457e135 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.452} -\def\filedate{2015/08/08} +\def\fileversion{1.46} +\def\filedate{2015/08/29} \ProvidesPackage{newtxmath}[\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -28,6 +28,7 @@ \xl@otftrue \fi \fi +\newif\iftx@noopt \newcommand{\cmr@default}{cmr} \def\ly@one{LY1} \def\t@one{T1} @@ -36,6 +37,8 @@ \input{binhex} \let\ntxmath@scaled\@empty \define@key{ntxmath}{scaled}[1.0]{\def\ntxmath@scaled{s*[#1]}} +\define@key{ntxmath}{scalesubdrop}[1.0]{\DeclareRobustCommand{\ntx@scalesub}{% +\fontdimen16\font=#1\fontdimen16\font\fontdimen17\font=#1\fontdimen17\font}} \DeclareOption*{% \begingroup \edef\x{\endgroup @@ -60,6 +63,10 @@ \tx@ottrue % default is true \let\rmdefaultB\rmdefault \ifx\tx@rmdefault\@tx@ptm \def\rmdefaultB{ntxtlf}\fi % newtxtext +\newcommand\enablesbcorrection{\AtBeginDocument{\mathcode`\_=\string"8000 \catcode`\_=12\relax}} +\newcommand\disablesbcorrection{\catcode`\_=8\relax} +\DeclareOption{nosubscriptcorrection}{\disablesbcorrection} +\DeclareOption{subscriptcorrection} {\enablesbcorrection} \DeclareOption{timesmathacc}{\tx@tmatrue} \DeclareOption{bigdelims}{\tx@bigdelimstrue} \DeclareOption{varbb}{\tx@varbbtrue} @@ -89,8 +96,10 @@ \DeclareOption{largelibfigs}{\tx@largelibfigstrue} \DeclareOption{liby}{\tx@libytrue} \DeclareOption{frenchmath}{\tx@frenchmtrue} +\DeclareOption{nonewtxmathopt}{\tx@noopttrue} +\DeclareOption{scale}{\tx@noopttrue} \ExecuteOptions{% -amssymbols,uprightGreek} +amssymbols,uprightGreek,nosubscriptcorrection} \ProcessOptions* % frenchmath implies uprightGreek \iftx@frenchm\tx@slantedGfalse\fi @@ -311,7 +320,38 @@ amssymbols,uprightGreek} \def\equalht#1{\tx@XXX #1\@nil} - +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Subscript correction code +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\begingroup + \catcode`\_=13 + \gdef_{\futurelet\next\s@@b} +\endgroup +\def\s@@b{\ifcat\relax\noexpand\next\expandafter\sb\else + \expandafter\s@@b@\fi} +\def\s@@b@#1{\sb{\futurelet\next\sb@#1}} +\def\sb@{% + \ifx\next\space@\def\next@. {\futurelet\next\sb@}\else + \def\next@.{% + \ifx\next f\mkern-\tw@ mu\else + \ifx\next j\mkern-\tw@ mu\else + \ifx\next p\mkern-\@ne mu\else + %\ifx\next t\mkern\@ne mu\else + \ifx\next y\mkern-\@ne mu\else + \ifx\next A\mkern-\tw@ mu\else + \ifx\next B\mkern-\@ne mu\else + \ifx\next D\mkern-\@ne mu\else + \ifx\next H\mkern-\@ne mu\else + \ifx\next I\mkern-\@ne mu\else + \ifx\next K\mkern-\@ne mu\else + \ifx\next L\mkern-\@ne mu\else + \ifx\next M\mkern-\@ne mu\else + \ifx\next N\mkern-0.5mu\else + \ifx\next P\mkern-\@ne mu\else + \ifx\next X\mkern-\@ne mu\else + \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}% + \fi + \next@.} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Math Symbols & Notations Definitions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index d3d38bf062e..c14667f8169 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -1,7 +1,7 @@ \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.452} -\def\filedate{2015/08/08} +\def\fileversion{1.46} +\def\filedate{2015/08/29} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)} diff --git a/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd index ba411f516c7..38a38956e4e 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlntxmi.fd @@ -4,15 +4,28 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{omlntxmi.fd} - [2012/03/22 Fontinst v1.933 font definitions for OML/ntxmi.] + [2015/08/25 Fontinst v1.933 font definitions for OML/ntxmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax \let\ntxmath@scaled\@empty% \fi +\def\tx@donoopt{\newif\iftx@noopt} +\expandafter\ifx\csname tx@nooptfalse\endcsname\relax + \tx@donoopt +\fi \DeclareFontFamily{OML}{ntxmi}{\skewchar\font127 } + \ifx\X@s@v@rg\undefined +\iftx@noopt % no optical sizes +\DeclareFontShape{OML}{ntxmi}{m}{it}{ + <-> \ntxmath@scaled ntxmi +}{} +\DeclareFontShape{OML}{ntxmi}{b}{it}{ + <-> \ntxmath@scaled ntxbmi +}{} +\else % optical sizes \DeclareFontShape{OML}{ntxmi}{m}{it}{ <-6.3> \ntxmath@scaled ntxmi5 <6.3-8.6> \ntxmath@scaled ntxmi7 % from 6.3 up to, but not including, 8.6 @@ -23,6 +36,15 @@ <6.3-8.6> \ntxmath@scaled ntxbmi7 % from 6.3 up to, but not including, 8.6 <8.6-> \ntxmath@scaled ntxbmi% }{} +\fi %tx@noopt +\else %\X@s@v@rg is defined +\iftx@noopt +\DeclareFontShape{OML}{ntxmi}{m}{it}{ + <-> \ntxmath@scaled ntxmi1 +}{} +\DeclareFontShape{OML}{ntxmi}{b}{it}{ + <-> \ntxmath@scaled ntxbmi1 +}{} \else \DeclareFontShape{OML}{ntxmi}{m}{it}{ <-6.3> \ntxmath@scaled ntxmi15 @@ -34,7 +56,10 @@ <6.3-8.6> \ntxmath@scaled ntxbmi17 % from 6.3 up to, but not including, 8.6 <8.6-> \ntxmath@scaled ntxbmi1% }{} -\fi +\fi %tx@noopt +\fi %\X@s@v@rg + + \DeclareFontShape{OML}{ntxmi}{l}{it}{<->ssub * ntxmi/m/it}{} \DeclareFontShape{OML}{ntxmi}{bx}{it}{<->ssub * ntxmi/b/it}{} -- cgit v1.2.3