newpx (12sep13)

git-svn-id: svn://tug.org/texlive/trunk@31635 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 143 insertions, 95 deletions

diff --git a/Master/texmf-dist/tex/latex/newpx/newpxmath.sty b/Master/texmf-dist/tex/latex/newpx/newpxmath.sty
index 14fb20a4546..9800ee757e6 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.03}
-\def\filedate{2013/08/18}
+\def\fileversion{1.04}
+\def\filedate{2013/09/11}
 \ProvidesPackage{newpxmath}
 	[\filedate\space v\fileversion]
 \@ifundefined{newpxmathLoaded}{}{\endinput}
@@ -21,11 +21,11 @@
 
 \csname newpxmathLoaded\endcsname
 \let\newpxmathLoaded\endinput
+\RequirePackage{amsmath} % for better \left
 
-%\RequirePackage{texgyrepagellax}
 \input{binhex}
-\RequirePackage{amsmath} % for better \left
 \RequirePackage{xkeyval}
+\let\npxmath@scaled\@empty
 \define@key{npxmath}{scaled}[1.0]{\def\npxmath@scaled{#1}}
 \DeclareOption*{%
   \begingroup
@@ -35,8 +35,9 @@
 \DeclareOption{varg}{\def\X@s@v@rg{}}
 \newcount\px@Isdigit
 \newif\ifpx@ams \newif\ifpx@slantedG \newif\ifpx@cmint \newif\ifpx@braces
-\newif\ifpx@varbb \newif\ifpx@vvarbb \newif\ifpx@symbolsC
+\newif\ifpx@varbb \newif\ifpx@vvarbb \newif\ifpx@symbolsC \newif\ifpx@bigdelims
 \px@symbolsCtrue
+\DeclareOption{bigdelims}{\px@bigdelimstrue}
 \DeclareOption{varbb}{\px@varbbtrue}
 \DeclareOption{vvarbb}{\px@vvarbbtrue}
 \DeclareOption{nosymbolsc}{\px@symbolsCfalse}
@@ -50,6 +51,8 @@
 amssymbols,uprightGreek}
 \ProcessOptions*
 
+%bigdelims cancels cmbraces
+\ifpx@bigdelims\px@bracesfalse\fi
 % Use existing text fonts for operators, mathrm, etc
 \DeclareSymbolFont{operators}{\encodingdefault}{\rmdefault}{m}{n}
 \SetSymbolFont{operators}{bold}{\encodingdefault}{\rmdefault}{b}{n}
@@ -130,21 +133,36 @@ amssymbols,uprightGreek}
 % Math Extension %
 %%%%%%%%%%%%%%%%%%
 
-\ifpx@braces%
-  \DeclareSymbolFont{largesymbols}{OMX}{npxexv}{m}{n}
-  \SetSymbolFont{largesymbols}{bold}{OMX}{npxexv}{b}{n}
-  \DeclareFontSubstitution{OMX}{npxexv}{m}{n}
-\else%
-  \DeclareSymbolFont{largesymbols}{OMX}{npxex}{m}{n}
-  \SetSymbolFont{largesymbols}{bold}{OMX}{npxex}{b}{n}
-  \DeclareFontSubstitution{OMX}{npxex}{m}{n}
+% no OMX used 
+\expandafter\ifx\csname npxmath@scaled\endcsname\relax
+  \let\npxmath@@scaled\@empty%
+\else
+  \edef\npxmath@@scaled{s*[\csname npxmath@scaled\endcsname]}%
+\fi
+
+\DeclareFontEncoding{LMX}{}{}
+\DeclareFontSubstitution{LMX}{npxexx}{m}{n}
+\DeclareFontFamily{LMX}{npxexx}{}
+\DeclareFontShape{LMX}{npxexx}{m}{n}{<-> \npxmath@@scaled zplexx}{}
+\DeclareFontShape{LMX}{npxexx}{b}{n}{<-> \npxmath@@scaled zplbexx}{}
+\DeclareFontShape{LMX}{npxexx}{bx}{n}{<->ssub npxexx/b/n}{}
+\DeclareSymbolFont{largesymbols}{LMX}{npxexx}{m}{n}
+\SetSymbolFont{largesymbols}{bold}{LMX}{npxexx}{b}{n}
+
+\ifpx@bigdelims
+    %default definitions of \big etc need some changes
+    %\renewcommand{\big}{\bBigg@\@ne}
+    \AtBeginDocument{\renewcommand{\Big}{\bBigg@{1.3}}
+    \renewcommand{\bigg}{\bBigg@{1.73}}
+    \renewcommand{\Bigg}{\bBigg@{2.16}}
+    }
 \fi%
 %%%%%%%%%%%%%%%%%%%%
 % Math Extension A %
 %%%%%%%%%%%%%%%%%%%%
 
-\DeclareSymbolFont{largesymbolsA}{U}{npxexa}{m}{n}
-\SetSymbolFont{largesymbolsA}{bold}{U}{npxexa}{b}{n}
+\DeclareSymbolFont{largesymbolsPXA}{U}{npxexa}{m}{n}
+\SetSymbolFont{largesymbolsPXA}{bold}{U}{npxexa}{b}{n}
 \DeclareFontSubstitution{U}{npxexa}{m}{n}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -224,6 +242,39 @@ amssymbols,uprightGreek}
 %\DeclareMathDelimiter{)}{\mathclose}{operators}{41}{largesymbols}{1}
 %\DeclareMathDelimiter{(}{\mathopen}{lettersA}{125}{largesymbols}{0}
 %\DeclareMathDelimiter{)}{\mathclose}{lettersA}{126}{largesymbols}{1}
+\ifpx@bigdelims
+  \DeclareMathDelimiter{(}{\mathopen}{lettersA}{155}{largesymbols}{130}
+  \DeclareMathDelimiter{)}{\mathclose}{lettersA}{156}{largesymbols}{131}
+  \DeclareMathDelimiter{[}{\mathopen}{lettersA}{157}{largesymbols}{132}
+  \DeclareMathDelimiter{]}{\mathclose}{lettersA}{158}{largesymbols}{133}
+  \DeclareMathDelimiter{\lfloor}{\mathopen}{lettersA}{159}{largesymbols}{134}
+  \DeclareMathDelimiter{\rfloor}{\mathclose}{lettersA}{160}{largesymbols}{135}
+  \DeclareMathDelimiter{\lceil}{\mathopen}{lettersA}{161}{largesymbols}{136}
+  \DeclareMathDelimiter{\rceil}{\mathclose}{lettersA}{162}{largesymbols}{137}
+  \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{163}{largesymbols}{138}
+  \DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{164}{largesymbols}{139}
+  \DeclareMathDelimiter{\langle}{\mathopen}{lettersA}{165}{largesymbols}{140}
+  \DeclareMathDelimiter{<}{\mathopen}{lettersA}{165}{largesymbols}{140}
+  \DeclareMathDelimiter{\rangle}{\mathclose}{lettersA}{166}{largesymbols}{141}
+  \DeclareMathDelimiter{>}{\mathclose}{lettersA}{166}{largesymbols}{141}
+  \DeclareMathSymbol{\mid}{\mathrel}{lettersA}{96}
+  \DeclareMathDelimiter{|}{\mathord}{lettersA}{96}{largesymbols}{128}
+  \DeclareMathDelimiter{\arrowvert}{\mathord}{lettersA}{167}{largesymbols}{60}
+  \DeclareMathDelimiter{\vert}{\mathord}{lettersA}{96}{largesymbols}{128}
+  %\DeclareMathSymbol{\parallel}{\mathrel}{lettersA}{129}
+  \DeclareMathDelimiter{\Arrowvert}{\mathord}{lettersA}{168}{largesymbols}{61}
+  \DeclareMathDelimiter{\Vert}{\mathord}{lettersA}{128}{largesymbols}{129}
+   \let\|=\Vert
+  \DeclareMathDelimiter{\updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{63}
+  \DeclareMathDelimiter{\Updownarrow}{\mathrel}{lettersA}{167}{largesymbols}{119}
+\else
+  \ifpx@braces
+    \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{142}
+    \DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{143}
+  \fi
+  \DeclareMathDelimiter{(}{\mathopen}{lettersA}{125}{largesymbols}{0}
+  \DeclareMathDelimiter{)}{\mathclose}{lettersA}{126}{largesymbols}{1}
+\fi
 %\DeclareMathSymbol{+}{\mathbin}{operators}{43}
 %\DeclareMathDelimiter{/}{\mathord}{operators}{47}{largesymbols}{14}
 %\DeclareMathSymbol{:}{\mathrel}{operators}{58}
@@ -419,10 +470,6 @@ amssymbols,uprightGreek}
 %\DeclareMathSymbol{\diamondsuit}{\mathord}{symbols}{125}
 %\DeclareMathSymbol{\heartsuit}{\mathord}{symbols}{126}
 %\DeclareMathSymbol{\spadesuit}{\mathord}{symbols}{127}
-\ifpx@braces%
-  \re@DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{62}{largesymbols}{8}
-  \re@DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{63}{largesymbols}{9}
-\fi
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Math Symbol A Definitions % AMSa
@@ -758,8 +805,8 @@ amssymbols,uprightGreek}
 \re@DeclareMathSymbol{\strictfi}{\mathrel}{symbolsC}{75}
 \re@DeclareMathSymbol{\strictiff}{\mathrel}{symbolsC}{76}
 \re@DeclareMathSymbol{\invamp}{\mathbin}{symbolsC}{77}
-\re@DeclareMathDelimiter{\lbag}{\mathopen}{symbolsC}{78}{largesymbolsA}{48}
-\re@DeclareMathDelimiter{\rbag}{\mathclose}{symbolsC}{79}{largesymbolsA}{49}
+\re@DeclareMathDelimiter{\lbag}{\mathopen}{symbolsC}{78}{largesymbolsPXA}{48}
+\re@DeclareMathDelimiter{\rbag}{\mathclose}{symbolsC}{79}{largesymbolsPXA}{49}
 \re@DeclareMathSymbol{\Lbag}{\mathopen}{symbolsC}{80}
 \re@DeclareMathSymbol{\Rbag}{\mathclose}{symbolsC}{81}
 \re@DeclareMathSymbol{\circledless}{\mathrel}{symbolsC}{82}
@@ -810,8 +857,8 @@ amssymbols,uprightGreek}
 \re@DeclareMathSymbol\leadsto{\mathrel}{symbolsC}{123}
 \re@DeclareMathSymbol{\sqcupplus}{\mathbin}{symbolsC}{124}
 \re@DeclareMathSymbol{\sqcapplus}{\mathbin}{symbolsC}{125}
-\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsA}{18}
-\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsA}{19}
+\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsPXA}{18}
+\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsPXA}{19}
 \re@DeclareMathSymbol{\boxright}{\mathrel}{symbolsC}{128}
 \re@DeclareMathSymbol{\boxleft}{\mathrel}{symbolsC}{129}
 \re@DeclareMathSymbol{\boxdotright}{\mathrel}{symbolsC}{130}
@@ -1108,78 +1155,78 @@ amssymbols,uprightGreek}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Math Extension A (npxexa) Definition % largesymbolsA
+% Math Extension A (npxexa) Definition % largesymbolsPXA
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsA}{0}
-\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsA}{2}
-\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsA}{4}
-\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsA}{6}
-\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsA}{16}
-%\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsA}{18}
-%\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsA}{19}
-\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsA}{32}
+\re@DeclareMathSymbol{\bignplus}{\mathop}{largesymbolsPXA}{0}
+\re@DeclareMathSymbol{\bigsqcupplus}{\mathop}{largesymbolsPXA}{2}
+\re@DeclareMathSymbol{\bigsqcapplus}{\mathop}{largesymbolsPXA}{4}
+\re@DeclareMathSymbol{\bigsqcap}{\mathop}{largesymbolsPXA}{6}
+\re@DeclareMathSymbol{\varprod}{\mathop}{largesymbolsPXA}{16}
+%\re@DeclareMathDelimiter{\llbracket}{\mathopen}{symbolsC}{126}{largesymbolsPXA}{18}
+%\re@DeclareMathDelimiter{\rrbracket}{\mathclose}{symbolsC}{127}{largesymbolsPXA}{19}
+\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsPXA}{32}
 %
 \ifpx@cmint
 % added 2012-04-16
-  \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbolsA}{84}
-  \re@DeclareMathSymbol{\intop}{\mathop}{largesymbolsA}{86}
-  \ifx\AmSfont\@undefined
-        \def\oint{\ointop\nolimits}
-        \def\int{\intop\nolimits}
-   \fi
+  \re@DeclareMathSymbol{\ointop}{\mathop}{largesymbolsPXA}{84}
+  \re@DeclareMathSymbol{\intop}{\mathop}{largesymbolsPXA}{86}
+%  \ifx\AmSfont\@undefined
+%        \def\oint{\ointop\nolimits}
+%        \def\int{\intop\nolimits}
+%   \fi
 \else % use px integrals
-  \ifx\AmSfont\@undefined\else
-    % The following are needed if amsmath has been loaded
-    \let\iint\relax
-    \let\iiint\relax
-    \let\iiiint\relax
-    \let\idotsint\relax
-  \fi
-\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsA}{8}
-   \def\oiint{\oiintop\nolimits}
-\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsA}{10}
-   \def\ointctrclockwise{\ointctrclockwiseop\nolimits}
-\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsA}{12}
-   \def\ointclockwise{\ointclockwiseop\nolimits}
-\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsA}{14}
-   \def\sqint{\sqintop\nolimits}
-\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsA}{33}
-   \def\iint{\iintop\nolimits}
-\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsA}{35}
-   \def\iiint{\iiintop\nolimits}
-\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsA}{37}
-   \def\iiiint{\iiiintop\nolimits}
-\re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsA}{39}
-   \def\idotsint{\idotsintop\nolimits}
-\re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsA}{41}
-   \def\oiiint{\oiiintop\nolimits}
-\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsA}{43}
-   \def\varointctrclockwise{\varointctrclockwiseop\nolimits}
-\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsA}{45}
-   \def\varointclockwise{\varointclockwiseop\nolimits}
-\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsA}{62}
-   \def\fint{\fintop\nolimits}
-\re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsA}{64}
-   \def\oiintctrclockwise{\oiintctrclockwiseop\nolimits}
-\re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsA}{66}
-   \def\varoiintclockwise{\varoiintclockwiseop\nolimits}
-\re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsA}{68}
-   \def\oiiintctrclockwise{\oiiintctrclockwiseop\nolimits}
-\re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsA}{70}
-   \def\varoiiintclockwise{\varoiiintclockwiseop\nolimits}
-\re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsA}{72}
-   \def\oiintclockwise{\oiintclockwiseop\nolimits}
-\re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsA}{74}
-   \def\varoiintctrclockwise{\varoiintctrclockwiseop\nolimits}
-\re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsA}{76}
-   \def\oiiintclockwise{\oiiintclockwiseop\nolimits}
-\re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsA}{78}
-   \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\nolimits}
-\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsA}{80}
-   \def\sqiint{\sqiintop\nolimits}
-\re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsA}{82}
-   \def\sqiiint{\sqiiintop\nolimits}
+%  \ifx\AmSfont\@undefined\else
+%    % The following are needed if amsmath has been loaded
+%    \let\iint\relax
+%    \let\iiint\relax
+%    \let\iiiint\relax
+%    \let\idotsint\relax
+%  \fi
+\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsPXA}{8}
+   \def\oiint{\oiintop\ilimits@}
+\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsPXA}{10}
+   \def\ointctrclockwise{\ointctrclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsPXA}{12}
+   \def\ointclockwise{\ointclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsPXA}{14}
+   \def\sqint{\sqintop\ilimits@}
+\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsPXA}{33}
+   \def\iint{\iintop\ilimits@}
+\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsPXA}{35}
+   \def\iiint{\iiintop\ilimits@}
+\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsPXA}{37}
+   \def\iiiint{\iiiintop\ilimits@}
+\re@DeclareMathSymbol{\idotsintop}{\mathop}{largesymbolsPXA}{39}
+   \def\idotsint{\idotsintop\ilimits@}
+\re@DeclareMathSymbol{\oiiintop}{\mathop}{largesymbolsPXA}{41}
+   \def\oiiint{\oiiintop\ilimits@}
+\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsPXA}{43}
+   \def\varointctrclockwise{\varointctrclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsPXA}{45}
+   \def\varointclockwise{\varointclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsPXA}{62}
+   \def\fint{\fintop\ilimits@}
+\re@DeclareMathSymbol{\oiintctrclockwiseop}{\mathop}{largesymbolsPXA}{64}
+   \def\oiintctrclockwise{\oiintctrclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\varoiintclockwiseop}{\mathop}{largesymbolsPXA}{66}
+   \def\varoiintclockwise{\varoiintclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\oiiintctrclockwiseop}{\mathop}{largesymbolsPXA}{68}
+   \def\oiiintctrclockwise{\oiiintctrclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\varoiiintclockwiseop}{\mathop}{largesymbolsPXA}{70}
+   \def\varoiiintclockwise{\varoiiintclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\oiintclockwiseop}{\mathop}{largesymbolsPXA}{72}
+   \def\oiintclockwise{\oiintclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\varoiintctrclockwiseop}{\mathop}{largesymbolsPXA}{74}
+   \def\varoiintctrclockwise{\varoiintctrclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\oiiintclockwiseop}{\mathop}{largesymbolsPXA}{76}
+   \def\oiiintclockwise{\oiiintclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\varoiiintctrclockwiseop}{\mathop}{largesymbolsPXA}{78}
+   \def\varoiiintctrclockwise{\varoiiintctrclockwiseop\ilimits@}
+\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsPXA}{80}
+   \def\sqiint{\sqiintop\ilimits@}
+\re@DeclareMathSymbol{\sqiiintop}{\mathop}{largesymbolsPXA}{82}
+   \def\sqiiint{\sqiiintop\ilimits@}
 \fi
 
 
@@ -1221,7 +1268,7 @@ amssymbols,uprightGreek}
 
 %%% For \underbrace and \overbrace:
 %%% use brace extension bar (in "20 of npxexa) instead of vrule
-%\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsA}{32}
+%\re@DeclareMathSymbol{\br@cext}{\mathord}{largesymbolsPXA}{32}
 \def\downbracefill{$\m@th%
    \braceld\mkern-1mu\cleaders\hbox{$\mkern-.5mu\br@cext\mkern-.5mu$}\hfill\mkern-1mu%
    \braceru\bracelu%
@@ -1301,8 +1348,8 @@ amssymbols,uprightGreek}
 \pxf@ntname{boldlettersA}
 \pxf@ntname{symbolsC}
 \pxf@ntname{boldsymbolsC}
-\pxf@ntname{largesymbolsA}
-\pxf@ntname{boldlargesymbolsA}
+\pxf@ntname{largesymbolsPXA}
+\pxf@ntname{boldlargesymbolsPXA}
   \typeout{*** Mathgroups ***}
   \count@\z@
   \loop\ifnum\count@<16
diff --git a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
index 2720ce73118..420fc3ad8b7 100644
--- a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
+++ b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
@@ -6,10 +6,10 @@
 % Text and math versions now separate. 
 % Added scaled keyword and osf option;
 % Modified the definition of \k to bypass problem with grouping.
-% Text is now directed a small modification of TeXGyrePagella rather than ppl.
+% Text is now directed to a small modification of TeXGyrePagella rather than ppl.
 
-\def\fileversion{1.01}
-\def\filedate{2013/05/25}
+\def\fileversion{1.04}
+\def\filedate{2013/09/06}
 \ProvidesPackage{newpxtext}[\filedate\space v\fileversion]
 
 \message{`newpxtext' v\fileversion, \filedate\space Text macros based on pxfonts (msharpe)}
@@ -18,6 +18,7 @@
 \let\orig@footnote=\thefootnote
 \let\orig@makefnmark=\@makefnmark
 \RequirePackage{xkeyval}
+\def\zpl@helvscaled{s*[.93]}
 \define@key{zpl}{scaled}[1.0]{\def\zpl@scaled{s*[#1]}%
 \@tempdima=#1\p@\@tempdima=.93\@tempdima%
 \def\zpl@helvscaled{s*[\strip@pt\@tempdima]}}