summaryrefslogtreecommitdiff
path: root/fonts/newpx/tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-12-06 03:03:03 +0000
committerNorbert Preining <norbert@preining.info>2021-12-06 03:03:03 +0000
commit51bc8dcf794519b64c5c4a92dd3c09097025167f (patch)
tree978c38c7c08fa0feb97be15cd5a248a44a8398a5 /fonts/newpx/tex
parente26711a638906ed9b27bd3c210f4f75da6064a58 (diff)
CTAN sync 202112060303
Diffstat (limited to 'fonts/newpx/tex')
-rw-r--r--fonts/newpx/tex/ly1zpldnom.fd62
-rw-r--r--fonts/newpx/tex/ly1zplinf.fd62
-rw-r--r--fonts/newpx/tex/ly1zpllf.fd46
-rw-r--r--fonts/newpx/tex/ly1zplosf.fd46
-rw-r--r--fonts/newpx/tex/ly1zplsubs.fd62
-rw-r--r--fonts/newpx/tex/ly1zpltlf.fd46
-rw-r--r--fonts/newpx/tex/ly1zpltosf.fd46
-rw-r--r--fonts/newpx/tex/newpxmath.sty8
-rw-r--r--fonts/newpx/tex/newpxtext.sty726
-rw-r--r--fonts/newpx/tex/ot1zpldnom.fd62
-rw-r--r--fonts/newpx/tex/ot1zplinf.fd62
-rw-r--r--fonts/newpx/tex/ot1zpllf.fd46
-rw-r--r--fonts/newpx/tex/ot1zplosf.fd46
-rw-r--r--fonts/newpx/tex/ot1zplsubs.fd62
-rw-r--r--fonts/newpx/tex/ot1zpltlf.fd46
-rw-r--r--fonts/newpx/tex/ot1zpltosf.fd46
-rw-r--r--fonts/newpx/tex/t1zpldnom.fd62
-rw-r--r--fonts/newpx/tex/t1zpldnumr.fd62
-rw-r--r--fonts/newpx/tex/t1zplinf.fd62
-rw-r--r--fonts/newpx/tex/t1zpllf.fd46
-rw-r--r--fonts/newpx/tex/t1zplosf.fd46
-rw-r--r--fonts/newpx/tex/t1zplsubs.fd62
-rw-r--r--fonts/newpx/tex/t1zpltlf.fd46
-rw-r--r--fonts/newpx/tex/t1zpltosf.fd46
-rw-r--r--fonts/newpx/tex/ts1zpllf.fd34
-rw-r--r--fonts/newpx/tex/ts1zplosf.fd35
-rw-r--r--fonts/newpx/tex/ts1zpltlf.fd35
-rw-r--r--fonts/newpx/tex/ts1zpltosf.fd35
28 files changed, 1493 insertions, 552 deletions
diff --git a/fonts/newpx/tex/ly1zpldnom.fd b/fonts/newpx/tex/ly1zpldnom.fd
new file mode 100644
index 0000000000..9bdf96cf23
--- /dev/null
+++ b/fonts/newpx/tex/ly1zpldnom.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{ly1zpldnom.fd}[2015/01/17 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{LY1}{zpldnom}{}
+\DeclareFontShape{LY1}{zpldnom}{m}{n}{ %medium
+ <-> \zpl@scaled zpldnom-Regular-ly1%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{m}{it}{ %italic
+ <-> \zpl@scaled zpldnom-Italic-ly1%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{b}{n}{ %bold
+ <-> \zpl@scaled zpldnom-Bold-ly1%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{b}{it}{ %bold italic
+ <-> \zpl@scaled zpldnom-BoldItalic-ly1%
+}{}
+
+\DeclareFontShape{LY1}{zpldnom}{m}{sc}{ %cap & small cap
+ <-> ssub * zpldnom/m/n%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{m}{sl}{ %slanted
+ <-> ssub * zpldnom/m/it%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{m}{scit}{ %italic
+ <-> ssub * zpldnom/m/it%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{m}{ui}{ %unslanted italic
+ <-> ssub * zpldnom/m/n%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{bx}{it}{ %bold extended italic
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{bx}{scit}{ %bold extended italic
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{bx}{n}{ %bold extended
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{b}{sl}{ %bold slanted
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{LY1}{zpldnom}{b}{scit}{ %bold italic
+ <-> ssub * zpldnom/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/ly1zplinf.fd b/fonts/newpx/tex/ly1zplinf.fd
new file mode 100644
index 0000000000..ebdf8152f6
--- /dev/null
+++ b/fonts/newpx/tex/ly1zplinf.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{ly1zplinf.fd}[2015/01/17 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{LY1}{zplinf}{}
+\DeclareFontShape{LY1}{zplinf}{m}{n}{ %medium
+ <-> \zpl@scaled zplinf-Regular-ly1%
+}{}
+\DeclareFontShape{LY1}{zplinf}{m}{it}{ %italic
+ <-> \zpl@scaled zplinf-Italic-ly1%
+}{}
+\DeclareFontShape{LY1}{zplinf}{b}{n}{ %bold
+ <-> \zpl@scaled zplinf-Bold-ly1%
+}{}
+\DeclareFontShape{LY1}{zplinf}{b}{it}{ %bold italic
+ <-> \zpl@scaled zplinf-BoldItalic-ly1%
+}{}
+
+\DeclareFontShape{LY1}{zplinf}{m}{sc}{ %cap & small cap
+ <-> ssub * zplinf/m/n%
+}{}
+\DeclareFontShape{LY1}{zplinf}{m}{sl}{ %slanted
+ <-> ssub * zplinf/m/it%
+}{}
+\DeclareFontShape{LY1}{zplinf}{m}{scit}{ %italic
+ <-> ssub * zplinf/m/it%
+}{}
+\DeclareFontShape{LY1}{zplinf}{m}{ui}{ %unslanted italic
+ <-> ssub * zplinf/m/n%
+}{}
+\DeclareFontShape{LY1}{zplinf}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{LY1}{zplinf}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{LY1}{zplinf}{bx}{it}{ %bold extended italic
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{LY1}{zplinf}{bx}{scit}{ %bold extended italic
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{LY1}{zplinf}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{LY1}{zplinf}{bx}{n}{ %bold extended
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{LY1}{zplinf}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{LY1}{zplinf}{b}{sl}{ %bold slanted
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{LY1}{zplinf}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{LY1}{zplinf}{b}{scit}{ %bold italic
+ <-> ssub * zplinf/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/ly1zpllf.fd b/fonts/newpx/tex/ly1zpllf.fd
index e25839a33f..af58f28968 100644
--- a/fonts/newpx/tex/ly1zpllf.fd
+++ b/fonts/newpx/tex/ly1zpllf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{ly1zpllf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/lf]
+\ProvidesFile{ly1zpllf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/LF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{LY1}{zpllf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-ly1}{}
-\DeclareFontShape{LY1}{zpllf}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zpllf}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-ly1}{}
-\DeclareFontShape{LY1}{zpllf}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zpllf}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-ly1}{}
-\DeclareFontShape{LY1}{zpllf}{bx}{sc}{<->ssub * zpllf/b/sc}{}
-\DeclareFontShape{LY1}{zpllf}{bx}{n}{<->ssub * zpllf/b/n}{}
-\DeclareFontShape{LY1}{zpllf}{bx}{scit}{<->ssub * zpllf/b/scit}{}
-\DeclareFontShape{LY1}{zpllf}{bx}{it}{<->ssub * zpllf/b/it}{}
+\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}{}
+\DeclareFontShape{LY1}{zplLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-ly1}{}
+\DeclareFontShape{LY1}{zplLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplLF}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-ly1}{}
+\DeclareFontShape{LY1}{zplLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplLF}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-ly1}{}
+\DeclareFontShape{LY1}{zplLF}{bx}{sc}{<->ssub * zplLF/b/sc}{}
+\DeclareFontShape{LY1}{zplLF}{bx}{n}{<->ssub * zplLF/b/n}{}
+\DeclareFontShape{LY1}{zplLF}{bx}{scit}{<->ssub * zplLF/b/scit}{}
+\DeclareFontShape{LY1}{zplLF}{bx}{it}{<->ssub * zplLF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{LY1}{zpllf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-ly1}{}
- \DeclareFontShape{LY1}{zpllf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-ly1}{}
- \DeclareFontShape{LY1}{zpllf}{bx}{sl}{<->ssub * zpllf/b/sl}{}
+ \DeclareFontShape{LY1}{zplLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-ly1}{}
+ \DeclareFontShape{LY1}{zplLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-ly1}{}
+ \DeclareFontShape{LY1}{zplLF}{bx}{sl}{<->ssub * zplLF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{LY1}{zpllf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ly1}{}
- \DeclareFontShape{LY1}{zpllf}{b}{sl}{<->ssub * zpllf/m/sl}{}
- \DeclareFontShape{LY1}{zpllf}{bx}{sl}{<->ssub * zpllf/m/sl}{}
+ \DeclareFontShape{LY1}{zplLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ly1}{}
+ \DeclareFontShape{LY1}{zplLF}{b}{sl}{<->ssub * zplLF/m/sl}{}
+ \DeclareFontShape{LY1}{zplLF}{bx}{sl}{<->ssub * zplLF/m/sl}{}
\fi
-\DeclareFontShape{LY1}{zpllf}{b}{scsl}{<->ssub * zpllf/b/scit}{}
-\DeclareFontShape{LY1}{zpllf}{bx}{scsl}{<->ssub * zpllf/b/scit}{}
-\DeclareFontShape{LY1}{zpllf}{m}{scsl}{<->ssub * zpllf/m/scit}{}
+\DeclareFontShape{LY1}{zplLF}{b}{scsl}{<->ssub * zplLF/b/scit}{}
+\DeclareFontShape{LY1}{zplLF}{bx}{scsl}{<->ssub * zplLF/b/scit}{}
+\DeclareFontShape{LY1}{zplLF}{m}{scsl}{<->ssub * zplLF/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ly1zplosf.fd b/fonts/newpx/tex/ly1zplosf.fd
index 81c9da4561..0e53ec571b 100644
--- a/fonts/newpx/tex/ly1zplosf.fd
+++ b/fonts/newpx/tex/ly1zplosf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{ly1zplosf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/osf]
+\ProvidesFile{ly1zplosf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/OsF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{LY1}{zplosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-ly1}{}
-\DeclareFontShape{LY1}{zplosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplosf}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-ly1}{}
-\DeclareFontShape{LY1}{zplosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zplosf}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-ly1}{}
-\DeclareFontShape{LY1}{zplosf}{bx}{sc}{<->ssub * zplosf/b/sc}{}
-\DeclareFontShape{LY1}{zplosf}{bx}{n}{<->ssub * zplosf/b/n}{}
-\DeclareFontShape{LY1}{zplosf}{bx}{scit}{<->ssub * zplosf/b/scit}{}
-\DeclareFontShape{LY1}{zplosf}{bx}{it}{<->ssub * zplosf/b/it}{}
+\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}{}
+\DeclareFontShape{LY1}{zplOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-ly1}{}
+\DeclareFontShape{LY1}{zplOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-ly1}{}
+\DeclareFontShape{LY1}{zplOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-ly1}{}
+\DeclareFontShape{LY1}{zplOsF}{bx}{sc}{<->ssub * zplOsF/b/sc}{}
+\DeclareFontShape{LY1}{zplOsF}{bx}{n}{<->ssub * zplOsF/b/n}{}
+\DeclareFontShape{LY1}{zplOsF}{bx}{scit}{<->ssub * zplOsF/b/scit}{}
+\DeclareFontShape{LY1}{zplOsF}{bx}{it}{<->ssub * zplOsF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{LY1}{zplosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-ly1}{}
- \DeclareFontShape{LY1}{zplosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-ly1}{}
- \DeclareFontShape{LY1}{zplosf}{bx}{sl}{<->ssub * zplosf/b/sl}{}
+ \DeclareFontShape{LY1}{zplOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-ly1}{}
+ \DeclareFontShape{LY1}{zplOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-ly1}{}
+ \DeclareFontShape{LY1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{LY1}{zplosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ly1}{}
- \DeclareFontShape{LY1}{zplosf}{b}{sl}{<->ssub * zplosf/m/sl}{}
- \DeclareFontShape{LY1}{zplosf}{bx}{sl}{<->ssub * zplosf/m/sl}{}
+ \DeclareFontShape{LY1}{zplOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ly1}{}
+ \DeclareFontShape{LY1}{zplOsF}{b}{sl}{<->ssub * zplOsF/m/sl}{}
+ \DeclareFontShape{LY1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/m/sl}{}
\fi
-\DeclareFontShape{LY1}{zplosf}{b}{scsl}{<->ssub * zplosf/b/scit}{}
-\DeclareFontShape{LY1}{zplosf}{bx}{scsl}{<->ssub * zplosf/b/scit}{}
-\DeclareFontShape{LY1}{zplosf}{m}{scsl}{<->ssub * zplosf/m/scit}{}
+\DeclareFontShape{LY1}{zplOsF}{b}{scsl}{<->ssub * zplOsF/b/scit}{}
+\DeclareFontShape{LY1}{zplOsF}{bx}{scsl}{<->ssub * zplOsF/b/scit}{}
+\DeclareFontShape{LY1}{zplOsF}{m}{scsl}{<->ssub * zplOsF/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ly1zplsubs.fd b/fonts/newpx/tex/ly1zplsubs.fd
new file mode 100644
index 0000000000..bf304750c5
--- /dev/null
+++ b/fonts/newpx/tex/ly1zplsubs.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{ly1zplsubs.fd}[2015/01/17 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{LY1}{zplsubs}{}
+\DeclareFontShape{LY1}{zplsubs}{m}{n}{ %medium
+ <-> \zpl@scaled zplsubs-Regular-ly1%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{m}{it}{ %italic
+ <-> \zpl@scaled zplsubs-Italic-ly1%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{b}{n}{ %bold
+ <-> \zpl@scaled zplsubs-Bold-ly1%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{b}{it}{ %bold italic
+ <-> \zpl@scaled zplsubs-BoldItalic-ly1%
+}{}
+
+\DeclareFontShape{LY1}{zplsubs}{m}{sc}{ %cap & small cap
+ <-> ssub * zplsubs/m/n%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{m}{sl}{ %slanted
+ <-> ssub * zplsubs/m/it%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{m}{scit}{ %italic
+ <-> ssub * zplsubs/m/it%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{m}{ui}{ %unslanted italic
+ <-> ssub * zplsubs/m/n%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zplsubs/b/it%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{bx}{it}{ %bold extended italic
+ <-> ssub * zplsubs/b/it%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{bx}{scit}{ %bold extended italic
+ <-> ssub * zplsubs/b/it%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{bx}{n}{ %bold extended
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{b}{sl}{ %bold slanted
+ <-> ssub * zplsubs/b/it%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{LY1}{zplsubs}{b}{scit}{ %bold italic
+ <-> ssub * zplsubs/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/ly1zpltlf.fd b/fonts/newpx/tex/ly1zpltlf.fd
index 6581db27e4..847bb2075a 100644
--- a/fonts/newpx/tex/ly1zpltlf.fd
+++ b/fonts/newpx/tex/ly1zpltlf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{ly1zpltlf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/tlf]
+\ProvidesFile{ly1zpltlf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/TLF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{LY1}{zpltlf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ly1}{}
-\DeclareFontShape{LY1}{zpltlf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zpltlf}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ly1}{}
-\DeclareFontShape{LY1}{zpltlf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zpltlf}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ly1}{}
-\DeclareFontShape{LY1}{zpltlf}{bx}{sc}{<->ssub * zpltlf/b/sc}{}
-\DeclareFontShape{LY1}{zpltlf}{bx}{n}{<->ssub * zpltlf/b/n}{}
-\DeclareFontShape{LY1}{zpltlf}{bx}{scit}{<->ssub * zpltlf/b/scit}{}
-\DeclareFontShape{LY1}{zpltlf}{bx}{it}{<->ssub * zpltlf/b/it}{}
+\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}{}
+\DeclareFontShape{LY1}{zplTLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ly1}{}
+\DeclareFontShape{LY1}{zplTLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplTLF}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ly1}{}
+\DeclareFontShape{LY1}{zplTLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplTLF}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ly1}{}
+\DeclareFontShape{LY1}{zplTLF}{bx}{sc}{<->ssub * zplTLF/b/sc}{}
+\DeclareFontShape{LY1}{zplTLF}{bx}{n}{<->ssub * zplTLF/b/n}{}
+\DeclareFontShape{LY1}{zplTLF}{bx}{scit}{<->ssub * zplTLF/b/scit}{}
+\DeclareFontShape{LY1}{zplTLF}{bx}{it}{<->ssub * zplTLF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{LY1}{zpltlf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ly1}{}
- \DeclareFontShape{LY1}{zpltlf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ly1}{}
- \DeclareFontShape{LY1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/b/sl}{}
+ \DeclareFontShape{LY1}{zplTLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ly1}{}
+ \DeclareFontShape{LY1}{zplTLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ly1}{}
+ \DeclareFontShape{LY1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{LY1}{zpltlf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ly1}{}
- \DeclareFontShape{LY1}{zpltlf}{b}{sl}{<->ssub * zpltlf/m/sl}{}
- \DeclareFontShape{LY1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/m/sl}{}
+ \DeclareFontShape{LY1}{zplTLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ly1}{}
+ \DeclareFontShape{LY1}{zplTLF}{b}{sl}{<->ssub * zplTLF/m/sl}{}
+ \DeclareFontShape{LY1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/m/sl}{}
\fi
-\DeclareFontShape{LY1}{zpltlf}{b}{scsl}{<->ssub * zpltlf/b/scit}{}
-\DeclareFontShape{LY1}{zpltlf}{bx}{scsl}{<->ssub * zpltlf/b/scit}{}
-\DeclareFontShape{LY1}{zpltlf}{m}{scsl}{<->ssub * zpltlf/m/scit}{}
+\DeclareFontShape{LY1}{zplTLF}{b}{scsl}{<->ssub * zplTLF/b/scit}{}
+\DeclareFontShape{LY1}{zplTLF}{bx}{scsl}{<->ssub * zplTLF/b/scit}{}
+\DeclareFontShape{LY1}{zplTLF}{m}{scsl}{<->ssub * zplTLF/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ly1zpltosf.fd b/fonts/newpx/tex/ly1zpltosf.fd
index b687c388d0..84e56add27 100644
--- a/fonts/newpx/tex/ly1zpltosf.fd
+++ b/fonts/newpx/tex/ly1zpltosf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{ly1zpltosf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/tosf]
+\ProvidesFile{ly1zpltosf.fd}[2021/05/25 v1.0 font definition file for LY1/zpl/TOsF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -12,29 +12,29 @@
\ifdefined\zpl@adobescfalse\zpl@makeadobesc\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{LY1}{zpltosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-ly1}{}
-\DeclareFontShape{LY1}{zpltosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-ly1}{}
-\DeclareFontShape{LY1}{zpltosf}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-ly1}{}
-\DeclareFontShape{LY1}{zpltosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-ly1}{}
-\DeclareFontShape{LY1}{zpltosf}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-ly1}{}
-\DeclareFontShape{LY1}{zpltosf}{bx}{sc}{<->ssub * zpltosf/b/sc}{}
-\DeclareFontShape{LY1}{zpltosf}{bx}{n}{<->ssub * zpltosf/b/n}{}
-\DeclareFontShape{LY1}{zpltosf}{bx}{scit}{<->ssub * zpltosf/b/scit}{}
-\DeclareFontShape{LY1}{zpltosf}{bx}{it}{<->ssub * zpltosf/b/it}{}
+\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}{}
+\DeclareFontShape{LY1}{zplTOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-ly1}{}
+\DeclareFontShape{LY1}{zplTOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-ly1}{}
+\DeclareFontShape{LY1}{zplTOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-ly1}{}
+\DeclareFontShape{LY1}{zplTOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-ly1}{}
+\DeclareFontShape{LY1}{zplTOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-ly1}{}
+\DeclareFontShape{LY1}{zplTOsF}{bx}{sc}{<->ssub * zplTOsF/b/sc}{}
+\DeclareFontShape{LY1}{zplTOsF}{bx}{n}{<->ssub * zplTOsF/b/n}{}
+\DeclareFontShape{LY1}{zplTOsF}{bx}{scit}{<->ssub * zplTOsF/b/scit}{}
+\DeclareFontShape{LY1}{zplTOsF}{bx}{it}{<->ssub * zplTOsF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{LY1}{zpltosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-ly1}{}
- \DeclareFontShape{LY1}{zpltosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-ly1}{}
- \DeclareFontShape{LY1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/b/sl}{}
+ \DeclareFontShape{LY1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-ly1}{}
+ \DeclareFontShape{LY1}{zplTOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-ly1}{}
+ \DeclareFontShape{LY1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{LY1}{zpltosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ly1}{}
- \DeclareFontShape{LY1}{zpltosf}{b}{sl}{<->ssub * zpltosf/m/sl}{}
- \DeclareFontShape{LY1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/m/sl}{}
+ \DeclareFontShape{LY1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ly1}{}
+ \DeclareFontShape{LY1}{zplTOsF}{b}{sl}{<->ssub * zplTOsF/m/sl}{}
+ \DeclareFontShape{LY1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/m/sl}{}
\fi
-\DeclareFontShape{LY1}{zpltosf}{b}{scsl}{<->ssub * zpltosf/b/scit}{}
-\DeclareFontShape{LY1}{zpltosf}{bx}{scsl}{<->ssub * zpltosf/b/scit}{}
-\DeclareFontShape{LY1}{zpltosf}{m}{scsl}{<->ssub * zpltosf/m/scit}{}
+\DeclareFontShape{LY1}{zplTOsF}{b}{scsl}{<->ssub * zplTOsF/b/scit}{}
+\DeclareFontShape{LY1}{zplTOsF}{bx}{scsl}{<->ssub * zplTOsF/b/scit}{}
+\DeclareFontShape{LY1}{zplTOsF}{m}{scsl}{<->ssub * zplTOsF/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/newpxmath.sty b/fonts/newpx/tex/newpxmath.sty
index 6ff5d27d82..af9a28bbb6 100644
--- a/fonts/newpx/tex/newpxmath.sty
+++ b/fonts/newpx/tex/newpxmath.sty
@@ -11,8 +11,8 @@
% of glyph collisions.
% These modifications are by Michael Sharpe, msharpe at ucsd dot edu
-\def\fileversion{1.426}
-\def\filedate{2021/10/12}
+\def\fileversion{1.5}
+\def\filedate{2021/12/04}
\ProvidesPackage{newpxmath}
[\filedate\space v\fileversion]
%\@ifundefined{newpxmathLoaded}{}{\endinput}
@@ -1822,8 +1822,8 @@ $\m@th\hfil #2#3\hfil$\crcr}}}}
\re@DeclareMathSymbol{\varsigmait}{\mathord}{letters}{38}
\re@DeclareMathSymbol{\varphiit}{\mathord}{letters}{39}
-%\re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{49} % change this
-\def\varg{\mathnormal{g}}
+\re@DeclareMathSymbol{\varg}{\mathord}{lettersA}{188} % change this
+%\def\varg{\mathnormal{g}}
\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/fonts/newpx/tex/newpxtext.sty b/fonts/newpx/tex/newpxtext.sty
index 44b0078956..08c4cdf962 100644
--- a/fonts/newpx/tex/newpxtext.sty
+++ b/fonts/newpx/tex/newpxtext.sty
@@ -5,154 +5,401 @@
% Changes from original pxfonts.sty by Michael Sharpe, msharpe at ucsd dot edu;
% 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 to an extension of TeXGyrePagella rather than ppl.
+% 1.5 is first version of newpxtext to support both [pdf]latex and unicode latex.
-\def\fileversion{1.422}
-\def\filedate{2021/05/29}
-\ProvidesPackage{newpxtext}[\filedate\space v\fileversion]
+\def\fileversion{1.5}
+\def\filedate{2021/12/03}
+\ProvidesPackage{newpxtext2}[%
+\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX]
\message{`newpxtext' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Pagella and its extensions (msharpe)}
-\RequirePackage{fontaxes}% so we can have [bold] italic small caps
-\let\orig@footnote=\thefootnote
-\let\orig@makefnmark=\@makefnmark
-\RequirePackage{xkeyval,etoolbox}
-\renewcommand*{\rmdefault}{zpltlf} % the default until end of preamble
-\def\useosf{\edef\zpl@figurestyle{osf}}
-\@onlypreamble\useosf
-\def\useproportional{\edef\zpl@figurealign{}}
-\@onlypreamble\useproportional
+\RequirePackage[T1]{fontenc}
+\renewcommand*{\rmdefault}{zplTLF} % the default until end of preamble
+\renewcommand*{\familydefault}{\rmdefault}
+\RequirePackage{ifxetex,ifluatex,xkeyval,etoolbox,textcomp}
+\RequirePackage{xstring,ifthen,scalefnt} % for \textfrac
+\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{}
+\DeclareEncodingSubset{TS1}{zpl*}{0}
-\newif\ifzpl@defaultsups
+%KOMA check
\newif\ifzpl@KOMA
\@ifundefined{KOMAClassName}{}{\zpl@KOMAtrue}
\@ifundefined{ver@scrextend.sty}{}{\zpl@KOMAtrue}
-\newif\ifzpl@adobesc % we don't use this exc. in fd, but may in future
+
+% Engine check
+\newif\ifzpl@otf
+\ifxetex
+ \zpl@otftrue
+\else\ifluatex
+ \zpl@otftrue
+\else % [pdf]LaTeX
+ \zpl@otffalse
+\fi\fi
+
+%%%%%%%%%%%%%%%%%%
+\IfFileExists{xkeyval.sty}{
+ \RequirePackage{xkeyval}
+ }{
+ \let\DeclareOptionX\DeclareOption
+ \let\ExecuteOptionsX\ExecuteOptions
+ \let\ProcessOptionsX\ProcessOptions
+}
+%%%%Start Options
+\newif\ifzpl@nomath\zpl@nomathfalse % load fontspec with no-math
+\newif\ifzpl@lining\zpl@liningtrue
+\newif\ifzpl@tabular\zpl@tabulartrue % default is tabular lining figures
+
+\DeclareOptionX{type1}[true]{%
+\@nameuse{if#1}\zpl@otffalse\fi
+}
+\DeclareOptionX{nofontspec}[true]{%
+\@nameuse{if#1}\zpl@otffalse\fi
+}
+\DeclareOptionX{no-math}[true]{%
+\@nameuse{if#1}\zpl@nomathtrue\fi
+}
+
+\def\zpl@defaultfeatures{}
+\DeclareOptionX{defaultfeatures}{\def\zpl@defaultfeatures{#1}}
+
+%Figure style options
+\edef\zpl@dfltfigurestyle{lf}
+\edef\zpl@dfltfigurealign{t}
+
+\DeclareOptionX{lining}[true]{%
+\@nameuse{zpl@lining#1}
+}
+\DeclareOptionX{lf}[true]{%
+\@nameuse{zpl@lining#1}
+}
+\DeclareOptionX{oldstyle}[true]{%
+\@nameuse{if#1}%
+ \zpl@liningfalse
+\else
+ \zpl@liningtrue
+\fi
+}
+\DeclareOptionX{osf}[true]{%
+\@nameuse{if#1}%
+ \zpl@liningfalse
+\else
+ \zpl@liningtrue
+\fi
+}
+\DeclareOptionX{tabular}[true]{%
+\@nameuse{zpl@tabular#1}
+}
+\DeclareOptionX{t}[true]{%
+\@nameuse{zpl@tabular#1}
+}
+\DeclareOptionX{proportional}[true]{%
+\@nameuse{if#1}%
+ \zpl@tabularfalse
+\else
+ \zpl@tabulartrue
+\fi
+}
+\DeclareOptionX{p}[true]{%
+\@nameuse{if#1}%
+ \zpl@tabularfalse
+\else
+ \zpl@tabulartrue
+\fi
+}
+
+%Scale
+\newcommand*{\zpl@scale}{1} % actual scaled command in \zpl@scaled
+\DeclareOptionX{scale}{\renewcommand*{\zpl@scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\zpl@scale}{#1}}
+
+\newif\ifzpl@defaultsups
+%\newif\ifzpl@adobesc % we don't use this exc. in fd, but may in future
\newif\ifzpl@scosf
-\newif\ifzpl@largesc
-\newif\ifzpl@helv \zpl@helvtrue % deefault is to load helvetica as sans serif font
-%\newif\ifzpl@babel
-%\ifdefined\bbl@tempa \zpl@babeltrue\fi
-\define@key{zpl}{babel}[true]{\relax}% for backward compatibility
-%\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@largesc
+\newif\ifzpl@helv \zpl@helvtrue % default is to load helvetica as sans serif font
\newif\ifzpl@thrm
\newif\ifzpl@sl
-\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}}
-%
+
+% Other options
+\DeclareOptionX{defaultsups}[true]{%
+\@nameuse{zpl@defaultsups#1}
+}
+\DeclareOptionX{babel}[true]{%
+\@nameuse{zpl@babel#1}% for backward compatibility
+}
+\DeclareOptionX{largesc}[true]{%
+\@nameuse{zpl@largesc#1}
+}
+\DeclareOptionX{nohelv}[true]{%
+\@nameuse{if#1}\zpl@helvfalse\fi}%
+
+\def\zpl@helvratio{.94}
+\DeclareOptionX{helvratio}[0.94]{%
+\def\zpl@helvratio{#1}
+}
+\def\zpl@spcmag{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}}
-\edef\zpl@dfltfigurestyle{lf}
-\DeclareOption{nohelv}{\zpl@helvfalse}
-\DeclareOption{lining}{\edef\zpl@figurestyle{lf}}
-\DeclareOption{lf}{\edef\zpl@figurestyle{lf}}
-\DeclareOption{theoremfont}{\zpl@thrmtrue}
-\DeclareOption{trueslanted}{\zpl@sltrue}
-\DeclareOption{oldstyle}{\useosf}
-\DeclareOption{osf}{\useosf}
-\DeclareOption{tabular}{\edef\zpl@figurealign{t}}
-\DeclareOption{p}{\useproportional}
-\DeclareOption{proportional}{\useproportional}
-\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}
+\def\zpl@nospc{T}
+
+\DeclareOptionX{spcfactor}{%
+\def\zpl@spcmag{#1}\def\zpl@nospc{F}
+}
+\DeclareOptionX{spacing}{%
+\def\zpl@spc{#1}
+}
+\DeclareOptionX{stretch}{%
+\def\zpl@stretch{#1}
+}
+\DeclareOptionX{shrink}{%
+\def\zpl@shrink{#1}
}
-\ExecuteOptions{lining,tabular}
-\DeclareOption*{%
- \begingroup
- \edef\x{\endgroup
- \noexpand\setkeys{zpl}{\CurrentOption}}%
- \x}
-%\def\zpl@style{x}% default is lining figures
-\setkeys{zpl}{helvratio} % set this first, at least to default
-\setkeys{zpl}{scaled} % get at least default
-\ProcessOptions*
-\def\zpl@spacing{%
+\def\zpl@defaultfeatures{}
+\newcount\zpl@cnt \zpl@cnt=0
+\newif\ifzpl@zeroslash
+\def\zpl@thmlin{X} % default is to not change to lining
+\def\zpl@noti{T}\def\zpl@nolo{T}
+\DeclareOptionX{defaultfeatures}{\def\zpl@defaultfeatures{#1}}
+\DeclareOptionX{oldSS}{\advance\zpl@cnt 32 }
+\DeclareOptionX{slashedzero}{\zpl@zeroslashtrue}
+\DeclareOptionX{theoremfont}{\zpl@thrmtrue\advance\zpl@cnt 16 }
+\DeclareOptionX{thmlining}{\edef\zpl@thmlin{l}}
+\DeclareOptionX{trueslanted}{\zpl@sltrue}
+\DeclareOptionX{scosf}{\zpl@scosftrue}
+\DeclareOptionX{tighter}{%
+\gdef\zpl@spc{.25em}\gdef\zpl@stretch{.125em}%
+\gdef\zpl@shrink{.1em}\def\zpl@noti{F}}
+\DeclareOptionX{looser}{%
+\gdef\zpl@spc{.3em}\gdef\zpl@stretch{.2em}%
+\gdef\zpl@shrink{.1em}\def\zpl@nolo{F}}
+
+\ProcessOptionsX\relax
+
+\def\re@DeclareTextSymbol#1#2#3{%
+ \let#1=\undefined
+ \DeclareTextSymbol{#1}{#2}{#3}}
+\ifzpl@otf
+ \ifzpl@nomath
+ \RequirePackage[no-math]{fontspec}
+ \else
+ \RequirePackage{fontspec}
+ \fi
+
+ \ifxetex\XeTeXtracingfonts=1\fi
+ \ifluatex % avoid possibly uncorrected "system" fonts
+ \directlua{fonts.names.set_location_precedence{
+ "local", "texmf", "system" }}
+ \fi
+ \def\zpl@base{TeXGyrePagellaX}
+
+ \newcommand{\textfrac}[3][]{{%\normalfont%
+\mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {{\lfstyle#1}\kern.1em}{}%
+\addfontfeatures{RawFeature=+numr}#2\char"2044% numerator
+\addfontfeatures{RawFeature=-numr;+dnom;+ss20}\char"2044{}#3%
+}}}
+
+\else % type1
+ \RequirePackage{fontaxes}
+ \fa@naming@exception{figures}{{superior}{proportional}}{sups}
+ \fa@naming@exception{figures}{{superior}{tabular}}{sups}
+% \def\sufigures{\@nomath\sufigures
+% \fontfigurestyle{superior}\selectfont}
+% \let\sustyle=\sufigures
+% \DeclareTextFontCommand{\textsu}{\sufigures}
+% \let\textsuperior\textsu
+ \DeclareRobustCommand{\sustyle}{%
+ \not@math@alphabet\sustyle\relax
+ \fontfamily{zplsups}\selectfont}
+ \let\sufigures=\sustyle
+ \let\nustyle=\sustyle
+ \let\nufigures=\sustyle
+
+ \fa@naming@exception{figures}{{inferior}{proportional}}{inf}
+ \fa@naming@exception{figures}{{inferior}{tabular}}{inf}
+% \def\infigures{\@nomath\infigures
+% \fontfigurestyle{inferior}\selectfont}
+% \let\instyle=\infigures
+% \DeclareTextFontCommand{\textinf}{\infigures}
+% \let\textinferior\textinf
+ \DeclareRobustCommand{\instyle}{%
+ \not@math@alphabet\instyle\relax
+ \fontfamily{zplsubs}\selectfont}
+ \let\infigures=\instyle
+
+ \fa@naming@exception{figures}{{denominators}{proportional}}{dnom}
+ \fa@naming@exception{figures}{{denominators}{tabular}}{dnom}
+% \def\defigures{\@nomath\defigures
+% \fontfamily{defigures}\selectfont}
+% \let\destyle=\defigures
+% \DeclareTextFontCommand{\textde}{\defigures}
+% \let\textdenominators\textde
+ \DeclareRobustCommand{\destyle}{%
+ \not@math@alphabet\destyle\relax
+ \fontfamily{zpldnom}\selectfont}
+ \let\defigures=\destyle
+
+ \fa@naming@exception{figures}{{numerators}{proportional}}{numr}
+ \fa@naming@exception{figures}{{numerators}{tabular}}{numr}
+% \def\defigures{\@nomath\nufigures
+% \fontfigurestyle{numerators}\selectfont}
+% \let\nustyle=\nufigures
+% \DeclareTextFontCommand{\textnu}{\nufigures}
+% \let\textnumerators\textnu
+ \DeclareRobustCommand{\nustyle}{%
+ \not@math@alphabet\nustyle\relax
+ \fontfamily{zplnumr}\selectfont}
+ \let\nufigures=\nustyle
+
+\newcommand{\textfrac}[3][]{% like \textfrac[1]{7}{8}
+ \mbox{%
+ \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1]
+ {\textlf{#1}\kern.1em}{}%
+ {\sustyle#2}% numerator
+ \StrRight{#2}{1}[\@digit@]%
+ % look for 1, 2, 6, 7
+ \ifcase\@digit@% 0
+ \or%\kern.03em% 1
+ \or\kern.04em% 2
+ \or%\kern-.01em% 3
+ \or%\kern.02em% 4
+ \or%\kern.01em% 5
+ \or\kern.01em% 6
+ \or\kern-.11em% 7
+ \or%\kern-.11em% 8
+ \or\kern-.02em% 9
+ \fi%
+% \kern\zpl@foresolidus{\fontencoding{TS1}\selectfont\char"2F}%
+% \kern\zpl@aftsolidus%
+ {\fontencoding{TS1}\selectfont\char"2F}%
+ \StrLeft{#3}{1}[\@digit@]%
+ % look for 1, 4, 7
+ \ifcase\@digit@% 0
+ \or%\kern -.02em% 1
+ \or% 2
+ \or% 3
+ \or\kern -.05em% 4
+ \or% 5
+ \or\kern-.02em% 6
+ \or\kern .01em% 7
+ \fi%
+ {\destyle #3}% denominator [#3]
+ }%mbox
+} % textfrac
+\fi
+
+\let\orig@footnote=\thefootnote
+\let\orig@makefnmark=\@makefnmark
+\def\bfseries@rm{b}
+\def\mdseries@rm{m}
+\def\useosf{\zpl@liningfalse}
+\@onlypreamble\useosf
+\def\useproportional{\zpl@tabularfalse}
+\@onlypreamble\useproportional
+
+\ifzpl@otf
+ \def\zpl@dflt{}
+ \ifzpl@zeroslash\edef\zpl@dflt{Numbers = SlashedZero ,
+ }\fi
+ \if T\zpl@nospc
+ \if F\zpl@noti\def\zpl@spcmag{{1,.625,1}}\def\zpl@nospc{F}\fi
+ \if F\zpl@nolo\def\zpl@spcmag{{1.2,1,1}}\def\zpl@nospc{F}\fi
+ \fi
+ \if F\zpl@nospc
+ \edef\zpl@dflt{\zpl@dflt WordSpace = \zpl@spcmag ,
+ }
+ \fi
+ \def\zpl@scraw{pcap}
+ \ifzpl@largesc\def\zpl@scraw{smcp}\fi
+
+ %\zpl@cnt will be 0..2^8-1
+ \edef\zpl@lst{}
+ \ifnum\zpl@cnt>127 \edef\zpl@lst{8}\advance\zpl@cnt -128 \fi
+ \ifnum\zpl@cnt>63 \edef\zpl@lst{7,\zpl@lst}\advance\zpl@cnt -64 \fi
+ \ifnum\zpl@cnt>31 \edef\zpl@lst{6,\zpl@lst}\advance\zpl@cnt -32 \fi
+ \ifnum\zpl@cnt>15 \edef\zpl@lst{5,\zpl@lst}\advance\zpl@cnt -16 \fi
+ \ifnum\zpl@cnt>7 \edef\zpl@lst{4,\zpl@lst}\advance\zpl@cnt -8 \fi
+ \ifnum\zpl@cnt>3 \edef\zpl@lst{3,\zpl@lst}\advance\zpl@cnt -4 \fi
+ \ifnum\zpl@cnt>1 \edef\zpl@lst{2,\zpl@lst}\advance\zpl@cnt -2 \fi
+ \ifnum\zpl@cnt>0 \edef\zpl@lst{1,\zpl@lst}\fi
+ \ifthenelse{\not\equal{\zpl@lst}{}}
+ {\edef\zpl@dflt{\zpl@dflt StylisticSet={\zpl@lst} ,
+ }}{}
+
+ \defaultfontfeatures{
+ Ligatures = TeX ,
+ Scale = \zpl@scale ,
+ Extension = .otf ,
+ SmallCapsFeatures={\ifzpl@scosf Numbers = OldStyle ,
+ \fi RawFeature = +\zpl@scraw ,
+ \ifluatex Renderer=Basic\fi} ,
+ \zpl@dflt ,
+ \zpl@defaultfeatures
+ }
+
+\else % type1
+ \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}
+ \fontdimen4\font=\zpl@shrink}
+ \@tempdima=\zpl@scale\p@\@tempdima=\zpl@helvratio\@tempdima%
+ \edef\qhv@scale{\strip@pt\@tempdima}
+ \def\zpl@scaled{s*[\zpl@scale]}% used in fd files
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
-\def\oldstylenums#1{{\fontencoding{TS1}\selectfont #1}}
+ %\def\oldstylenums#1{{\fontencoding{TS1}\selectfont #1}}
-\DeclareRobustCommand{\sustyle}{%
- \not@math@alphabet\sustyle\relax
- \fontfamily{zplsups}\selectfont}
+ %\expandafter\patchcmd\expandafter{\csname scshape \endcsname}{\fontshape}{\fontfamily{zpl\zpl@figurealign osf}\fontshape}{\message{Replaced figure style by osf in sc.}}{\message{Unable to replace figure style by osf in sc.}}
-\ifzpl@defaultsups %
-\else
- \ifzpl@KOMA
- %\let\textsuperscript\sustyle
- \else % NOT KOMA
- \def\f@@tn@te{footnote}
- \def\@makefnmark{%
- \ifx\@mpfn\f@@tn@te%
- \ifx\thefootnote\orig@footnote%
- \hbox{\sustyle\hspace*{.05em}\@thefnmark\hspace*{.05em}}%
- \else%
- \orig@makefnmark%
+ \DeclareRobustCommand{\lfstyle}{%
+ \not@math@alphabet\lfstyle\relax
+ \fontfamily{zplLF}\selectfont %
+ }
+ \DeclareRobustCommand{\tlfstyle}{%
+ \not@math@alphabet\tlfstyle\relax
+ \fontfamily{zplTLF}\selectfont %
+ }
+ \DeclareRobustCommand{\osfstyle}{%
+ \not@math@alphabet\osfstyle\relax
+ \fontfamily{zplOsF}\selectfont %
+ }
+ \DeclareRobustCommand{\tosfstyle}{%
+ \not@math@alphabet\tosfstyle\relax
+ \fontfamily{zplTOsF}\selectfont %
+ }
+ \ifzpl@defaultsups %
+ \else
+ \ifzpl@KOMA
+ %\let\textsuperscript\sustyle
+ \else % NOT KOMA
+ \def\f@@tn@te{footnote}
+ \def\@makefnmark{%
+ \ifx\@mpfn\f@@tn@te%
+ \ifx\thefootnote\orig@footnote%
+ \hbox{\sustyle\hspace*{.05em}\@thefnmark\hspace*{.05em}}%
+ \else%
+ \orig@makefnmark%
+ \fi
+ \else%
+ \orig@makefnmark%
+ \fi}%
\fi
- \else%
- \orig@makefnmark%
- \fi}%
\fi
-\fi
+ \ifzpl@helv\renewcommand*{\sfdefault}{qhv}\fi
+ \renewcommand*{\ttdefault}{npxtt}
+ \DeclareRobustCommand\thfamily % new family for theorem font
+ {\not@math@alphabet\thfamily\relax
+ \fontfamily\thdefault\selectfont}
+ \DeclareRobustCommand{\textth}[1]{%
+ {\thfamily #1}%
+ }
+ \let\textthit\textth
-\ifzpl@scosf %
-\DeclareRobustCommand{\textsc}[1]{%
-{\fontfamily{zpl\zpl@figurealign osf}\scshape\selectfont #1}%
-}\fi% use OsF in small caps
-
-\DeclareRobustCommand{\lfstyle}{%
- \not@math@alphabet\lfstyle\relax
- \fontfamily{zpllf}\selectfont %
-}% to get lf
-\DeclareRobustCommand{\tlfstyle}{%
- \not@math@alphabet\tlfstyle\relax
- \fontfamily{zpltlf}\selectfont %
-}% to get tlf
-\DeclareRobustCommand{\osfstyle}{%
- \not@math@alphabet\osfstyle\relax
- \fontfamily{zplosf}\selectfont %
-}% to get osf
-\DeclareRobustCommand{\tosfstyle}{%
- \not@math@alphabet\tosfstyle\relax
- \fontfamily{zpltosf}\selectfont %
-}% to get tosf
-\DeclareRobustCommand{\textlf}[1]{%
- {\lfstyle #1}%
-}% to get lf
-\DeclareRobustCommand{\texttlf}[1]{%
- {\tlfstyle #1}%
-}% to get tlf
-\DeclareRobustCommand{\textosf}[1]{%
- {\osfstyle #1}%
-}% to get osf
-\DeclareRobustCommand{\texttosf}[1]{%
- {\tosfstyle #1}%
-}% to get tosf
-\DeclareRobustCommand{\textsu}[1]{%
- {\sustyle #1}%
-}% to get sup style
+\fi % type1
-%\AtEndPreamble{%
\ifzpl@thrm
%\RequirePackage{amsmath,amsthm} % in case of theoremfont
\ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty
@@ -170,95 +417,172 @@
\fi%
\fi%}
-%%%%%%%%%%%%%%%%%%%%%%
-% Text Serif (TGPagellaX) %
-%%%%%%%%%%%%%%%%%%%%%%
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Text Sans Serif (based on Helvetica) %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-%\renewcommand*{\sfdefault}{npxss}
-\ifzpl@helv\renewcommand*{\sfdefault}{qhv}\fi
-%\show\qhv@scale
-%\show\zpl@helvratio
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Text (Monospaced) Typewriter %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifzpl@otf
+% \def\zpl@nft{\if t\zpl@thmtab Monospaced%
+% \else Proportional\fi}
+ \DeclareTextFontCommand{\textsl}{\slshape}
+ \DeclareTextFontCommand{%
+ \osfstyle}{\addfontfeatures{Numbers={Proportional,OldStyle}}}
+ \DeclareTextFontCommand{%
+ \tosfstyle}{\addfontfeatures{Numbers={Tabular,OldStyle}}}
+ \DeclareTextFontCommand{%
+ \tlfstyle}{\addfontfeatures{Numbers={Tabular,Lining}}}
+ \DeclareTextFontCommand{%
+ \lfstyle}{\addfontfeatures{Numbers={Proportional,Lining}}}
-\renewcommand*{\ttdefault}{npxtt}
+ \providecommand\sufigures{%
+ \addfontfeatures{VerticalPosition=Superior}}
+ \providecommand\infigures{%
+ \addfontfeatures{VerticalPosition=Inferior}}
+ \providecommand\nufigures{%
+ \addfontfeatures{VerticalPosition=Numerator}}
+ \providecommand\defigures{%
+ \addfontfeatures{VerticalPosition=Denominator}}
+ \let\sustyle=\sufigures
+ \let\nustyle=\nufigures
+ \let\instyle=\infigures
+ \let\destyle=\defigures
+ \ifzpl@defaultsups %
+ \else
+ \usepackage{realscripts}
+ \ifzpl@KOMA
+ \setkomafont{footnotelabel}{\normalfont}
+ \else
+ \renewcommand\footnotemarkfont{\normalfont}
+ \fi
+ \fi
+% \ifzpl@scosf
+% \edef\zpl@fnt{\expandafter\csname zpl\ifzpl@tabular T\fi OsF\endcsname}
+% \DeclareRobustCommand{\textsc}[1]{%
+% {\zpl@fnt \addfontfeatures{RawFeature=+smcp}#1}}%
+% \fi
+ \renewcommand*{\textcircled}[1]{\hmode@bgroup\ooalign{%
+ \hfil \raise -.255ex\hbox{{%
+ \normalfont\addfontfeatures{Numbers={Monospaced, Lining}}%
+ \scalefont{.8}{\sustyle#1}}}% end hbox
+ \hfil \crcr \symbol{"25EF}}%
+ \egroup}
+\else % type1
+ \renewcommand*{\textcircled}[1]{\hmode@bgroup\ooalign{%
+ \hfil \raise -.15ex\hbox{{%
+ \normalfont
+ {\scalefont{.8}\sustyle#1}}}% end hbox
+ \hfil \crcr \textbigcircle}%
+ \egroup}
+\fi
-\def\re@DeclareTextSymbol#1#2#3{%
- \let#1=\undefined
- \DeclareTextSymbol{#1}{#2}{#3}}
-
-\def\re@DeclareMathSymbol#1#2#3#4{%
- \let#1=\undefined
- \DeclareMathSymbol{#1}{#2}{#3}{#4}}
-
-%\re@DeclareTextSymbol{\L}{OT1}{138}
-%\re@DeclareTextSymbol{\l}{OT1}{170}
-\re@DeclareTextSymbol{\textdollar}{OT1}{36}
-%\re@DeclareTextSymbol{\textsterling}{OT1}{163}
-%\re@DeclareMathSymbol{\mathsterling}{\mathord}{operators}{163}
-
-\DeclareTextComposite{\r}{OT1}{A}{197}
-\DeclareTextComposite{\r}{OT1}{a}{229}
-
-% ring accent, eg \r{A}
-%\re@DeclareTextSymbol{\textcent}{OT1}{162}
-
-%%% Modification of T1 and LY1 encoding related stuff
-%%%
-
-% ogonek accent
-\def\T@n@@nc@d@ng{T1}
-\def\T@n@@nc@d@ngM@cr@M@d{%
-\DeclareTextCommand{\k}{T1}[1]{{\ooalign{\hidewidth\char12\crcr##1}}}%
+% applies to both
+\DeclareRobustCommand{\textlf}[1]{%
+ {\lfstyle #1}%
}
-
-\def\LY@n@@nc@d@ng{LY1}
-\def\LY@n@@nc@d@ngM@cr@M@d{%
-\DeclareTextCommand{\k}{LY1}[1]{{\ooalign{\hidewidth\char7\crcr##1}}}%
+\DeclareRobustCommand{\texttlf}[1]{%
+ {\tlfstyle #1}%
}
-
-\AtBeginDocument{%
-\ifx\encodingdefault\T@n@@nc@d@ng\T@n@@nc@d@ngM@cr@M@d\fi%
-\ifx\encodingdefault\LY@n@@nc@d@ng\LY@n@@nc@d@ngM@cr@M@d\fi%
+\DeclareRobustCommand{\textosf}[1]{%
+ {\osfstyle #1}%
}
-
-%\ifzpl@babel
-% \renewcommand*{\rmdefault}{zpl\zpl@figurealign%
-%\zpl@figurestyle}
-% \normalfont
-%\else
-\DeclareRobustCommand\thfamily % new family for theorem font
- {\not@math@alphabet\thfamily\relax
- \fontfamily\thdefault\selectfont}
-\DeclareRobustCommand{\textth}[1]{%
- {\thfamily #1}%
+\DeclareRobustCommand{\texttosf}[1]{%
+ {\tosfstyle #1}%
}
-\let\textthit\textth
-
+\DeclareRobustCommand{\textsu}[1]{%
+ {\sustyle #1}%
+}
+\DeclareTextFontCommand{\textsu}{\sustyle}
+ \let\textsuperior\textsu
+\DeclareTextFontCommand{\textnu}{\nustyle}
+ \let\textnumerator\textnu
+\DeclareTextFontCommand{\textde}{\destyle}
+ \let\textdenominator\textde
+\DeclareTextFontCommand{\textinf}{\instyle}
+ \let\textinferior\textinf
+
\AtEndPreamble{%
-\renewcommand*{\rmdefault}{zpl\zpl@figurealign%
-\zpl@figurestyle}
-\def\zpl@thfigurestyle{\zpl@figurestyle}
-\ifx\zpl@figurestyle\zpl@dfltfigurestyle
- \def\zpl@thfigurestyle{tlf}
-\else
- \def\zpl@thfigurestyle{osf}
-\fi % there just two possible figure styles for the theorem font
-\newcommand*{\thdefault}{zplth-\zpl@thfigurestyle}
+\ifzpl@otf
+ \ifzpl@lining
+ \def\zpl@figurestyle{Lining}
+ \else
+ \def\zpl@figurestyle{OldStyle}
+ \fi
+ \ifzpl@tabular
+ \def\zpl@figurealign{Monospaced}
+ \else
+ \def\zpl@figurealign{Proportional}
+ \fi
+ \setmainfont
+ [ Numbers = {\zpl@figurealign,\zpl@figurestyle},
+ UprightFont = *-Regular ,
+ ItalicFont = *-Italic ,
+ SlantedFont = *-Slanted ,
+ BoldFont = *-Bold ,
+ BoldItalicFont = *-BoldItalic ,
+ BoldSlantedFont= *-BoldSlanted ,
+ ] {\zpl@base}
+ \let\zpl@sty\zpl@figurestyle
+ \if l\zpl@thmlin\def\zpl@sty{Lining}\fi
+ \newcommand{\thfamily}%{\@nameuse{zpl\zpl@figurestyle}%
+ {\addfontfeatures{%
+ Numbers={\zpl@figurealign,\zpl@sty} ,
+ RawFeature=+ss05}
+ \itshape} % for theorems
+ \ifzpl@sl\else\let\slshape=\thfamily\fi
+
+
+\else % type1
+ \ifzpl@lining
+ \def\zpl@figurestyle{LF}
+ \else
+ \def\zpl@figurestyle{OsF}
+ \fi
+ \ifzpl@tabular
+ \def\zpl@figurealign{T}
+ \else
+ \def\zpl@figurealign{}
+ \fi
+
+ \renewcommand*{\rmdefault}{zpl\zpl@figurealign%
+ \zpl@figurestyle}
+ \ifzpl@scosf %
+ \DeclareRobustCommand{\textsc}[1]{%
+ {\fontfamily{zpl\zpl@figurealign OsF}\scshape\selectfont #1}%
+ }\fi% use OsF in small caps
+
+ \def\zpl@thfigurestyle{\zpl@figurestyle}
+ \ifx\zpl@figurestyle\zpl@dfltfigurestyle
+ \def\zpl@thfigurestyle{tlf}
+ \else
+ \def\zpl@thfigurestyle{osf}
+ \fi % there just two possible figure styles for the theorem font
+ \newcommand*{\thdefault}{zplth-\zpl@thfigurestyle}
+ \normalfont
+\fi
+}
+%both
\ifzpl@thrm
\theoremstyle{plain}
\patchcmd{\th@plain}{\itshape}{\thfamily}{\message{Replaced itshape by thfamily in theorem style plain.}}{\message{Unable to replace itshape by thfamily in theorem style plain.}}
\fi
-\normalfont}
-%\fi
+
+% Define \oldstylenums, \liningnums ,\tabularnums and \proportionalnums
+\ifzpl@otf
+ \DeclareTextFontCommand{%
+ \oldstylenums}{\addfontfeatures{Numbers=OldStyle}}
+ \DeclareTextFontCommand{%
+ \liningnums}{\addfontfeatures{Numbers=Lining}}
+ \DeclareTextFontCommand{%
+ \tabularnums}{\addfontfeatures{Numbers=Tabular}}
+ \DeclareTextFontCommand{%
+ \proportionalnums}{\addfontfeatures{Numbers=Proportional}}
+\else % type1
+ \DeclareTextFontCommand{%
+ \oldstylenums}{\fontfamily{zpl\zpl@figurealign OsF}\selectfont }
+ \DeclareTextFontCommand{%
+ \liningnums}{\fontfamily{zpl\zpl@figurealign LF}\selectfont }
+ \DeclareTextFontCommand{%
+ \tabularnums}{\fontfamily{zplT\zpl@figurestyle}\selectfont }
+ \DeclareTextFontCommand{%
+ \proportionalnums}{\fontfamily{zpl\zpl@figurestyle}\selectfont }
+ \re@DeclareTextSymbol{\textdollar}{OT1}{36}
+\fi
\endinput
diff --git a/fonts/newpx/tex/ot1zpldnom.fd b/fonts/newpx/tex/ot1zpldnom.fd
new file mode 100644
index 0000000000..129ec2a34d
--- /dev/null
+++ b/fonts/newpx/tex/ot1zpldnom.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{ot1zpldnom.fd}[2015/01/17 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{OT1}{zpldnom}{}
+\DeclareFontShape{OT1}{zpldnom}{m}{n}{ %medium
+ <-> \zpl@scaled zpldnom-Regular-ot1%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{m}{it}{ %italic
+ <-> \zpl@scaled zpldnom-Italic-ot1%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{b}{n}{ %bold
+ <-> \zpl@scaled zpldnom-Bold-ot1%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{b}{it}{ %bold italic
+ <-> \zpl@scaled zpldnom-BoldItalic-ot1%
+}{}
+
+\DeclareFontShape{OT1}{zpldnom}{m}{sc}{ %cap & small cap
+ <-> ssub * zpldnom/m/n%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{m}{sl}{ %slanted
+ <-> ssub * zpldnom/m/it%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{m}{scit}{ %italic
+ <-> ssub * zpldnom/m/it%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{m}{ui}{ %unslanted italic
+ <-> ssub * zpldnom/m/n%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{bx}{it}{ %bold extended italic
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{bx}{scit}{ %bold extended italic
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{bx}{n}{ %bold extended
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{b}{sl}{ %bold slanted
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{OT1}{zpldnom}{b}{scit}{ %bold italic
+ <-> ssub * zpldnom/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/ot1zplinf.fd b/fonts/newpx/tex/ot1zplinf.fd
new file mode 100644
index 0000000000..12d0ec251d
--- /dev/null
+++ b/fonts/newpx/tex/ot1zplinf.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{ot1zplinf.fd}[2015/01/17 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{OT1}{zplinf}{}
+\DeclareFontShape{OT1}{zplinf}{m}{n}{ %medium
+ <-> \zpl@scaled zplinf-Regular-ot1%
+}{}
+\DeclareFontShape{OT1}{zplinf}{m}{it}{ %italic
+ <-> \zpl@scaled zplinf-Italic-ot1%
+}{}
+\DeclareFontShape{OT1}{zplinf}{b}{n}{ %bold
+ <-> \zpl@scaled zplinf-Bold-ot1%
+}{}
+\DeclareFontShape{OT1}{zplinf}{b}{it}{ %bold italic
+ <-> \zpl@scaled zplinf-BoldItalic-ot1%
+}{}
+
+\DeclareFontShape{OT1}{zplinf}{m}{sc}{ %cap & small cap
+ <-> ssub * zplinf/m/n%
+}{}
+\DeclareFontShape{OT1}{zplinf}{m}{sl}{ %slanted
+ <-> ssub * zplinf/m/it%
+}{}
+\DeclareFontShape{OT1}{zplinf}{m}{scit}{ %italic
+ <-> ssub * zplinf/m/it%
+}{}
+\DeclareFontShape{OT1}{zplinf}{m}{ui}{ %unslanted italic
+ <-> ssub * zplinf/m/n%
+}{}
+\DeclareFontShape{OT1}{zplinf}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{OT1}{zplinf}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{OT1}{zplinf}{bx}{it}{ %bold extended italic
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{OT1}{zplinf}{bx}{scit}{ %bold extended italic
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{OT1}{zplinf}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{OT1}{zplinf}{bx}{n}{ %bold extended
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{OT1}{zplinf}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{OT1}{zplinf}{b}{sl}{ %bold slanted
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{OT1}{zplinf}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{OT1}{zplinf}{b}{scit}{ %bold italic
+ <-> ssub * zplinf/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/ot1zpllf.fd b/fonts/newpx/tex/ot1zpllf.fd
index 0b2741e615..197e31aa08 100644
--- a/fonts/newpx/tex/ot1zpllf.fd
+++ b/fonts/newpx/tex/ot1zpllf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{ot1zpllf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/lf]
+\ProvidesFile{ot1zpllf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/LF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{OT1}{zpllf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-ot1}{}
-\DeclareFontShape{OT1}{zpllf}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zpllf}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-ot1}{}
-\DeclareFontShape{OT1}{zpllf}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zpllf}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-ot1}{}
-\DeclareFontShape{OT1}{zpllf}{bx}{sc}{<->ssub * zpllf/b/sc}{}
-\DeclareFontShape{OT1}{zpllf}{bx}{n}{<->ssub * zpllf/b/n}{}
-\DeclareFontShape{OT1}{zpllf}{bx}{scit}{<->ssub * zpllf/b/scit}{}
-\DeclareFontShape{OT1}{zpllf}{bx}{it}{<->ssub * zpllf/b/it}{}
+\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}{}
+\DeclareFontShape{OT1}{zplLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-ot1}{}
+\DeclareFontShape{OT1}{zplLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplLF}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-ot1}{}
+\DeclareFontShape{OT1}{zplLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplLF}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-ot1}{}
+\DeclareFontShape{OT1}{zplLF}{bx}{sc}{<->ssub * zplLF/b/sc}{}
+\DeclareFontShape{OT1}{zplLF}{bx}{n}{<->ssub * zplLF/b/n}{}
+\DeclareFontShape{OT1}{zplLF}{bx}{scit}{<->ssub * zplLF/b/scit}{}
+\DeclareFontShape{OT1}{zplLF}{bx}{it}{<->ssub * zplLF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{OT1}{zpllf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-ot1}{}
- \DeclareFontShape{OT1}{zpllf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-ot1}{}
- \DeclareFontShape{OT1}{zpllf}{bx}{sl}{<->ssub * zpllf/b/sl}{}
+ \DeclareFontShape{OT1}{zplLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-ot1}{}
+ \DeclareFontShape{OT1}{zplLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-ot1}{}
+ \DeclareFontShape{OT1}{zplLF}{bx}{sl}{<->ssub * zplLF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{OT1}{zpllf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ot1}{}
- \DeclareFontShape{OT1}{zpllf}{b}{sl}{<->ssub * zpllf/m/sl}{}
- \DeclareFontShape{OT1}{zpllf}{bx}{sl}{<->ssub * zpllf/m/sl}{}
+ \DeclareFontShape{OT1}{zplLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ot1}{}
+ \DeclareFontShape{OT1}{zplLF}{b}{sl}{<->ssub * zplLF/m/sl}{}
+ \DeclareFontShape{OT1}{zplLF}{bx}{sl}{<->ssub * zplLF/m/sl}{}
\fi
-\DeclareFontShape{OT1}{zpllf}{b}{scsl}{<->ssub * zpllf/b/scit}{}
-\DeclareFontShape{OT1}{zpllf}{bx}{scsl}{<->ssub * zpllf/b/scit}{}
-\DeclareFontShape{OT1}{zpllf}{m}{scsl}{<->ssub * zpllf/m/scit}{}
+\DeclareFontShape{OT1}{zplLF}{b}{scsl}{<->ssub * zplLF/b/scit}{}
+\DeclareFontShape{OT1}{zplLF}{bx}{scsl}{<->ssub * zplLF/b/scit}{}
+\DeclareFontShape{OT1}{zplLF}{m}{scsl}{<->ssub * zplLF/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ot1zplosf.fd b/fonts/newpx/tex/ot1zplosf.fd
index 1aa435aa52..c196686570 100644
--- a/fonts/newpx/tex/ot1zplosf.fd
+++ b/fonts/newpx/tex/ot1zplosf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{ot1zplosf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/osf]
+\ProvidesFile{ot1zplosf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/OsF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{OT1}{zplosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-ot1}{}
-\DeclareFontShape{OT1}{zplosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplosf}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-ot1}{}
-\DeclareFontShape{OT1}{zplosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zplosf}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-ot1}{}
-\DeclareFontShape{OT1}{zplosf}{bx}{sc}{<->ssub * zplosf/b/sc}{}
-\DeclareFontShape{OT1}{zplosf}{bx}{n}{<->ssub * zplosf/b/n}{}
-\DeclareFontShape{OT1}{zplosf}{bx}{scit}{<->ssub * zplosf/b/scit}{}
-\DeclareFontShape{OT1}{zplosf}{bx}{it}{<->ssub * zplosf/b/it}{}
+\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}{}
+\DeclareFontShape{OT1}{zplOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-ot1}{}
+\DeclareFontShape{OT1}{zplOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-ot1}{}
+\DeclareFontShape{OT1}{zplOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-ot1}{}
+\DeclareFontShape{OT1}{zplOsF}{bx}{sc}{<->ssub * zplOsF/b/sc}{}
+\DeclareFontShape{OT1}{zplOsF}{bx}{n}{<->ssub * zplOsF/b/n}{}
+\DeclareFontShape{OT1}{zplOsF}{bx}{scit}{<->ssub * zplOsF/b/scit}{}
+\DeclareFontShape{OT1}{zplOsF}{bx}{it}{<->ssub * zplOsF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{OT1}{zplosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-ot1}{}
- \DeclareFontShape{OT1}{zplosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-ot1}{}
- \DeclareFontShape{OT1}{zplosf}{bx}{sl}{<->ssub * zplosf/b/sl}{}
+ \DeclareFontShape{OT1}{zplOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-ot1}{}
+ \DeclareFontShape{OT1}{zplOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-ot1}{}
+ \DeclareFontShape{OT1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{OT1}{zplosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ot1}{}
- \DeclareFontShape{OT1}{zplosf}{b}{sl}{<->ssub * zplosf/m/sl}{}
- \DeclareFontShape{OT1}{zplosf}{bx}{sl}{<->ssub * zplosf/m/sl}{}
+ \DeclareFontShape{OT1}{zplOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ot1}{}
+ \DeclareFontShape{OT1}{zplOsF}{b}{sl}{<->ssub * zplOsF/m/sl}{}
+ \DeclareFontShape{OT1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/m/sl}{}
\fi
-\DeclareFontShape{OT1}{zplosf}{b}{scsl}{<->ssub * zplosf/b/scit}{}
-\DeclareFontShape{OT1}{zplosf}{bx}{scsl}{<->ssub * zplosf/b/scit}{}
-\DeclareFontShape{OT1}{zplosf}{m}{scsl}{<->ssub * zplosf/m/scit}{}
+\DeclareFontShape{OT1}{zplOsF}{b}{scsl}{<->ssub * zplOsF/b/scit}{}
+\DeclareFontShape{OT1}{zplOsF}{bx}{scsl}{<->ssub * zplOsF/b/scit}{}
+\DeclareFontShape{OT1}{zplOsF}{m}{scsl}{<->ssub * zplOsF/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ot1zplsubs.fd b/fonts/newpx/tex/ot1zplsubs.fd
new file mode 100644
index 0000000000..92faf1fbf8
--- /dev/null
+++ b/fonts/newpx/tex/ot1zplsubs.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{ot1zplsups.fd}[2015/01/17 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{OT1}{zplsups}{}
+\DeclareFontShape{OT1}{zplsups}{m}{n}{ %medium
+ <-> \zpl@scaled zplsups-Regular-ot1%
+}{}
+\DeclareFontShape{OT1}{zplsups}{m}{it}{ %italic
+ <-> \zpl@scaled zplsups-Italic-ot1%
+}{}
+\DeclareFontShape{OT1}{zplsups}{b}{n}{ %bold
+ <-> \zpl@scaled zplsups-Bold-ot1%
+}{}
+\DeclareFontShape{OT1}{zplsups}{b}{it}{ %bold italic
+ <-> \zpl@scaled zplsups-BoldItalic-ot1%
+}{}
+
+\DeclareFontShape{OT1}{zplsups}{m}{sc}{ %cap & small cap
+ <-> ssub * zplsups/m/n%
+}{}
+\DeclareFontShape{OT1}{zplsups}{m}{sl}{ %slanted
+ <-> ssub * zplsups/m/it%
+}{}
+\DeclareFontShape{OT1}{zplsups}{m}{scit}{ %italic
+ <-> ssub * zplsups/m/it%
+}{}
+\DeclareFontShape{OT1}{zplsups}{m}{ui}{ %unslanted italic
+ <-> ssub * zplsups/m/n%
+}{}
+\DeclareFontShape{OT1}{zplsups}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zplsups/b/n%
+}{}
+\DeclareFontShape{OT1}{zplsups}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zplsups/b/it%
+}{}
+\DeclareFontShape{OT1}{zplsups}{bx}{it}{ %bold extended italic
+ <-> ssub * zplsups/b/it%
+}{}
+\DeclareFontShape{OT1}{zplsups}{bx}{scit}{ %bold extended italic
+ <-> ssub * zplsups/b/it%
+}{}
+\DeclareFontShape{OT1}{zplsups}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zplsups/b/n%
+}{}
+\DeclareFontShape{OT1}{zplsups}{bx}{n}{ %bold extended
+ <-> ssub * zplsups/b/n%
+}{}
+\DeclareFontShape{OT1}{zplsups}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zplsups/b/n%
+}{}
+\DeclareFontShape{OT1}{zplsups}{b}{sl}{ %bold slanted
+ <-> ssub * zplsups/b/it%
+}{}
+\DeclareFontShape{OT1}{zplsups}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zplsups/b/n%
+}{}
+\DeclareFontShape{OT1}{zplsups}{b}{scit}{ %bold italic
+ <-> ssub * zplsups/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/ot1zpltlf.fd b/fonts/newpx/tex/ot1zpltlf.fd
index 963f373fc3..c1dd06a019 100644
--- a/fonts/newpx/tex/ot1zpltlf.fd
+++ b/fonts/newpx/tex/ot1zpltlf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{ot1zpltlf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/tlf]
+\ProvidesFile{ot1zpltlf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/TLF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{OT1}{zpltlf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ot1}{}
-\DeclareFontShape{OT1}{zpltlf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zpltlf}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ot1}{}
-\DeclareFontShape{OT1}{zpltlf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zpltlf}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ot1}{}
-\DeclareFontShape{OT1}{zpltlf}{bx}{sc}{<->ssub * zpltlf/b/sc}{}
-\DeclareFontShape{OT1}{zpltlf}{bx}{n}{<->ssub * zpltlf/b/n}{}
-\DeclareFontShape{OT1}{zpltlf}{bx}{scit}{<->ssub * zpltlf/b/scit}{}
-\DeclareFontShape{OT1}{zpltlf}{bx}{it}{<->ssub * zpltlf/b/it}{}
+\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}{}
+\DeclareFontShape{OT1}{zplTLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-ot1}{}
+\DeclareFontShape{OT1}{zplTLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplTLF}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-ot1}{}
+\DeclareFontShape{OT1}{zplTLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplTLF}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-ot1}{}
+\DeclareFontShape{OT1}{zplTLF}{bx}{sc}{<->ssub * zplTLF/b/sc}{}
+\DeclareFontShape{OT1}{zplTLF}{bx}{n}{<->ssub * zplTLF/b/n}{}
+\DeclareFontShape{OT1}{zplTLF}{bx}{scit}{<->ssub * zplTLF/b/scit}{}
+\DeclareFontShape{OT1}{zplTLF}{bx}{it}{<->ssub * zplTLF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{OT1}{zpltlf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ot1}{}
- \DeclareFontShape{OT1}{zpltlf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ot1}{}
- \DeclareFontShape{OT1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/b/sl}{}
+ \DeclareFontShape{OT1}{zplTLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-ot1}{}
+ \DeclareFontShape{OT1}{zplTLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-ot1}{}
+ \DeclareFontShape{OT1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{OT1}{zpltlf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ot1}{}
- \DeclareFontShape{OT1}{zpltlf}{b}{sl}{<->ssub * zpltlf/m/sl}{}
- \DeclareFontShape{OT1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/m/sl}{}
+ \DeclareFontShape{OT1}{zplTLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-ot1}{}
+ \DeclareFontShape{OT1}{zplTLF}{b}{sl}{<->ssub * zplTLF/m/sl}{}
+ \DeclareFontShape{OT1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/m/sl}{}
\fi
-\DeclareFontShape{OT1}{zpltlf}{b}{scsl}{<->ssub * zpltlf/b/scit}{}
-\DeclareFontShape{OT1}{zpltlf}{bx}{scsl}{<->ssub * zpltlf/b/scit}{}
-\DeclareFontShape{OT1}{zpltlf}{m}{scsl}{<->ssub * zpltlf/m/scit}{}
+\DeclareFontShape{OT1}{zplTLF}{b}{scsl}{<->ssub * zplTLF/b/scit}{}
+\DeclareFontShape{OT1}{zplTLF}{bx}{scsl}{<->ssub * zplTLF/b/scit}{}
+\DeclareFontShape{OT1}{zplTLF}{m}{scsl}{<->ssub * zplTLF/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ot1zpltosf.fd b/fonts/newpx/tex/ot1zpltosf.fd
index a8064cd42e..1c97b20a46 100644
--- a/fonts/newpx/tex/ot1zpltosf.fd
+++ b/fonts/newpx/tex/ot1zpltosf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{ot1zpltosf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/tosf]
+\ProvidesFile{ot1zpltosf.fd}[2021/05/25 v1.0 font definition file for OT1/zpl/TOsF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -12,29 +12,29 @@
\ifdefined\zpl@adobescfalse\zpl@makeadobesc\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{OT1}{zpltosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-ot1}{}
-\DeclareFontShape{OT1}{zpltosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-ot1}{}
-\DeclareFontShape{OT1}{zpltosf}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-ot1}{}
-\DeclareFontShape{OT1}{zpltosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-ot1}{}
-\DeclareFontShape{OT1}{zpltosf}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-ot1}{}
-\DeclareFontShape{OT1}{zpltosf}{bx}{sc}{<->ssub * zpltosf/b/sc}{}
-\DeclareFontShape{OT1}{zpltosf}{bx}{n}{<->ssub * zpltosf/b/n}{}
-\DeclareFontShape{OT1}{zpltosf}{bx}{scit}{<->ssub * zpltosf/b/scit}{}
-\DeclareFontShape{OT1}{zpltosf}{bx}{it}{<->ssub * zpltosf/b/it}{}
+\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}{}
+\DeclareFontShape{OT1}{zplTOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-ot1}{}
+\DeclareFontShape{OT1}{zplTOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-ot1}{}
+\DeclareFontShape{OT1}{zplTOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-ot1}{}
+\DeclareFontShape{OT1}{zplTOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-ot1}{}
+\DeclareFontShape{OT1}{zplTOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-ot1}{}
+\DeclareFontShape{OT1}{zplTOsF}{bx}{sc}{<->ssub * zplTOsF/b/sc}{}
+\DeclareFontShape{OT1}{zplTOsF}{bx}{n}{<->ssub * zplTOsF/b/n}{}
+\DeclareFontShape{OT1}{zplTOsF}{bx}{scit}{<->ssub * zplTOsF/b/scit}{}
+\DeclareFontShape{OT1}{zplTOsF}{bx}{it}{<->ssub * zplTOsF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{OT1}{zpltosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-ot1}{}
- \DeclareFontShape{OT1}{zpltosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-ot1}{}
- \DeclareFontShape{OT1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/b/sl}{}
+ \DeclareFontShape{OT1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-ot1}{}
+ \DeclareFontShape{OT1}{zplTOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-ot1}{}
+ \DeclareFontShape{OT1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{OT1}{zpltosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ot1}{}
- \DeclareFontShape{OT1}{zpltosf}{b}{sl}{<->ssub * zpltosf/m/sl}{}
- \DeclareFontShape{OT1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/m/sl}{}
+ \DeclareFontShape{OT1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-ot1}{}
+ \DeclareFontShape{OT1}{zplTOsF}{b}{sl}{<->ssub * zplTOsF/m/sl}{}
+ \DeclareFontShape{OT1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/m/sl}{}
\fi
-\DeclareFontShape{OT1}{zpltosf}{b}{scsl}{<->ssub * zpltosf/b/scit}{}
-\DeclareFontShape{OT1}{zpltosf}{bx}{scsl}{<->ssub * zpltosf/b/scit}{}
-\DeclareFontShape{OT1}{zpltosf}{m}{scsl}{<->ssub * zpltosf/m/scit}{}
+\DeclareFontShape{OT1}{zplTOsF}{b}{scsl}{<->ssub * zplTOsF/b/scit}{}
+\DeclareFontShape{OT1}{zplTOsF}{bx}{scsl}{<->ssub * zplTOsF/b/scit}{}
+\DeclareFontShape{OT1}{zplTOsF}{m}{scsl}{<->ssub * zplTOsF/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/t1zpldnom.fd b/fonts/newpx/tex/t1zpldnom.fd
new file mode 100644
index 0000000000..4adab5a93b
--- /dev/null
+++ b/fonts/newpx/tex/t1zpldnom.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{t1zpldnom.fd}[2021/09/23 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{T1}{zpldnom}{}
+\DeclareFontShape{T1}{zpldnom}{m}{n}{ %medium
+ <-> \zpl@scaled zpldnom-Regular-t1%
+}{}
+\DeclareFontShape{T1}{zpldnom}{m}{it}{ %italic
+ <-> \zpl@scaled zpldnom-Italic-t1%
+}{}
+\DeclareFontShape{T1}{zpldnom}{b}{n}{ %bold
+ <-> \zpl@scaled zpldnom-Bold-t1%
+}{}
+\DeclareFontShape{T1}{zpldnom}{b}{it}{ %bold italic
+ <-> \zpl@scaled zpldnom-BoldItalic-t1%
+}{}
+
+\DeclareFontShape{T1}{zpldnom}{m}{sc}{ %cap & small cap
+ <-> ssub * zpldnom/m/n%
+}{}
+\DeclareFontShape{T1}{zpldnom}{m}{sl}{ %slanted
+ <-> ssub * zpldnom/m/it%
+}{}
+\DeclareFontShape{T1}{zpldnom}{m}{scit}{ %italic
+ <-> ssub * zpldnom/m/it%
+}{}
+\DeclareFontShape{T1}{zpldnom}{m}{ui}{ %unslanted italic
+ <-> ssub * zpldnom/m/n%
+}{}
+\DeclareFontShape{T1}{zpldnom}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{T1}{zpldnom}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{T1}{zpldnom}{bx}{it}{ %bold extended italic
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{T1}{zpldnom}{bx}{scit}{ %bold extended italic
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{T1}{zpldnom}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{T1}{zpldnom}{bx}{n}{ %bold extended
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{T1}{zpldnom}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{T1}{zpldnom}{b}{sl}{ %bold slanted
+ <-> ssub * zpldnom/b/it%
+}{}
+\DeclareFontShape{T1}{zpldnom}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zpldnom/b/n%
+}{}
+\DeclareFontShape{T1}{zpldnom}{b}{scit}{ %bold italic
+ <-> ssub * zpldnom/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/t1zpldnumr.fd b/fonts/newpx/tex/t1zpldnumr.fd
new file mode 100644
index 0000000000..e1aeab1353
--- /dev/null
+++ b/fonts/newpx/tex/t1zpldnumr.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{t1zplnumr.fd}[2021/09/23 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{T1}{zplnumr}{}
+\DeclareFontShape{T1}{zplnumr}{m}{n}{ %medium
+ <-> \zpl@scaled zplnumr-Regular-t1%
+}{}
+\DeclareFontShape{T1}{zplnumr}{m}{it}{ %italic
+ <-> \zpl@scaled zplnumr-Italic-t1%
+}{}
+\DeclareFontShape{T1}{zplnumr}{b}{n}{ %bold
+ <-> \zpl@scaled zplnumr-Bold-t1%
+}{}
+\DeclareFontShape{T1}{zplnumr}{b}{it}{ %bold italic
+ <-> \zpl@scaled zplnumr-BoldItalic-t1%
+}{}
+
+\DeclareFontShape{T1}{zplnumr}{m}{sc}{ %cap & small cap
+ <-> ssub * zplnumr/m/n%
+}{}
+\DeclareFontShape{T1}{zplnumr}{m}{sl}{ %slanted
+ <-> ssub * zplnumr/m/it%
+}{}
+\DeclareFontShape{T1}{zplnumr}{m}{scit}{ %italic
+ <-> ssub * zplnumr/m/it%
+}{}
+\DeclareFontShape{T1}{zplnumr}{m}{ui}{ %unslanted italic
+ <-> ssub * zplnumr/m/n%
+}{}
+\DeclareFontShape{T1}{zplnumr}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zplnumr/b/n%
+}{}
+\DeclareFontShape{T1}{zplnumr}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zplnumr/b/it%
+}{}
+\DeclareFontShape{T1}{zplnumr}{bx}{it}{ %bold extended italic
+ <-> ssub * zplnumr/b/it%
+}{}
+\DeclareFontShape{T1}{zplnumr}{bx}{scit}{ %bold extended italic
+ <-> ssub * zplnumr/b/it%
+}{}
+\DeclareFontShape{T1}{zplnumr}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zplnumr/b/n%
+}{}
+\DeclareFontShape{T1}{zplnumr}{bx}{n}{ %bold extended
+ <-> ssub * zplnumr/b/n%
+}{}
+\DeclareFontShape{T1}{zplnumr}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zplnumr/b/n%
+}{}
+\DeclareFontShape{T1}{zplnumr}{b}{sl}{ %bold slanted
+ <-> ssub * zplnumr/b/it%
+}{}
+\DeclareFontShape{T1}{zplnumr}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zplnumr/b/n%
+}{}
+\DeclareFontShape{T1}{zplnumr}{b}{scit}{ %bold italic
+ <-> ssub * zplnumr/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/t1zplinf.fd b/fonts/newpx/tex/t1zplinf.fd
new file mode 100644
index 0000000000..a0dcfd32c0
--- /dev/null
+++ b/fonts/newpx/tex/t1zplinf.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{t1zplinf.fd}[2015/01/17 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{T1}{zplinf}{}
+\DeclareFontShape{T1}{zplinf}{m}{n}{ %medium
+ <-> \zpl@scaled zplinf-Regular-t1%
+}{}
+\DeclareFontShape{T1}{zplinf}{m}{it}{ %italic
+ <-> \zpl@scaled zplinf-Italic-t1%
+}{}
+\DeclareFontShape{T1}{zplinf}{b}{n}{ %bold
+ <-> \zpl@scaled zplinf-Bold-t1%
+}{}
+\DeclareFontShape{T1}{zplinf}{b}{it}{ %bold italic
+ <-> \zpl@scaled zplinf-BoldItalic-t1%
+}{}
+
+\DeclareFontShape{T1}{zplinf}{m}{sc}{ %cap & small cap
+ <-> ssub * zplinf/m/n%
+}{}
+\DeclareFontShape{T1}{zplinf}{m}{sl}{ %slanted
+ <-> ssub * zplinf/m/it%
+}{}
+\DeclareFontShape{T1}{zplinf}{m}{scit}{ %italic
+ <-> ssub * zplinf/m/it%
+}{}
+\DeclareFontShape{T1}{zplinf}{m}{ui}{ %unslanted italic
+ <-> ssub * zplinf/m/n%
+}{}
+\DeclareFontShape{T1}{zplinf}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{T1}{zplinf}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{T1}{zplinf}{bx}{it}{ %bold extended italic
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{T1}{zplinf}{bx}{scit}{ %bold extended italic
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{T1}{zplinf}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{T1}{zplinf}{bx}{n}{ %bold extended
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{T1}{zplinf}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{T1}{zplinf}{b}{sl}{ %bold slanted
+ <-> ssub * zplinf/b/it%
+}{}
+\DeclareFontShape{T1}{zplinf}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zplinf/b/n%
+}{}
+\DeclareFontShape{T1}{zplinf}{b}{scit}{ %bold italic
+ <-> ssub * zplinf/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/t1zpllf.fd b/fonts/newpx/tex/t1zpllf.fd
index acf5317eb3..0ed682d3f6 100644
--- a/fonts/newpx/tex/t1zpllf.fd
+++ b/fonts/newpx/tex/t1zpllf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{t1zpllf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/lf]
+\ProvidesFile{t1zpllf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/LF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{T1}{zpllf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-t1}{}
-\DeclareFontShape{T1}{zpllf}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zpllf}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-t1}{}
-\DeclareFontShape{T1}{zpllf}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zpllf}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-t1}{}
-\DeclareFontShape{T1}{zpllf}{bx}{sc}{<->ssub * zpllf/b/sc}{}
-\DeclareFontShape{T1}{zpllf}{bx}{n}{<->ssub * zpllf/b/n}{}
-\DeclareFontShape{T1}{zpllf}{bx}{scit}{<->ssub * zpllf/b/scit}{}
-\DeclareFontShape{T1}{zpllf}{bx}{it}{<->ssub * zpllf/b/it}{}
+\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}{}
+\DeclareFontShape{T1}{zplLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-lf-t1}{}
+\DeclareFontShape{T1}{zplLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-lf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplLF}{m}{n}{<-> \zpl@scaled zpl-Regular-lf-t1}{}
+\DeclareFontShape{T1}{zplLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-lf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplLF}{m}{it}{<-> \zpl@scaled zpl-Italic-lf-t1}{}
+\DeclareFontShape{T1}{zplLF}{bx}{sc}{<->ssub * zplLF/b/sc}{}
+\DeclareFontShape{T1}{zplLF}{bx}{n}{<->ssub * zplLF/b/n}{}
+\DeclareFontShape{T1}{zplLF}{bx}{scit}{<->ssub * zplLF/b/scit}{}
+\DeclareFontShape{T1}{zplLF}{bx}{it}{<->ssub * zplLF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{T1}{zpllf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-t1}{}
- \DeclareFontShape{T1}{zpllf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-t1}{}
- \DeclareFontShape{T1}{zpllf}{bx}{sl}{<->ssub * zpllf/b/sl}{}
+ \DeclareFontShape{T1}{zplLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-lf-t1}{}
+ \DeclareFontShape{T1}{zplLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-lf-t1}{}
+ \DeclareFontShape{T1}{zplLF}{bx}{sl}{<->ssub * zplLF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{T1}{zpllf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-t1}{}
- \DeclareFontShape{T1}{zpllf}{b}{sl}{<->ssub * zpllf/m/sl}{}
- \DeclareFontShape{T1}{zpllf}{bx}{sl}{<->ssub * zpllf/m/sl}{}
+ \DeclareFontShape{T1}{zplLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-t1}{}
+ \DeclareFontShape{T1}{zplLF}{b}{sl}{<->ssub * zplLF/m/sl}{}
+ \DeclareFontShape{T1}{zplLF}{bx}{sl}{<->ssub * zplLF/m/sl}{}
\fi
-\DeclareFontShape{T1}{zpllf}{b}{scsl}{<->ssub * zpllf/b/scit}{}
-\DeclareFontShape{T1}{zpllf}{m}{scsl}{<->ssub * zpllf/m/scit}{}
-\DeclareFontShape{T1}{zpllf}{b}{scsl}{<->ssub * zpllf/b/scit}{}
+\DeclareFontShape{T1}{zplLF}{b}{scsl}{<->ssub * zplLF/b/scit}{}
+\DeclareFontShape{T1}{zplLF}{m}{scsl}{<->ssub * zplLF/m/scit}{}
+\DeclareFontShape{T1}{zplLF}{b}{scsl}{<->ssub * zplLF/b/scit}{}
\endinput
diff --git a/fonts/newpx/tex/t1zplosf.fd b/fonts/newpx/tex/t1zplosf.fd
index ff6623550f..1eca4cea2f 100644
--- a/fonts/newpx/tex/t1zplosf.fd
+++ b/fonts/newpx/tex/t1zplosf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{t1zplosf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/osf]
+\ProvidesFile{t1zplosf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/OsF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -11,29 +11,29 @@
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{T1}{zplosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-t1}{}
-\DeclareFontShape{T1}{zplosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplosf}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-t1}{}
-\DeclareFontShape{T1}{zplosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zplosf}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-t1}{}
-\DeclareFontShape{T1}{zplosf}{bx}{sc}{<->ssub * zplosf/b/sc}{}
-\DeclareFontShape{T1}{zplosf}{bx}{n}{<->ssub * zplosf/b/n}{}
-\DeclareFontShape{T1}{zplosf}{bx}{scit}{<->ssub * zplosf/b/scit}{}
-\DeclareFontShape{T1}{zplosf}{bx}{it}{<->ssub * zplosf/b/it}{}
+\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}{}
+\DeclareFontShape{T1}{zplOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-osf-t1}{}
+\DeclareFontShape{T1}{zplOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-osf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-osf-t1}{}
+\DeclareFontShape{T1}{zplOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-osf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-osf-t1}{}
+\DeclareFontShape{T1}{zplOsF}{bx}{sc}{<->ssub * zplOsF/b/sc}{}
+\DeclareFontShape{T1}{zplOsF}{bx}{n}{<->ssub * zplOsF/b/n}{}
+\DeclareFontShape{T1}{zplOsF}{bx}{scit}{<->ssub * zplOsF/b/scit}{}
+\DeclareFontShape{T1}{zplOsF}{bx}{it}{<->ssub * zplOsF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{T1}{zplosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-t1}{}
- \DeclareFontShape{T1}{zplosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-t1}{}
- \DeclareFontShape{T1}{zplosf}{bx}{sl}{<->ssub * zplosf/b/sl}{}
+ \DeclareFontShape{T1}{zplOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-osf-t1}{}
+ \DeclareFontShape{T1}{zplOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-osf-t1}{}
+ \DeclareFontShape{T1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{T1}{zplosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-t1}{}
- \DeclareFontShape{T1}{zplosf}{b}{sl}{<->ssub * zplosf/m/sl}{}
- \DeclareFontShape{T1}{zplosf}{bx}{sl}{<->ssub * zplosf/m/sl}{}
+ \DeclareFontShape{T1}{zplOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-t1}{}
+ \DeclareFontShape{T1}{zplOsF}{b}{sl}{<->ssub * zplOsF/m/sl}{}
+ \DeclareFontShape{T1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/m/sl}{}
\fi
-\DeclareFontShape{T1}{zplosf}{b}{scsl}{<->ssub * zplosf/b/scit}{}
-\DeclareFontShape{T1}{zplosf}{m}{scsl}{<->ssub * zplosf/m/scit}{}
-\DeclareFontShape{T1}{zplosf}{bx}{scsl}{<->ssub * zplosf/b/scit}{}
+\DeclareFontShape{T1}{zplOsF}{b}{scsl}{<->ssub * zplOsF/b/scit}{}
+\DeclareFontShape{T1}{zplOsF}{m}{scsl}{<->ssub * zplOsF/m/scit}{}
+\DeclareFontShape{T1}{zplOsF}{bx}{scsl}{<->ssub * zplOsF/b/scit}{}
\endinput
diff --git a/fonts/newpx/tex/t1zplsubs.fd b/fonts/newpx/tex/t1zplsubs.fd
new file mode 100644
index 0000000000..ff4b2bfe56
--- /dev/null
+++ b/fonts/newpx/tex/t1zplsubs.fd
@@ -0,0 +1,62 @@
+\ProvidesFile{t1zplsubs.fd}[2015/01/17 v1.0]
+\expandafter\ifx\csname zpl@scaled\endcsname\relax
+ \global\let\zpl@scaled\@empty%
+\fi
+
+\DeclareFontFamily{T1}{zplsubs}{}
+\DeclareFontShape{T1}{zplsubs}{m}{n}{ %medium
+ <-> \zpl@scaled zplsubs-Regular-t1%
+}{}
+\DeclareFontShape{T1}{zplsubs}{m}{it}{ %italic
+ <-> \zpl@scaled zplsubs-Italic-t1%
+}{}
+\DeclareFontShape{T1}{zplsubs}{b}{n}{ %bold
+ <-> \zpl@scaled zplsubs-Bold-t1%
+}{}
+\DeclareFontShape{T1}{zplsubs}{b}{it}{ %bold italic
+ <-> \zpl@scaled zplsubs-BoldItalic-t1%
+}{}
+
+\DeclareFontShape{T1}{zplsubs}{m}{sc}{ %cap & small cap
+ <-> ssub * zplsubs/m/n%
+}{}
+\DeclareFontShape{T1}{zplsubs}{m}{sl}{ %slanted
+ <-> ssub * zplsubs/m/it%
+}{}
+\DeclareFontShape{T1}{zplsubs}{m}{scit}{ %italic
+ <-> ssub * zplsubs/m/it%
+}{}
+\DeclareFontShape{T1}{zplsubs}{m}{ui}{ %unslanted italic
+ <-> ssub * zplsubs/m/n%
+}{}
+\DeclareFontShape{T1}{zplsubs}{bx}{sc}{ %bold extended cap & small cap
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{T1}{zplsubs}{bx}{sl}{ %bold extended slanted
+ <-> ssub * zplsubs/b/it%
+}{}
+\DeclareFontShape{T1}{zplsubs}{bx}{it}{ %bold extended italic
+ <-> ssub * zplsubs/b/it%
+}{}
+\DeclareFontShape{T1}{zplsubs}{bx}{scit}{ %bold extended italic
+ <-> ssub * zplsubs/b/it%
+}{}
+\DeclareFontShape{T1}{zplsubs}{bx}{ui}{ %bold extended unslanted italic
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{T1}{zplsubs}{bx}{n}{ %bold extended
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{T1}{zplsubs}{b}{sc}{ %bold cap & small cap
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{T1}{zplsubs}{b}{sl}{ %bold slanted
+ <-> ssub * zplsubs/b/it%
+}{}
+\DeclareFontShape{T1}{zplsubs}{b}{ui}{ %bold unslanted italic
+ <-> ssub * zplsubs/b/n%
+}{}
+\DeclareFontShape{T1}{zplsubs}{b}{scit}{ %bold italic
+ <-> ssub * zplsubs/b/it%
+}{}
+\endinput
diff --git a/fonts/newpx/tex/t1zpltlf.fd b/fonts/newpx/tex/t1zpltlf.fd
index 4219957913..55eed53ceb 100644
--- a/fonts/newpx/tex/t1zpltlf.fd
+++ b/fonts/newpx/tex/t1zpltlf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{t1zpltlf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/tlf]
+\ProvidesFile{t1zpltlf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/TLF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -10,29 +10,29 @@
\ifdefined\zpl@largescfalse \zpl@makelsfx\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{T1}{zpltlf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-t1}{}
-\DeclareFontShape{T1}{zpltlf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zpltlf}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-t1}{}
-\DeclareFontShape{T1}{zpltlf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zpltlf}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-t1}{}
-\DeclareFontShape{T1}{zpltlf}{bx}{sc}{<->ssub * zpltlf/b/sc}{}
-\DeclareFontShape{T1}{zpltlf}{bx}{n}{<->ssub * zpltlf/b/n}{}
-\DeclareFontShape{T1}{zpltlf}{bx}{scit}{<->ssub * zpltlf/b/scit}{}
-\DeclareFontShape{T1}{zpltlf}{bx}{it}{<->ssub * zpltlf/b/it}{}
+\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}{}
+\DeclareFontShape{T1}{zplTLF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tlf-t1}{}
+\DeclareFontShape{T1}{zplTLF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tlf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplTLF}{m}{n}{<-> \zpl@scaled zpl-Regular-tlf-t1}{}
+\DeclareFontShape{T1}{zplTLF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tlf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplTLF}{m}{it}{<-> \zpl@scaled zpl-Italic-tlf-t1}{}
+\DeclareFontShape{T1}{zplTLF}{bx}{sc}{<->ssub * zplTLF/b/sc}{}
+\DeclareFontShape{T1}{zplTLF}{bx}{n}{<->ssub * zplTLF/b/n}{}
+\DeclareFontShape{T1}{zplTLF}{bx}{scit}{<->ssub * zplTLF/b/scit}{}
+\DeclareFontShape{T1}{zplTLF}{bx}{it}{<->ssub * zplTLF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{T1}{zpltlf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-t1}{}
- \DeclareFontShape{T1}{zpltlf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-t1}{}
- \DeclareFontShape{T1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/b/sl}{}
+ \DeclareFontShape{T1}{zplTLF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tlf-t1}{}
+ \DeclareFontShape{T1}{zplTLF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tlf-t1}{}
+ \DeclareFontShape{T1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{T1}{zpltlf}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-t1}{}
- \DeclareFontShape{T1}{zpltlf}{b}{sl}{<->ssub * zpltlf/m/sl}{}
- \DeclareFontShape{T1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/m/sl}{}
+ \DeclareFontShape{T1}{zplTLF}{m}{sl}{<-> \zpl@scaled zplth-Italic-tlf-t1}{}
+ \DeclareFontShape{T1}{zplTLF}{b}{sl}{<->ssub * zplTLF/m/sl}{}
+ \DeclareFontShape{T1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/m/sl}{}
\fi
-\DeclareFontShape{T1}{zpltlf}{b}{scsl}{<->ssub * zpltlf/b/scit}{}
-\DeclareFontShape{T1}{zpltlf}{m}{scsl}{<->ssub * zpltlf/m/scit}{}
-\DeclareFontShape{T1}{zpltlf}{bx}{scsl}{<->ssub * zpltlf/b/scit}{}
+\DeclareFontShape{T1}{zplTLF}{b}{scsl}{<->ssub * zplTLF/b/scit}{}
+\DeclareFontShape{T1}{zplTLF}{m}{scsl}{<->ssub * zplTLF/m/scit}{}
+\DeclareFontShape{T1}{zplTLF}{bx}{scsl}{<->ssub * zplTLF/b/scit}{}
\endinput
diff --git a/fonts/newpx/tex/t1zpltosf.fd b/fonts/newpx/tex/t1zpltosf.fd
index d1de0d2006..cb4b8f4f99 100644
--- a/fonts/newpx/tex/t1zpltosf.fd
+++ b/fonts/newpx/tex/t1zpltosf.fd
@@ -1,4 +1,4 @@
-\ProvidesFile{t1zpltosf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/tosf]
+\ProvidesFile{t1zpltosf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/TOsF]
\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{}
@@ -12,29 +12,29 @@
\ifdefined\zpl@adobescfalse\zpl@makeadobesc\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{T1}{zpltosf}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-t1}{}
-\DeclareFontShape{T1}{zpltosf}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-t1}{}
-\DeclareFontShape{T1}{zpltosf}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-t1}{}
-\DeclareFontShape{T1}{zpltosf}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-t1}{}
-\DeclareFontShape{T1}{zpltosf}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-t1}{}
-\DeclareFontShape{T1}{zpltosf}{bx}{sc}{<->ssub * zpltosf/b/sc}{}
-\DeclareFontShape{T1}{zpltosf}{bx}{n}{<->ssub * zpltosf/b/n}{}
-\DeclareFontShape{T1}{zpltosf}{bx}{scit}{<->ssub * zpltosf/b/scit}{}
-\DeclareFontShape{T1}{zpltosf}{bx}{it}{<->ssub * zpltosf/b/it}{}
+\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}{}
+\DeclareFontShape{T1}{zplTOsF}{b}{it}{<-> \zpl@scaled zpl-BoldItalic-tosf-t1}{}
+\DeclareFontShape{T1}{zplTOsF}{m}{sc}{<-> \zpl@scaled zpl-Regular-tosf-sc\zpl@lsfx\zpl@asfx-t1}{}
+\DeclareFontShape{T1}{zplTOsF}{m}{n}{<-> \zpl@scaled zpl-Regular-tosf-t1}{}
+\DeclareFontShape{T1}{zplTOsF}{m}{scit}{<-> \zpl@scaled zpl-Italic-tosf-sc\zpl@lsfx-t1}{}
+\DeclareFontShape{T1}{zplTOsF}{m}{it}{<-> \zpl@scaled zpl-Italic-tosf-t1}{}
+\DeclareFontShape{T1}{zplTOsF}{bx}{sc}{<->ssub * zplTOsF/b/sc}{}
+\DeclareFontShape{T1}{zplTOsF}{bx}{n}{<->ssub * zplTOsF/b/n}{}
+\DeclareFontShape{T1}{zplTOsF}{bx}{scit}{<->ssub * zplTOsF/b/scit}{}
+\DeclareFontShape{T1}{zplTOsF}{bx}{it}{<->ssub * zplTOsF/b/it}{}
\ifzpl@sl % point to real slanted fonts
- \DeclareFontShape{T1}{zpltosf}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-t1}{}
- \DeclareFontShape{T1}{zpltosf}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-t1}{}
- \DeclareFontShape{T1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/b/sl}{}
+ \DeclareFontShape{T1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zpl-Slanted-tosf-t1}{}
+ \DeclareFontShape{T1}{zplTOsF}{b}{sl}{<-> \zpl@scaled zpl-BoldSlanted-tosf-t1}{}
+ \DeclareFontShape{T1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/b/sl}{}
\else %point to theorem font
- \DeclareFontShape{T1}{zpltosf}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-t1}{}
- \DeclareFontShape{T1}{zpltosf}{b}{sl}{<->ssub * zpltosf/m/sl}{}
- \DeclareFontShape{T1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/m/sl}{}
+ \DeclareFontShape{T1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zplth-Italic-osf-t1}{}
+ \DeclareFontShape{T1}{zplTOsF}{b}{sl}{<->ssub * zplTOsF/m/sl}{}
+ \DeclareFontShape{T1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/m/sl}{}
\fi
-\DeclareFontShape{T1}{zpltosf}{b}{scsl}{<->ssub * zpltosf/b/scit}{}
-\DeclareFontShape{T1}{zpltosf}{bx}{scsl}{<->ssub * zpltosf/b/scit}{}
-\DeclareFontShape{T1}{zpltosf}{m}{scsl}{<->ssub * zpltosf/m/scit}{}
+\DeclareFontShape{T1}{zplTOsF}{b}{scsl}{<->ssub * zplTOsF/b/scit}{}
+\DeclareFontShape{T1}{zplTOsF}{bx}{scsl}{<->ssub * zplTOsF/b/scit}{}
+\DeclareFontShape{T1}{zplTOsF}{m}{scsl}{<->ssub * zplTOsF/m/scit}{}
\endinput
diff --git a/fonts/newpx/tex/ts1zpllf.fd b/fonts/newpx/tex/ts1zpllf.fd
index 03e8158417..50b59fd2b4 100644
--- a/fonts/newpx/tex/ts1zpllf.fd
+++ b/fonts/newpx/tex/ts1zpllf.fd
@@ -1,24 +1,24 @@
-\ProvidesFile{ts1zpllf.fd}[2015/01/18 v1.0 fd file for TS1/zpllf]
+\ProvidesFile{ts1zpllf.fd}[2021/11/24 v1.0 fd file for TS1/zplLF]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{TS1}{zpllf}{m}{it}{<-> \zpl@scaled ts1-qplri}{}
-\DeclareFontShape{TS1}{zpllf}{bx}{n}{<->ssub * zpllf/b/n}{}
-\DeclareFontShape{TS1}{zpllf}{bx}{it}{<->ssub * zpllf/b/it}{}
-\DeclareFontShape{TS1}{zpllf}{b}{sl}{<->ssub * zpllf/b/it}{}
-\DeclareFontShape{TS1}{zpllf}{m}{sc}{<->ssub * zpllf/m/n}{}
-\DeclareFontShape{TS1}{zpllf}{m}{scit}{<->ssub * zpllf/m/it}{}
-\DeclareFontShape{TS1}{zpllf}{b}{sc}{<->ssub * zpllf/b/n}{}
-\DeclareFontShape{TS1}{zpllf}{b}{scit}{<->ssub * zpllf/b/it}{}
-\DeclareFontShape{TS1}{zpllf}{bx}{sc}{<->ssub * zpllf/b/n}{}
-\DeclareFontShape{TS1}{zpllf}{bx}{scit}{<->ssub * zpllf/b/it}{}
-\DeclareFontShape{TS1}{zpllf}{m}{sl}{<->ssub * zpllf/m/it}{}
-\DeclareFontShape{TS1}{zpllf}{bx}{sl}{<->ssub * zpllf/b/it}{}
+\DeclareFontFamily{TS1}{zplLF}{\zpl@spacing}
+\DeclareFontShape{TS1}{zplLF}{b}{n}{<-> \zpl@scaled zplLF-Bold-ts1}{}
+\DeclareFontShape{TS1}{zplLF}{b}{it}{<-> \zpl@scaled zplLF-BoldItalic-ts1}{}
+\DeclareFontShape{TS1}{zplLF}{m}{n}{<-> \zpl@scaled zplLF-Regular-ts1}{}
+\DeclareFontShape{TS1}{zplLF}{m}{it}{<-> \zpl@scaled zplLF-Italic-ts1}{}
+\DeclareFontShape{TS1}{zplLF}{m}{sl}{<-> \zpl@scaled zplLF-Slanted-ts1}{}
+\DeclareFontShape{TS1}{zplLF}{b}{sl}{<-> \zpl@scaled zplLF-BoldSlanted-ts1}{}
+\DeclareFontShape{TS1}{zplLF}{bx}{n}{<->ssub * zplLF/b/n}{}
+\DeclareFontShape{TS1}{zplLF}{bx}{it}{<->ssub * zplLF/b/it}{}
+\DeclareFontShape{TS1}{zplLF}{bx}{sl}{<->ssub * zplLF/b/sl}{}
+\DeclareFontShape{TS1}{zplLF}{m}{sc}{<->ssub * zplLF/m/n}{}
+\DeclareFontShape{TS1}{zplLF}{m}{scit}{<->ssub * zplLF/m/it}{}
+\DeclareFontShape{TS1}{zplLF}{b}{sc}{<->ssub * zplLF/b/n}{}
+\DeclareFontShape{TS1}{zplLF}{b}{scit}{<->ssub * zplLF/b/it}{}
+\DeclareFontShape{TS1}{zplLF}{bx}{sc}{<->ssub * zplLF/b/n}{}
+\DeclareFontShape{TS1}{zplLF}{bx}{scit}{<->ssub * zplLF/b/it}{}
\endinput
diff --git a/fonts/newpx/tex/ts1zplosf.fd b/fonts/newpx/tex/ts1zplosf.fd
index 87e8f74cf6..8c45a451ca 100644
--- a/fonts/newpx/tex/ts1zplosf.fd
+++ b/fonts/newpx/tex/ts1zplosf.fd
@@ -1,25 +1,24 @@
-\ProvidesFile{ts1zplosf.fd}[2015/01/18 v1.0 fd file for TS1/zplosf]
+\ProvidesFile{ts1zplosf.fd}[2021/11/24 v1.0 fd file for TS1/zplOsF]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{TS1}{zplosf}{m}{it}{<-> \zpl@scaled ts1-qplri}{}
-\DeclareFontShape{TS1}{zplosf}{bx}{n}{<->ssub * zplosf/b/n}{}
-\DeclareFontShape{TS1}{zplosf}{bx}{it}{<->ssub * zplosf/b/it}{}
-\DeclareFontShape{TS1}{zplosf}{b}{sl}{<->sub * zplosf/b/it}{}
-\DeclareFontShape{TS1}{zplosf}{m}{sl}{<->sub * zplosf/m/it}{}
-\DeclareFontShape{TS1}{zplosf}{m}{sc}{<->ssub * zplosf/m/n}{}
-\DeclareFontShape{TS1}{zplosf}{m}{scit}{<->ssub * zplosf/m/it}{}
-\DeclareFontShape{TS1}{zplosf}{b}{sc}{<->ssub * zplosf/b/n}{}
-\DeclareFontShape{TS1}{zplosf}{b}{scit}{<->ssub * zplosf/b/it}{}
-\DeclareFontShape{TS1}{zplosf}{bx}{sc}{<->ssub * zplosf/b/n}{}
-\DeclareFontShape{TS1}{zplosf}{bx}{scit}{<->ssub * zplosf/b/it}{}
-\DeclareFontShape{TS1}{zplosf}{m}{sl}{<->ssub * zplosf/m/it}{}
-\DeclareFontShape{TS1}{zplosf}{bx}{sl}{<->ssub * zplosf/b/it}{}
+\DeclareFontFamily{TS1}{zplOsF}{\zpl@spacing}
+\DeclareFontShape{TS1}{zplOsF}{b}{n}{<-> \zpl@scaled zplOsF-Bold-ts1}{}
+\DeclareFontShape{TS1}{zplOsF}{b}{it}{<-> \zpl@scaled zplOsF-BoldItalic-ts1}{}
+\DeclareFontShape{TS1}{zplOsF}{m}{n}{<-> \zpl@scaled zplOsF-Regular-ts1}{}
+\DeclareFontShape{TS1}{zplOsF}{m}{it}{<-> \zpl@scaled zplOsF-Italic-ts1}{}
+\DeclareFontShape{TS1}{zplOsF}{m}{sl}{<-> \zpl@scaled zplOsF-Slanted-ts1}{}
+\DeclareFontShape{TS1}{zplOsF}{b}{sl}{<-> \zpl@scaled zplOsF-BoldSlanted-ts1}{}
+\DeclareFontShape{TS1}{zplOsF}{bx}{n}{<->ssub * zplOsF/b/n}{}
+\DeclareFontShape{TS1}{zplOsF}{bx}{it}{<->ssub * zplOsF/b/it}{}
+\DeclareFontShape{TS1}{zplOsF}{m}{sc}{<->ssub * zplOsF/m/n}{}
+\DeclareFontShape{TS1}{zplOsF}{m}{scit}{<->ssub * zplOsF/m/it}{}
+\DeclareFontShape{TS1}{zplOsF}{b}{sc}{<->ssub * zplOsF/b/n}{}
+\DeclareFontShape{TS1}{zplOsF}{b}{scit}{<->ssub * zplOsF/b/it}{}
+\DeclareFontShape{TS1}{zplOsF}{bx}{sc}{<->ssub * zplOsF/b/n}{}
+\DeclareFontShape{TS1}{zplOsF}{bx}{scit}{<->ssub * zplOsF/b/it}{}
+\DeclareFontShape{TS1}{zplOsF}{bx}{sl}{<->ssub * zplOsF/b/sl}{}
\endinput
diff --git a/fonts/newpx/tex/ts1zpltlf.fd b/fonts/newpx/tex/ts1zpltlf.fd
index e4855b7f58..d16ecc401b 100644
--- a/fonts/newpx/tex/ts1zpltlf.fd
+++ b/fonts/newpx/tex/ts1zpltlf.fd
@@ -1,25 +1,24 @@
-\ProvidesFile{ts1zpltlf.fd}[2015/01/18 v1.0 fd file for TS1/zpltlf]
+\ProvidesFile{ts1zpltlf.fd}[2021/11/24 v1.0 fd file for TS1/zplTLF]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\DeclareFontFamily{TS1}{zpltlf}{\zpl@spacing}
-\DeclareFontShape{TS1}{zpltlf}{b}{n}{<-> \zpl@scaled ts1-qplb}{}
-\DeclareFontShape{TS1}{zpltlf}{b}{it}{<-> \zpl@scaled ts1-qplbi}{}
-\DeclareFontShape{TS1}{zpltlf}{m}{n}{<-> \zpl@scaled ts1-qplr}{}
-\DeclareFontShape{TS1}{zpltlf}{m}{it}{<-> \zpl@scaled ts1-qplri}{}
-\DeclareFontShape{TS1}{zpltlf}{bx}{n}{<->ssub * zpltlf/b/n}{}
-\DeclareFontShape{TS1}{zpltlf}{bx}{it}{<->ssub * zpltlf/b/it}{}
-\DeclareFontShape{TS1}{zpltlf}{b}{sl}{<->sub * zpltlf/b/it}{}
-\DeclareFontShape{TS1}{zpltlf}{m}{sl}{<->sub * zpltlf/m/it}{}
-\DeclareFontShape{TS1}{zpltlf}{m}{sc}{<->ssub * zpltlf/m/n}{}
-\DeclareFontShape{TS1}{zpltlf}{m}{scit}{<->ssub * zpltlf/m/it}{}
-\DeclareFontShape{TS1}{zpltlf}{b}{sc}{<->ssub * zpltlf/b/n}{}
-\DeclareFontShape{TS1}{zpltlf}{b}{scit}{<->ssub * zpltlf/b/it}{}
-\DeclareFontShape{TS1}{zpltlf}{bx}{sc}{<->ssub * zpltlf/b/n}{}
-\DeclareFontShape{TS1}{zpltlf}{bx}{scit}{<->ssub * zpltlf/b/it}{}
-\DeclareFontShape{TS1}{zpltlf}{m}{sl}{<->ssub * zpltlf/m/it}{}
-\DeclareFontShape{TS1}{zpltlf}{bx}{sl}{<->ssub * zpltlf/b/it}{}
+\DeclareFontFamily{TS1}{zplTLF}{\zpl@spacing}
+\DeclareFontShape{TS1}{zplTLF}{b}{n}{<-> \zpl@scaled zplTLF-Bold-ts1}{}
+\DeclareFontShape{TS1}{zplTLF}{b}{it}{<-> \zpl@scaled zplTLF-BoldItalic-ts1}{}
+\DeclareFontShape{TS1}{zplTLF}{m}{n}{<-> \zpl@scaled zplTLF-Regular-ts1}{}
+\DeclareFontShape{TS1}{zplTLF}{m}{it}{<-> \zpl@scaled zplTLF-Italic-ts1}{}
+\DeclareFontShape{TS1}{zplTLF}{m}{sl}{<-> \zpl@scaled zplTLF-Slanted-ts1}{}
+\DeclareFontShape{TS1}{zplTLF}{b}{sl}{<-> \zpl@scaled zplTLF-BoldSlanted-ts1}{}
+\DeclareFontShape{TS1}{zplTLF}{bx}{n}{<->ssub * zplTLF/b/n}{}
+\DeclareFontShape{TS1}{zplTLF}{bx}{it}{<->ssub * zplTLF/b/it}{}
+\DeclareFontShape{TS1}{zplTLF}{m}{sc}{<->ssub * zplTLF/m/n}{}
+\DeclareFontShape{TS1}{zplTLF}{m}{scit}{<->ssub * zplTLF/m/it}{}
+\DeclareFontShape{TS1}{zplTLF}{b}{sc}{<->ssub * zplTLF/b/n}{}
+\DeclareFontShape{TS1}{zplTLF}{b}{scit}{<->ssub * zplTLF/b/it}{}
+\DeclareFontShape{TS1}{zplTLF}{bx}{sc}{<->ssub * zplTLF/b/n}{}
+\DeclareFontShape{TS1}{zplTLF}{bx}{scit}{<->ssub * zplTLF/b/it}{}
+\DeclareFontShape{TS1}{zplTLF}{bx}{sl}{<->ssub * zplTLF/b/sl}{}
\endinput
diff --git a/fonts/newpx/tex/ts1zpltosf.fd b/fonts/newpx/tex/ts1zpltosf.fd
index 168be759ca..9fc5aa68e5 100644
--- a/fonts/newpx/tex/ts1zpltosf.fd
+++ b/fonts/newpx/tex/ts1zpltosf.fd
@@ -1,25 +1,24 @@
-\ProvidesFile{ts1zpltosf.fd}[2015/01/18 v1.0 fd file for TS1/zpltosf]
+\ProvidesFile{ts1zpltosf.fd}[2021/11/24 v1.0 fd file for TS1/zplTOsF]
\expandafter\ifx\csname zpl@scaled\endcsname\relax
\global\let\zpl@scaled\@empty%
\fi
\ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi
-\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}{}
-\DeclareFontShape{TS1}{zpltosf}{m}{it}{<-> \zpl@scaled ts1-qplri}{}
-\DeclareFontShape{TS1}{zpltosf}{bx}{n}{<->ssub * zpltosf/b/n}{}
-\DeclareFontShape{TS1}{zpltosf}{bx}{it}{<->ssub * zpltosf/b/it}{}
-\DeclareFontShape{TS1}{zpltosf}{b}{sl}{<->sub * zpltosf/b/it}{}
-\DeclareFontShape{TS1}{zpltosf}{m}{sl}{<->sub * zpltosf/m/it}{}
-\DeclareFontShape{TS1}{zpltosf}{m}{sc}{<->ssub * zpltosf/m/n}{}
-\DeclareFontShape{TS1}{zpltosf}{m}{scit}{<->ssub * zpltosf/m/it}{}
-\DeclareFontShape{TS1}{zpltosf}{b}{sc}{<->ssub * zpltosf/b/n}{}
-\DeclareFontShape{TS1}{zpltosf}{b}{scit}{<->ssub * zpltosf/b/it}{}
-\DeclareFontShape{TS1}{zpltosf}{bx}{sc}{<->ssub * zpltosf/b/n}{}
-\DeclareFontShape{TS1}{zpltosf}{bx}{scit}{<->ssub * zpltosf/b/it}{}
-\DeclareFontShape{TS1}{zpltosf}{m}{sl}{<->ssub * zpltosf/m/it}{}
-\DeclareFontShape{TS1}{zpltosf}{bx}{sl}{<->ssub * zpltosf/b/it}{}
+\DeclareFontFamily{TS1}{zplTOsF}{\zpl@spacing}
+\DeclareFontShape{TS1}{zplTOsF}{b}{n}{<-> \zpl@scaled zplTOsF-Bold-ts1}{}
+\DeclareFontShape{TS1}{zplTOsF}{b}{it}{<-> \zpl@scaled zplTOsF-BoldItalic-ts1}{}
+\DeclareFontShape{TS1}{zplTOsF}{m}{n}{<-> \zpl@scaled zplTOsF-Regular-ts1}{}
+\DeclareFontShape{TS1}{zplTOsF}{m}{it}{<-> \zpl@scaled zplTOsF-Italic-ts1}{}
+\DeclareFontShape{TS1}{zplTOsF}{m}{sl}{<-> \zpl@scaled zplTOsF-Slanted-ts1}{}
+\DeclareFontShape{TS1}{zplTOsF}{b}{sl}{<-> \zpl@scaled zplTOsF-BoldSlanted-ts1}{}
+\DeclareFontShape{TS1}{zplTOsF}{bx}{n}{<->ssub * zplTOsF/b/n}{}
+\DeclareFontShape{TS1}{zplTOsF}{bx}{it}{<->ssub * zplTOsF/b/it}{}
+\DeclareFontShape{TS1}{zplTOsF}{m}{sc}{<->ssub * zplTOsF/m/n}{}
+\DeclareFontShape{TS1}{zplTOsF}{m}{scit}{<->ssub * zplTOsF/m/it}{}
+\DeclareFontShape{TS1}{zplTOsF}{b}{sc}{<->ssub * zplTOsF/b/n}{}
+\DeclareFontShape{TS1}{zplTOsF}{b}{scit}{<->ssub * zplTOsF/b/it}{}
+\DeclareFontShape{TS1}{zplTOsF}{bx}{sc}{<->ssub * zplTOsF/b/n}{}
+\DeclareFontShape{TS1}{zplTOsF}{bx}{scit}{<->ssub * zplTOsF/b/it}{}
+\DeclareFontShape{TS1}{zplTOsF}{bx}{sl}{<->ssub * zplTOsF/b/sl}{}
\endinput