diff options
| author | Karl Berry <karl@freefriends.org> | 2014-02-20 23:25:02 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2014-02-20 23:25:02 +0000 |
| commit | 7d4a08e930252b1d2154e39c026ff94131bde1fb (patch) | |
| tree | db4d16f0283edf5220a685e85236a91384888d76 /Master/texmf-dist/tex | |
| parent | 1879dcf757469fd062cd22a708b784c1e0d54265 (diff) | |
newpx (20feb14)
git-svn-id: svn://tug.org/texlive/trunk@33009 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/newpx/newpxmath.sty | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/newpx/newpxtext.sty | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty index cd3744cee9f..dbd59d64b8f 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.11} -\def\filedate{2014/02/10} +\def\fileversion{1.12} +\def\filedate{2014/02/19} \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 6155dcbe314..2c931a520f1 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.11} -\def\filedate{2014/02/10} +\def\fileversion{1.12} +\def\filedate{2014/02/19} \ProvidesPackage{newpxtext}[\filedate\space v\fileversion] \message{`newpxtext' v\fileversion, \filedate\space Text macros based on pxfonts (msharpe)} @@ -17,7 +17,11 @@ \let\orig@footnote=\thefootnote \let\orig@makefnmark=\@makefnmark -\RequirePackage{xkeyval} +\RequirePackage{xkeyval,etoolbox} +\renewcommand*{\rmdefault}{zplx} % the default until end of preamble +\def\useosf{\AtEndPreamble{\renewcommand*{\rmdefault}{zplj}}} +\@onlypreamble\useosf + \newif\ifzpl@defaultsups \define@boolkey{zpl}{defaultsups}[true]{% \csname zpl@defaultsups#1\endcsname} @@ -30,8 +34,8 @@ \noexpand\setkeys{zpl}{\CurrentOption}}% \x} \def\zpl@style{x}% default is lining figures -\DeclareOption{osf}{\def\zpl@style{j}}% oldstyle figures -\DeclareOption{oldstyle}{\def\zpl@style{j}}% oldstyle figures +\DeclareOption{osf}{\useosf}% oldstyle figures +\DeclareOption{oldstyle}{\useosf}% oldstyle figures \setkeys{zpl}{helvratio} % set this first, at least to default \setkeys{zpl}{scaled} % get at least default \ProcessOptions* @@ -65,9 +69,6 @@ % Text Serif (TGPagellaX) % %%%%%%%%%%%%%%%%%%%%%% -\renewcommand*{\rmdefault}{zpl\zpl@style} -\def\useosf{\renewcommand*{\rmdefault}{zplj}} -\@onlypreamble\useosf %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Text Sans Serif (based on Helvetica) % |