From 029e1cf653d4e4a38b8c8297283655ad807d7600 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 19 Oct 2013 22:39:13 +0000
Subject: newpx (19oct13)

git-svn-id: svn://tug.org/texlive/trunk@31949 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/newpx/newpxmath.sty | 13 ++++---------
 Master/texmf-dist/tex/latex/newpx/newpxtext.sty | 25 +++++++++++++++++++++----
 2 files changed, 25 insertions(+), 13 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 f5cdb41fc66..46ac48ac81c 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.05}
-\def\filedate{2013/09/30}
+\def\fileversion{1.051}
+\def\filedate{2013/10/18}
 \ProvidesPackage{newpxmath}
 	[\filedate\space v\fileversion]
 \@ifundefined{newpxmathLoaded}{}{\endinput}
@@ -254,9 +254,9 @@ amssymbols,uprightGreek}
   \DeclareMathDelimiter{\lbrace}{\mathopen}{lettersA}{163}{largesymbols}{138}
   \DeclareMathDelimiter{\rbrace}{\mathclose}{lettersA}{164}{largesymbols}{139}
   \DeclareMathDelimiter{\langle}{\mathopen}{lettersA}{165}{largesymbols}{140}
-  \DeclareMathDelimiter{<}{\mathopen}{letters}{60}{largesymbols}{140}
+  \DeclareMathDelimiter{<}{\mathopen}{lettersA}{165}{largesymbols}{140}
   \DeclareMathDelimiter{\rangle}{\mathclose}{lettersA}{166}{largesymbols}{141}
-  \DeclareMathDelimiter{>}{\mathclose}{letters}{62}{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}
@@ -1056,11 +1056,6 @@ amssymbols,uprightGreek}
 % the mathgroup of lettersA  is stored in macro \symlettersA
 
 \re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{49}
-\DeclareMathSymbol{\forallAlt}{\mathord}{lettersA}{91}%added 20130930
-\DeclareMathSymbol{\existsAlt}{\mathord}{lettersA}{92}%added 20130930
-\DeclareMathSymbol{\nexistsAlt}{\mathord}{lettersA}{93}%added 20130930
-\DeclareMathSymbol{\emptysetAlt}{\mathord}{lettersA}{94}%added 20130930
-\re@DeclareMathSymbol{\varnothing}{\mathord}{lettersA}{95}%added 20130930
 \DeclareMathSymbol{\uppartial}{\mathord}{lettersA}{64}
 
 \def\npx@UC{A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z}
diff --git a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
index 8336a225f53..24a197e2347 100644
--- a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
+++ b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
@@ -8,17 +8,20 @@
 % 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.05}
-\def\filedate{2013/09/30}
+\def\fileversion{1.051}
+\def\filedate{2013/10/18}
 \ProvidesPackage{newpxtext}[\filedate\space v\fileversion]
 
 \message{`newpxtext' v\fileversion, \filedate\space Text macros based on pxfonts (msharpe)}
-%\RequirePackage{fontaxes}% so we can have [bold] italic small caps
+\RequirePackage{fontaxes}% so we can have [bold] italic small caps
 
 \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}{scaled}[1.0]{\def\zpl@scaled{s*[#1]}%
 \@tempdima=#1\p@\@tempdima=.93\@tempdima%
 \def\zpl@helvscaled{s*[\strip@pt\@tempdima]}}
@@ -40,7 +43,21 @@
   \not@math@alphabet\sustyle\relax
   \fontfamily{zpl1}\selectfont}
 
-\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi}
+%\def\@makefnmark{\ifx \thefootnote\orig@footnote \hbox{\sustyle\hspace*{.04em}\@thefnmark}\else\orig@makefnmark\fi}
+\ifzpl@defaultsups %
+\else
+  \def\f@@tn@te{footnote}
+  \def\@makefnmark{%
+    \ifx\@mpfn\f@@tn@te%
+      \ifx\thefootnote\orig@footnote%
+        \hbox{\sustyle\hspace*{.04em}\@thefnmark}
+      \else%
+        \orig@makefnmark
+      \fi
+    \else%
+      \orig@makefnmark
+    \fi}
+\fi
 
 %%%%%%%%%%%%%%%%%%%%%%
 % Text Serif (TGPagellaX) %
-- 
cgit v1.2.3