diff options
author | Karl Berry <karl@freefriends.org> | 2013-11-22 00:03:57 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-11-22 00:03:57 +0000 |
commit | d3327348f5b0444783671bcb991cb01776fc82ea (patch) | |
tree | 84036947095ce2e709f2a2c31ba25cf3f68ecbef /Master/texmf-dist/tex/latex/newtx | |
parent | f7eb2c6a23e6a15f86a636186d8bd77f16b2061d (diff) |
newtx (20nov13)
git-svn-id: svn://tug.org/texlive/trunk@32201 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 7 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd | 162 |
3 files changed, 119 insertions, 60 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index dbc6ef10604..03c3ae62513 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.151} -\def\filedate{2013/10/17} +\def\fileversion{1.16} +\def\filedate{2013/11/19} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -45,6 +45,7 @@ \newif\iftx@ams \newif\iftx@slantedG \newif\iftx@cmint \newif\iftx@braces \newif\iftx@libertine \newif\iftx@varbb \newif\iftx@vvarbb \newif\iftx@symbolsC \newif\iftx@gm \newif\iftx@bigdelims +\newif\iftx@liby \tx@symbolsCtrue \newif\iftx@altnu \newif\iftx@largelibfigs @@ -65,6 +66,7 @@ \DeclareOption{slantedGreek}{\tx@slantedGtrue} \DeclareOption{altnu}{\tx@altnutrue} \DeclareOption{largelibfigs}{\tx@largelibfigstrue} +\DeclareOption{liby}{\tx@libytrue} \ExecuteOptions{% amssymbols,uprightGreek} \ProcessOptions* @@ -75,8 +77,8 @@ amssymbols,uprightGreek} \iftx@libertine\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi \iftx@minion\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi \iftx@gm\ifx\X@s@v@rg\undefined\else\let\X@s@v@rg\@undefined\fi\fi -% altnu and largelibfigs valid only with libertine -\iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\fi +% altnu, liby and largelibfigs valid only with libertine +\iftx@libertine\else\tx@altnufalse\tx@largelibfigsfalse\tx@libyfalse\fi % Use existing text fonts for operators, mathrm, etc \ifxl@otf \iftx@libertine diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index ca82cf14634..c8ba07948cd 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty @@ -13,8 +13,8 @@ % Added scaled keyword and osf option; % Modified the definition of \k to bypass problem with grouping; -\def\fileversion{1.151} -\def\filedate{2013/10/15} +\def\fileversion{1.16} +\def\filedate{2013/11/19} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)} @@ -26,7 +26,7 @@ \RequirePackage{xkeyval} \def\ntx@helvscaled{s*[.9]} \newif\ifntx@defaultsups -\define@key{ntx}{defaultsups}[true]{% +\define@boolkey{ntx}{defaultsups}[true]{% \csname ntx@defaultsups#1\endcsname} \define@key{ntx}{scaled}[1.0]{\def\ntx@scaled{s*[#1]}% \@tempdima=#1\p@\@tempdima=.9\@tempdima% @@ -38,6 +38,7 @@ \x} \def\ntx@style{x}% default is lining figures \DeclareOption{osf}{\def\ntx@style{j}} +\DeclareOption{oldstyle}{\def\ntx@style{j}} \ProcessOptions* diff --git a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd index 3a803cc753d..233c75474bf 100644 --- a/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd +++ b/Master/texmf-dist/tex/latex/newtx/omlnxlmi.fd @@ -5,7 +5,7 @@ %THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY \ProvidesFile{omlnxlmi.fd} - [2012/05/19 Fontinst v1.933 font definitions for OML/nxlmi.] + [2013/11/19 Fontinst v1.933 font definitions for OML/nxlmi.] \expandafter\ifx\csname ntxmath@scaled\endcsname\relax \let\ntxmath@scaled\@empty% @@ -13,58 +13,114 @@ \DeclareFontFamily{OML}{nxlmi}{\skewchar \font =127} -\iftx@libaltvw % new v, w - \iftx@altnu % new nu - \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi35 - <6.3-8.6> \ntxmath@scaled nxlmi37 - <8.6-> \ntxmath@scaled nxlmi3 - }{} - - \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi35 - <6.3-8.6> \ntxmath@scaled nxlbmi37 - <8.6-> \ntxmath@scaled nxlbmi3 - }{} - \else % old nu - \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi15 - <6.3-8.6> \ntxmath@scaled nxlmi17 - <8.6-> \ntxmath@scaled nxlmi1 - }{} - - \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi15 - <6.3-8.6> \ntxmath@scaled nxlbmi17 - <8.6-> \ntxmath@scaled nxlbmi1 - }{} - \fi -\else % original v, w - \iftx@altnu - \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi25 - <6.3-8.6> \ntxmath@scaled nxlmi27 - <8.6-> \ntxmath@scaled nxlmi2 - }{} - - \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi25 - <6.3-8.6> \ntxmath@scaled nxlbmi27 - <8.6-> \ntxmath@scaled nxlbmi2 - }{} - \else - \DeclareFontShape{OML}{nxlmi}{m}{it}{ - <-6.3> \ntxmath@scaled nxlmi5 - <6.3-8.6> \ntxmath@scaled nxlmi7 - <8.6-> \ntxmath@scaled nxlmi - }{} - - \DeclareFontShape{OML}{nxlmi}{b}{it}{ - <-6.3> \ntxmath@scaled nxlbmi5 - <6.3-8.6> \ntxmath@scaled nxlbmi7 - <8.6-> \ntxmath@scaled nxlbmi - }{} - \fi +\iftx@liby + \iftx@libaltvw % new v, w + \iftx@altnu % new nu + \DeclareFontShape{OML}{nxlmi}{m}{it}{ + <-6.3> \ntxmath@scaled nxlmi035 + <6.3-8.6> \ntxmath@scaled nxlmi037 + <8.6-> \ntxmath@scaled nxlmi03 + }{} + + \DeclareFontShape{OML}{nxlmi}{b}{it}{ + <-6.3> \ntxmath@scaled nxlbmi35 + <6.3-8.6> \ntxmath@scaled nxlbmi37 + <8.6-> \ntxmath@scaled nxlbmi3 + }{} + \else % old nu + \DeclareFontShape{OML}{nxlmi}{m}{it}{ + <-6.3> \ntxmath@scaled nxlmi015 + <6.3-8.6> \ntxmath@scaled nxlmi017 + <8.6-> \ntxmath@scaled nxlmi01 + }{} + + \DeclareFontShape{OML}{nxlmi}{b}{it}{ + <-6.3> \ntxmath@scaled nxlbmi15 + <6.3-8.6> \ntxmath@scaled nxlbmi17 + <8.6-> \ntxmath@scaled nxlbmi1 + }{} + \fi + \else % original v, w + \iftx@altnu + \DeclareFontShape{OML}{nxlmi}{m}{it}{ + <-6.3> \ntxmath@scaled nxlmi025 + <6.3-8.6> \ntxmath@scaled nxlmi027 + <8.6-> \ntxmath@scaled nxlmi02 + }{} + + \DeclareFontShape{OML}{nxlmi}{b}{it}{ + <-6.3> \ntxmath@scaled nxlbmi25 + <6.3-8.6> \ntxmath@scaled nxlbmi27 + <8.6-> \ntxmath@scaled nxlbmi2 + }{} + \else + \DeclareFontShape{OML}{nxlmi}{m}{it}{ + <-6.3> \ntxmath@scaled nxlmi05 + <6.3-8.6> \ntxmath@scaled nxlmi07 + <8.6-> \ntxmath@scaled nxlmi0 + }{} + + \DeclareFontShape{OML}{nxlmi}{b}{it}{ + <-6.3> \ntxmath@scaled nxlbmi5 + <6.3-8.6> \ntxmath@scaled nxlbmi7 + <8.6-> \ntxmath@scaled nxlbmi + }{} + \fi + \fi +\else % math italic y from txfonts + \iftx@libaltvw % new v, w + \iftx@altnu % new nu + \DeclareFontShape{OML}{nxlmi}{m}{it}{ + <-6.3> \ntxmath@scaled nxlmi35 + <6.3-8.6> \ntxmath@scaled nxlmi37 + <8.6-> \ntxmath@scaled nxlmi3 + }{} + + \DeclareFontShape{OML}{nxlmi}{b}{it}{ + <-6.3> \ntxmath@scaled nxlbmi35 + <6.3-8.6> \ntxmath@scaled nxlbmi37 + <8.6-> \ntxmath@scaled nxlbmi3 + }{} + \else % old nu + \DeclareFontShape{OML}{nxlmi}{m}{it}{ + <-6.3> \ntxmath@scaled nxlmi15 + <6.3-8.6> \ntxmath@scaled nxlmi17 + <8.6-> \ntxmath@scaled nxlmi1 + }{} + + \DeclareFontShape{OML}{nxlmi}{b}{it}{ + <-6.3> \ntxmath@scaled nxlbmi15 + <6.3-8.6> \ntxmath@scaled nxlbmi17 + <8.6-> \ntxmath@scaled nxlbmi1 + }{} + \fi + \else % original v, w + \iftx@altnu + \DeclareFontShape{OML}{nxlmi}{m}{it}{ + <-6.3> \ntxmath@scaled nxlmi25 + <6.3-8.6> \ntxmath@scaled nxlmi27 + <8.6-> \ntxmath@scaled nxlmi2 + }{} + + \DeclareFontShape{OML}{nxlmi}{b}{it}{ + <-6.3> \ntxmath@scaled nxlbmi25 + <6.3-8.6> \ntxmath@scaled nxlbmi27 + <8.6-> \ntxmath@scaled nxlbmi2 + }{} + \else + \DeclareFontShape{OML}{nxlmi}{m}{it}{ + <-6.3> \ntxmath@scaled nxlmi5 + <6.3-8.6> \ntxmath@scaled nxlmi7 + <8.6-> \ntxmath@scaled nxlmi + }{} + + \DeclareFontShape{OML}{nxlmi}{b}{it}{ + <-6.3> \ntxmath@scaled nxlbmi5 + <6.3-8.6> \ntxmath@scaled nxlbmi7 + <8.6-> \ntxmath@scaled nxlbmi + }{} + \fi + \fi \fi \DeclareFontShape{OML}{nxlmi}{m}{sl}{<->ssub * nxlmi/m/it}{} \DeclareFontShape{OML}{nxlmi}{bx}{it}{<->ssub * nxlmi/b/it}{} |