summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/newpx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-03-11 20:24:15 +0000
committerKarl Berry <karl@freefriends.org>2015-03-11 20:24:15 +0000
commit8199df640dfe4f184a4de0658a853b6ba6f8ea27 (patch)
tree498fa6c44a2ebf7017ef6c8e7882262a09925823 /Master/texmf-dist/tex/latex/newpx
parent03b9375ab75a28d12e255dd3202d9c23d97a3021 (diff)
newpx (11mar15)
git-svn-id: svn://tug.org/texlive/trunk@36483 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/newpx')
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ly1zpllf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ly1zplosf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ly1zpltlf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ly1zpltosf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/newpxtext.sty34
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ot1zpllf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ot1zplosf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ot1zpltlf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ot1zpltosf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/t1zpllf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/t1zplosf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/t1zpltlf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/t1zpltosf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ts1zpllf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ts1zplosf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ts1zpltlf.fd5
-rw-r--r--Master/texmf-dist/tex/latex/newpx/ts1zpltosf.fd5
17 files changed, 74 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/latex/newpx/ly1zpllf.fd b/Master/texmf-dist/tex/latex/newpx/ly1zpllf.fd
index 3129577fd12..3602fa7fd5d 100644
--- a/Master/texmf-dist/tex/latex/newpx/ly1zpllf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ly1zpllf.fd
@@ -1,13 +1,14 @@
\ProvidesFile{ly1zpllf.fd}[2015/01/17 v1.0 font definition file for LY1/zpl/lf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{LY1}{zpllf}{}
+\DeclareFontFamily{LY1}{zpllf}{\zpl@spacing}
\DeclareFontShape{LY1}{zpllf}{b}{sc}{<-> \zpl@scaled zpl-Bold-lf-sc\zpl@lsfx-ly1}{}
\DeclareFontShape{LY1}{zpllf}{b}{n}{<-> \zpl@scaled zpl-Bold-lf-ly1}{}
\DeclareFontShape{LY1}{zpllf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-lf-sc\zpl@lsfx-ly1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ly1zplosf.fd b/Master/texmf-dist/tex/latex/newpx/ly1zplosf.fd
index a9f4f5e4f54..1a11aba1d2f 100644
--- a/Master/texmf-dist/tex/latex/newpx/ly1zplosf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ly1zplosf.fd
@@ -1,13 +1,14 @@
\ProvidesFile{ly1zplosf.fd}[2015/01/17 v1.0 font definition file for LY1/zpl/osf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{LY1}{zplosf}{}
+\DeclareFontFamily{LY1}{zplosf}{\zpl@spacing}
\DeclareFontShape{LY1}{zplosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-osf-sc\zpl@lsfx-ly1}{}
\DeclareFontShape{LY1}{zplosf}{b}{n}{<-> \zpl@scaled zpl-Bold-osf-ly1}{}
\DeclareFontShape{LY1}{zplosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-osf-sc\zpl@lsfx-ly1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ly1zpltlf.fd b/Master/texmf-dist/tex/latex/newpx/ly1zpltlf.fd
index d0cfc40be81..6ed731945a0 100644
--- a/Master/texmf-dist/tex/latex/newpx/ly1zpltlf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ly1zpltlf.fd
@@ -1,13 +1,14 @@
\ProvidesFile{ly1zpltlf.fd}[2015/01/17 v1.0 font definition file for LY1/zpl/tlf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{LY1}{zpltlf}{}
+\DeclareFontFamily{LY1}{zpltlf}{\zpl@spacing}
\DeclareFontShape{LY1}{zpltlf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-ly1}{}
\DeclareFontShape{LY1}{zpltlf}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-ly1}{}
\DeclareFontShape{LY1}{zpltlf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-ly1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ly1zpltosf.fd b/Master/texmf-dist/tex/latex/newpx/ly1zpltosf.fd
index fa25a4213da..edbefaf1952 100644
--- a/Master/texmf-dist/tex/latex/newpx/ly1zpltosf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ly1zpltosf.fd
@@ -1,15 +1,16 @@
\ProvidesFile{ly1zpltosf.fd}[2015/02/07 v1.0 font definition file for LY1/zpl/tosf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@asfx{}
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\def\zpl@makeadobesc{\ifzpl@adobesc\def\zpl@lsfx{l}\def\zpl@adobesc{a}\else\zpl@makelsfx\fi}
\ifdefined\zpl@adobescfalse\zpl@makeadobesc\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{LY1}{zpltosf}{}
+\DeclareFontFamily{LY1}{zpltosf}{\zpl@spacing}
\DeclareFontShape{LY1}{zpltosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tosf-sc\zpl@lsfx\zpl@asfx-ly1}{}
\DeclareFontShape{LY1}{zpltosf}{b}{n}{<-> \zpl@scaled zpl-Bold-tosf-ly1}{}
\DeclareFontShape{LY1}{zpltosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tosf-sc\zpl@lsfx-ly1}{}
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
diff --git a/Master/texmf-dist/tex/latex/newpx/ot1zpllf.fd b/Master/texmf-dist/tex/latex/newpx/ot1zpllf.fd
index 9c57928d9c2..f262b2d3339 100644
--- a/Master/texmf-dist/tex/latex/newpx/ot1zpllf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ot1zpllf.fd
@@ -1,13 +1,14 @@
\ProvidesFile{ot1zpllf.fd}[2015/01/19 v1.0 font definition file for OT1/zpl/lf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{OT1}{zpllf}{}
+\DeclareFontFamily{OT1}{zpllf}{\zpl@spacing}
\DeclareFontShape{OT1}{zpllf}{b}{sc}{<-> \zpl@scaled zpl-Bold-lf-sc\zpl@lsfx-ot1}{}
\DeclareFontShape{OT1}{zpllf}{b}{n}{<-> \zpl@scaled zpl-Bold-lf-ot1}{}
\DeclareFontShape{OT1}{zpllf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-lf-sc\zpl@lsfx-ot1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ot1zplosf.fd b/Master/texmf-dist/tex/latex/newpx/ot1zplosf.fd
index 840637435d1..93ca336cd28 100644
--- a/Master/texmf-dist/tex/latex/newpx/ot1zplosf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ot1zplosf.fd
@@ -1,13 +1,14 @@
\ProvidesFile{ot1zplosf.fd}[2015/01/17 v1.0 font definition file for OT1/zpl/osf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{OT1}{zplosf}{}
+\DeclareFontFamily{OT1}{zplosf}{\zpl@spacing}
\DeclareFontShape{OT1}{zplosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-osf-sc\zpl@lsfx-ot1}{}
\DeclareFontShape{OT1}{zplosf}{b}{n}{<-> \zpl@scaled zpl-Bold-osf-ot1}{}
\DeclareFontShape{OT1}{zplosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-osf-sc\zpl@lsfx-ot1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ot1zpltlf.fd b/Master/texmf-dist/tex/latex/newpx/ot1zpltlf.fd
index 682050f1897..7c6c591adea 100644
--- a/Master/texmf-dist/tex/latex/newpx/ot1zpltlf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ot1zpltlf.fd
@@ -1,13 +1,14 @@
\ProvidesFile{ot1zpltlf.fd}[2015/01/17 v1.0 font definition file for OT1/zpl/tlf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{OT1}{zpltlf}{}
+\DeclareFontFamily{OT1}{zpltlf}{\zpl@spacing}
\DeclareFontShape{OT1}{zpltlf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-ot1}{}
\DeclareFontShape{OT1}{zpltlf}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-ot1}{}
\DeclareFontShape{OT1}{zpltlf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-ot1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ot1zpltosf.fd b/Master/texmf-dist/tex/latex/newpx/ot1zpltosf.fd
index 82c42b633dd..4d0e5fb7d57 100644
--- a/Master/texmf-dist/tex/latex/newpx/ot1zpltosf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ot1zpltosf.fd
@@ -1,15 +1,16 @@
\ProvidesFile{ot1zpltosf.fd}[2015/02/07 v1.0 font definition file for OT1/zpl/tosf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@asfx{}
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\def\zpl@makeadobesc{\ifzpl@adobesc\def\zpl@lsfx{l}\def\zpl@adobesc{a}\else\zpl@makelsfx\fi}
\ifdefined\zpl@adobescfalse\zpl@makeadobesc\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{OT1}{zpltosf}{}
+\DeclareFontFamily{OT1}{zpltosf}{\zpl@spacing}
\DeclareFontShape{OT1}{zpltosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tosf-sc\zpl@lsfx\zpl@asfx-ot1}{}
\DeclareFontShape{OT1}{zpltosf}{b}{n}{<-> \zpl@scaled zpl-Bold-tosf-ot1}{}
\DeclareFontShape{OT1}{zpltosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tosf-sc\zpl@lsfx-ot1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/t1zpllf.fd b/Master/texmf-dist/tex/latex/newpx/t1zpllf.fd
index 67de7a94786..f880d62be70 100644
--- a/Master/texmf-dist/tex/latex/newpx/t1zpllf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/t1zpllf.fd
@@ -1,13 +1,14 @@
\ProvidesFile{t1zpllf.fd}[2015/01/17 v1.0 font definition file for T1/zpl/lf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{T1}{zpllf}{}
+\DeclareFontFamily{T1}{zpllf}{\zpl@spacing}
\DeclareFontShape{T1}{zpllf}{b}{sc}{<-> \zpl@scaled zpl-Bold-lf-sc\zpl@lsfx-t1}{}
\DeclareFontShape{T1}{zpllf}{b}{n}{<-> \zpl@scaled zpl-Bold-lf-t1}{}
\DeclareFontShape{T1}{zpllf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-lf-sc\zpl@lsfx-t1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/t1zplosf.fd b/Master/texmf-dist/tex/latex/newpx/t1zplosf.fd
index 43c543ae439..3b8d96e6d22 100644
--- a/Master/texmf-dist/tex/latex/newpx/t1zplosf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/t1zplosf.fd
@@ -1,14 +1,15 @@
\ProvidesFile{t1zplosf.fd}[2015/01/17 v1.0 font definition file for T1/zpl/osf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{T1}{zplosf}{}
+\DeclareFontFamily{T1}{zplosf}{\zpl@spacing}
\DeclareFontShape{T1}{zplosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-osf-sc\zpl@lsfx-t1}{}
\DeclareFontShape{T1}{zplosf}{b}{n}{<-> \zpl@scaled zpl-Bold-osf-t1}{}
\DeclareFontShape{T1}{zplosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-osf-sc\zpl@lsfx-t1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/t1zpltlf.fd b/Master/texmf-dist/tex/latex/newpx/t1zpltlf.fd
index 19ba5af3bfc..30793cb5628 100644
--- a/Master/texmf-dist/tex/latex/newpx/t1zpltlf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/t1zpltlf.fd
@@ -1,13 +1,14 @@
\ProvidesFile{t1zpltlf.fd}[2015/01/17 v1.0 font definition file for T1/zpl/tlf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{T1}{zpltlf}{}
+\DeclareFontFamily{T1}{zpltlf}{\zpl@spacing}
\DeclareFontShape{T1}{zpltlf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tlf-sc\zpl@lsfx-t1}{}
\DeclareFontShape{T1}{zpltlf}{b}{n}{<-> \zpl@scaled zpl-Bold-tlf-t1}{}
\DeclareFontShape{T1}{zpltlf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tlf-sc\zpl@lsfx-t1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/t1zpltosf.fd b/Master/texmf-dist/tex/latex/newpx/t1zpltosf.fd
index 93187536eca..7985bce3e1c 100644
--- a/Master/texmf-dist/tex/latex/newpx/t1zpltosf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/t1zpltosf.fd
@@ -1,15 +1,16 @@
\ProvidesFile{t1zpltosf.fd}[2015/01/17 v1.0 font definition file for T1/zpl/tosf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
\def\zpl@asfx{}
\def\zpl@lsfx{}
\def\zpl@makelsfx{\ifzpl@largesc\def\zpl@lsfx{l}\fi}
\def\zpl@makeadobesc{\ifzpl@adobesc\def\zpl@lsfx{l}\def\zpl@adobesc{a}\else\zpl@makelsfx\fi}
\ifdefined\zpl@adobescfalse\zpl@makeadobesc\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{T1}{zpltosf}{}
+\DeclareFontFamily{T1}{zpltosf}{\zpl@spacing}
\DeclareFontShape{T1}{zpltosf}{b}{sc}{<-> \zpl@scaled zpl-Bold-tosf-sc\zpl@lsfx\zpl@asfx-t1}{}
\DeclareFontShape{T1}{zpltosf}{b}{n}{<-> \zpl@scaled zpl-Bold-tosf-t1}{}
\DeclareFontShape{T1}{zpltosf}{b}{scit}{<-> \zpl@scaled zpl-BoldItalic-tosf-sc\zpl@lsfx-t1}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ts1zpllf.fd b/Master/texmf-dist/tex/latex/newpx/ts1zpllf.fd
index 67bf72977b6..73cfc51e5bb 100644
--- a/Master/texmf-dist/tex/latex/newpx/ts1zpllf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ts1zpllf.fd
@@ -1,10 +1,11 @@
\ProvidesFile{ts1zpllf.fd}[2015/01/18 v1.0 fd file for TS1/zpllf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{TS1}{zpllf}{}
+\DeclareFontFamily{TS1}{zpllf}{\zpl@spacing}
\DeclareFontShape{TS1}{zpllf}{b}{n}{<-> \zpl@scaled ts1-qplb}{}
\DeclareFontShape{TS1}{zpllf}{b}{it}{<-> \zpl@scaled ts1-qplbi}{}
\DeclareFontShape{TS1}{zpllf}{m}{n}{<-> \zpl@scaled ts1-qplr}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ts1zplosf.fd b/Master/texmf-dist/tex/latex/newpx/ts1zplosf.fd
index eb3d38daa70..ab75c14b6e9 100644
--- a/Master/texmf-dist/tex/latex/newpx/ts1zplosf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ts1zplosf.fd
@@ -1,10 +1,11 @@
\ProvidesFile{ts1zplosf.fd}[2015/01/18 v1.0 fd file for TS1/zplosf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{TS1}{zplosf}{}
+\DeclareFontFamily{TS1}{zplosf}{\zpl@spacing}
\DeclareFontShape{TS1}{zplosf}{b}{n}{<-> \zpl@scaled ts1-qplb}{}
\DeclareFontShape{TS1}{zplosf}{b}{it}{<-> \zpl@scaled ts1-qplbi}{}
\DeclareFontShape{TS1}{zplosf}{m}{n}{<-> \zpl@scaled ts1-qplr}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ts1zpltlf.fd b/Master/texmf-dist/tex/latex/newpx/ts1zpltlf.fd
index 803b572032e..47584d27feb 100644
--- a/Master/texmf-dist/tex/latex/newpx/ts1zpltlf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ts1zpltlf.fd
@@ -1,10 +1,11 @@
\ProvidesFile{ts1zpltlf.fd}[2015/01/18 v1.0 fd file for TS1/zpltlf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{TS1}{zpltlf}{}
+\DeclareFontFamily{TS1}{zpltlf}{\zpl@spacing}
\DeclareFontShape{TS1}{zpltlf}{b}{n}{<-> \zpl@scaled ts1-plmb}{}
\DeclareFontShape{TS1}{zpltlf}{b}{it}{<-> \zpl@scaled ts1-qplbi}{}
\DeclareFontShape{TS1}{zpltlf}{m}{n}{<-> \zpl@scaled ts1-qplr}{}
diff --git a/Master/texmf-dist/tex/latex/newpx/ts1zpltosf.fd b/Master/texmf-dist/tex/latex/newpx/ts1zpltosf.fd
index 566077303ff..9e15a905788 100644
--- a/Master/texmf-dist/tex/latex/newpx/ts1zpltosf.fd
+++ b/Master/texmf-dist/tex/latex/newpx/ts1zpltosf.fd
@@ -1,10 +1,11 @@
\ProvidesFile{ts1zpltosf.fd}[2015/01/18 v1.0 fd file for TS1/zpltosf]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
- \let\zpl@scaled\@empty%
+ \globallet\zpl@scaled\@empty%
\fi
+\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{TS1}{zpltosf}{}
+\DeclareFontFamily{TS1}{zpltosf}{\zpl@spacing}
\DeclareFontShape{TS1}{zpltosf}{b}{n}{<-> \zpl@scaled ts1-qplb}{}
\DeclareFontShape{TS1}{zpltosf}{b}{it}{<-> \zpl@scaled ts1-qplbi}{}
\DeclareFontShape{TS1}{zpltosf}{m}{n}{<-> \zpl@scaled ts1-qplr}{}