From 7d0323672e7671b05adecd11768583b8cc70d798 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 8 Apr 2015 22:18:15 +0000 Subject: newpx (8apr15) git-svn-id: svn://tug.org/texlive/trunk@36744 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/newpx/newpxmath.sty | 15 +++++++++++---- Master/texmf-dist/tex/latex/newpx/newpxtext.sty | 10 ++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/newpx') diff --git a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty index 94fe347c2b9..51d3e659310 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.231} -\def\filedate{2015/04/06} +\def\fileversion{1.232} +\def\filedate{2015/04/07} \ProvidesPackage{newpxmath} [\filedate\space v\fileversion] \@ifundefined{newpxmathLoaded}{}{\endinput} @@ -1452,8 +1452,15 @@ $\hfil\displaystyle{#1}\hfil$\crcr% %%% %%% for AMS classes %%% -\DeclareRobustCommand{\textsquare}{\begingroup \usefont{U}{npxsya}{m}{n}\thr@@\endgroup} -\DeclareRobustCommand{\openbox}{\begingroup \usefont{U}{npxsya}{m}{n}\thr@@\endgroup} +\chardef\newpxmath@openbox 131 % was 3 in npxsya +\DeclareRobustCommand{\textsquare}{\begingroup + \usefont{U}{npxsym}{m}{n}\newpxmath@openbox\endgroup} +\DeclareRobustCommand{\openbox}{} +% the spaces below after openbox and textsquare should not be removed +\expandafter\let\csname openbox \expandafter\endcsname + \csname textsquare \endcsname +%\DeclareRobustCommand{\textsquare}{\begingroup \usefont{U}{npxsya}{m}{n}\thr@@\endgroup} +%\DeclareRobustCommand{\openbox}{\begingroup \usefont{U}{npxsya}{m}{n}\thr@@\endgroup} \def\defaultscriptratio{.73} % default is .7 \def\defaultscriptscriptratio{.55} % default is .5 diff --git a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty index 20ea5e02984..77ec9790381 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 an extension of TeXGyrePagella rather than ppl. -\def\fileversion{1.231} -\def\filedate{2015/04/06} +\def\fileversion{1.232} +\def\filedate{2015/04/07} \ProvidesPackage{newpxtext}[\filedate\space v\fileversion] \message{`newpxtext' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Pagella and its extensions (msharpe)} @@ -21,6 +21,8 @@ \renewcommand*{\rmdefault}{zpltlf} % the default until end of preamble \def\useosf{\edef\zpl@figurestyle{osf}} \@onlypreamble\useosf +\def\useproportional{\edef\zpl@figurealign{}} +\@onlypreamble\useproportional \newif\ifzpl@defaultsups \newif\ifzpl@adobesc % we don't use this exc. in fd, but may in future @@ -52,8 +54,8 @@ \DeclareOption{oldstyle}{\useosf} \DeclareOption{osf}{\useosf} \DeclareOption{tabular}{\edef\zpl@figurealign{t}} -\DeclareOption{p}{\edef\zpl@figurealign{}} -\DeclareOption{proportional}{\edef\zpl@figurealign{}} +\DeclareOption{p}{\useproportional} +\DeclareOption{proportional}{\useproportional} \DeclareOption{scosf}{\zpl@scosftrue} \DeclareOption{tighter}{% \gdef\zpl@spc{.25em}\gdef\zpl@stretch{.125em}\gdef\zpl@shrink{.1em}} -- cgit v1.2.3