From 2beb28d9364942cafba87c0fd5ace4b9803079c6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Jan 2014 23:19:01 +0000 Subject: newpx (10jan14) git-svn-id: svn://tug.org/texlive/trunk@32627 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newpx/newpxmath.sty | 4 +- Master/texmf-dist/tex/latex/newpx/newpxtext.sty | 26 ++++++---- Master/texmf-dist/tex/latex/newpx/ts1npxss.fd | 69 +++++++++++++------------ 3 files changed, 53 insertions(+), 46 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty index ca773793a54..f866bb16e4f 100644 --- a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty +++ b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty @@ -11,8 +11,8 @@ % of glyph collisions. % These modifications are by Michael Sharpe, msharpe at ucsd dot edu -\def\fileversion{1.071} -\def\filedate{2014/01/07} +\def\fileversion{1.08} +\def\filedate{2014/01/09} \ProvidesPackage{newpxmath} [\filedate\space v\fileversion] \@ifundefined{newpxmathLoaded}{}{\endinput} diff --git a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty index 29e06255009..3df6014ce05 100644 --- a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty +++ b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty @@ -8,8 +8,8 @@ % Modified the definition of \k to bypass problem with grouping. % Text is now directed to a small modification of TeXGyrePagella rather than ppl. -\def\fileversion{1.071} -\def\filedate{2014/01/07} +\def\fileversion{1.08} +\def\filedate{2014/01/09} \ProvidesPackage{newpxtext}[\filedate\space v\fileversion] \message{`newpxtext' v\fileversion, \filedate\space Text macros based on pxfonts (msharpe)} @@ -18,13 +18,12 @@ \let\orig@footnote=\thefootnote \let\orig@makefnmark=\@makefnmark \RequirePackage{xkeyval} -\def\zpl@helvscaled{s*[.93]} \newif\ifzpl@defaultsups \define@boolkey{zpl}{defaultsups}[true]{% \csname zpl@defaultsups#1\endcsname} +\define@key{zpl}{helvratio}[0.94]{\def\zpl@helvratio{#1}} \define@key{zpl}{scaled}[1.0]{\def\zpl@scaled{s*[#1]}% -\@tempdima=#1\p@\@tempdima=.93\@tempdima% -\def\zpl@helvscaled{s*[\strip@pt\@tempdima]}} +\def\zpl@scale{#1}} \DeclareOption*{% \begingroup \edef\x{\endgroup @@ -33,8 +32,11 @@ \def\zpl@style{x}% default is lining figures \DeclareOption{osf}{\def\zpl@style{j}}% oldstyle figures \DeclareOption{oldstyle}{\def\zpl@style{j}}% oldstyle figures - +\setkeys{zpl}{helvratio} % set this first, at least to default +\setkeys{zpl}{scaled} % get at least default \ProcessOptions* +\@tempdima=\zpl@scale\p@\@tempdima=\zpl@helvratio\@tempdima% +\edef\qhv@scale{\strip@pt\@tempdima} \RequirePackage[T1]{fontenc} \RequirePackage{textcomp} @@ -50,12 +52,12 @@ \def\@makefnmark{% \ifx\@mpfn\f@@tn@te% \ifx\thefootnote\orig@footnote% - \hbox{\sustyle\hspace*{.04em}\@thefnmark} + \hbox{\sustyle\hspace*{.05em}\@thefnmark\hspace*{.05em}}% \else% - \orig@makefnmark + \orig@makefnmark% \fi \else% - \orig@makefnmark + \orig@makefnmark% \fi} \fi @@ -72,8 +74,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\renewcommand*{\sfdefault}{npxss} - +%\renewcommand*{\sfdefault}{npxss} +\renewcommand*{\sfdefault}{qhv} +%\show\qhv@scale +%\show\zpl@helvratio %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Text (Monospaced) Typewriter % diff --git a/Master/texmf-dist/tex/latex/newpx/ts1npxss.fd b/Master/texmf-dist/tex/latex/newpx/ts1npxss.fd index 7c249f14255..a6e18ab8061 100644 --- a/Master/texmf-dist/tex/latex/newpx/ts1npxss.fd +++ b/Master/texmf-dist/tex/latex/newpx/ts1npxss.fd @@ -1,50 +1,53 @@ -\ProvidesFile{ts1pxss.fd} - [2000/12/14 v1.0] +\ProvidesFile{ts1npxss.fd} + [2014/01/09 v1.0] +\expandafter\ifx\csname zpl@helvscaled\endcsname\relax + \let\zpl@helvscaled\@empty% +\fi -\DeclareFontFamily{TS1}{pxss}{} -\DeclareFontShape{TS1}{pxss}{m}{n}{ %medium - <->tcxss% +\DeclareFontFamily{TS1}{npxss}{} +\DeclareFontShape{TS1}{npxss}{m}{n}{ %medium + <-> \zpl@helvscaled tcxss% }{} -\DeclareFontShape{TS1}{pxss}{m}{sc}{ %cap & small cap - <->ssub * pxss/m/n% +\DeclareFontShape{TS1}{npxss}{m}{sc}{ %cap & small cap + <->ssub * npxss/m/n% }{} -\DeclareFontShape{TS1}{pxss}{m}{sl}{ %slanted - <->tcxsssl% +\DeclareFontShape{TS1}{npxss}{m}{sl}{ %slanted + <-> \zpl@helvscaled tcxsssl% }{} -\DeclareFontShape{TS1}{pxss}{m}{it}{ %italic - <->ssub * pxss/m/sl% +\DeclareFontShape{TS1}{npxss}{m}{it}{ %italic + <->ssub * npxss/m/sl% }{} -\DeclareFontShape{TS1}{pxss}{m}{ui}{ %unslanted italic - <->ssub * pxss/m/it% +\DeclareFontShape{TS1}{npxss}{m}{ui}{ %unslanted italic + <->ssub * npxss/m/it% }{} -\DeclareFontShape{TS1}{pxss}{bx}{n}{ %bold extended - <->tcxbss% +\DeclareFontShape{TS1}{npxss}{bx}{n}{ %bold extended + <-> \zpl@helvscaled tcxbss% }{} -\DeclareFontShape{TS1}{pxss}{bx}{sc}{ %bold extended cap & small cap - <->ssub * pxss/bx/n% +\DeclareFontShape{TS1}{npxss}{bx}{sc}{ %bold extended cap & small cap + <->ssub * npxss/bx/n% }{} -\DeclareFontShape{TS1}{pxss}{bx}{sl}{ %bold extended slanted - <->tcxbsssl% +\DeclareFontShape{TS1}{npxss}{bx}{sl}{ %bold extended slanted + <-> \zpl@helvscaled tcxbsssl% }{} -\DeclareFontShape{TS1}{pxss}{bx}{it}{ %bold extended italic - <->ssub * pxss/bx/sl% +\DeclareFontShape{TS1}{npxss}{bx}{it}{ %bold extended italic + <->ssub * npxss/bx/sl% }{} -\DeclareFontShape{TS1}{pxss}{bx}{ui}{ %bold extended unslanted italic - <->ssub * pxss/bx/it% +\DeclareFontShape{TS1}{npxss}{bx}{ui}{ %bold extended unslanted italic + <->ssub * npxss/bx/it% }{} -\DeclareFontShape{TS1}{pxss}{b}{n}{ %bold - <->ssub * pxss/bx/n% +\DeclareFontShape{TS1}{npxss}{b}{n}{ %bold + <->ssub * npxss/bx/n% }{} -\DeclareFontShape{TS1}{pxss}{b}{sc}{ %bold cap & small cap - <->ssub * pxss/bx/sc% +\DeclareFontShape{TS1}{npxss}{b}{sc}{ %bold cap & small cap + <->ssub * npxss/bx/sc% }{} -\DeclareFontShape{TS1}{pxss}{b}{sl}{ %bold slanted - <->ssub * pxss/bx/sl% +\DeclareFontShape{TS1}{npxss}{b}{sl}{ %bold slanted + <->ssub * npxss/bx/sl% }{} -\DeclareFontShape{TS1}{pxss}{b}{it}{ %bold italic - <->ssub * pxss/bx/it% +\DeclareFontShape{TS1}{npxss}{b}{it}{ %bold italic + <->ssub * npxss/bx/it% }{} -\DeclareFontShape{TS1}{pxss}{b}{ui}{ %bold unslanted italic - <->ssub * pxss/bx/ui% +\DeclareFontShape{TS1}{npxss}{b}{ui}{ %bold unslanted italic + <->ssub * npxss/bx/ui% }{} \endinput -- cgit v1.2.3