diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/newpx/newpxtext.sty')
| -rw-r--r-- | Master/texmf-dist/tex/latex/newpx/newpxtext.sty | 26 |
1 files changed, 15 insertions, 11 deletions
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 % |