1 files changed, 26 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/newpx/newpxtext.sty b/Master/texmf-dist/tex/latex/newpx/newpxtext.sty
index 6ac65e3faa5..5dc46f5d2d0 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.211}
-\def\filedate{2015/03/03}
+\def\fileversion{1.22}
+\def\filedate{2015/03/09}
 \ProvidesPackage{newpxtext}[\filedate\space v\fileversion]
 
 \message{`newpxtext' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Pagella and its extensions (msharpe)}
@@ -26,20 +26,26 @@
 \newif\ifzpl@adobesc % we don't use this exc. in fd, but may in future
 \newif\ifzpl@scosf
 \newif\ifzpl@largesc
-
+\newif\ifzpl@babel
+\ifdefined\bbl@tempa \zpl@babeltrue\fi
+\define@key{zpl}{babel}[true]{%
+\csname zpl@babel#1\endcsname}
 \define@boolkey{zpl}{defaultsups}[true]{%
 \csname zpl@defaultsups#1\endcsname}
 \define@boolkey{zpl}{largesc}[true]{%
 \csname zpl@largesc#1\endcsname}
-\newif\ifzpl@babel
-\define@key{zpl}{babel}[true]{%
-\csname zpl@babel#1\endcsname}
 \newif\ifzpl@thrm
-\define@key{zpl}{babel}[true]{%
-\csname zpl@babel#1\endcsname}
 \define@key{zpl}{helvratio}[0.94]{\def\zpl@helvratio{#1}}
 \define@key{zpl}{scaled}[1.0]{\def\zpl@scaled{s*[#1]}%
 \def\zpl@scale{#1}}
+%
+\def\zpl@spc{.25em}
+\def\zpl@stretch{.2em}
+\def\zpl@shrink{.1em}
+\define@key{zpl}{spacing}[.25em]{\gdef\zpl@spc{#1}}
+\define@key{zpl}{stretch}[.2em]{\gdef\zpl@stretch{#1}}
+\define@key{zpl}{shrink}[.1em]{\gdef\zpl@shrink{#1}}
+
 \DeclareOption{lining}{\edef\zpl@figurestyle{lf}}
 \DeclareOption{lf}{\edef\zpl@figurestyle{lf}}
 \DeclareOption{theoremfont}{\zpl@thrmtrue}
@@ -49,6 +55,11 @@
 \DeclareOption{p}{\edef\zpl@figurealign{}}
 \DeclareOption{proportional}{\edef\zpl@figurealign{}}
 \DeclareOption{scosf}{\zpl@scosftrue}
+\DeclareOption{tighter}{%
+\gdef\zpl@spc{.25em}\gdef\zpl@stretch{.125em}\gdef\zpl@shrink{.1em}}
+\DeclareOption{looser}{%
+\gdef\zpl@spc{.3em}\gdef\zpl@stretch{.2em}\gdef\zpl@shrink{.1em}
+}
 \ExecuteOptions{lining,tabular}
 \DeclareOption*{%
   \begingroup
@@ -59,11 +70,18 @@
 \setkeys{zpl}{helvratio} % set this first, at least to default
 \setkeys{zpl}{scaled} % get at least default
 \ProcessOptions*
+\def\zpl@spacing{%
+	\fontdimen2\font=\zpl@spc
+	\fontdimen3\font=\zpl@stretch
+	\fontdimen4\font=\zpl@shrink
+}
+	 
 \@tempdima=\zpl@scale\p@\@tempdima=\zpl@helvratio\@tempdima%
 \edef\qhv@scale{\strip@pt\@tempdima}
 
 \RequirePackage[T1]{fontenc}
 \RequirePackage{textcomp}
+\def\oldstylenums#1{{\fontencoding{TS1}\selectfont #1}}
 
 \DeclareRobustCommand{\sustyle}{%
   \not@math@alphabet\sustyle\relax