From 1b036f2b1ea41303cd93846bdb9b66744acf5ea7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 4 May 2015 23:32:30 +0000 Subject: newtx (4may15) git-svn-id: svn://tug.org/texlive/trunk@37185 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/newtxmath.sty | 4 ++-- Master/texmf-dist/tex/latex/newtx/newtxtext.sty | 24 ++++++++++++++++++++++-- Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd | 3 ++- Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd | 3 ++- 14 files changed, 48 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex/latex/newtx') diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd index 1b8c4893cf5..d3395d04c3b 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxlf.fd @@ -6,8 +6,9 @@ \def\ntx@lsfx{} \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \ifdefined\ntx@largescfalse \ntx@makelsfx\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{LY1}{ntxlf}{} +\DeclareFontFamily{LY1}{ntxlf}{\ntx@spacing} \DeclareFontShape{LY1}{ntxlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-lf-sc\ntx@lsfx-ly1}{} \DeclareFontShape{LY1}{ntxlf}{b}{n}{<-> \ntx@scaled ntx-Bold-lf-ly1}{} \DeclareFontShape{LY1}{ntxlf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-lf-sc\ntx@lsfx-ly1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd index a8cfb9e85cb..a9026bdd90b 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxosf.fd @@ -6,8 +6,9 @@ \def\ntx@lsfx{} \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \ifdefined\ntx@largescfalse \ntx@makelsfx\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{LY1}{ntxosf}{} +\DeclareFontFamily{LY1}{ntxosf}{\ntx@spacing} \DeclareFontShape{LY1}{ntxosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-osf-sc\ntx@lsfx-ly1}{} \DeclareFontShape{LY1}{ntxosf}{b}{n}{<-> \ntx@scaled ntx-Bold-osf-ly1}{} \DeclareFontShape{LY1}{ntxosf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-osf-sc\ntx@lsfx-ly1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd index e4de72608f5..02c7aef37cc 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxtlf.fd @@ -6,8 +6,9 @@ \def\ntx@lsfx{} \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \ifdefined\ntx@largescfalse \ntx@makelsfx\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{LY1}{ntxtlf}{} +\DeclareFontFamily{LY1}{ntxtlf}{\ntx@spacing} \DeclareFontShape{LY1}{ntxtlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tlf-sc\ntx@lsfx-ly1}{} \DeclareFontShape{LY1}{ntxtlf}{b}{n}{<-> \ntx@scaled ntx-Bold-tlf-ly1}{} \DeclareFontShape{LY1}{ntxtlf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-tlf-sc\ntx@lsfx-ly1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd b/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd index 195ab7a9e95..32c7f2fee4c 100644 --- a/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ly1ntxtosf.fd @@ -8,8 +8,9 @@ \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \def\ntx@makeadobesc{\ifntx@adobesc\def\ntx@lsfx{l}\def\ntx@adobesc{a}\else\ntx@makelsfx\fi} \ifdefined\ntx@adobescfalse\ntx@makeadobesc\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{LY1}{ntxtosf}{} +\DeclareFontFamily{LY1}{ntxtosf}{\ntx@spacing} \DeclareFontShape{LY1}{ntxtosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tosf-sc\ntx@lsfx\ntx@asfx-ly1}{} \DeclareFontShape{LY1}{ntxtosf}{b}{n}{<-> \ntx@scaled ntx-Bold-tosf-ly1}{} \DeclareFontShape{LY1}{ntxtosf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-tosf-sc\ntx@lsfx-ly1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/newtxmath.sty b/Master/texmf-dist/tex/latex/newtx/newtxmath.sty index 6c5210118b3..6253b6320ca 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.436} -\def\filedate{2015/04/27} +\def\fileversion{1.437} +\def\filedate{2015/05/01} \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 c44943b2a86..5668ca8aaac 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.436} -\def\filedate{2015/04/27} +\def\fileversion{1.437} +\def\filedate{2015/05/01} \ProvidesPackage{newtxtext}[\filedate\space v\fileversion] \message{`newtxtext' v\fileversion, \filedate\space Text macros taking advantage of TeX-Gyre Termes fonts (msharpe)} @@ -41,6 +41,15 @@ \def\ntx@scale{#1}} \setkeys{ntx}{helvratio} % set this first, at least to default 0.9 \setkeys{ntx}{scaled} % get at least default + +\def\ntx@spc{.25em} +\def\ntx@stretch{.2em} +\def\ntx@shrink{.1em} +\define@key{ntx}{spacing}[.25em]{\gdef\ntx@spc{#1}} +\define@key{ntx}{stretch}[.2em]{\gdef\ntx@stretch{#1}} +\define@key{ntx}{shrink}[.1em]{\gdef\ntx@shrink{#1}} + + \DeclareOption{lining}{\edef\ntx@figurestyle{lf}} \DeclareOption{lf}{\edef\ntx@figurestyle{lf}} \DeclareOption{theoremfont}{\ntx@thrmtrue} @@ -51,6 +60,11 @@ \DeclareOption{proportional}{\useproportional} %\DeclareOption{sups}{\ntx@defaultsupsfalse} \DeclareOption{scosf}{\ntx@scosftrue} +\DeclareOption{tighter}{% +\gdef\ntx@spc{.25em}\gdef\ntx@stretch{.15em}\gdef\ntx@shrink{.06em}} +\DeclareOption{looser}{% +\gdef\ntx@spc{.3em}\gdef\ntx@stretch{.2em}\gdef\ntx@shrink{.15em} +} \ExecuteOptions{lining,tabular} \DeclareOption*{% @@ -60,6 +74,12 @@ \x} \ProcessOptions* +\def\ntx@spacing{% + \fontdimen2\font=\ntx@spc + \fontdimen3\font=\ntx@stretch + \fontdimen4\font=\ntx@shrink +} + \@tempdima=\ntx@scale\p@\@tempdima=\ntx@helvratio\@tempdima% \edef\qhv@scale{\strip@pt\@tempdima} diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd index 93d7796f082..215a44ed6d7 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxlf.fd @@ -6,8 +6,9 @@ \def\ntx@lsfx{} \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \ifdefined\ntx@largescfalse \ntx@makelsfx\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{OT1}{ntxlf}{} +\DeclareFontFamily{OT1}{ntxlf}{\ntx@spacing} \DeclareFontShape{OT1}{ntxlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-lf-sc\ntx@lsfx-ot1}{} \DeclareFontShape{OT1}{ntxlf}{b}{n}{<-> \ntx@scaled ntx-Bold-lf-ot1}{} \DeclareFontShape{OT1}{ntxlf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-lf-sc\ntx@lsfx-ot1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd index 718b6507681..3cf89bf7bf4 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxosf.fd @@ -6,8 +6,9 @@ \def\ntx@lsfx{} \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \ifdefined\ntx@largescfalse \ntx@makelsfx\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{OT1}{ntxosf}{} +\DeclareFontFamily{OT1}{ntxosf}{\ntx@spacing} \DeclareFontShape{OT1}{ntxosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-osf-sc\ntx@lsfx-ot1}{} \DeclareFontShape{OT1}{ntxosf}{b}{n}{<-> \ntx@scaled ntx-Bold-osf-ot1}{} \DeclareFontShape{OT1}{ntxosf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-osf-sc\ntx@lsfx-ot1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd index 5f4a25a9590..c566647cdcf 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxtlf.fd @@ -6,8 +6,9 @@ \def\ntx@lsfx{} \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \ifdefined\ntx@largescfalse \ntx@makelsfx\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{OT1}{ntxtlf}{} +\DeclareFontFamily{OT1}{ntxtlf}{\ntx@spacing} \DeclareFontShape{OT1}{ntxtlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tlf-sc\ntx@lsfx-ot1}{} \DeclareFontShape{OT1}{ntxtlf}{b}{n}{<-> \ntx@scaled ntx-Bold-tlf-ot1}{} \DeclareFontShape{OT1}{ntxtlf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-tlf-sc\ntx@lsfx-ot1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd b/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd index 5e897d0ced2..14a6cb7dc71 100644 --- a/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/ot1ntxtosf.fd @@ -8,8 +8,9 @@ \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \def\ntx@makeadobesc{\ifntx@adobesc\def\ntx@lsfx{l}\def\ntx@adobesc{a}\else\ntx@makelsfx\fi} \ifdefined\ntx@adobescfalse\ntx@makeadobesc\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{OT1}{ntxtosf}{} +\DeclareFontFamily{OT1}{ntxtosf}{\ntx@spacing} \DeclareFontShape{OT1}{ntxtosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tosf-sc\ntx@lsfx\ntx@asfx-ot1}{} \DeclareFontShape{OT1}{ntxtosf}{b}{n}{<-> \ntx@scaled ntx-Bold-tosf-ot1}{} \DeclareFontShape{OT1}{ntxtosf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-tosf-sc\ntx@lsfx-ot1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd index b3a3719719a..449bfc32b59 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxlf.fd @@ -6,8 +6,9 @@ \def\ntx@lsfx{} \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \ifdefined\ntx@largescfalse \ntx@makelsfx\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{T1}{ntxlf}{} +\DeclareFontFamily{T1}{ntxlf}{\ntx@spacing} \DeclareFontShape{T1}{ntxlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-lf-sc\ntx@lsfx-t1}{} \DeclareFontShape{T1}{ntxlf}{b}{n}{<-> \ntx@scaled ntx-Bold-lf-t1}{} \DeclareFontShape{T1}{ntxlf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-lf-sc\ntx@lsfx-t1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd index d1033fee06f..d84c8bd7705 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxosf.fd @@ -6,8 +6,9 @@ \def\ntx@lsfx{} \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \ifdefined\ntx@largescfalse \ntx@makelsfx\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{T1}{ntxosf}{} +\DeclareFontFamily{T1}{ntxosf}{\ntx@spacing} \DeclareFontShape{T1}{ntxosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-osf-sc\ntx@lsfx-t1}{} \DeclareFontShape{T1}{ntxosf}{b}{n}{<-> \ntx@scaled ntx-Bold-osf-t1}{} \DeclareFontShape{T1}{ntxosf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-osf-sc\ntx@lsfx-t1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd index 034ef27a64e..2c3182cc808 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxtlf.fd @@ -6,8 +6,9 @@ \def\ntx@lsfx{} \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \ifdefined\ntx@largescfalse \ntx@makelsfx\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{T1}{ntxtlf}{} +\DeclareFontFamily{T1}{ntxtlf}{\ntx@spacing} \DeclareFontShape{T1}{ntxtlf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tlf-sc\ntx@lsfx-t1}{} \DeclareFontShape{T1}{ntxtlf}{b}{n}{<-> \ntx@scaled ntx-Bold-tlf-t1}{} \DeclareFontShape{T1}{ntxtlf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-tlf-sc\ntx@lsfx-t1}{} diff --git a/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd b/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd index 0b6eba7489e..ee3e68f46b4 100644 --- a/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd +++ b/Master/texmf-dist/tex/latex/newtx/t1ntxtosf.fd @@ -8,8 +8,9 @@ \def\ntx@makelsfx{\ifntx@largesc\def\ntx@lsfx{l}\fi} \def\ntx@makeadobesc{\ifntx@adobesc\def\ntx@lsfx{l}\def\ntx@adobesc{a}\else\ntx@makelsfx\fi} \ifdefined\ntx@adobescfalse\ntx@makeadobesc\fi +\ifdefined\ntx@spacing \else\global\let\ntx@spacing\@empty\fi -\DeclareFontFamily{T1}{ntxtosf}{} +\DeclareFontFamily{T1}{ntxtosf}{\ntx@spacing} \DeclareFontShape{T1}{ntxtosf}{b}{sc}{<-> \ntx@scaled ntx-Bold-tosf-sc\ntx@lsfx\ntx@asfx-t1}{} \DeclareFontShape{T1}{ntxtosf}{b}{n}{<-> \ntx@scaled ntx-Bold-tosf-t1}{} \DeclareFontShape{T1}{ntxtosf}{b}{scit}{<-> \ntx@scaled ntx-BoldItalic-tosf-sc\ntx@lsfx-t1}{} -- cgit v1.2.3