From 241082cbe6f4fe8c38e91c38418ca828ac8d2f7c Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 25 Oct 2023 03:01:25 +0000 Subject: CTAN sync 202310250301 --- fonts/newpx/tex/ly1minzpl.fd | 2 +- fonts/newpx/tex/ly1zpllf.fd | 48 +-- fonts/newpx/tex/ly1zplosf.fd | 48 +-- fonts/newpx/tex/ly1zpltlf.fd | 48 +-- fonts/newpx/tex/ly1zpltosf.fd | 48 +-- fonts/newpx/tex/newpxtext.sty | 230 +++++++------ fonts/newpx/tex/newpxtext1.sty | 766 +++++++++++++++++++++++++++++++++++++++++ fonts/newpx/tex/newpxtextX.sty | 506 +++++++++++++++++++++++++++ fonts/newpx/tex/ot1minzpl.fd | 2 +- fonts/newpx/tex/ot1zpllf.fd | 48 +-- fonts/newpx/tex/ot1zplosf.fd | 48 +-- fonts/newpx/tex/ot1zpltlf.fd | 48 +-- fonts/newpx/tex/ot1zpltosf.fd | 48 +-- fonts/newpx/tex/t1minzpl.fd | 2 +- fonts/newpx/tex/t1zpldnom.fd | 2 +- fonts/newpx/tex/t1zplinf.fd | 2 +- fonts/newpx/tex/t1zpllf.fd | 48 +-- fonts/newpx/tex/t1zplosf.fd | 48 +-- fonts/newpx/tex/t1zpltlf.fd | 48 +-- fonts/newpx/tex/t1zpltosf.fd | 48 +-- fonts/newpx/tex/ts1zpllf.fd | 34 +- fonts/newpx/tex/ts1zplosf.fd | 34 +- fonts/newpx/tex/ts1zpltlf.fd | 32 +- fonts/newpx/tex/ts1zpltosf.fd | 32 +- 24 files changed, 1765 insertions(+), 455 deletions(-) create mode 100644 fonts/newpx/tex/newpxtext1.sty create mode 100644 fonts/newpx/tex/newpxtextX.sty (limited to 'fonts/newpx/tex') diff --git a/fonts/newpx/tex/ly1minzpl.fd b/fonts/newpx/tex/ly1minzpl.fd index df2b7e96f2..9927e717e6 100644 --- a/fonts/newpx/tex/ly1minzpl.fd +++ b/fonts/newpx/tex/ly1minzpl.fd @@ -1,6 +1,6 @@ \ProvidesFile{ly1minzpl.fd}[2021/05/25 v1.0 font definition file for LY1/minzpl/TLF] -\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% diff --git a/fonts/newpx/tex/ly1zpllf.fd b/fonts/newpx/tex/ly1zpllf.fd index af58f28968..e6b8afe7cb 100644 --- a/fonts/newpx/tex/ly1zpllf.fd +++ b/fonts/newpx/tex/ly1zpllf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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 0e53ec571b..5b2f6badba 100644 --- a/fonts/newpx/tex/ly1zplosf.fd +++ b/fonts/newpx/tex/ly1zplosf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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/ly1zpltlf.fd b/fonts/newpx/tex/ly1zpltlf.fd index 847bb2075a..2506dfee75 100644 --- a/fonts/newpx/tex/ly1zpltlf.fd +++ b/fonts/newpx/tex/ly1zpltlf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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 84e56add27..aa7f2a4509 100644 --- a/fonts/newpx/tex/ly1zpltosf.fd +++ b/fonts/newpx/tex/ly1zpltosf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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/newpxtext.sty b/fonts/newpx/tex/newpxtext.sty index 696a5c9732..1b25ea155a 100644 --- a/fonts/newpx/tex/newpxtext.sty +++ b/fonts/newpx/tex/newpxtext.sty @@ -8,16 +8,18 @@ % 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.521} -\def\filedate{2023/09/27} +\def\fileversion{1.53} +\def\filedate{2023/10/23} \ProvidesPackage{newpxtext}[% \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[T1]{fontenc} -\renewcommand*{\rmdefault}{zplTLF} % the default until end of preamble +\RequirePackage{xcolor} +\renewcommand*{\rmdefault}{zpltlf} % the default until end of preamble \renewcommand*{\familydefault}{\rmdefault} +\RequirePackage{xpatch} % need to patch \scshape \RequirePackage{iftex,xkeyval,etoolbox,textcomp} \RequirePackage{xstring,ifthen,scalefnt} % for \textfrac \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} @@ -127,13 +129,17 @@ \newdimen\zplsups@scale \newdimen\zplsups@raise \def\zplsups@raised{\z@} -\def\zplsups@spaced{.04em} +\def\zplsups@Lspaced{.04em} +\def\zplsups@Rspaced{.04em} \def\zplsups@scaledval{1.0} -\def\zplsups@supscale{1.0} +\def\zplsups@scalefactor{1} +\newcommand*{\zplsups@color}{black} \DeclareOptionX{supscaled}{\renewcommand*{\zplsups@scaledval}{#1}} \DeclareOptionX{supscale}{\renewcommand*{\zplsups@scaledval}{#1}} \DeclareOptionX{supsraised}{\renewcommand*{\zplsups@raised}{#1}} -\DeclareOptionX{supspaced}{\renewcommand*{\zplsups@supspaced}{#1}} +\DeclareOptionX{supLspaced}{\renewcommand*{\zplsups@Lspaced}{#1}} +\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups@Rspaced}{#1}} +\DeclareOptionX{supscolor}{\renewcommand*{\zplsups@color}{#1}} % Other options \DeclareOptionX{defaultsups}[true]{% @@ -203,8 +209,8 @@ \setlength{\zplsups@raise}{\zplsups@raised} \setlength{\zplsups@scale}{\zplsups@scaledval\p@} \zplsups@scale=\zpl@scale\zplsups@scale % +\def\zplsups@scalefactor{\strip@pt\zplsups@scale} \def\zplsups@scaled{s*[\strip@pt\zplsups@scale]} - % for stacked fractions \@ifundefined{zpl@xht}{\def\zpl@xht{460}}{} % lowercase letters \@ifundefined{zpl@deht}{\def\zpl@deht{412}}{} % denominator figures ht @@ -218,6 +224,7 @@ \def\re@DeclareTextSymbol#1#2#3{% \let#1=\undefined \DeclareTextSymbol{#1}{#2}{#3}} + \ifzpl@otf \ifzpl@nomath \RequirePackage[no-math]{fontspec} @@ -232,7 +239,14 @@ "local", "texmf", "system" }} \fi \def\zpl@base{TeXGyrePagellaX} - + \ifzpl@scosf + \AtBeginDocument{% + \xpretocmd{\scshape} + {\addfontfeatures{Numbers=OldStyle}} + {}{}% + }% + \fi + \newcommand{\textfrac}[3][]{{%\normalfont% \mbox{% \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1] @@ -242,23 +256,18 @@ }}} \else % type1 -% for possible use in footnote markers -% \DeclareFontFamily{OT1}{zplsups}{}% -% \DeclareFontShape{OT1}{zplsups}{m}{n}{% -% <-> \zplsups@scaled zplsups-Regular-ot1 -%}{} -% \DeclareFontFamily{T1}{zplsups}{}% -% \DeclareFontShape{T1}{zsups}{m}{n}{% -% <-> \zplsups@scaled zplsups-Regular-t1 -%}{} -% \DeclareFontFamily{TS1}{zsups}{}% -% \DeclareFontShape{TS1}{zsups}{m}{n}{% -% <-> \zplsups@scaled zplsups-Regular-ts1 -%}{} -\DeclareRobustCommand{\supstyle}{% - \not@math@alphabet\supstyle\relax - \usefont{\f@encoding}{zplsups}{m}{n}} - + \ifzpl@scosf + \AtBeginDocument{% + \xpretocmd{\scshape} + {\fontfamily{zpl\zpl@figurealign osf}} + {}{}% + }% + \fi% + \DeclareRobustCommand{\sustyle}{% + \not@math@alphabet\sustyle\relax + \fontfamily{zplsups}\selectfont} + \let\supstyle\sustyle + \ifdim\zplsups@raise=\z@ \DeclareRobustCommand{\textsups}[1]{{\supstyle#1}} \else @@ -273,13 +282,7 @@ % \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} @@ -288,11 +291,12 @@ % \let\instyle=\infigures % \DeclareTextFontCommand{\textinf}{\infigures} % \let\textinferior\textinf - \DeclareRobustCommand{\instyle}{% + \DeclareRobustCommand{\infstyle}{% \not@math@alphabet\instyle\relax \fontfamily{zplsubs}\selectfont} - \let\infigures=\instyle - + \let\infigures=\infstyle + \let\instyle\infstyle + \fa@naming@exception{figures}{{denominators}{proportional}}{dnom} \fa@naming@exception{figures}{{denominators}{tabular}}{dnom} % \def\defigures{\@nomath\defigures @@ -354,8 +358,8 @@ } % textfrac \fi -\let\orig@footnote=\thefootnote -\let\orig@makefnmark=\@makefnmark +%\let\orig@footnote=\thefootnote +%\let\orig@makefnmark=\@makefnmark \def\bfseries@rm{b} \def\mdseries@rm{m} \def\useosf{\zpl@liningfalse} @@ -392,13 +396,13 @@ {\edef\zpl@dflt{\zpl@dflt StylisticSet={\zpl@lst} , }}{} - \defaultfontfeatures{ + \defaultfontfeatures[\zpl@base]{ Ligatures = TeX , Scale = \zpl@scale , Extension = .otf , SmallCapsFeatures={\ifzpl@scosf Numbers = OldStyle , - \fi RawFeature = +\zpl@scraw , - \ifluatex Renderer=Basic\fi} , + \fi RawFeature = +\zpl@scraw } , + \ifluatex Renderer=Basic , \fi \zpl@dflt , RawFeature=-ss05 , \zpl@defaultfeatures @@ -413,29 +417,26 @@ \edef\qhv@scale{\strip@pt\@tempdima} \def\zpl@scaled{s*[\zpl@scale]}% used in fd files - %\def\oldstylenums#1{{\fontencoding{TS1}\selectfont #1}} - - %\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.}} \DeclareRobustCommand{\lfstyle}{% \not@math@alphabet\lfstyle\relax - \fontfamily{zplLF}\selectfont % + \fontfamily{zpllf}\selectfont % } \DeclareRobustCommand{\tlfstyle}{% \not@math@alphabet\tlfstyle\relax - \fontfamily{zplTLF}\selectfont % + \fontfamily{zpltlf}\selectfont % } \DeclareRobustCommand{\osfstyle}{% \not@math@alphabet\osfstyle\relax - \fontfamily{zplOsF}\selectfont % + \fontfamily{zplosf}\selectfont % } \DeclareRobustCommand{\tosfstyle}{% \not@math@alphabet\tosfstyle\relax - \fontfamily{zplTOsF}\selectfont % + \fontfamily{zpltosf}\selectfont % } \ifzpl@defaultsups % \else - \ExplSyntaxOn + \ExplSyntaxOn \DeclareDocumentCommand \fakesuperscript {m} { \@textsuperscript{\selectfont#1} } @@ -443,23 +444,31 @@ \IfBooleanTF #1 \fakesuperscript \realsuperscript } \DeclareDocumentCommand \realsuperscript {m} { - \ifzpl@defaultsups\fakesuperscript{#1} - \else\hspace*{\zplsups@spaced}\textsups{#1}\fi - } - - \cs_set:Npn \@makefnmark { - \mbox{% + \hbox_set:Nn \l_tmpa_box {{\sustyle#1}} + \box_scale:Nnn \l_tmpa_box { \zplsups@scalefactor } { \zplsups@scalefactor } + \hbox_set:Nn \l_tmpa_box + { \box_move_up:nn \zplsups@raised {\box_use:N \l_tmpa_box} } + \hspace*{\zplsups@Lspaced}{\color{\zplsups@color}% + \box_use:N \l_tmpa_box} \hspace*{\zplsups@Rspaced}}% + + + \cs_set:Npn \@makefnmark { + \mbox{% \footnotemarkfont\textsuperscript{\@thefnmark}} } - \cs_if_exist:NTF \ftntm@font + \cs_if_exist:NTF \ftntm@font % will exist only for KOMA { - \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} + \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} } { - \cs_new:Npn \footnotemarkfont {\normalfont} + \cs_new:Npn \footnotemarkfont {\normalfont} } \ExplSyntaxOff \fi + \ifzpl@KOMA + \setkomafont{footnotereference}{\normalfont\supstyle} + \setkomafont{footnotelabel}{\normalfont\supstyle} + \fi % \ifzpl@KOMA % \let\textsuperscript\sustyle % \setkomafont{footnotelabel}{\textsuperscript} @@ -510,7 +519,7 @@ \ifzpl@otf % \def\zpl@nft{\if t\zpl@thmtab Monospaced% % \else Proportional\fi} - \DeclareTextFontCommand{\textsl}{\slshape} +%\DeclareTextFontCommand{\textsl}{\slshape} \DeclareTextFontCommand{% \osfstyle}{\addfontfeatures{Numbers={Proportional,OldStyle}}} \DeclareTextFontCommand{% @@ -520,32 +529,69 @@ \DeclareTextFontCommand{% \lfstyle}{\addfontfeatures{Numbers={Proportional,Lining}}} - \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 + \DeclareRobustCommand{\destyle}{% + \not@math@alphabet\destyle\relax + \addfontfeatures{VerticalPosition=Denominator}% + } + \DeclareRobustCommand{\nustyle}{% + \not@math@alphabet\nustyle\relax + \addfontfeatures{VerticalPosition=Numerator}% + } + \DeclareRobustCommand{\sustyle}{% + \not@math@alphabet\sustyle\relax + \addfontfeatures{VerticalPosition=Superior}% + } + \DeclareRobustCommand{\infstyle}{% + \not@math@alphabet\infstyle\relax + \addfontfeatures{VerticalPosition=Inferior}% + } + \let\instyle\infstyle + \let\sufigures\sustyle + \let\nufigures\nustyle + \let\infigures\infstyle + \let\defigures\destyle + \ifzpl@defaultsups % \else + \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont\textsuperscript{\@thefnmark}}{}{} + \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont\textsuperscript{\@thefnmark}}{}{} + %\show\maketitle \RequirePackage{realscripts} - \renewcommand\footnotemarkfont{\normalfont\sufigures} + \renewcommand\footnotemarkfont{\normalfont}%\sufigures} + \ExplSyntaxOn + \DeclareDocumentCommand \fakesuperscript {m} { + \@textsuperscript{\selectfont#1} + } + \RenewDocumentCommand \textsuperscript {s} { + \IfBooleanTF #1 \fakesuperscript \realsuperscript + } + \DeclareDocumentCommand \realsuperscript {m} { + \hbox_set:Nn \l_tmpa_box {\textsups{#1}} + \box_scale:Nnn \l_tmpa_box { \zplsups@scalefactor } { \zplsups@scalefactor } + \hbox_set:Nn \l_tmpa_box + { \box_move_up:nn \zplsups@raised {\box_use:N \l_tmpa_box} } + \hspace*{\zplsups@Lspaced}{\color{\zplsups@color}% + \box_use:N \l_tmpa_box }% + \hspace*{\zplsups@Rspaced}} + + \cs_set:Npn \@makefnmark {% + \mbox{% + \footnotemarkfont\textsuperscript{\@thefnmark}} + } + \cs_if_exist:NTF \ftntm@font + { + \cs_set:Npn \footnotemarkfont {\normalfont \ftntm@font} + } + { + \cs_set:Npn \footnotemarkfont {\normalfont} + } + \ExplSyntaxOff \fi \ifzpl@KOMA \setkomafont{footnotereference}{\normalfont\sustyle} \setkomafont{footnotelabel}{\normalfont\sustyle} \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}}% @@ -574,18 +620,17 @@ \DeclareRobustCommand{\texttosf}[1]{% {\tosfstyle #1}% } -\DeclareRobustCommand{\textsu}[1]{% - {\sustyle #1}% -} \DeclareTextFontCommand{\textsu}{\sustyle} - \let\textsuperior\textsu + \let\textsup\textsu + \let\textsups\textsu \DeclareTextFontCommand{\textnumerator}{\nustyle} \ifzpl@notextnu\else\let\textnu=\textnumerator\fi \let\textnum\textnumerator \DeclareTextFontCommand{\textde}{\destyle} \let\textdenominator\textde -\DeclareTextFontCommand{\textinf}{\instyle} +\DeclareTextFontCommand{\textinf}{\infstyle} \let\textinferior\textinf + \let\textsub\textinf \newdimen\zpl@sixem\zpl@sixem6pt % for checking if a number refers to ex \newdimen\zpl@y \newdimen\zpl@x @@ -650,12 +695,6 @@ \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 @@ -669,22 +708,22 @@ \else % type1 \ifzpl@lining - \def\zpl@figurestyle{LF} + \def\zpl@figurestyle{lf} \else - \def\zpl@figurestyle{OsF} + \def\zpl@figurestyle{osf} \fi \ifzpl@tabular - \def\zpl@figurealign{T} + \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 + %\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 @@ -697,7 +736,6 @@ \fi % type1 % both \ifzpl@KOMA - %\let\textsuperscript\textsu \@ifpackageloaded{AB@authnote}{% \renewcommand\AB@authnote[1]{\textsu{#1}} \renewcommand\AB@affilnote[1]{\textsu{#1}} @@ -726,9 +764,9 @@ \DeclareTextFontCommand{% \oldstylenums}{\fontfamily{zpl\zpl@figurealign OsF}\selectfont } \DeclareTextFontCommand{% - \liningnums}{\fontfamily{zpl\zpl@figurealign LF}\selectfont } + \liningnums}{\fontfamily{zpl\zpl@figurealign lf}\selectfont } \DeclareTextFontCommand{% - \tabularnums}{\fontfamily{zplT\zpl@figurestyle}\selectfont } + \tabularnums}{\fontfamily{zplt\zpl@figurestyle}\selectfont } \DeclareTextFontCommand{% \proportionalnums}{\fontfamily{zpl\zpl@figurestyle}\selectfont } \re@DeclareTextSymbol{\textdollar}{OT1}{36} diff --git a/fonts/newpx/tex/newpxtext1.sty b/fonts/newpx/tex/newpxtext1.sty new file mode 100644 index 0000000000..2dda973cb8 --- /dev/null +++ b/fonts/newpx/tex/newpxtext1.sty @@ -0,0 +1,766 @@ +\NeedsTeXFormat{LaTeX2e} + +% Based originally on Young Ryu's pxfonts.sty, v.1.1.1 +% +% 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; +% Text is now directed to an extension of TeXGyrePagella rather than ppl. +% 1.5 is the first version of newpxtext to support both [pdf]latex and unicode latex. + +\def\fileversion{1.523} +\def\filedate{2023/09/28} +\ProvidesPackage{newpxtext}[% +\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[T1]{fontenc} +\renewcommand*{\rmdefault}{zplTLF} % the default until end of preamble +\renewcommand*{\familydefault}{\rmdefault} +\RequirePackage{xpatch} % need to patch \scshape +\RequirePackage{iftex,xkeyval,etoolbox,textcomp} +\RequirePackage{xstring,ifthen,scalefnt} % for \textfrac +\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} +\DeclareEncodingSubset{TS1}{zpl*}{0} + +%KOMA check +\newif\ifzpl@KOMA +\@ifundefined{KOMAClassName}{}{\zpl@KOMAtrue} +\@ifundefined{ver@scrextend.sty}{}{\zpl@KOMAtrue} +\newif\ifzpl@LTX +\@ifclassloaded{article}{\zpl@LTXtrue}{} +\@ifclassloaded{report}{\zpl@LTXtrue}{} +\@ifclassloaded{book}{\zpl@LTXtrue}{} + +% Engine check +\newif\ifzpl@otf +\iftutex\zpl@otftrue +%\else % [pdf]LaTeX +% \zpl@otffalse +\fi +\def\zpl@divide#1#2{\strip@pt\dimexpr 1pt * (\dimexpr #1pt\relax) / \dimexpr #2pt\relax\relax} +%%%%%%%%%%%%%%%%%% +\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 +\@ifundefined{ver@newpxmath.sty}{}{\zpl@nomathtrue} + +\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 +\providecommand{\zpl@scale}{1} % actual scaled command in \zpl@scaled +\DeclareOptionX{scale}{\def\zpl@scale{#1}} +\DeclareOptionX{scaled}{\def\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 % default is to load helvetica as sans serif font +\newif\ifzpl@thrm +\newif\ifzpl@sl +% new sups options +\newdimen\zplsups@scale +\newdimen\zplsups@raise +\def\zplsups@raised{\z@} +\def\zplsups@Lspaced{.04em} +\def\zplsups@Rspaced{.04em} +\def\zplsups@scaledval{1.0} +\def\zplsups@supscale{1.0} +\DeclareOptionX{supscaled}{\renewcommand*{\zplsups@scaledval}{#1}} +\DeclareOptionX{supscale}{\renewcommand*{\zplsups@scaledval}{#1}} +\DeclareOptionX{supsraised}{\renewcommand*{\zplsups@raised}{#1}} +\DeclareOptionX{supLspaced}{\renewcommand*{\zplsups@Lspaced}{#1}} +\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups@Rspaced}{#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} +\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} +} +\newcount\zpl@cnt \zpl@cnt=0 +\newif\ifzpl@zeroslash +\newif\ifzpl@notextnu +\def\zpl@thmlin{X} % default is to not change to lining +\def\zpl@noti{T}\def\zpl@nolo{T} +\DeclareOptionX{oldSS}{\advance\zpl@cnt 32 } +\DeclareOptionX{notextnu}{\zpl@notextnutrue} +\DeclareOptionX{slashedzero}{\zpl@zeroslashtrue} +\DeclareOptionX{theoremfont}{\zpl@thrmtrue } +\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}} + +\DeclareOptionX{sfracvcenter}{% +\def\zpl@sfrVC{#1}} +\DeclareOptionX{sfracvspacing}{% +\def\zpl@sfrVS{#1}} +\DeclareOptionX{sfracbarthick}{% +\def\zpl@sfrTH{#1}} +\DeclareOptionX{sfracscaling}{% +\def\zpl@sfrSC{#1}} + +\ProcessOptionsX\relax + +\setlength{\zplsups@raise}{\zplsups@raised} +\setlength{\zplsups@scale}{\zplsups@scaledval\p@} +\zplsups@scale=\zpl@scale\zplsups@scale % +\def\zplsups@scaled{s*[\strip@pt\zplsups@scale]} +% for stacked fractions +\@ifundefined{zpl@xht}{\def\zpl@xht{460}}{} % lowercase letters +\@ifundefined{zpl@deht}{\def\zpl@deht{412}}{} % denominator figures ht +\@ifundefined{zpl@nubase}{\def\zpl@nubase{270}}{} % baseline of numerators +\@ifundefined{zpl@debase}{\def\zpl@debase{0}}{} % baseline of denoms +\@ifundefined{zpl@sfrVC}{\def\zpl@sfrVC{335}}{}% vertical center of sfrac +\@ifundefined{zpl@sfrVS}{\def\zpl@sfrVS{106}}{} % space above/below bar +\@ifundefined{zpl@sfrTH}{\def\zpl@sfrTH{52}}{} % bar thickness +\@ifundefined{zpl@sfrSC}{\def\zpl@sfrSC{.9}}{} % scale defigures by this + +\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 % causing unwanted warnings in Tectonic system + + \ifluatex % avoid possibly uncorrected "system" fonts + \directlua{fonts.names.set_location_precedence{ + "local", "texmf", "system" }} + \fi + \def\zpl@base{TeXGyrePagellaX} + \ifzpl@scosf + \AtBeginDocument{% + \xpretocmd{\scshape} + {\addfontfeatures{Numbers=OldStyle}} + {}{}% + }% + \fi + + + \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 + \ifzpl@scosf + \AtBeginDocument{% + \xpretocmd{\scshape} + {\fontfamily{zpl\zpl@figurealign osf}} + {}{}% + }% + \fi% +% for possible use in footnote markers +% \DeclareFontFamily{OT1}{zplsups}{}% +% \DeclareFontShape{OT1}{zplsups}{m}{n}{% +% <-> \zplsups@scaled zplsups-Regular-ot1 +%}{} +% \DeclareFontFamily{T1}{zplsups}{}% +% \DeclareFontShape{T1}{zsups}{m}{n}{% +% <-> \zplsups@scaled zplsups-Regular-t1 +%}{} +% \DeclareFontFamily{TS1}{zsups}{}% +% \DeclareFontShape{TS1}{zsups}{m}{n}{% +% <-> \zplsups@scaled zplsups-Regular-ts1 +%}{} +\DeclareRobustCommand{\supstyle}{% + \not@math@alphabet\supstyle\relax + \usefont{\f@encoding}{zplsups}{m}{n}} + +\ifdim\zplsups@raise=\z@ + \DeclareRobustCommand{\textsups}[1]{{\supstyle#1}} +\else + \DeclareRobustCommand{\textsups}[1]{% + \raisebox{\zplsups@raise}{\hbox{{\supstyle#1}}}} +\fi + +\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} +% \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}{}% + {\nustyle#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}\def\zpl@scrawN{smcp} + \ifzpl@largesc\def\zpl@scraw{smcp}\def\zpl@scrawN{pcap}\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@scrawN;+\zpl@scraw } + \ifluatex Renderer=Basic\fi , + \zpl@dflt , + RawFeature=-ss05 , + \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} + \def\zpl@scaled{s*[\zpl@scale]}% used in fd files + + + \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 + \ExplSyntaxOn + \DeclareDocumentCommand \fakesuperscript {m} { + \@textsuperscript{\selectfont#1} + } + \RenewDocumentCommand \textsuperscript {s} { + \IfBooleanTF #1 \fakesuperscript \realsuperscript + } + \DeclareDocumentCommand \realsuperscript {m} { + \ifzpl@defaultsups\fakesuperscript{#1} + \else\hspace*{\zplsups@Lspaced}\textsups{#1}\hspace*{\zplsups@Rspaced}\fi + } + + \cs_set:Npn \@makefnmark { + \mbox{% + \footnotemarkfont\textsuperscript{\@thefnmark}} + } + \cs_if_exist:NTF \ftntm@font + { + \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} + } + { + \cs_new:Npn \footnotemarkfont {\normalfont} + } + \ExplSyntaxOff + \fi +% \ifzpl@KOMA +% \let\textsuperscript\sustyle +% \setkomafont{footnotelabel}{\textsuperscript} +% \setkomafont{footnotereference}{\textsuperscript} +% \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 +% \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 + +\fi % type1 + +\ifzpl@thrm + %\RequirePackage{amsmath,amsthm} % in case of theoremfont + \ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty + \@ifpackageloaded{ntheorem}\relax{% + \newtheoremstyle{plain} + {\medskipamount} % ABOVESPACE, was \topsep + {\medskipamount} % BELOWSPACE, was \topsep + {\thfamily} % BODYFONT--\thfamily is italic with upright figures and punctuation + {} % INDENT (empty value is the same as 0pt) + {\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection + {.} % HEADPUNCT + {5pt plus 1pt minus 1pt} % HEADSPACE + {} % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section] + } % end @ifpackageloaded + \fi% +\fi%} + +\ifzpl@otf + \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}}} + + \DeclareRobustCommand{\destyle}{% + \not@math@alphabet\destyle\relax + \addfontfeatures{VerticalPosition=Denominator}% + } + \DeclareRobustCommand{\nustyle}{% + \not@math@alphabet\nustyle\relax + \addfontfeatures{VerticalPosition=Numerator}% + } + \DeclareRobustCommand{\sustyle}{% + \not@math@alphabet\sustyle\relax + \addfontfeatures{VerticalPosition=Superior}% + } + \DeclareRobustCommand{\infstyle}{% + \not@math@alphabet\infstyle\relax + \addfontfeatures{VerticalPosition=Inferior}% + } + + \let\sufigures\sustyle + \let\nufigures\nustyle + \let\infigures\infstyle + \let\defigures\destyle + + \ifzpl@defaultsups % + \else + \RequirePackage{realscripts} + \renewcommand\footnotemarkfont{\normalfont\sufigures} + \fi + \ifzpl@KOMA + \setkomafont{footnotereference}{\normalfont\sustyle} + \setkomafont{footnotelabel}{\normalfont\sustyle} + \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 + +% applies to both +\DeclareRobustCommand{\textlf}[1]{% + {\lfstyle #1}% +} +\DeclareRobustCommand{\texttlf}[1]{% + {\tlfstyle #1}% +} +\DeclareRobustCommand{\textosf}[1]{% + {\osfstyle #1}% +} +\DeclareRobustCommand{\texttosf}[1]{% + {\tosfstyle #1}% +} +%\DeclareRobustCommand{\textsu}[1]{% +% {\sustyle #1}% +%} +\DeclareTextFontCommand{\textsu}{\sustyle} + %\let\textsuperior\textsu +\let\textsup\textsu + \let\textsups\textsu +\DeclareTextFontCommand{\textnumerator}{\nustyle} + \ifzpl@notextnu\else\let\textnu=\textnumerator\fi + \let\textnum\textnumerator +\DeclareTextFontCommand{\textde}{\destyle} + \let\textdenominator\textde +\DeclareTextFontCommand{\textinf}{\instyle} + \let\textinferior\textinf + +\newdimen\zpl@sixem\zpl@sixem6pt % for checking if a number refers to ex +\newdimen\zpl@y \newdimen\zpl@x + +% convert numerical entry that may be multiple of ex (<6) or em value +\def\zpl@toex#1{\zpl@x#1pt \ifdim\zpl@x<\z@\zpl@y-\zpl@x\else\zpl@y\zpl@x\fi \ifdim\zpl@y>\zpl@sixem \zpl@x\dimexpr + 1pt * (\dimexpr #1pt\relax) / \dimexpr \zpl@xht pt\relax\relax\fi} + +\newdimen\zpl@tmpdima \newdimen\zpl@tmpdimb \newdimen\zpl@tmpdimc +\newdimen\zpl@tmpdimd \newdimen\zpl@tmpdime \newdimen\zpl@tmpdimf +\newdimen\zpl@dimA +\newdimen\zpl@dimAA \newdimen\zpl@dimB \newdimen\zpl@dimBB +\newdimen\zpl@dimC % vertical center +% double cap letters for below bar, single cap for above + +\zpl@toex\zpl@sfrVC\zpl@dimC\zpl@x %Vertical center of fraction +\zpl@toex\zpl@sfrTH\zpl@tmpdimb\zpl@x % bar thickness +\zpl@tmpdime.5\zpl@tmpdimb % half bar thickness +\zpl@toex\zpl@sfrVS\zpl@tmpdimc\zpl@x% vertical space +\zpl@toex\zpl@deht\zpl@tmpdimd\zpl@x % height of unscaled figures +\zpl@tmpdimd\zpl@sfrSC\zpl@tmpdimd % height of scaled figures +\zpl@toex\zpl@debase\zpl@tmpdimf\zpl@x % unscaled baseline of de figures +\zpl@toex\zpl@nubase\zpl@tmpdima\zpl@x % unscaled baseline of nu figures +\zpl@tmpdima\zpl@sfrSC\zpl@tmpdima % scaled nu baseline +\zpl@tmpdimf\zpl@sfrSC\zpl@tmpdimf % scaled de baseline +\zpl@dimA\zpl@dimC +\advance\zpl@dimA by \zpl@tmpdime % top of bar +\zpl@dimAA\zpl@dimC +\advance\zpl@dimAA by -\zpl@tmpdime % bottom of bar +\zpl@dimB\zpl@dimA +\advance\zpl@dimB by \zpl@tmpdimc % top figure baseline +\advance\zpl@dimB by -\zpl@tmpdima +\zpl@dimBB\zpl@dimAA +\advance\zpl@dimBB by -\zpl@tmpdimc % +\advance\zpl@dimBB by -\zpl@tmpdimd % bottom figure baseline +\advance\zpl@dimBB by -\zpl@tmpdimf +\newcommand*{\textsfrac}[3][]{% like \textsfrac[1]{23}{34} +\mbox{% + \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1] + {\textlf{#1}\kern.12em}{}% + {\hmode@bgroup% +\ooalign{% + \setbox0=\hbox{\scalefont{\zpl@sfrSC}\nustyle#2}% + \hfil \raise\strip@pt\zpl@dimB ex\box0\hfil \crcr% + \leaders\hrule height \strip@pt\zpl@dimA ex depth -\strip@pt\zpl@dimAA ex\hfill \crcr% + \setbox1=\hbox{\scalefont{\zpl@sfrSC}\destyle#3}% + \hfil\raise\strip@pt\zpl@dimBB ex\box1\hfil}% +\egroup}} +} + +\AtEndPreamble{% +\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 +% \ifzpl@scosf +% %\traceon +% \setmainfont +% [Numbers = {\zpl@figurealign,\zpl@figurestyle}, +% SmallCapsFeatures = { Letters=SmallCaps , Numbers = OldStyle } +% ] {\zpl@base} +%% \traceoff +% \else +% \setmainfont +% [Numbers = {\zpl@figurealign,\zpl@figurestyle} +% SmallCapsFeatures = { Letters=SmallCaps , } +% ] {\zpl@base} +% \fi + \setmainfont + [Numbers = {Proportional , Lining }, + SmallCapsFeatures = { Letters = SmallCaps , Numbers = OldStyle } + ] {TeXGyrePagellaX} + + +% \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 % change + +\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} + \let\familydefault\rmdefault + + % 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 % type1 +% both +\ifzpl@KOMA + %\let\textsuperscript\textsu + \@ifpackageloaded{AB@authnote}{% + \renewcommand\AB@authnote[1]{\textsu{#1}} + \renewcommand\AB@affilnote[1]{\textsu{#1}} + } +\fi +%both +\ifzpl@thrm + \@ifundefined{theoremstyle}{}{ + \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 +} + +% 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/newpxtextX.sty b/fonts/newpx/tex/newpxtextX.sty new file mode 100644 index 0000000000..b2f46f3c67 --- /dev/null +++ b/fonts/newpx/tex/newpxtextX.sty @@ -0,0 +1,506 @@ +\NeedsTeXFormat{LaTeX2e} + +% Based originally on Young Ryu's pxfonts.sty, v.1.1.1 +% +% 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; +% Text is now directed to an extension of TeXGyrePagella rather than ppl. +% 1.5 is the first version of newpxtext to support both [pdf]latex and unicode latex. + +\def\fileversion{1.523X} +\def\filedate{2023/10/02} +\ProvidesPackage{newpxtextX}[% +\filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX] + +\message{`newpxtextX' v\fileversion, \filedate\space Text macros taking advantage of TeXGyre Pagella and its extensions (msharpe)} + +\RequirePackage[T1]{fontenc} + +\RequirePackage{xpatch} % need to patch \scshape +\RequirePackage{iftex,xkeyval,etoolbox,textcomp} +\RequirePackage{xstring,ifthen,scalefnt} % for \textfrac + +% Engine check +\newif\ifzpl@otf +\iftutex\zpl@otftrue +\else + \endinput +\fi +%%%%%%%%%%%%%%%%%% + \RequirePackage{xkeyval} +%%%% 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 +\@ifundefined{ver@newpxmath.sty}{}{\zpl@nomathtrue} + +\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 +\providecommand{\zpl@scale}{1} % actual scaled command in \zpl@scaled +\DeclareOptionX{scale}{\def\zpl@scale{#1}} +\DeclareOptionX{scaled}{\def\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 % default is to load helvetica as sans serif font +\newif\ifzpl@thrm +\newif\ifzpl@sl +% new sups options +\newdimen\zplsups@scale +\newdimen\zplsups@raise +\def\zplsups@raised{\z@} +\def\zplsups@Lspaced{.04em} +\def\zplsups@Rspaced{.04em} +\def\zplsups@scaledval{1.0} +\def\zplsups@supscale{1.0} +\DeclareOptionX{supscaled}{\renewcommand*{\zplsups@scaledval}{#1}} +\DeclareOptionX{supscale}{\renewcommand*{\zplsups@scaledval}{#1}} +\DeclareOptionX{supsraised}{\renewcommand*{\zplsups@raised}{#1}} +\DeclareOptionX{supLspaced}{\renewcommand*{\zplsups@Lspaced}{#1}} +\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups@Rspaced}{#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} +\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} +} +\newcount\zpl@cnt \zpl@cnt=0 +\newif\ifzpl@zeroslash +\newif\ifzpl@notextnu +\def\zpl@thmlin{X} % default is to not change to lining +\def\zpl@noti{T}\def\zpl@nolo{T} +\DeclareOptionX{oldSS}{\advance\zpl@cnt 32 } +\DeclareOptionX{notextnu}{\zpl@notextnutrue} +\DeclareOptionX{slashedzero}{\zpl@zeroslashtrue} +\DeclareOptionX{theoremfont}{\zpl@thrmtrue } +\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}} + +\DeclareOptionX{sfracvcenter}{% +\def\zpl@sfrVC{#1}} +\DeclareOptionX{sfracvspacing}{% +\def\zpl@sfrVS{#1}} +\DeclareOptionX{sfracbarthick}{% +\def\zpl@sfrTH{#1}} +\DeclareOptionX{sfracscaling}{% +\def\zpl@sfrSC{#1}} + +\ProcessOptionsX\relax + +\setlength{\zplsups@raise}{\zplsups@raised} +\setlength{\zplsups@scale}{\zplsups@scaledval\p@} +\zplsups@scale=\zpl@scale\zplsups@scale % +\def\zplsups@scaled{s*[\strip@pt\zplsups@scale]} +% for stacked fractions +\@ifundefined{zpl@xht}{\def\zpl@xht{460}}{} % lowercase letters +\@ifundefined{zpl@deht}{\def\zpl@deht{412}}{} % denominator figures ht +\@ifundefined{zpl@nubase}{\def\zpl@nubase{270}}{} % baseline of numerators +\@ifundefined{zpl@debase}{\def\zpl@debase{0}}{} % baseline of denoms +\@ifundefined{zpl@sfrVC}{\def\zpl@sfrVC{335}}{}% vertical center of sfrac +\@ifundefined{zpl@sfrVS}{\def\zpl@sfrVS{106}}{} % space above/below bar +\@ifundefined{zpl@sfrTH}{\def\zpl@sfrTH{52}}{} % bar thickness +\@ifundefined{zpl@sfrSC}{\def\zpl@sfrSC{.9}}{} % scale defigures by this + +\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 + + \ifluatex % avoid possibly uncorrected "system" fonts + \directlua{fonts.names.set_location_precedence{ + "local", "texmf", "system" }} + \fi + \def\zpl@base{TeXGyrePagellaX} +% \ifzpl@scosf +% \AtEndPreamble{% +% \xpretocmd{\scshape} +% {\addfontfeatures{ Numbers = OldStyle }} +% {}{}% +% }% +% \fi + + + \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 +\fi + +\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}\def\zpl@scrawN{smcp} + \ifzpl@largesc\def\zpl@scraw{smcp}\def\zpl@scrawN{pcap}\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@scrawN;+\zpl@scraw } + \ifluatex Renderer=Basic\fi , + \zpl@dflt , + RawFeature=-ss05 , + \zpl@defaultfeatures + } + +\else % type1 + \fi % type1 + +\ifzpl@thrm + %\RequirePackage{amsmath,amsthm} % in case of theoremfont + \ifdefined\newtheoremstyle %amsthm and ntheorem, not theorem.sty + \@ifpackageloaded{ntheorem}\relax{% + \newtheoremstyle{plain} + {\medskipamount} % ABOVESPACE, was \topsep + {\medskipamount} % BELOWSPACE, was \topsep + {\thfamily} % BODYFONT--\thfamily is italic with upright figures and punctuation + {} % INDENT (empty value is the same as 0pt) + {\bfseries} % HEADFONT--you may want to add \tlfstyle so the number is tab lining, regardless of text figure selection + {.} % HEADPUNCT + {5pt plus 1pt minus 1pt} % HEADSPACE + {} % CUSTOM-HEAD-SPEC\newtheorem{thm}{Theorem}[section] + } % end @ifpackageloaded + \fi% +\fi%} + +\ifzpl@otf + \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}}} + + \DeclareRobustCommand{\destyle}{% + \not@math@alphabet\destyle\relax + \addfontfeatures{VerticalPosition=Denominator}% + } + \DeclareRobustCommand{\nustyle}{% + \not@math@alphabet\nustyle\relax + \addfontfeatures{VerticalPosition=Numerator}% + } + \DeclareRobustCommand{\sustyle}{% + \not@math@alphabet\sustyle\relax + \addfontfeatures{VerticalPosition=Superior}% + } + \DeclareRobustCommand{\infstyle}{% + \not@math@alphabet\infstyle\relax + \addfontfeatures{VerticalPosition=Inferior}% + } + + \let\sufigures\sustyle + \let\nufigures\nustyle + \let\infigures\infstyle + \let\defigures\destyle + + \ifzpl@defaultsups % + \else + \RequirePackage{realscripts} + \renewcommand\footnotemarkfont{\normalfont\sufigures} + \fi +% \ifzpl@KOMA +% \setkomafont{footnotereference}{\normalfont\sustyle} +% \setkomafont{footnotelabel}{\normalfont\sustyle} +% \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 +\fi + +% applies to both +\DeclareRobustCommand{\textlf}[1]{% + {\lfstyle #1}% +} +\DeclareRobustCommand{\texttlf}[1]{% + {\tlfstyle #1}% +} +\DeclareRobustCommand{\textosf}[1]{% + {\osfstyle #1}% +} +\DeclareRobustCommand{\texttosf}[1]{% + {\tosfstyle #1}% +} +%\DeclareRobustCommand{\textsu}[1]{% +% {\sustyle #1}% +%} +\DeclareTextFontCommand{\textsu}{\sustyle} + %\let\textsuperior\textsu +\let\textsup\textsu + \let\textsups\textsu +\DeclareTextFontCommand{\textnumerator}{\nustyle} + \ifzpl@notextnu\else\let\textnu=\textnumerator\fi + \let\textnum\textnumerator +\DeclareTextFontCommand{\textde}{\destyle} + \let\textdenominator\textde +\DeclareTextFontCommand{\textinf}{\instyle} + \let\textinferior\textinf + +\newdimen\zpl@sixem\zpl@sixem6pt % for checking if a number refers to ex +\newdimen\zpl@y \newdimen\zpl@x + +% convert numerical entry that may be multiple of ex (<6) or em value +\def\zpl@toex#1{\zpl@x#1pt \ifdim\zpl@x<\z@\zpl@y-\zpl@x\else\zpl@y\zpl@x\fi \ifdim\zpl@y>\zpl@sixem \zpl@x\dimexpr + 1pt * (\dimexpr #1pt\relax) / \dimexpr \zpl@xht pt\relax\relax\fi} + +\newdimen\zpl@tmpdima \newdimen\zpl@tmpdimb \newdimen\zpl@tmpdimc +\newdimen\zpl@tmpdimd \newdimen\zpl@tmpdime \newdimen\zpl@tmpdimf +\newdimen\zpl@dimA +\newdimen\zpl@dimAA \newdimen\zpl@dimB \newdimen\zpl@dimBB +\newdimen\zpl@dimC % vertical center +% double cap letters for below bar, single cap for above + +\zpl@toex\zpl@sfrVC\zpl@dimC\zpl@x %Vertical center of fraction +\zpl@toex\zpl@sfrTH\zpl@tmpdimb\zpl@x % bar thickness +\zpl@tmpdime.5\zpl@tmpdimb % half bar thickness +\zpl@toex\zpl@sfrVS\zpl@tmpdimc\zpl@x% vertical space +\zpl@toex\zpl@deht\zpl@tmpdimd\zpl@x % height of unscaled figures +\zpl@tmpdimd\zpl@sfrSC\zpl@tmpdimd % height of scaled figures +\zpl@toex\zpl@debase\zpl@tmpdimf\zpl@x % unscaled baseline of de figures +\zpl@toex\zpl@nubase\zpl@tmpdima\zpl@x % unscaled baseline of nu figures +\zpl@tmpdima\zpl@sfrSC\zpl@tmpdima % scaled nu baseline +\zpl@tmpdimf\zpl@sfrSC\zpl@tmpdimf % scaled de baseline +\zpl@dimA\zpl@dimC +\advance\zpl@dimA by \zpl@tmpdime % top of bar +\zpl@dimAA\zpl@dimC +\advance\zpl@dimAA by -\zpl@tmpdime % bottom of bar +\zpl@dimB\zpl@dimA +\advance\zpl@dimB by \zpl@tmpdimc % top figure baseline +\advance\zpl@dimB by -\zpl@tmpdima +\zpl@dimBB\zpl@dimAA +\advance\zpl@dimBB by -\zpl@tmpdimc % +\advance\zpl@dimBB by -\zpl@tmpdimd % bottom figure baseline +\advance\zpl@dimBB by -\zpl@tmpdimf +\newcommand*{\textsfrac}[3][]{% like \textsfrac[1]{23}{34} +\mbox{% + \ifthenelse{\not\equal{#1}{}}%Test for integer portion [optional #1] + {\textlf{#1}\kern.12em}{}% + {\hmode@bgroup% +\ooalign{% + \setbox0=\hbox{\scalefont{\zpl@sfrSC}\nustyle#2}% + \hfil \raise\strip@pt\zpl@dimB ex\box0\hfil \crcr% + \leaders\hrule height \strip@pt\zpl@dimA ex depth -\strip@pt\zpl@dimAA ex\hfill \crcr% + \setbox1=\hbox{\scalefont{\zpl@sfrSC}\destyle#3}% + \hfil\raise\strip@pt\zpl@dimBB ex\box1\hfil}% +\egroup}} +} + +\AtEndPreamble{% +\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 +% \ifzpl@scosf +% %\traceon +% \setmainfont +% [Numbers = {\zpl@figurealign,\zpl@figurestyle}, +% SmallCapsFeatures = { Letters=SmallCaps , Numbers = OldStyle } +% ] {\zpl@base} +%% \traceoff +% \else +% \setmainfont +% [Numbers = {\zpl@figurealign,\zpl@figurestyle} +% SmallCapsFeatures = { Letters=SmallCaps , } +% ] {\zpl@base} +% \fi +%\traceon +\setmainfont + [Numbers = {Proportional , Lining }, + SmallCapsFeatures = { Letters = SmallCaps , Numbers = OldStyle } + ] {TeXGyrePagellaX} + + +% \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 % change + +\else % type1 + \fi % type1 +% both +%\ifzpl@KOMA +% %\let\textsuperscript\textsu +% \@ifpackageloaded{AB@authnote}{% +% \renewcommand\AB@authnote[1]{\textsu{#1}} +% \renewcommand\AB@affilnote[1]{\textsu{#1}} +% } +%\fi +%both +\ifzpl@thrm + \@ifundefined{theoremstyle}{}{ + \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 +} + +% 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 +\fi + +\endinput + diff --git a/fonts/newpx/tex/ot1minzpl.fd b/fonts/newpx/tex/ot1minzpl.fd index 490d13ff73..b37ce888c4 100644 --- a/fonts/newpx/tex/ot1minzpl.fd +++ b/fonts/newpx/tex/ot1minzpl.fd @@ -1,6 +1,6 @@ \ProvidesFile{ot1minzpl.fd}[2021/05/25 v1.0 font definition file for OT1/minzpl/TLF] -\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% diff --git a/fonts/newpx/tex/ot1zpllf.fd b/fonts/newpx/tex/ot1zpllf.fd index 197e31aa08..1782095ea3 100644 --- a/fonts/newpx/tex/ot1zpllf.fd +++ b/fonts/newpx/tex/ot1zpllf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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 c196686570..d1ea0482b8 100644 --- a/fonts/newpx/tex/ot1zplosf.fd +++ b/fonts/newpx/tex/ot1zplosf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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/ot1zpltlf.fd b/fonts/newpx/tex/ot1zpltlf.fd index c1dd06a019..0ef93971a8 100644 --- a/fonts/newpx/tex/ot1zpltlf.fd +++ b/fonts/newpx/tex/ot1zpltlf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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 1c97b20a46..81fd2b9d11 100644 --- a/fonts/newpx/tex/ot1zpltosf.fd +++ b/fonts/newpx/tex/ot1zpltosf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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/t1minzpl.fd b/fonts/newpx/tex/t1minzpl.fd index d320d7f8d4..c9262e9177 100644 --- a/fonts/newpx/tex/t1minzpl.fd +++ b/fonts/newpx/tex/t1minzpl.fd @@ -1,6 +1,6 @@ \ProvidesFile{t1minzpl.fd}[2021/05/25 v1.0 font definition file for T1/minzpl/TLF] -\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% diff --git a/fonts/newpx/tex/t1zpldnom.fd b/fonts/newpx/tex/t1zpldnom.fd index 4adab5a93b..91656b05ee 100644 --- a/fonts/newpx/tex/t1zpldnom.fd +++ b/fonts/newpx/tex/t1zpldnom.fd @@ -1,4 +1,4 @@ -\ProvidesFile{t1zpldnom.fd}[2021/09/23 v1.0] +\ProvidesFile{T1zpldnom.fd}[2021/09/23 v1.0] \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% \fi diff --git a/fonts/newpx/tex/t1zplinf.fd b/fonts/newpx/tex/t1zplinf.fd index a0dcfd32c0..eec0c28f13 100644 --- a/fonts/newpx/tex/t1zplinf.fd +++ b/fonts/newpx/tex/t1zplinf.fd @@ -1,4 +1,4 @@ -\ProvidesFile{t1zplinf.fd}[2015/01/17 v1.0] +\ProvidesFile{T1zplinf.fd}[2015/01/17 v1.0] \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% \fi diff --git a/fonts/newpx/tex/t1zpllf.fd b/fonts/newpx/tex/t1zpllf.fd index 0ed682d3f6..1757be99f7 100644 --- a/fonts/newpx/tex/t1zpllf.fd +++ b/fonts/newpx/tex/t1zpllf.fd @@ -1,6 +1,6 @@ -\ProvidesFile{t1zpllf.fd}[2021/05/25 v1.0 font definition file for T1/zpl/LF] +\ProvidesFile{T1zpl.fd}[2021/05/25 v1.0 font definition file for T1/zpl/lf] -\@ifundefined{ifzpl@sl}{\let\ifzpl@sl\iftrue}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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 1eca4cea2f..b403ce84fb 100644 --- a/fonts/newpx/tex/t1zplosf.fd +++ b/fonts/newpx/tex/t1zplosf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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/t1zpltlf.fd b/fonts/newpx/tex/t1zpltlf.fd index 55eed53ceb..ad19ffb543 100644 --- a/fonts/newpx/tex/t1zpltlf.fd +++ b/fonts/newpx/tex/t1zpltlf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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 cb4b8f4f99..bda43810cd 100644 --- a/fonts/newpx/tex/t1zpltosf.fd +++ b/fonts/newpx/tex/t1zpltosf.fd @@ -1,6 +1,6 @@ -\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}{} +\@ifundefined{ifzpl@sl}{\global\let\ifzpl@sl\iftrue}{} \expandafter\ifx\csname zpl@scaled\endcsname\relax \global\let\zpl@scaled\@empty% @@ -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 50b59fd2b4..dc9216ce49 100644 --- a/fonts/newpx/tex/ts1zpllf.fd +++ b/fonts/newpx/tex/ts1zpllf.fd @@ -1,24 +1,24 @@ -\ProvidesFile{ts1zpllf.fd}[2021/11/24 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 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}{} +\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 8c45a451ca..7362847b7a 100644 --- a/fonts/newpx/tex/ts1zplosf.fd +++ b/fonts/newpx/tex/ts1zplosf.fd @@ -1,24 +1,24 @@ -\ProvidesFile{ts1zplosf.fd}[2021/11/24 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 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}{} +\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 d16ecc401b..514358dac3 100644 --- a/fonts/newpx/tex/ts1zpltlf.fd +++ b/fonts/newpx/tex/ts1zpltlf.fd @@ -5,20 +5,20 @@ \fi \ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi -\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}{} +\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 9fc5aa68e5..63a4c154c7 100644 --- a/fonts/newpx/tex/ts1zpltosf.fd +++ b/fonts/newpx/tex/ts1zpltosf.fd @@ -5,20 +5,20 @@ \fi \ifdefined\zpl@spacing \else\global\let\zpl@spacing\@empty\fi -\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}{} +\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 -- cgit v1.2.3