diff options
Diffstat (limited to 'fonts/newpx/tex/newpxtext.sty')
-rw-r--r-- | fonts/newpx/tex/newpxtext.sty | 212 |
1 files changed, 107 insertions, 105 deletions
diff --git a/fonts/newpx/tex/newpxtext.sty b/fonts/newpx/tex/newpxtext.sty index 9d1686273d..937112b88c 100644 --- a/fonts/newpx/tex/newpxtext.sty +++ b/fonts/newpx/tex/newpxtext.sty @@ -8,8 +8,8 @@ % 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.534} -\def\filedate{2023/11/13} +\def\fileversion{1.535} +\def\filedate{2024/01/10} \ProvidesPackage{newpxtext}[% \filedate\space v\fileversion (Michael Sharpe) latex and unicode latex support for TeXGyrePagellaX] @@ -126,20 +126,21 @@ \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@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{supLspaced}{\renewcommand*{\zplsups@Lspaced}{#1}} -\DeclareOptionX{supRspaced}{\renewcommand*{\zplsups@Rspaced}{#1}} -\DeclareOptionX{supscolor}{\renewcommand*{\zplsups@color}{#1}} +%\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@scalefactor{1} +%\newcommand*{\zplsups@color}{black} +\newif\ifzpl@supsflag +\DeclareOptionX{supscaled}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@scaledval}{#1}} +\DeclareOptionX{supscale}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@scaledval}{#1}} +\DeclareOptionX{supsraised}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@raised}{#1}} +\DeclareOptionX{supLspaced}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@Lspaced}{#1}} +\DeclareOptionX{supRspaced}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@Rspaced}{#1}} +\DeclareOptionX{supspaced}{\zpl@supsflagtrue}%\DeclareOptionX{supscolor}{\zpl@supsflagtrue}%{\renewcommand*{\zplsups@color}{#1}} % Other options \DeclareOptionX{defaultsups}[true]{% @@ -205,12 +206,13 @@ \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@scalefactor{\strip@pt\zplsups@scale} -\def\zplsups@scaled{s*[\strip@pt\zplsups@scale]} +\ifzpl@supsflag% +\PackageWarningNoLine{newpxtext}{sups options no longer handled---use superiors package (v2) instead.}\fi +%\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 @@ -268,12 +270,12 @@ \fontfamily{zplsups}\selectfont} \let\supstyle\sustyle -\ifdim\zplsups@raise=\z@ +%\ifdim\zplsups@raise=\z@ \DeclareRobustCommand{\textsups}[1]{{\supstyle#1}} -\else - \DeclareRobustCommand{\textsups}[1]{% - \raisebox{\zplsups@raise}{\hbox{{\supstyle#1}}}} -\fi +%\else +% \DeclareRobustCommand{\textsups}[1]{% +% \raisebox{\zplsups@raise}{\hbox{{\supstyle#1}}}} +%\fi \RequirePackage{fontaxes} \fa@naming@exception{figures}{{superior}{proportional}}{sups} @@ -435,44 +437,44 @@ \fontfamily{zpltosf}\selectfont % } \ifzpl@defaultsups % - \else - \ExplSyntaxOn - \DeclareDocumentCommand \fakesuperscript {m} { - \@textsuperscript{\selectfont#1} - } - \RenewDocumentCommand \textsuperscript {s} { - \IfBooleanTF #1 \fakesuperscript \realsuperscript - } - \DeclareDocumentCommand \realsuperscript {m} { - \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 % will exist only for KOMA - { - \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} - } - { - \cs_new:Npn \footnotemarkfont {\normalfont} - } - \ExplSyntaxOff - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle} -{\hb@xt@1.8em}{\hb@xt@2.18em}{}{} - \ifzpl@KOMA - \setkomafont{footnotereference}{\normalfont\sustyle} - \setkomafont{footnotelabel}{\normalfont\sustyle} - \fi - \fi + \else\fi +% \ExplSyntaxOn +% \DeclareDocumentCommand \fakesuperscript {m} { +% \@textsuperscript{\selectfont#1} +% } +% \RenewDocumentCommand \textsuperscript {s} { +% \IfBooleanTF #1 \fakesuperscript \realsuperscript +% } +% \DeclareDocumentCommand \realsuperscript {m} { +% \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 % will exist only for KOMA +% { +% \cs_new:Npn \footnotemarkfont {\normalfont \ftntm@font} +% } +% { +% \cs_new:Npn \footnotemarkfont {\normalfont} +% } +% \ExplSyntaxOff +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +%% \patchcmd{\maketitle} +%%{\hb@xt@1.8em}{\hb@xt@2.18em}{}{} +% \ifzpl@KOMA +% \setkomafont{footnotereference}{\normalfont\sustyle} +% \setkomafont{footnotelabel}{\normalfont\sustyle} +% \fi +% \fi % \ifzpl@KOMA % \let\textsuperscript\sustyle % \setkomafont{footnotelabel}{\textsuperscript} @@ -556,46 +558,46 @@ \let\defigures\destyle \ifzpl@defaultsups % - \else - \RequirePackage{realscripts} - \ExplSyntaxOn - \DeclareDocumentCommand \imagsuperscript {m} { - \fontspec_if_fontspec_font:TF - { - \fontspec_if_opentype:TF - { \fontspec_if_feature:nTF {+sups} - { {\addfontfeature{VerticalPosition=Superior}#1} } - { \fakesuperscript{#1} } - } - { \fontspec_if_aat_feature:nnTF {10} {1} - { {\addfontfeature{VerticalPosition=Superior}#1} } - { \fakesuperscript{#1} } - } - } - { \fakesuperscript{#1} } -} - - \RenewDocumentCommand \realsuperscript {m} { - \hbox_set:Nn \l_tmpa_box {\imagsuperscript{#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}} - - \ExplSyntaxOff - - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} - \patchcmd{\maketitle} -{\hb@xt@1.8em}{\hb@xt@2.18em}{}{} - \ifzpl@KOMA - \setkomafont{footnotereference}{\normalfont\sustyle} - \setkomafont{footnotelabel}{\normalfont\sustyle} - \fi - \fi + \else\fi +% \RequirePackage{realscripts} +% \ExplSyntaxOn +% \DeclareDocumentCommand \imagsuperscript {m} { +% \fontspec_if_fontspec_font:TF +% { +% \fontspec_if_opentype:TF +% { \fontspec_if_feature:nTF {+sups} +% { {\addfontfeature{VerticalPosition=Superior}#1} } +% { \fakesuperscript{#1} } +% } +% { \fontspec_if_aat_feature:nnTF {10} {1} +% { {\addfontfeature{VerticalPosition=Superior}#1} } +% { \fakesuperscript{#1} } +% } +% } +% { \fakesuperscript{#1} } +%} +% +% \RenewDocumentCommand \realsuperscript {m} { +% \hbox_set:Nn \l_tmpa_box {\imagsuperscript{#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}} +% +% \ExplSyntaxOff +% +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +% \patchcmd{\maketitle}{\@textsuperscript{\normalfont\@thefnmark}}{\normalfont{\textsuperscript\@thefnmark}}{}{} +%% \patchcmd{\maketitle} +%%{\hb@xt@1.8em}{\hb@xt@2.18em}{}{} +% \ifzpl@KOMA +% \setkomafont{footnotereference}{\normalfont\sustyle} +% \setkomafont{footnotelabel}{\normalfont\sustyle} +% \fi +% \fi \renewcommand*{\textcircled}[1]{\hmode@bgroup\ooalign{% \hfil \raise -.255ex\hbox{{% |