diff options
author | Karl Berry <karl@freefriends.org> | 2014-09-30 00:05:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-09-30 00:05:23 +0000 |
commit | a458db6297c00b012e16fa3b4391c158ef4f4b92 (patch) | |
tree | d05a44b6d1d9d5ca595525160b97bb85db5c3895 /Master/texmf-dist/tex/latex/newtx | |
parent | 805c9c1fe26d5bd3dacaba4bc6d38ed7787aea38 (diff) |
newtx (29sep14)
git-svn-id: svn://tug.org/texlive/trunk@35284 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newtx')
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/ly1ntxrj.fd | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/ly1ntxrx.fd | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 6 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 15 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/ot1ntxrj.fd | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/ot1ntxrx.fd | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/t1ntxrj.fd | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/newtx/t1ntxrx.fd | 10 |
8 files changed, 59 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxrj.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxrj.fd index 5724c6f19b0..62fa6e2a5cd 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxrj.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxrj.fd @@ -1,14 +1,18 @@ -\ProvidesFile{ly1ntxrj.fd}[2012/12/25 v1.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@scaled ly1-ntxrc-osf\ntx@asfx% }{} \DeclareFontShape{LY1}{ntxrj}{m}{sl}{ %slanted <-> \ntx@scaled tyxslj% @@ -29,7 +33,7 @@ <-> \ntx@scaled tyxbj% }{} \DeclareFontShape{LY1}{ntxrj}{bx}{sc}{ %bold extended cap & small cap -<-> \ntx@scaled ly1-ntxbc-osf% +<-> \ntx@scaled ly1-ntxbc-osf\ntx@asfx% }{} \DeclareFontShape{LY1}{ntxrj}{bx}{sl}{ %bold extended slanted <-> \ntx@scaled tyxbslj% diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxrx.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxrx.fd index e9af1029d23..c0acc26c409 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxrx.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxrx.fd @@ -1,14 +1,18 @@ -\ProvidesFile{ly1ntxrx.fd}[2012/12/25 v1.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@scaled tyxsc\ntx@asfx% }{} \DeclareFontShape{LY1}{ntxrx}{m}{sl}{ %slanted <-> \ntx@scaled tyxsl% @@ -29,7 +33,7 @@ <-> \ntx@scaled tyxb% }{} \DeclareFontShape{LY1}{ntxrx}{bx}{sc}{ %bold extended cap & small cap - <-> \ntx@scaled tyxbsc% + <-> \ntx@scaled tyxbsc\ntx@asfx% }{} \DeclareFontShape{LY1}{ntxrx}{bx}{sl}{ %bold extended slanted <-> \ntx@scaled tyxbsl% diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 500135e656d..ee083ebfb62 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.28} -\def\filedate{2014/06/19} +\def\fileversion{1.29} +\def\filedate{2014/09/28} \ProvidesPackage{newtxmath} [\filedate\space v\fileversion] \@ifundefined{newtxmathLoaded}{}{\endinput} @@ -63,6 +63,8 @@ \DeclareOption{utopia}{\tx@uttrue} \DeclareOption{heuristica}{\tx@uttrue} \DeclareOption{Heuristica}{\tx@uttrue} +\DeclareOption{Erewhon}{\tx@uttrue} +\DeclareOption{erewhon}{\tx@uttrue} \DeclareOption{cmintegrals}{\tx@cminttrue} \DeclareOption{cmbraces}{\tx@bracestrue} \DeclareOption{noamssymbols}{\tx@amsfalse} diff --git a/Master/texmf-dist/tex/latex/newtx/newtxtext.sty b/Master/texmf-dist/tex/latex/newtx/newtxtext.sty index 549d689c6fe..efa9e49536f 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.28} -\def\filedate{2014/06/19} +\def\fileversion{1.29} +\def\filedate{2014/09/28} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros based on txfonts (msharpe)} @@ -29,8 +29,12 @@ \@onlypreamble\useosf \newif\ifntx@defaultsups +\newif\ifntx@adobesc +\newif\ifntx@scosf \define@boolkey{ntx}{defaultsups}[true]{% \csname ntx@defaultsups#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}} @@ -43,6 +47,7 @@ \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* @@ -51,11 +56,15 @@ \RequirePackage[T1]{fontenc} \RequirePackage{textcomp} +\ifntx@scosf % +\DeclareRobustCommand{\textsc}[1]{% +{\fontfamily{ntxrj}\scshape\selectfont #1}% +}\fi% use OsF in small caps \DeclareRobustCommand{\sustyle}{% \not@math@alphabet\sustyle\relax \fontfamily{ntxr1}\selectfont} - +\DeclareTextFontCommand{\textsu}{\sustyle} %\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi} \ifntx@defaultsups % \else diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxrj.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxrj.fd index f461ecf915d..f8ddf206345 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxrj.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxrj.fd @@ -1,14 +1,18 @@ -\ProvidesFile{ot1ntxrj.fd}[2012/12/25 v1.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@scaled ot1-ntxrc-osf\ntx@asfx% }{} \DeclareFontShape{OT1}{ntxrj}{m}{sl}{ %slanted <-> \ntx@scaled txslj% @@ -29,7 +33,7 @@ <-> \ntx@scaled txbj% }{} \DeclareFontShape{OT1}{ntxrj}{bx}{sc}{ %bold extended cap & small cap -<-> \ntx@scaled ot1-ntxbc-osf% +<-> \ntx@scaled ot1-ntxbc-osf\ntx@asfx% }{} \DeclareFontShape{OT1}{ntxrj}{bx}{sl}{ %bold extended slanted <-> \ntx@scaled txbslj% diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxrx.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxrx.fd index 787c3b6cea4..ebb2045a422 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxrx.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxrx.fd @@ -1,14 +1,18 @@ -\ProvidesFile{ot1ntxrx.fd}[2012/12/25 v1.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@scaled txsc\ntx@asfx% }{} \DeclareFontShape{OT1}{ntxrx}{m}{sl}{ %slanted <-> \ntx@scaled txsl% @@ -29,7 +33,7 @@ <-> \ntx@scaled txb% }{} \DeclareFontShape{OT1}{ntxrx}{bx}{sc}{ %bold extended cap & small cap - <-> \ntx@scaled txbsc% + <-> \ntx@scaled txbsc\ntx@asfx% }{} \DeclareFontShape{OT1}{ntxrx}{bx}{sl}{ %bold extended slanted <-> \ntx@scaled txbsl% diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxrj.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxrj.fd index 1a4febd42aa..a02b2cbb65b 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxrj.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxrj.fd @@ -1,14 +1,18 @@ -\ProvidesFile{t1ntxrj.fd}[2012/04/17 v1.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@scaled t1-ntxrc-osf\ntx@asfx% }{} \DeclareFontShape{T1}{ntxrj}{m}{sl}{ %slanted <-> \ntx@scaled t1xslj% @@ -29,7 +33,7 @@ <-> \ntx@scaled t1xbj% }{} \DeclareFontShape{T1}{ntxrj}{bx}{sc}{ %bold extended cap & small cap -<-> \ntx@scaled t1-ntxbc-osf% +<-> \ntx@scaled t1-ntxbc-osf\ntx@asfx% }{} \DeclareFontShape{T1}{ntxrj}{bx}{sl}{ %bold extended slanted <-> \ntx@scaled t1xbslj% diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxrx.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxrx.fd index 25896e2630f..c77fb84bb66 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxrx.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxrx.fd @@ -1,14 +1,18 @@ -\ProvidesFile{t1ntxrx.fd}[2012/12/25 v1.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@scaled t1xsc\ntx@asfx% }{} \DeclareFontShape{T1}{ntxrx}{m}{sl}{ %slanted <-> \ntx@scaled t1xsl% @@ -29,7 +33,7 @@ <-> \ntx@scaled t1xb% }{} \DeclareFontShape{T1}{ntxrx}{bx}{sc}{ %bold extended cap & small cap - <-> \ntx@scaled t1xbsc% + <-> \ntx@scaled t1xbsc\ntx@asfx% }{} \DeclareFontShape{T1}{ntxrx}{bx}{sl}{ %bold extended slanted <-> \ntx@scaled t1xbsl% |